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

Style class / instance / username labels 

(imported from commit 2e0c9d72aa17971bdc12750dad62a59c46f646f1)
This commit is contained in:
Keegan McAllister 2012-08-29 12:29:01 -04:00
parent 8948b21758
commit 1b587fc2c6
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/zephyr/index.html
View File

@ -15,9 +15,9 @@
<tr id={{ zephyr.id }}> <tr id={{ zephyr.id }}>
<td class="pointer">{% if user_profile.pointer == zephyr.id %}<p id="selected">&gt;{% else %}<p>{% endif %}</p></td> <td class="pointer">{% if user_profile.pointer == zephyr.id %}<p id="selected">&gt;{% else %}<p>{% endif %}</p></td>
<td class="zephyr"> <td class="zephyr">
<p><span onclick="narrow('{{ zephyr.display_recipient }}', '{{ zephyr.id }}')" class="zephyr_class" style="background-color: {% if zephyr.recipient.type == 'class' %}yellow{% else %}magenta{% endif %};">{{ zephyr.display_recipient }}</span> / <p><span onclick="narrow('{{ zephyr.display_recipient }}', '{{ zephyr.id }}')" class="label {% if zephyr.recipient.type == 'class' %}zephyr_class{% else %}zephyr_personal_recipient{% endif %}">{{ zephyr.display_recipient }}</span>
<span onclick="narrow_instance('{{ zephyr.display_recipient }}', '{{ zephyr.instance }}', '{{ zephyr.id }}')" class="zephyr_instance" style="background-color: green;">{{ zephyr.instance }}</span> / <span onclick="narrow_instance('{{ zephyr.display_recipient }}', '{{ zephyr.instance }}', '{{ zephyr.id }}')" class="label zephyr_instance">{{ zephyr.instance }}</span>
<span onclick="prepare_personal('{{ zephyr.sender.user.username }}')" style="background-color: magenta;">{{ zephyr.sender.user.username }}</span><br /> <span onclick="prepare_personal('{{ zephyr.sender.user.username }}')" class="label zephyr_sender">{{ zephyr.sender.user.username }}</span><br />
{{ zephyr.content }} {{ zephyr.content }}
</p></td> </p></td>
</tr> </tr>

12
zephyr/static/js/zephyr.js
View File

@ -128,19 +128,19 @@ $(function() {
}); });
function add_message(index, zephyr) { function add_message(index, zephyr) {
var recipient_color; var recipient_class;
if (zephyr.type == "class") { if (zephyr.type == "class") {
recipient_color = "yellow"; recipient_class = "zephyr_class";
} else { } else {
recipient_color = "magenta"; recipient_class = "zephyr_personal_recipient";
} }
var new_str = "<tr id=" + zephyr.id + ">" + var new_str = "<tr id=" + zephyr.id + ">" +
"<td class='pointer'><p></p></td>" + "<td class='pointer'><p></p></td>" +
"<td class='zephyr'>" + "<td class='zephyr'>" +
"<p><span onclick=\"narrow('" + zephyr.display_recipient + "','" + zephyr.id + "')\" class='zephyr_class' style='background-color: " + recipient_color + ";'>" + zephyr.display_recipient + "<p><span onclick=\"narrow('" + zephyr.display_recipient + "','" + zephyr.id + "')\" class='label " + recipient_class + "'>" + zephyr.display_recipient +
"</span> / <span onclick=\"narrow_instance('" + zephyr.display_recipient + "','" + zephyr.instance + "','" + zephyr.id + "')\" class='zephyr_instance' style='background-color: green;'>" + "</span> <span onclick=\"narrow_instance('" + zephyr.display_recipient + "','" + zephyr.instance + "','" + zephyr.id + "')\" class='label zephyr_instance'>" +
zephyr.instance + "</span> / <span onclick=\"prepare_personal('" + zephyr.sender + "')\" style='background-color: magenta;'>" + zephyr.sender + "</span><br />" zephyr.instance + "</span> <span onclick=\"prepare_personal('" + zephyr.sender + "')\" class='label zephyr_sender'>" + zephyr.sender + "</span><br />"
+ zephyr.content + + zephyr.content +
"</p></td>" + "</p></td>" +
"</tr>" "</tr>"

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

@ -24,3 +24,19 @@ form.zephyr textarea {
#unhide { #unhide {
margin-top: 5px; margin-top: 5px;
} }
.zephyr_class {
background-color: #b94a48;
}
.zephyr_instance {
background-color: #468847;
}
.zephyr_personal_recipient {
background-color: #3a87ad;
}
.zephyr_sender {
background-color: #3a87ad;
}