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

229 lines
8.2 KiB
Handlebars
Raw Normal View History

Rename zephyrs to messages in various local variables. (imported from commit 91ac7e47c51fdcaf6559b06f07e36b041aad3e2c)
2012-10-10 16:29:48 +02:00
{{! Client-side Mustache template for rendering messages.}}
Long class and instance names get auto-abbreviated. This required some serious retooling of the table, and some thinking about the interactions between table-layout: fixed and colspan. And some of it is still a little magic-number-y. (Like that 97% width on zephyr_compose_box -- without it, the stream compose box looks weird in Chrome, but not Firefox.) (imported from commit 20c426ad2dae5efa3107890b28976a957bb3d1e3)
2012-10-02 20:47:01 +02:00
Rename zephyr_sender to message_sender. (imported from commit 14eb36342c10c341de299eb262af6ec1c0d51ca3)
2012-10-10 16:37:15 +02:00
{{! Because we use table-layout: fixed for the Message table,
Long class and instance names get auto-abbreviated. This required some serious retooling of the table, and some thinking about the interactions between table-layout: fixed and colspan. And some of it is still a little magic-number-y. (Like that 97% width on zephyr_compose_box -- without it, the stream compose box looks weird in Chrome, but not Firefox.) (imported from commit 20c426ad2dae5efa3107890b28976a957bb3d1e3)
2012-10-02 20:47:01 +02:00
all the column widths are computed from the first row;
these CSS classes specify the widths for that first,
collapsed row. (Otherwise, colspan breaks everything).}}
Maintain one layout-setting row at the top of each table (imported from commit b375ea78d79ca39b486d124256d0d4e89558d83a)
2012-10-02 23:19:33 +02:00
{{#include_layout_row}}
Eliminate some inline styles (visibility: collapse). (imported from commit a29f12ea2f82672ef05e5dcca486ec527acbd6dd)
2012-10-15 22:35:46 +02:00
<tr class="ztable_layout_row">
Fix incorrect use of self-closing tags <td /> is not valid HTML. (imported from commit e7914f88a7eedde887a8f6751d7516de1ccf99bf)
2013-08-27 19:14:44 +02:00
<td class="ztable_col1"></td>
<td class="ztable_col2"></td>
Long class and instance names get auto-abbreviated. This required some serious retooling of the table, and some thinking about the interactions between table-layout: fixed and colspan. And some of it is still a little magic-number-y. (Like that 97% width on zephyr_compose_box -- without it, the stream compose box looks weird in Chrome, but not Firefox.) (imported from commit 20c426ad2dae5efa3107890b28976a957bb3d1e3)
2012-10-02 20:47:01 +02:00
</tr>
Maintain one layout-setting row at the top of each table (imported from commit b375ea78d79ca39b486d124256d0d4e89558d83a)
2012-10-02 23:19:33 +02:00
{{/include_layout_row}}
Long class and instance names get auto-abbreviated. This required some serious retooling of the table, and some thinking about the interactions between table-layout: fixed and colspan. And some of it is still a little magic-number-y. (Like that 97% width on zephyr_compose_box -- without it, the stream compose box looks weird in Chrome, but not Firefox.) (imported from commit 20c426ad2dae5efa3107890b28976a957bb3d1e3)
2012-10-02 20:47:01 +02:00
Rename zephyrs to messages in various local variables. (imported from commit 91ac7e47c51fdcaf6559b06f07e36b041aad3e2c)
2012-10-10 16:29:48 +02:00
{{#each messages}}
Render all new zephyrs with a single template invocation (imported from commit 13803e0e96901d129d4aefcd5fde63548deb4dc0)
2012-09-24 23:26:32 +02:00
{{#with this}}
Split add_to_table into preprocessing, templating, and postprocessing (imported from commit ef17ff33f4496fcf619170bda1a46f14734d3e43)
2012-09-24 22:36:09 +02:00
{{#include_bookend}}
Fix indentation in message.handlebars (imported from commit 186bd9506aa6a7d3052f1f96e8af05a22812a636)
2013-10-09 14:33:46 +02:00
<tr class="bookend_tr">
<td colspan="2" class="bookend{{#if subscribed}} sub-unsub-message{{/if}}{{#if unsubscribed}} sub-unsub-message{{/if}}">
Display heading on boundary between historical and non-historical. (imported from commit b1669725d5a10ae086d04d0aa03341bcb0b8b858)
2013-04-03 23:30:06 +02:00
{{#if subscribed}}
Remove extra space between stream transitions. This was causing the spacing to be extra-spacious. We only need the extra space at the bottom of a --- Subscribed to stream x --- message. Also, add this space (and style things more nicely) with CSS -- <center> has been deprecated since HTML 4.01. (imported from commit b5500bdf67bdcca5f4e5b2d3bbd76846b3961254)
2013-04-17 05:52:20 +02:00
<span>--- Subscribed to stream {{subscribed}} ---</span>
Display heading on boundary between historical and non-historical. (imported from commit b1669725d5a10ae086d04d0aa03341bcb0b8b858)
2013-04-03 23:30:06 +02:00
{{/if}}
{{#if unsubscribed}}
Remove extra space between stream transitions. This was causing the spacing to be extra-spacious. We only need the extra space at the bottom of a --- Subscribed to stream x --- message. Also, add this space (and style things more nicely) with CSS -- <center> has been deprecated since HTML 4.01. (imported from commit b5500bdf67bdcca5f4e5b2d3bbd76846b3961254)
2013-04-17 05:52:20 +02:00
<span>--- Unsubscribed from stream {{unsubscribed}} ---</span>
Display heading on boundary between historical and non-historical. (imported from commit b1669725d5a10ae086d04d0aa03341bcb0b8b858)
2013-04-03 23:30:06 +02:00
{{/if}}
Remove extra space between stream transitions. This was causing the spacing to be extra-spacious. We only need the extra space at the bottom of a --- Subscribed to stream x --- message. Also, add this space (and style things more nicely) with CSS -- <center> has been deprecated since HTML 4.01. (imported from commit b5500bdf67bdcca5f4e5b2d3bbd76846b3961254)
2013-04-17 05:52:20 +02:00
</td>
Display heading on boundary between historical and non-historical. (imported from commit b1669725d5a10ae086d04d0aa03341bcb0b8b858)
2013-04-03 23:30:06 +02:00
</tr>
Split add_to_table into preprocessing, templating, and postprocessing (imported from commit ef17ff33f4496fcf619170bda1a46f14734d3e43)
2012-09-24 22:36:09 +02:00
{{/include_bookend}}
Show date in a bar separating messages rather than on each message. Trac #1393. (imported from commit f69d01bd8149f4549694db1ff517a2d0929ffc6a)
2013-06-24 23:16:50 +02:00
{{#if show_date}}
message_list: Don't leak date row headers when prepending messages. (imported from commit 794c668dd79f89000e6559c0d96c78832e4e43d0)
2013-07-03 21:14:54 +02:00
<tr class="date_row" data-zid="{{id}}"><td colspan="4">{{{show_date}}}</td></tr>
Show date in a bar separating messages rather than on each message. Trac #1393. (imported from commit f69d01bd8149f4549694db1ff517a2d0929ffc6a)
2013-06-24 23:16:50 +02:00
{{/if}}
Implement message summarization experiment. When you read messages in a narrow and then un-narrow, collapse adjacent messages read in the narrow into a summary row that can be clicked to expand those messages. Scoped to staging with feature flags. The implementation of this within our current MessageList is rather ugly. (imported from commit bcb3a39d8c0c334136fe86318f18ead03f0f50bf)
2013-07-25 22:08:16 +02:00
{{#if is_summary}}
summarize-experiment: Fix an uncommon case that breaks rows.get(). One of the ugly parts of message_list.js is how it re-uses the message objects from the server to hold handlebars template parameters. These objects are shared between different message lists and re-renders, but are mutated by the rendering process. The `dom_id` attribute is normally unset on summary rows, and should not be used in the template. But when a message comes in with a `dom_id` from another render, it can end up on the summary row, breaking `rows.get()`. (imported from commit ef6af65d5e995dffbd7234547786d6ea861920da)
2013-08-08 23:12:45 +02:00
<tr zid="{{first_message_id}}" data-messages="{{message_ids}}" class="summary_row selectable_row{{#include_footer}} last_message{{/include_footer}}{{^is_stream}} summary_row_private_message{{/is_stream}}">
Make summary rows selectable. We represent summary rows by the ID of their first message for for selection purposes. (imported from commit 9f3c4d23f6b1295b117d5197e214de983bb2cc20)
2013-08-07 23:04:19 +02:00
<td class="summary_colorblock" style="background-color: {{background_color}};">
<span class="pointer_icon"><i class="icon-vector-caret-right"></i></span>
</td>
Implement message summarization experiment. When you read messages in a narrow and then un-narrow, collapse adjacent messages read in the narrow into a summary row that can be clicked to expand those messages. Scoped to staging with feature flags. The implementation of this within our current MessageList is rather ugly. (imported from commit bcb3a39d8c0c334136fe86318f18ead03f0f50bf)
2013-07-25 22:08:16 +02:00
<td class="message_header message_header_stream right_part">
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
{{! [+] }}
Add semantic classes for expanding/collapsing messages (imported from commit 9d71fd46667058ba92d941b79d6e2c822c721efe)
2013-09-11 20:42:25 +02:00
<i class="messages-expand icon-vector-expand-alt"></i>
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
{{#if is_stream}}
{{! invite-only lock icon }}
{{#if invite_only}}
<i class="icon-vector-lock" title="This is an invite-only stream"></i>
{{/if}}
{{! stream }}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
<a class="message_label_clickable narrows_by_recipient stream_label"
href="{{stream_url}}"
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
title="Narrow to stream &quot;{{display_recipient}}&quot;">{{display_recipient}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
</a>
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
{{! > }}
&nbsp;
<i class="icon-vector-narrow icon-vector-small"></i>
<span class="copy-paste-text">&gt;</span>&nbsp;
{{! topic }}
<span class="stream_topic">
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
<a class="message_label_clickable narrows_by_subject"
href="{{topic_url}}"
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
title="Narrow to stream &quot;{{display_recipient}}&quot;, topic &quot;{{subject}}&quot;">
{{subject}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
</a>
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
{{! exterior links (e.g. to a trac ticket) }}
{{#each subject_links}}
<a href="{{this}}" target="_blank">
Add </a> closing tags for exterior topic links (imported from commit c54615088faf712cc5ccaa982c5091b54ccf634d)
2013-10-03 21:39:31 +02:00
<i class="icon-vector-external-link-sign"></i>
</a>
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
{{/each}}
</span>
{{else}}
{{! You and Somebody Else, links to PM narrow}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
<a class="message_label_clickable narrows_by_recipient"
href="{{pm_with_url}}"
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
title="Narrow to your private messages with {{display_reply_to}}">
You and {{display_reply_to}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
</a>
Add recipient bar features to summary bar. The summary bar now has the following features: * invite-only locks * narrowing links to stream/topic/person * exterior topic links (imported from commit ddb987b8e04e7dfc2d602c958270b7bc0e37fb5f)
2013-08-27 16:21:02 +02:00
{{/if}}
{{! "(5 read)" or something similar}}
({{count}} {{summary_adjective}})
Implement message summarization experiment. When you read messages in a narrow and then un-narrow, collapse adjacent messages read in the narrow into a summary row that can be clicked to expand those messages. Scoped to staging with feature flags. The implementation of this within our current MessageList is rather ugly. (imported from commit bcb3a39d8c0c334136fe86318f18ead03f0f50bf)
2013-07-25 22:08:16 +02:00
</td>
</tr>
{{else}}
Render Huddle titles the way Waseem detailed in his original mockup. This actually involved refactoring a good bit of existing code; we in this commit introduce a new property of zephyr called .reply_to, which is the fully rendered-to-string and pretty-printable version of the person to which any reply should be addressed. This is useful for grouping personals, where if you simply went by the .display_recipient or .sender you would have to check them against eachother. We also introduce a new narrow_classish command, which is triggered on clicking on the "Huddle with…" text. This method intelligently determines which sort of narrowing to do; we essentially moved out code from the 'r' key handling section and put it in its own function. (imported from commit 2406ee0f6f83b990eec83190d2e8858865c06238)
2012-09-20 21:33:45 +02:00
{{#include_recipient}}
Add data-messages attribute to recipient rows. This is to set up collapsing, but I think they could be useful in general, so I'm keeping this is a separate commit. (imported from commit 0da2b8ef246649f678c7cb6664ee78bf36aca076)
2013-08-23 00:30:05 +02:00
<tr zid="{{id}}" class="recipient_row" data-messages="{{message_ids}}">
Rename is_class to is_stream. (imported from commit 6a68581c8a3ab72b13907af651a772a4a190ac40)
2012-10-10 23:31:26 +02:00
{{#if is_stream}}
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! color strip on the left }}
<td class="message_header_colorblock" style="background-color: {{background_color}};">
</td>
Modify message list template to switch to a cleaner appearance. * Switch to a 2-column layout by removing the old unused message tools column and the pointer columns. * Change column spans to 2 instead of 4. * Change recipient bar to have a colorblock on the left. * Add a special "last_message" class to messages that appear last in a message block. (imported from commit 55036587445c699d5c55d52b0236daf402a80cff)
2013-06-21 23:35:45 +02:00
<td class="message_header message_header_stream right_part">
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! [-] }}
Allow collapsing of recipient sections. This is experimental, for staging only. There might be a better way to model this than dueling force_expand/force_collapse flags, but it works for now. The code in collapse_recipient_group() could also be DRYed up relative to expand_summary_row(). (imported from commit 107151d1ecd640970fb7700d41278a003bd1abaa)
2013-08-23 01:04:34 +02:00
{{#if collapsible}}
Add semantic classes for expanding/collapsing messages (imported from commit 9d71fd46667058ba92d941b79d6e2c822c721efe)
2013-09-11 20:42:25 +02:00
<i class="messages-collapse icon-vector-collapse-alt"></i>
Allow collapsing of recipient sections. This is experimental, for staging only. There might be a better way to model this than dueling force_expand/force_collapse flags, but it works for now. The code in collapse_recipient_group() could also be DRYed up relative to expand_summary_row(). (imported from commit 107151d1ecd640970fb7700d41278a003bd1abaa)
2013-08-23 01:04:34 +02:00
{{/if}}
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! invite only lock }}
{{#if invite_only}}
<i class="icon-vector-lock" title="This is an invite-only stream"></i>
{{/if}}
{{! stream link }}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
<a class="message_label_clickable narrows_by_recipient stream_label"
href="{{stream_url}}"
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
title="Narrow to stream &quot;{{display_recipient}}&quot;">
{{display_recipient}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
</a>
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! > (narrowing icon) }}
&nbsp;
<i class="icon-vector-narrow icon-vector-small"></i>
<span class="copy-paste-text">&gt;</span>
&nbsp;
{{! topic stuff }}
Allow anyone to edit a "no topic" message This change would allow anyone in the realm to set a topic for a "no topic" message. As soon as the message topic is set, only the sender can change it again. (imported from commit 0a91a93b8fd14549965cedc79f45ffd869d82307)
2013-08-16 23:45:13 +02:00
<span class="stream_topic">
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! topic link }}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
<a class="message_label_clickable narrows_by_subject"
href="{{topic_url}}"
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
title="Narrow to stream &quot;{{display_recipient}}&quot;, topic &quot;{{subject}}&quot;">
{{#if ../../../../../use_match_properties}}
{{{match_subject}}}
{{else}}
{{subject}}
{{/if}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
</a>
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! edit subject pencil icon }}
Allow anyone to edit a "no topic" message This change would allow anyone in the realm to set a topic for a "no topic" message. As soon as the message topic is set, only the sender can change it again. (imported from commit 0a91a93b8fd14549965cedc79f45ffd869d82307)
2013-08-16 23:45:13 +02:00
{{#if empty_subject}}
<i class="icon-vector-pencil edit_subject"></i>
{{/if}}
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{! exterior links (e.g. to a trac ticket) }}
{{#each subject_links}}
<a href="{{this}}" target="_blank">
<i class="icon-vector-external-link-sign"></i>
Add </a> closing tags for exterior topic links (imported from commit c54615088faf712cc5ccaa982c5091b54ccf634d)
2013-10-03 21:39:31 +02:00
</a>
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
{{/each}}
Allow anyone to edit a "no topic" message This change would allow anyone in the realm to set a topic for a "no topic" message. As soon as the message topic is set, only the sender can change it again. (imported from commit 0a91a93b8fd14549965cedc79f45ffd869d82307)
2013-08-16 23:45:13 +02:00
</span>
Add whitespace/comments to message.handlebars. I added comments to the section of the template that generates recipient bars for stream/topic messages. (imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-03 21:36:50 +02:00
Allow anyone to edit a "no topic" message This change would allow anyone in the realm to set a topic for a "no topic" message. As soon as the message topic is set, only the sender can change it again. (imported from commit 0a91a93b8fd14549965cedc79f45ffd869d82307)
2013-08-16 23:45:13 +02:00
<span class="topic_edit">
<span class="topic_edit_form" id="{{id}}"></span>
</span>
Restore 'narrow to stream' functionality when you click on the stream name. (imported from commit efb82e44205e41979062ec6a1b1a989ea52d2c97)
2012-10-19 16:24:24 +02:00
</td>
Clean up zephyr template slightly. (imported from commit 999e6261785a0714bf72a8fe8f2c05c20cf59db9)
2012-09-28 17:19:31 +02:00
{{else}}
Modify message list template to switch to a cleaner appearance. * Switch to a 2-column layout by removing the old unused message tools column and the pointer columns. * Change column spans to 2 instead of 4. * Change recipient bar to have a colorblock on the left. * Add a special "last_message" class to messages that appear last in a message block. (imported from commit 55036587445c699d5c55d52b0236daf402a80cff)
2013-06-21 23:35:45 +02:00
<td class="message_header_colorblock message_header_private_message" style="background-color: {{background_color}};"></td>
Switch the private message recipient bar back to a dark background (imported from commit b172e35bf1f33eda5dc8b352d017a96530bf27b7)
2013-07-02 20:37:44 +02:00
<td class="message_header message_header_private_message right_part dark_background">
Allow collapsing of recipient sections. This is experimental, for staging only. There might be a better way to model this than dueling force_expand/force_collapse flags, but it works for now. The code in collapse_recipient_group() could also be DRYed up relative to expand_summary_row(). (imported from commit 107151d1ecd640970fb7700d41278a003bd1abaa)
2013-08-23 01:04:34 +02:00
{{#if collapsible}}
Add semantic classes for expanding/collapsing messages (imported from commit 9d71fd46667058ba92d941b79d6e2c822c721efe)
2013-09-11 20:42:25 +02:00
<i class="messages-collapse icon-vector-collapse-alt"></i>
Allow collapsing of recipient sections. This is experimental, for staging only. There might be a better way to model this than dueling force_expand/force_collapse flags, but it works for now. The code in collapse_recipient_group() could also be DRYed up relative to expand_summary_row(). (imported from commit 107151d1ecd640970fb7700d41278a003bd1abaa)
2013-08-23 01:04:34 +02:00
{{/if}}
Use <a> tags for links in the recipient/summary bars. The main user-facing feature here is that users can open narrows in new tabs or windows. Internally, it makes the HTML more semantic. One consequence of making these elements into actual anchor tags is that clicking on them no longer triggers this logic to close the compose box when you click outside of it: // Unfocus our compose area if we click out of it. Don't let exits out // of modals or selecting text (for copy+paste) trigger cancelling. if (compose.composing() && !$(e.target).is("a") && ($(e.target).closest(".modal").length === 0) && window.getSelection().toString() === "") { compose.cancel(); } Instead of patching the above code, I elected to just call compose.cancel() explicitly in the click handlers for the links themselves. We are gonna try to clean up the compose-box behavior globally soon. (imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-03 23:05:46 +02:00
<a class="message_label_clickable narrows_by_recipient"
href="{{pm_with_url}}"
Use white text for recipient labels on streams set to dark colors Fixes #577. (imported from commit 0518e33b96bc0028fc80d533f6b8ec35fd5cdc04)
2013-02-16 09:43:27 +01:00
title="Narrow to your private messages with {{display_reply_to}}">
Fix indentation in message.handlebars (imported from commit 186bd9506aa6a7d3052f1f96e8af05a22812a636)
2013-10-09 14:33:46 +02:00
You and {{display_reply_to}}
</a>
Attempt at making stream names more prominent when skimming. Known issues: * Narrowing links sort of broken * "S/H" is a terrible selector (imported from commit 14d309b55dfaa4c4bc5cb1310a111a46f2fb7e20)
2012-10-17 22:03:00 +02:00
</td>
Clean up zephyr template slightly. (imported from commit 999e6261785a0714bf72a8fe8f2c05c20cf59db9)
2012-09-28 17:19:31 +02:00
{{/if}}
Fix bad tags in message.handlebars (imported from commit 507d5ce1666e66f613ccef8932c0a51ce3c94aa8)
2013-10-08 13:09:12 +02:00
</tr>
Render Huddle titles the way Waseem detailed in his original mockup. This actually involved refactoring a good bit of existing code; we in this commit introduce a new property of zephyr called .reply_to, which is the fully rendered-to-string and pretty-printable version of the person to which any reply should be addressed. This is useful for grouping personals, where if you simply went by the .display_recipient or .sender you would have to check them against eachother. We also introduce a new narrow_classish command, which is triggered on clicking on the "Huddle with…" text. This method intelligently determines which sort of narrowing to do; we essentially moved out code from the 'r' key handling section and put it in its own function. (imported from commit 2406ee0f6f83b990eec83190d2e8858865c06238)
2012-09-20 21:33:45 +02:00
{{/include_recipient}}
Clean up zephyr template slightly. (imported from commit 999e6261785a0714bf72a8fe8f2c05c20cf59db9)
2012-09-28 17:19:31 +02:00
<tr zid="{{id}}" id="{{dom_id}}"
Make summary rows selectable. We represent summary rows by the ID of their first message for for selection purposes. (imported from commit 9f3c4d23f6b1295b117d5197e214de983bb2cc20)
2013-08-07 23:04:19 +02:00
class="message_row{{^is_stream}} private-message{{/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#contains_mention}} mention{{/contains_mention}}{{#include_footer}} last_message{{/include_footer}}{{#unread}} unread{{/unread}} selectable_row">
Fix indentation in message.handlebars (imported from commit 186bd9506aa6a7d3052f1f96e8af05a22812a636)
2013-10-09 14:33:46 +02:00
<td class="messagebox_colorblock{{^is_stream}} message_header_private_message{{/is_stream}}" style="background-color: {{background_color}};"><span class="pointer_icon"><i class="icon-vector-caret-right"></i></span></td>
<td class="messagebox{{^include_sender}} prev_is_same_sender{{/include_sender}}{{^is_stream}} private-message{{/is_stream}}">
Revert "Chevron icon on each message now causes a dropdown menu; hover on message for info" This reverts commit f8fbf70c8502370a78159e24f3cf9589fb9d384f, since we're waiting on some Firefox and no-hover fixes. (imported from commit 6b13f5bb9d907303ab311afd7da584bc06538c91)
2013-07-03 23:25:24 +02:00
<div class="message_top_line">
Add unread green dots to the left of the message, which fade out. This is a heavily adapted version of Allen's commit that did the same. Some gotchas: * Because the unread count indicator is not in the message content, we can't center it in the middle of the message content (we'd need to put it inside the div to do so). * Awesome Gecko bug surrounding tables makes this also somewhat annoying, so watch out for this if you're making changes here. > In Gecko, if you have a positioned <table> element inside a > positioned block element, such as a <div>, a position: absolute; > styled element inside the table would be positioned relative to the > outer <div> rather than the table, which is the nearest positioned > ancestor. This is a bug, and has not been fixed. (imported from commit 45c00c37f3721c211331b228e84d46283e1cc9ba)
2013-07-18 22:16:01 +02:00
<div class="unread_marker"></div>
Clean up zephyr template slightly. (imported from commit 999e6261785a0714bf72a8fe8f2c05c20cf59db9)
2012-09-28 17:19:31 +02:00
{{#include_sender}}
Revised message actions and message info popovers Since f8fbf70c8502 had troubles in FF and people did not like the message-info-on-hover, this commit hopefully will work better. Tables are likely the culprit with using dropdowns in FF, so when we stop having the messagelist be at table, we can switch back to dropdowns which are relatively positioned rather than absolutely on the page. (imported from commit c49a5cd45f3439d089146771e2aa0cee6431125a)
2013-07-11 23:06:58 +02:00
<span class="message_sender sender_info_hover">
Show correct avatar for desktop notifications. This updates desktop notifications to use avatar_url from the server (in case users have uploaded their own avatar). It also removes the unneeded stamp parameter from the URL, and it unifies URL handling with message_list. (imported from commit 6bb43a25c01cc3d26f30fc167780a477d1c5d023)
2013-06-13 23:48:23 +02:00
{{! See ../js/notifications.js for another user of avatar_url. }}
Change the layout of the message boxes in the message pane and make other message-related adjustments. Specifically: * Leave the avatar image as inline and round it. * Move timestamp to the left column. * Replace the "Info" link with a permanent info sign. * Move the pointer bar to the left. * Remove borders * Change selection background colors, and PM colors. * Introduce the "narrowing" icon into our FontAwesome set. * Modify the tests to account for the new "narrowing" icon and fixed a bug in star-finding. * Clean up CSS and add a more prominent color to private messages (imported from commit 8a8d6de8acccc52c0d16f5d1ce31aabdc72c88c8)
2013-05-10 22:48:02 +02:00
<div class="inline_profile_picture"
Show correct avatar for desktop notifications. This updates desktop notifications to use avatar_url from the server (in case users have uploaded their own avatar). It also removes the unneeded stamp parameter from the URL, and it unifies URL handling with message_list. (imported from commit 6bb43a25c01cc3d26f30fc167780a477d1c5d023)
2013-06-13 23:48:23 +02:00
style="background-image: url('{{small_avatar_url}}');"/>
Support /me syntax. If a user types "/me runs to the store", we put "runs to the store" in bold after their name. (imported from commit fbc11e99244e1c8fa1c03e4753e706957fcd449e)
2013-11-08 02:00:12 +01:00
<span class="sender_name{{#status_message}} sender-status{{/status_message}}">
{{sender_full_name}}
{{#if status_message}}
{{{ status_message }}}
{{/if}}
</span>
Refactor: Put the zephyr <tr>s in the template. (imported from commit 8a822d7c8463c248d536f97f07bfb19ca242b83f)
2012-09-18 16:45:25 +02:00
</span>
Fix indentation in message template (imported from commit e506bccefdfdc3c015f71f5caa144ce5de2a2bac)
2013-02-09 07:18:23 +01:00
{{/include_sender}}
Revised message actions and message info popovers Since f8fbf70c8502 had troubles in FF and people did not like the message-info-on-hover, this commit hopefully will work better. Tables are likely the culprit with using dropdowns in FF, so when we stop having the messagelist be at table, we can switch back to dropdowns which are relatively positioned rather than absolutely on the page. (imported from commit c49a5cd45f3439d089146771e2aa0cee6431125a)
2013-07-11 23:06:58 +02:00
<span class="message_time">{{timestr}}</span>
Modify some messagebox colors and put the timestamp and icons into one line * Change the highlight colors for private and mention messages * Put timestamp and message controls into a single line * Modify layout to allow more flexibility in control placement * Lighten narrowed view background color * Adjust composition area columns (imported from commit c7edca358b079da0ca76fa26d998946574bded6a)
2013-05-24 00:03:39 +02:00
<div class="message_controls">
<div class="star">
<span class="message_star {{#if starred}}icon-vector-star{{else}}icon-vector-star empty-star{{/if}}"
Fix bad tags in message.handlebars (imported from commit 507d5ce1666e66f613ccef8932c0a51ce3c94aa8)
2013-10-08 13:09:12 +02:00
title="{{#if starred}}Unstar{{else}}Star{{/if}} this message"></span>
Modify some messagebox colors and put the timestamp and icons into one line * Change the highlight colors for private and mention messages * Put timestamp and message controls into a single line * Modify layout to allow more flexibility in control placement * Lighten narrowed view background color * Adjust composition area columns (imported from commit c7edca358b079da0ca76fa26d998946574bded6a)
2013-05-24 00:03:39 +02:00
</div>
Revert "Chevron icon on each message now causes a dropdown menu; hover on message for info" This reverts commit f8fbf70c8502370a78159e24f3cf9589fb9d384f, since we're waiting on some Firefox and no-hover fixes. (imported from commit 6b13f5bb9d907303ab311afd7da584bc06538c91)
2013-07-03 23:25:24 +02:00
<div class="info actions_hover">
A better chevron for message actions dropdown (imported from commit 4ef172175db927f5385aceb2b369349adc47201a)
2013-07-11 22:01:25 +02:00
<i class="icon-vector-chevron-down"></i>
Replace "info" with "chevron down" for message context. (imported from commit a12d3ce9adfe6b3c019f252f9361a9f6da59ebaf)
2013-06-12 19:27:07 +02:00
</div>
Modify some messagebox colors and put the timestamp and icons into one line * Change the highlight colors for private and mention messages * Put timestamp and message controls into a single line * Modify layout to allow more flexibility in control placement * Lighten narrowed view background color * Adjust composition area columns (imported from commit c7edca358b079da0ca76fa26d998946574bded6a)
2013-05-24 00:03:39 +02:00
</div>
Add a link for the actions popover next to the timestamp Hopefully the text and link-like styling will make it more clear that this feature exists. The sender's name is still clickable, but loses the link-like styling since the popover isn't about the sender. The space between the sender's name and this link is now active as well. We also remove the sender's email address that was previously visible on hover. It's not hard for the name + email + actions link + timestamp to be too long for one line. The email is still present in the popover. (imported from commit 3a85f199c42102cac0d217543db0a539935e2914)
2013-02-09 08:11:08 +01:00
</div>
Support /me syntax. If a user types "/me runs to the store", we put "runs to the store" in bold after their name. (imported from commit fbc11e99244e1c8fa1c03e4753e706957fcd449e)
2013-11-08 02:00:12 +01:00
<div class="message_content">
{{#unless status_message}}
{{#if ../../../use_match_properties}}{{{match_content}}}{{else}}{{{content}}}{{/if}}
{{/unless}}
</div>
Add user interface frontend for editing messages. The only known outstanding bug with this is that it doesn't properly handle the updating of a message's highlighting/presence in a narrowed view (e.g. in theory, a message should disappear if it is edited such that its subject doesn't match your narrow or it no longer matches your search). I think I'll just open a trac ticket about that once this is merged, since it's a little hairy to deal with and kinda a marginal use case. Also it's not pretty, but that should be easy to tweak once we get the framework merged. Conflicts: tools/jslint/check-all.js (imported from commit 2d0e3a440bcd885546bd8e28aff97bf379649950)
2013-05-15 00:22:16 +02:00
<div class="message_edit">
<div class="message_edit_form" id="{{id}}"></div>
</div>
Automatically condense long messages Addresses Trac #747. (imported from commit 4ddf2d8773023805650f04924be62da2d0fe826e)
2013-03-13 22:47:38 +01:00
<div class="message_expander message_length_controller" title="See the rest of this message">[More...]</div>
Add support for completely collapsing messages through the info popover. (imported from commit 0a01c4cc8f99019233659c175d73826e16cc95ee)
2013-05-08 23:17:49 +02:00
<div class="message_condenser message_length_controller" title="Make this message take up less space on the screen">[Condense this message]</div>
[schema] Record and display whether a message was edited. We also record the historical edits to the message in this JSON format: [{"prev_content": "new test message 14", "timestamp": 1369157249}, {"prev_content": "new test message 13", "timestamp": 1369157118}] but we don't actually do anything with the information as of yet. (imported from commit 2d5ca449b87b33ad035ab0e076a22e150c8e7267)
2013-05-21 17:48:46 +02:00
{{#if last_edit_timestr}}
<div class="message_edit_notice">Last edited: {{{last_edit_timestr}}}</div>
{{/if}}
Refactor: Put the zephyr <tr>s in the template. (imported from commit 8a822d7c8463c248d536f97f07bfb19ca242b83f)
2012-09-18 16:45:25 +02:00
</td>
</tr>
Implement message summarization experiment. When you read messages in a narrow and then un-narrow, collapse adjacent messages read in the narrow into a summary row that can be clicked to expand those messages. Scoped to staging with feature flags. The implementation of this within our current MessageList is rather ugly. (imported from commit bcb3a39d8c0c334136fe86318f18ead03f0f50bf)
2013-07-25 22:08:16 +02:00
{{/if}}
Render all new zephyrs with a single template invocation (imported from commit 13803e0e96901d129d4aefcd5fde63548deb4dc0)
2012-09-24 23:26:32 +02:00
{{/with}}
{{/each}}
Add trailing bookend with current subscribed status in some narrows. This is basically just the logical extension of the previous commit for the case where the last thing we did was subscribe or unsubscribe. This even magically updates when you subscribe or unsubscribe from another window :). (imported from commit 2399329d11bf66aa0b614a21d2b3cf4035452279)
2013-04-10 23:38:30 +02:00
{{#if trailing_bookend}}
Fix indentation in message.handlebars (imported from commit 186bd9506aa6a7d3052f1f96e8af05a22812a636)
2013-10-09 14:33:46 +02:00
<tr id="trailing_bookend" class="bookend_tr">
<td colspan="2" class="bookend">
<center>{{trailing_bookend}}</center>
<span class="tiny"><p></p></span>
</td>
Add trailing bookend with current subscribed status in some narrows. This is basically just the logical extension of the previous commit for the case where the last thing we did was subscribe or unsubscribe. This even magically updates when you subscribe or unsubscribe from another window :). (imported from commit 2399329d11bf66aa0b614a21d2b3cf4035452279)
2013-04-10 23:38:30 +02:00
</tr>
{{/if}}