paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove searchbar from narrowed view.

Browse Source 
Today I'm of the mindset that searching is a fundamentally
distinct operation than narrowing, so this reflects that.
(There would be a separate screen and UI for searching,
 I guess.)

(imported from commit 432a4088612dafd06184bec228b63056961325dd)
This commit is contained in:
Waseem Daher
2012-09-13 10:36:29 -04:00
parent 51e109d043
commit 3e5008b143
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zephyr/index.html
View File

@@ -65,12 +65,10 @@ var people_list = {{ people }};
</tbody> </tbody>
</table> </table>
<br/><br/> <br/><br/>
<div class="searchbox row"> <div class="narrowbox row">
<div class="input-prepend input-append pull-left"> <div class="input-prepend input-append pull-left">
<button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-remove"></i></button> <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> <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> </div>
</div> </div>
<div id="bottom_whitespace"></div> <div id="bottom_whitespace"></div>

4
zephyr/static/js/zephyr.js
View File

@@ -372,7 +372,7 @@ function do_narrow(description, filter_function) {
scroll_to_selected(); scroll_to_selected();
$("#show_all_messages").removeAttr("disabled"); $("#show_all_messages").removeAttr("disabled");
$("div.searchbox").show(); $("div.narrowbox").show();
$("#currently_narrowed_to").html(description); $("#currently_narrowed_to").html(description);
} }
@@ -444,7 +444,7 @@ function show_all_messages() {
scroll_to_selected(); scroll_to_selected();
$("div.searchbox").hide(); $("div.narrowbox").hide();
$("#show_all_messages").attr("disabled", "disabled"); $("#show_all_messages").attr("disabled", "disabled");
$("#currently_narrowed_to").html(""); $("#currently_narrowed_to").html("");
} }

6
zephyr/static/styles/zephyr.css
View File

@@ -201,7 +201,7 @@ input.send_zephyr {
float: right; float: right;
} }
div.searchbox { div.narrowbox {
position: fixed; position: fixed;
display: none; display: none;
padding: 2px; padding: 2px;
@@ -222,7 +222,3 @@ td.selected_message_indicator {
background-color: blue; background-color: blue;
width: 2px; width: 2px;
} }
form#zephyr_searchbox {
margin: 0px;
}