Merge pull request #157 from uw-it-aca/develop

Develop
uw-it-aca · Sep 23, 2016 · 9f6ac4b · 9f6ac4b
2 parents 4b28ce8 + 2a440cb
commit 9f6ac4b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/scout/static/scout/css/critical.scss b/scout/static/scout/css/critical.scss
@@ -396,6 +396,8 @@ a {color: $scout-link;}
 
             fieldset { border: none; padding: 0; margin:0;  margin-bottom: 20px; float: left; width: 50%; font-size: 14px;
                 legend { font-family: 'Raleway', sans-serif; font-weight: 700; font-size: 12px; text-transform: uppercase; margin-bottom: 8px; color: #6564a8; padding: 5px 0; letter-spacing: 1px; }
+
+                h3 { font-weight:normal; font-size: 11px; text-transform: uppercase; margin-bottom: 3px; color:#666; padding: 5px 0; letter-spacing: 1px; }
             }
 
             label { display: block; line-height: 20px; font-size: 14px; white-space: nowrap;

diff --git a/scout/templates/scout/study/detail.html b/scout/templates/scout/study/detail.html
@@ -160,13 +160,13 @@ <h4 class="visually-hidden">Space Details</h4>
                 <div class="scout-spot-hours">
                     <h3>Hours</h3>
                     <ul style="margin-bottom: 15px;">
-                        <li><span class="day">Monday:</span> {% for hours in spot.hours.monday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Tuesday:</span> {% for hours in spot.hours.tuesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Wednesday:</span> {% for hours in spot.hours.wednesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Thursday:</span> {% for hours in spot.hours.thursday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Friday:</span> {% for hours in spot.hours.friday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Saturday:</span> {% for hours in spot.hours.saturday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Sunday:</span> {% for hours in spot.hours.sunday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Monday:</span> {% for hours in spot.hours.monday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Tuesday:</span> {% for hours in spot.hours.tuesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Wednesday:</span> {% for hours in spot.hours.wednesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Thursday:</span> {% for hours in spot.hours.thursday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Friday:</span> {% for hours in spot.hours.friday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Saturday:</span> {% for hours in spot.hours.saturday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Sunday:</span> {% for hours in spot.hours.sunday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
                     </ul>
 
                     {% if spot.hours_notes %}

diff --git a/scout/templates/scout/tech/detail.html b/scout/templates/scout/tech/detail.html
@@ -189,13 +189,13 @@ <h4 class="visually-hidden">Map</h4>
                 <div class="scout-spot-hours">
                     <h3>Location Hours</h3>
                     <ul style="margin-bottom: 15px;">
-                        <li><span class="day">Monday:</span> {% for hours in spot.hours.monday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Tuesday:</span> {% for hours in spot.hours.tuesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Wednesday:</span> {% for hours in spot.hours.wednesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Thursday:</span> {% for hours in spot.hours.thursday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Friday:</span> {% for hours in spot.hours.friday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Saturday:</span> {% for hours in spot.hours.saturday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
-                        <li><span class="day">Sunday:</span> {% for hours in spot.hours.sunday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Monday:</span> {% for hours in spot.hours.monday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Tuesday:</span> {% for hours in spot.hours.tuesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Wednesday:</span> {% for hours in spot.hours.wednesday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Thursday:</span> {% for hours in spot.hours.thursday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Friday:</span> {% for hours in spot.hours.friday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Saturday:</span> {% for hours in spot.hours.saturday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
+                        <li><span class="day">Sunday:</span> {% for hours in spot.hours.sunday %}{% if not forloop.first %}, {% endif %} {{ hours.0|time:"P"|upper|remove_periods }} - {{ hours.1|time:"P"|upper|display_midnight|remove_periods }}{% empty %}<span class="closed">Closed</span>{% endfor %}</li>
                     </ul>
 
                     {% if spot.hours_notes %}

diff --git a/scout/templates/scout/tech/filter.html b/scout/templates/scout/tech/filter.html
@@ -16,28 +16,43 @@ <h2 class="visually-hidden" id="filter_header">Tech List Filter</h2>
                 <fieldset class="scout-filter-split">
                     <legend>Type</legend>
                     <div id="subcategory_select">
+
+                        <h3>Computers</h3>
+                        <label><input type="checkbox" value="Laptop Computer">Laptop Computer</label>
+                        <label><input type="checkbox" value="Tablet Computer">Tablet Computer</label>
+
+                        <h3>Cameras</h3>
+                        <label><input type="checkbox" value="Digital Camera">Digital Camera</label>
+                        <label><input type="checkbox" value="Digital Video Camera">Digital Video Camera</label>
+
+                        <h3>DSLR Accessories</h3>
+                        <label><input type="checkbox" value="DSLR Accessories - Light Kit">Light Kit</label>
+                        <label><input type="checkbox" value="DSLR Accessories - Macro Lens">Macro Lens</label>
+                        <label><input type="checkbox" value="DSLR Accessories - Macro Ring Lite Flash">Macro Ring Lite Flash</label>
+                        <label><input type="checkbox" value="DSLR Accessories - Shoe Mount Flash">Shoe Mount Flash</label>
+                        <label><input type="checkbox" value="DSLR Accessories - SLR Remote">SLR Remote</label>
+                        <label><input type="checkbox" value="DSLR Accessories - Telephoto Lens">Telephoto Lens</label>
+                        <label><input type="checkbox" value="DSLR Accessories - Wide Angle Lens">Wide Angle Lens</label>
+
+                        <h3>Other types</h3>
                         <label><input type="checkbox" value="Blu-ray Burner">Blu-ray Burner</label>
                         <label><input type="checkbox" value="Calculator">Calculator</label>
                         <label><input type="checkbox" value="Data Projector">Data Projector</label>
-                        <label><input type="checkbox" value="Digital Camera">Digital Camera</label>
                         <label><input type="checkbox" value="Digital Pen Tablet">Digital Pen Tablet</label>
-                        <label><input type="checkbox" value="Digital Video Camera">Digital Video Camera</label>
-                        <label><input type="checkbox" value="DSLR Accessories">DSLR Accessories</label>
                         <label><input type="checkbox" value="External Hard Drive">External Hard Drive</label>
-                        <label><input type="checkbox" value="Laptop Computer">Laptop Computer</label>
                         <label><input type="checkbox" value="Microphone Stands">Microphone Stands</label>
                         <label><input type="checkbox" value="Portable Audio System">Portable Audio System</label>
                         <label><input type="checkbox" value="Power Point Remote">Power Point Remote</label>
                         <label><input type="checkbox" value="Projection Screen">Projection Screen</label>
                         <label><input type="checkbox" value="Shotgun Microphone">Shotgun Microphone</label>
-                        <label><input type="checkbox" value="Tablet Computer">Tablet Computer</label>
                         <label><input type="checkbox" value="Tripod">Tripod</label>
                         <label><input type="checkbox" value="Voice Recorder/MP3 player">Voice Recorder/MP3 player</label>
                         <label><input type="checkbox" value="Wireless Microphone System">Wireless Microphone System</label>
+
                     </div>
                 </fieldset>
             </div>
-            
+
              <div class="scout-card clearfix">
                 <fieldset class="scout-filter-split">
                     <legend>Brand</legend>