Merge pull request #53 from wagtail/51-location-styling-missing-styles

Amend location page to include styling
wagtail · Feb 19, 2017 · 68180bf · 68180bf
2 parents 19fd2f2 + dbc0322
commit 68180bf
Showing 1 changed file with 10 additions and 20 deletions.
diff --git a/bakerydemo/templates/locations/location_page.html b/bakerydemo/templates/locations/location_page.html
@@ -7,11 +7,6 @@
         #map {
           height: 100%;
         }
-        html, body {
-          height: 100%;
-          margin: 0;
-          padding: 0;
-        }
     </style>
 {% endblock head-extra %}
 
@@ -25,7 +20,13 @@
         <div class="row">
             <div class="col-md-7">
                 <h1>{{ page.title }}</h1>
-                <p class="stand-first">{{ page.subtitle }}</p>
+                <p class="stand-first">
+                {% if page.is_open %}
+                  This location is currently open
+                {% else %}
+                  Sorry, this location is currently closed
+                {% endif %}
+                </p>
             </div>
         </div>
     </div>
@@ -41,10 +42,10 @@ <h1>{{ page.title }}</h1>
                 <div class="intro col-md-7"><p>{{ page.introduction }}</p></div>
             {% endif %}
 
-            {% if page.opening_hours %}
+            {% if page.operating_hours %}
                 <div class="col-md-4 col-md-offset-1 location-opening">
                 <h3>Opening hours</h3>
-                {% for hours in page.opening_hours %}
+                {% for hours in page.operating_hours %}
                   <time itemprop="openingHours" datetime="{{ hours }}" class="location-time">
                     <span class="day">{{ hours.day }}</span>:
                     <span class="hours">
@@ -72,24 +73,13 @@ <h3>Opening hours</h3>
       <h3>Address</h3>
         <address>{{ page.address|linebreaks }}</address>
     </div>
-    {# @TODO align address to opening hours? #}
   </div>
 
   <div class="map-container">
     <div id="map" class="maps embed-container"></div>
   </div>
 </div>
 
-    {% if page.is_open %}
-      Open Now!
-    {% else %}
-      Currently Closed
-    {% endif %}
-
-    {% for hours in page.operating_hours %}
-        <li>{{ hours }}</li>
-    {% endfor %}
-
 <div class="container">
   <div class="row">
     <div class="col-md-7 location-body">
@@ -107,7 +97,7 @@ <h3>Address</h3>
               lng: {{long}}
           },
           zoom: 15,
-          scrollwheel:  false
+          scrollwheel: false
         });
         var marker = new google.maps.Marker({
           position: {