From 947d450a6db2baad243f4c8f7d7ecb58a2b07e7b Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Sun, 17 Feb 2013 12:56:50 -0500
Subject: [PATCH] Draw user presence dots as actual list bullets

This keeps the name to the right of the bullet even if it overflows
onto two lines.

Fixes #909.

(imported from commit 60528bb30c2d9e29687b773abc76c18369a8a068)
---
 templates/zephyr/index.html     |  2 +-
 zephyr/static/styles/zephyr.css | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 8bd8ff0dcd..36847d311f 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -123,7 +123,7 @@ var people_list = [
                       <hr id="stream_filters_sep">
                       <div id="stream_filters" class="scrolling_list"></div>
                       <hr />
-                      <div id="user_presences" class="scrolling_list"></div>
+                      <ul id="user_presences" class="scrolling_list"></ul>
                   </ul>
               </div>
             </div>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index c29fd027e0..b7ece04ebd 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -144,26 +144,27 @@ a:hover code {
 }
 
 #user_presences {
-    margin-top: 1em;
-    overflow-y: hidden;
+    /* Pad so the bullets are visible */
+    padding-left: 20px;
+
+    margin-top:  1em;
+    margin-left: 0;
+    overflow-y:  hidden;
 }
 #user_presences:hover {
     overflow-y: auto;
 }
 
-#user_presences li.active-icon:before {
-    content: url(/static/images/presence/user-active.png);
-    margin-right: 6px; /* +9px image = 15px */
+#user_presences li.active-icon {
+    list-style-image: url(/static/images/presence/user-active.png);
 }
 
-#user_presences li.away-icon:before {
-    content: url(/static/images/presence/user-away.png);
-    margin-right: 6px; /* +9px image = 15px */
+#user_presences li.away-icon {
+    list-style-image: url(/static/images/presence/user-away.png);
 }
 
-#user_presences li.idle-icon:before {
-    content: url(/static/images/presence/user-idle.png);
-    margin-right: 6px; /* +9px image = 15px */
+#user_presences li.idle-icon {
+    list-style-image: url(/static/images/presence/user-idle.png);
 }
 
 ul.filters {