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

Display huddles as 'You and...'. 

(imported from commit 35fe0e56751b1a2993bd99181e8bbd57e8c3ce81)
This commit is contained in:
Waseem Daher 2012-10-19 15:11:13 -04:00
parent 647f3c1220
commit 17d44be14a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zephyr/home.html
View File

@ -74,7 +74,7 @@
<tr id="personal-message">
<td colspan="2" class="message_header message_header_huddle left_part"></td>
<td class="message_header message_header_huddle right_part">
<input type="text" class="recipient_box" name="recipient" id="huddle_recipient" onblur="focus_on('new_message_content')" value="" placeholder="Huddle with one or more people..." autocomplete="off"/>
You and <input type="text" class="recipient_box" name="recipient" id="huddle_recipient" onblur="focus_on('new_message_content')" value="" placeholder="one or more people..." autocomplete="off"/>
</td>
</tr>
<tr>

2
zephyr/jstemplates/message.html
View File

@ -41,7 +41,7 @@
</td>
<td class="message_label_clickable message_header message_header_huddle right_part"
onclick="narrow.target({{id}}); narrow.by_recipient();"
title="Huddle with {{display_reply_to}}">{{display_reply_to}}</td>
title="Huddle with you and {{display_reply_to}}">You and {{display_reply_to}}</td>
</tr>
{{/if}}
{{/include_recipient}}

6
zephyr/static/js/narrow.js
View File

@ -61,7 +61,7 @@ exports.target = function (id) {
};
exports.all_personals = function () {
do_narrow("All huddles with you", function (other) {
do_narrow("<i class='icon-user'></i> You and anyone else", function (other) {
return other.type === "personal" || other.type === "huddle";
});
};
@ -85,7 +85,7 @@ exports.by_recipient = function () {
switch (message.type) {
case 'personal':
// Narrow to personals with a specific user
do_narrow("<i class='icon-user'></i> " + message.display_reply_to, function (other) {
do_narrow("<i class='icon-user'></i> You and " + message.display_reply_to, function (other) {
return (other.type === 'personal') &&
(((other.display_recipient.email === message.display_recipient.email)
&& (other.sender_email === message.sender_email)) ||
@ -95,7 +95,7 @@ exports.by_recipient = function () {
break;
case 'huddle':
do_narrow("<i class='icon-user'></i> " + message.display_reply_to, function (other) {
do_narrow("<i class='icon-user'></i> You and " + message.display_reply_to, function (other) {
return (other.type === "personal" || other.type === "huddle")
&& other.reply_to === message.reply_to;
});