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

Rename class-message to stream-message.

Browse Source 
(imported from commit fe69222bdca28bab303adca8ea8448a6aac35e40)
This commit is contained in:
Tim Abbott
2012-10-10 17:29:02 -04:00
parent 413fdeb655
commit 873f8fd2bb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zephyr/home.html
View File

@@ -37,7 +37,7 @@
<td class="ztable_col2" /> <td class="ztable_col2" />
<td class="ztable_col3" /> <td class="ztable_col3" />
</tr> </tr>
<tr id="class-message"> <tr id="stream-message">
<td colspan="2" class="message_newstyle_class"> <td colspan="2" class="message_newstyle_class">
<input type="text" class="recipient_box" name="stream" id="class" onchange="focus_on('instance')" value="" placeholder="Stream" autocomplete="off"/> <input type="text" class="recipient_box" name="stream" id="class" onchange="focus_on('instance')" value="" placeholder="Stream" autocomplete="off"/>
</td> </td>
@@ -54,7 +54,7 @@
<td class="message_picture"> <td class="message_picture">
<div id="stream_or_huddle"> <div id="stream_or_huddle">
<ul class="nav nav-pills nav-stacked" id="message-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="#stream-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>
</div> </div>

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

@@ -22,20 +22,20 @@ function clear_compose_box() {
function compose_button() { function compose_button() {
clear_compose_box(); clear_compose_box();
$('#sidebar a[href="#home"]').tab('show'); $('#sidebar a[href="#home"]').tab('show');
show_compose('class', $("#class")); show_compose('stream', $("#class"));
} }
function toggle_compose() { function toggle_compose() {
if ($("#message-type-tabs li.active").find("a[href=#class-message]").length !== 0) { if ($("#message-type-tabs li.active").find("a[href=#stream-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 {
show_compose('class', $("#class")); show_compose('stream', $("#class"));
} }
} }
function composing_class_message() { function composing_class_message() {
return $("#class-message").is(":visible"); return $("#stream-message").is(":visible");
} }
function composing_huddle_message() { function composing_huddle_message() {

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

@@ -116,16 +116,16 @@ $(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.
$('#message-type-tabs a[href="#class-message"]').on('shown', function (e) { $('#message-type-tabs a[href="#stream-message"]').on('shown', function (e) {
$('#personal-message').hide(); $('#personal-message').hide();
$('#class-message').show(); $('#stream-message').show();
$('#new_message_type').val('stream'); $('#new_message_type').val('stream');
$("#send-status").removeClass(status_classes).hide(); $("#send-status").removeClass(status_classes).hide();
focus_on("stream"); focus_on("stream");
}); });
$('#message-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(); $('#stream-message').hide();
$('#new_message_type').val('personal'); $('#new_message_type').val('personal');
$("#send-status").removeClass(status_classes).hide(); $("#send-status").removeClass(status_classes).hide();
focus_on("huddle_recipient"); focus_on("huddle_recipient");
@@ -187,7 +187,7 @@ $(function () {
}); });
$('.button-slide').click(function () { $('.button-slide').click(function () {
show_compose('class', $("#class")); show_compose('stream', $("#class"));
}); });
$('#sidebar a[href="#subscriptions"]').click(fetch_subs); $('#sidebar a[href="#subscriptions"]').click(fetch_subs);