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

Rename zephyr-type-tabs to message-type-tabs.

Browse Source 
(imported from commit 623d226209bc6cbe20721be08a271e52185ea65e)
This commit is contained in:
Tim Abbott
2012-10-09 17:46:41 -04:00
parent dfc0b1a4d9
commit 78c303e44a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zephyr/home.html
View File

@@ -53,7 +53,7 @@
<tr> <tr>
<td class="zephyr_picture"> <td class="zephyr_picture">
<div id="stream_or_huddle"> <div id="stream_or_huddle">
<ul class="nav nav-pills nav-stacked" id="zephyr-type-tabs"> <ul class="nav nav-pills nav-stacked" id="message-type-tabs">
<li class="active"><a href="#class-message" data-toggle="pill">Stream</a></li> <li class="active"><a href="#class-message" data-toggle="pill">Stream</a></li>
<li><a href="#personal-message" data-toggle="pill">Huddle</a></li> <li><a href="#personal-message" data-toggle="pill">Huddle</a></li>
</ul> </ul>

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

@@ -3,7 +3,7 @@ var status_classes = 'alert-error alert-success alert-info';
function show_compose(tabname, focus_area) { function show_compose(tabname, focus_area) {
$('#zephyr_compose').css({visibility: "visible"}); $('#zephyr_compose').css({visibility: "visible"});
$('.zephyr_comp').slideDown(100); $('.zephyr_comp').slideDown(100);
$('#zephyr-type-tabs a[href="#' + tabname + '-message"]').tab('show'); $('#message-type-tabs a[href="#' + tabname + '-message"]').tab('show');
focus_area.focus(); focus_area.focus();
focus_area.select(); focus_area.select();
} }
@@ -25,7 +25,7 @@ function compose_button() {
} }
function toggle_compose() { function toggle_compose() {
if ($("#zephyr-type-tabs li.active").find("a[href=#class-message]").length !== 0) { if ($("#message-type-tabs li.active").find("a[href=#class-message]").length !== 0) {
// In class tab, switch to personals. // In class tab, switch to personals.
show_compose('personal', $("#huddle_recipient")); show_compose('personal', $("#huddle_recipient"));
} else { } else {

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

@@ -116,12 +116,12 @@ $(function () {
// NB: This just binds to current elements, and won't bind to elements // NB: This just binds to current elements, and won't bind to elements
// created after ready() is called. // created after ready() is called.
$('#zephyr-type-tabs a[href="#class-message"]').on('shown', function (e) { $('#message-type-tabs a[href="#class-message"]').on('shown', function (e) {
$('#personal-message').hide(); $('#personal-message').hide();
$('#class-message').show(); $('#class-message').show();
$('#new_message_type').val('class'); $('#new_message_type').val('class');
}); });
$('#zephyr-type-tabs a[href="#personal-message"]').on('shown', function (e) { $('#message-type-tabs a[href="#personal-message"]').on('shown', function (e) {
$('#personal-message').show(); $('#personal-message').show();
$('#class-message').hide(); $('#class-message').hide();
$('#new_message_type').val('personal'); $('#new_message_type').val('personal');

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

@@ -348,7 +348,7 @@ input.send_zephyr {
border: 1px solid grey; border: 1px solid grey;
} }
#zephyr-type-tabs { #message-type-tabs {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
} }