From e8a1ecad9402b0435840a4c16ff482e6c32e2c01 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Wed, 12 Sep 2012 13:18:49 -0400
Subject: [PATCH] Renaming some divs for additional clarity.

unhide -> show_all_messages
narrow_indicator -> currently_narrowed_to
narrow -> searchbox

This is a little clearer about what these buttons/functions
do, which will be useful as we add a little more complexity
associated with searching.

(imported from commit b51e745ea71c212d6735e04011eaea5e71bf6d5a)
---
 templates/zephyr/index.html     |  6 +++---
 zephyr/static/js/zephyr.js      | 16 ++++++++--------
 zephyr/static/styles/zephyr.css |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 25ce460719..bab4d51fb2 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -65,10 +65,10 @@ var people_list = {{ people }};
               </tbody>
             </table>
             <br/><br/>
-            <div class="narrow row">
+            <div class="searchbox row">
               <div class="input-prepend input-append pull-left">
-                <button id="unhide" class="btn" disabled=disabled onclick="unhide()"><i class="icon-remove"></i></button>
-                <span class="add-on"><span id="narrow_indicator" class="badge"></span></span>
+                <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-remove"></i></button>
+                <span class="add-on"><span id="currently_narrowed_to" class="badge"></span></span>
                 <input class="input-xlarge search-query" type="text" value="" placeholder="Search">
                 <button class="btn"><i class="icon-search"></i></button>
               </div>
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 063db644f5..62f26fbdb1 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -269,7 +269,7 @@ function process_goto_hotkey(code) {
         break;
 
     case 65: // 'a': un-narrow
-        unhide();
+        show_all_messages();
         break;
     }
 
@@ -354,9 +354,9 @@ function do_narrow(description, filter_function) {
     select_zephyr(selected_zephyr_id);
     scroll_to_selected();
 
-    $("#unhide").removeAttr("disabled");
-    $("div.narrow").show();
-    $("#narrow_indicator").html(description);
+    $("#show_all_messages").removeAttr("disabled");
+    $("div.searchbox").show();
+    $("#currently_narrowed_to").html(description);
 }
 
 function narrow_huddle() {
@@ -421,15 +421,15 @@ function narrow_instance() {
     });
 }
 
-function unhide() {
+function show_all_messages() {
     current_view_predicate = home_view;
     get_all_zephyr_rows().show();
 
     scroll_to_selected();
 
-    $("div.narrow").hide();
-    $("#unhide").attr("disabled", "disabled");
-    $("#narrow_indicator").html("");
+    $("div.searchbox").hide();
+    $("#show_all_messages").attr("disabled", "disabled");
+    $("#currently_narrowed_to").html("");
 }
 
 function newline2br(content) {
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index a35573b4f5..10aef34df3 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -199,7 +199,7 @@ input.send_zephyr {
     float: right;
 }
 
-div.narrow {
+div.searchbox {
     position: fixed;
     display: none;
     padding: 2px;