From e7604e170aab011066ab650b29797919822fd2cc Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@humbughq.com>
Date: Tue, 26 Feb 2013 15:30:06 -0500
Subject: [PATCH] Make left sidebar HTML more standards-compliant

(imported from commit 4cfc7789d4b930ea074596ddf06d16638e91c9a2)
---
 templates/zephyr/index.html     | 8 +++-----
 zephyr/static/js/ui.js          | 6 +++---
 zephyr/static/styles/zephyr.css | 4 ++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 33eb1f0fdb..ea066c2639 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -107,16 +107,14 @@ var people_list = [
                   </div>
               </div>
               <div class="bottom_sidebar">
-                  <ul class="filters">
-                      <div id="global_filters">
+                      <ul id="global_filters" class="filters">
                           {# Special-case this link so we don't actually go to page top. #}
                           <li data-name="home" class="active-filter"><a href="#">Home <span class="count">(<span class="value"></span>)</span></a></li>
                           <li data-name="all" class="hidden-filter"><a href="#narrow/in/all">All messages <span class="count">(<span class="value"></span>)</span></a></li>
                           <li data-name="private" ><a href="#narrow/is/private-message">All private messages <span class="count">(<span class="value"></span>)</span></a></li>
-                      </div>
+                      </ul>
                       <hr id="stream_filters_sep">
-                      <div id="stream_filters" class="scrolling_list"></div>
-                  </ul>
+                      <ul id="stream_filters" class="filters scrolling_list"></ul>
               </div>
             </div>
           </div>
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index d2ac174a19..ff53ed9ce5 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -892,7 +892,7 @@ $(function () {
 
 function sort_narrow_list() {
     var items = $('#stream_filters li').get();
-    var div = $('#stream_filters');
+    var parent = $('#stream_filters');
     items.sort(function(a,b){
         var keyA = $(a).text();
         var keyB = $(b).text();
@@ -902,10 +902,10 @@ function sort_narrow_list() {
         return 0;
     });
 
-    div.empty();
+    parent.empty();
 
     $.each(items, function(i, li){
-          div.append(li);
+          parent.append(li);
     });
 }
 
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 877d16dfe3..ceb6ef8a00 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -138,6 +138,10 @@ a:hover code {
     margin-top: 1em;
 }
 
+#stream_filters_sep {
+    margin: 10px 14px 10px 25px;
+}
+
 #stream_filters {
     overflow-y: hidden;
 }