Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add search bar and buttons above narrowbar. 

(imported from commit 7def7d5824714a44c65d6a8e6699b2d8cda31418)
This commit is contained in:
Jessica McKellar 2012-10-26 10:57:58 -04:00 committed by Waseem Daher
parent 14388baf4b
commit 74a75eea0c
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
templates/zephyr/home.html
View File

@ -2,6 +2,16 @@
<div class="row"> <div class="row">
<div class="span9" id="top_statusbar"> <div class="span9" id="top_statusbar">
<div class="row" id="searchbox">
<form>
<div id="search_arrows">
<input id="search" type="text" placeholder="Search…">
<button class="btn search_button" type="button" id="search_up" onclick="search_button_handler(true);">↑</button>
<button class="btn search_button" type="button" id="search_down" onclick="search_button_handler(false);">↓</button>
<button class="btn search_button" type="button" id="search_exit" onclick="clear_search();">X</button>
</div>
</form>
</div>
<div class="narrowed_to_bar"> <div class="narrowed_to_bar">
<div id="narrowlabel"> <div id="narrowlabel">
<div class="close" onclick="narrow.show_all_messages()">&times;</div> <div class="close" onclick="narrow.show_all_messages()">&times;</div>
@ -32,6 +42,7 @@
<div class="span9"> <div class="span9">
<div class="message_list" id="main_div"> <div class="message_list" id="main_div">
<div id="top_whitespace"></div> <div id="top_whitespace"></div>
<div id="top_narrowed_whitespace"></div>
<div id="loading_control"> <div id="loading_control">
<button type="button" class="btn btn-large btn-block" id="load_more" <button type="button" class="btn btn-large btn-block" id="load_more"
onclick="load_more_messages();">Load older messages</button> onclick="load_more_messages();">Load older messages</button>

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

@ -358,6 +358,30 @@ input.send_message {
visibility: hidden; /* so that we pass clicks through to underneath us */ visibility: hidden; /* so that we pass clicks through to underneath us */
} }
#searchbox {
visibility: visible;
max-height: 30px;
padding: 5px 10px;
margin-left: 10px;
margin-right: 19px;
background-color: #DDD;
border: 1px solid black;
}
#search {
width: 81%;
}
.highlight {
background-color: #FCEA81;
}
.search_button {
margin-bottom: 10px;
text-align: center;
padding: 4px 10px 4px 10px;
}
.narrowed_to_bar { .narrowed_to_bar {
/* We use display: to toggle whether or not this actually shows up, /* We use display: to toggle whether or not this actually shows up,
but we need visibility: visible because its parent, but we need visibility: visible because its parent,
@ -400,7 +424,13 @@ table.floating_recipient {
#top_whitespace { #top_whitespace {
display: block; display: block;
height: 35px; height: 40px;
}
#top_narrowed_whitespace {
visibility: hidden;
display: none;
height: 34px; /* Height of narrowlabel + floating indicator */
} }
#bottom_whitespace { #bottom_whitespace {
@ -469,4 +499,4 @@ table.floating_recipient {
.hotkeys_table .hotkey_heading { .hotkeys_table .hotkey_heading {
padding-top: 1em; padding-top: 1em;
} }