Merge pull request #161 from levivm/feature/new_digitalglarus

Feature/new digitalglarus

digitalglarus/forms.py

@@ -123,9 +123,11 @@ class BookingDateForm(forms.Form):
             raise forms.ValidationError("Your end date must be greather than your start date.")
 
         q1 = Q(bookingorder__customer__user=self.user,
-               start_date__lte=start_date, end_date__gte=start_date)
+               start_date__lte=start_date, end_date__gte=start_date,
+               bookingorder__status=BookingOrder.APPROVED)
         q2 = Q(bookingorder__customer__user=self.user,
-               start_date__gt=start_date, start_date__lte=end_date)
+               start_date__gt=start_date, start_date__lte=end_date,
+               bookingorder__status=BookingOrder.APPROVED)
         if Booking.objects.filter(q1 | q2).exists():
             raise forms.ValidationError("You already have a booking in these dates.")
 

digitalglarus/templates/digitalglarus/login.html

@@ -98,6 +98,9 @@
 			  
               <button type="submit" class="btn btn-primary btn-blue">Login</button>
             </form>
+
+
+
             <br>
             <div class="notice-box">
                <p class="signup-text">Forgot password?<a href="{% url 'digitalglarus:reset_password' %}">Find ID/Password</a></p>

digitalglarus/templates/digitalglarus/supportus.html

@@ -33,6 +33,15 @@
     margin-top: 0px;
   }
 
+
+  @media only screen and (max-width: 450px) {
+
+     /*body { font-size: 2em; }*/
+     .intro-headline-big {font-size: 1.8em !important;}
+      
+
+  }
+
   </style>
 {% endblock %}
 
@@ -142,7 +151,7 @@
           <h2 class="whatwedo">What we do with your support</h2>
            <p class="carousel-text text-center supporter-white">Discover how your donation is being used in renovating our coworking space!</p>
             <div class="row">
-             <div class="col-md-6 col-md-offset-3 supportus-posts">
+             <div class="col-md-7 col-md-offset-3 supportus-posts">
                 <div class="blog-list">
                   {% for post in post_list %}
                   {% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}