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

Rename zephyr_compose* to compose*.

Browse Source 
(imported from commit 103351bbdb7657720d7b7b9f57ee88e5957d09a4)
This commit is contained in:
Tim Abbott
2012-10-09 17:56:16 -04:00
parent bc988b16e3
commit a62cd32107
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zephyr/home.html
View File

@@ -23,14 +23,14 @@
<div id="bottom_whitespace"></div> <div id="bottom_whitespace"></div>
</div> </div>
<div class="zephyr_compose" id="zephyr_compose"> <div class="compose" id="compose">
<div class="alert" id="send-status"></div> <div class="alert" id="send-status"></div>
<div class="close composebox-close" onclick="hide_compose()">&times;</div> <div class="close composebox-close" onclick="hide_compose()">&times;</div>
<div class="zephyr_comp"> <div class="zephyr_comp">
<form action="/send_message/" method="post" class="zephyr"> <form action="/send_message/" method="post" class="zephyr">
<input type="hidden" name="type" value="class" id="new_message_type"/> <input type="hidden" name="type" value="class" id="new_message_type"/>
{% csrf_token %} {% csrf_token %}
<table class="zephyr_compose_table"> <table class="compose_table">
<tbody> <tbody>
<tr style="visibility: collapse;"> <tr style="visibility: collapse;">
<td class="ztable_col1" /> <td class="ztable_col1" />

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

@@ -1,7 +1,7 @@
var status_classes = 'alert-error alert-success alert-info'; 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"}); $('#compose').css({visibility: "visible"});
$('.zephyr_comp').slideDown(100); $('.zephyr_comp').slideDown(100);
$('#message-type-tabs a[href="#' + tabname + '-message"]').tab('show'); $('#message-type-tabs a[href="#' + tabname + '-message"]').tab('show');
focus_area.focus(); focus_area.focus();
@@ -11,11 +11,11 @@ function show_compose(tabname, focus_area) {
function hide_compose() { function hide_compose() {
$('input, textarea, button').blur(); $('input, textarea, button').blur();
$('.zephyr_comp').slideUp(100, $('.zephyr_comp').slideUp(100,
function() { $('#zephyr_compose').css({visibility: "hidden"});}); function() { $('#compose').css({visibility: "hidden"});});
} }
function clear_compose_box() { function clear_compose_box() {
$("#zephyr_compose").find('input[type=text], textarea').val(''); $("#compose").find('input[type=text], textarea').val('');
} }
function compose_button() { function compose_button() {
@@ -66,12 +66,12 @@ function compose_error(error_text, bad_input) {
.addClass('alert-error') .addClass('alert-error')
.text(error_text) .text(error_text)
.stop(true).fadeTo(0, 1); .stop(true).fadeTo(0, 1);
$('#zephyr_compose').find('input[type="submit"]').removeAttr('disabled'); $('#compose').find('input[type="submit"]').removeAttr('disabled');
bad_input.focus().select(); bad_input.focus().select();
} }
function submit_buttons() { function submit_buttons() {
return $('#zephyr_compose').find('input[type="submit"]'); return $('#compose').find('input[type="submit"]');
} }
// *Synchronously* check if a class exists. // *Synchronously* check if a class exists.

2
zephyr/static/js/subscribe.js
View File

@@ -28,7 +28,7 @@ function sub_from_home(zephyr_class, prompt_button) {
timeout: 10*60*1000, // 10 minutes in ms timeout: 10*60*1000, // 10 minutes in ms
success: function (response) { success: function (response) {
add_to_class_list(response.data); add_to_class_list(response.data);
$("#zephyr_compose form").ajaxSubmit(); $("#compose form").ajaxSubmit();
prompt_button.stop(true).fadeOut(500); prompt_button.stop(true).fadeOut(500);
}, },
error: function (xhr, error_type, exn) { error: function (xhr, error_type, exn) {

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

@@ -5,7 +5,7 @@ var instance_list = [];
$(function () { $(function () {
var i; var i;
var send_status = $('#send-status'); var send_status = $('#send-status');
var buttons = $('#zephyr_compose').find('input[type="submit"]'); var buttons = $('#compose').find('input[type="submit"]');
var options = { var options = {
dataType: 'json', // This seems to be ignored. We still get back an xhr. dataType: 'json', // This seems to be ignored. We still get back an xhr.
@@ -36,7 +36,7 @@ $(function () {
}; };
send_status.hide(); send_status.hide();
$("#zephyr_compose form").ajaxForm(options); $("#compose form").ajaxForm(options);
// Populate class_list_hash with data handed over to client-side template. // Populate class_list_hash with data handed over to client-side template.
for (i = 0; i < class_list.length; i++) { for (i = 0; i < class_list.length; i++) {

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

@@ -138,7 +138,7 @@ table.message_table {
width: 100%; width: 100%;
} }
table.zephyr_compose_table { table.compose_table {
/* = zephyr_list */ /* = zephyr_list */
width: 640px; width: 640px;
table-layout: fixed; table-layout: fixed;
@@ -196,7 +196,7 @@ img.profile_picture {
height: 30px; height: 30px;
} }
#zephyr_compose { #compose {
visibility: hidden; visibility: hidden;
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
@@ -236,7 +236,7 @@ img.profile_picture {
filter: alpha(opacity=40); filter: alpha(opacity=40);
} }
.zephyr_compose_table #personal-message { .compose_table #personal-message {
display: none; display: none;
} }