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

actions popover: Change "Topic Edit" to "View Source / Topic Edit". 

Also edit the icon to show "View Source" as the primary feature.
This commit is contained in:
Rishi Gupta 2016-10-25 13:56:28 -07:00 committed by Tim Abbott
parent 7c227d8bb2
commit 82a0fe0eca
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/popovers.js
View File

@ -58,14 +58,16 @@ exports.toggle_actions_popover = function (element, id) {
if (elt.data('popover') === undefined) {
var message = current_msg_list.get(id);
var editability = message_edit.get_editability(message);
var is_editable = (editability === message_edit.editability_types.TOPIC_ONLY ||
editability === message_edit.editability_types.FULL);
var use_edit_icon;
var editability_menu_item;
if (editability === message_edit.editability_types.FULL) {
use_edit_icon = true;
editability_menu_item = i18n.t("Edit");
} else if (editability === message_edit.editability_types.TOPIC_ONLY) {
editability_menu_item = i18n.t("Edit Topic");
use_edit_icon = false;
editability_menu_item = i18n.t("View Source / Edit Topic");
} else {
use_edit_icon = false;
editability_menu_item = i18n.t("View Source");
}
var can_mute_topic =
@ -79,7 +81,7 @@ exports.toggle_actions_popover = function (element, id) {
var args = {
message: message,
is_editable: is_editable,
use_edit_icon: use_edit_icon,
editability_menu_item: editability_menu_item,
can_mute_topic: can_mute_topic,
can_unmute_topic: can_unmute_topic,

2
static/templates/actions_popover_content.handlebars
View File

@ -3,7 +3,7 @@
<li>
<a href="#" class="popover_edit_message" data-msgid="{{message.id}}">
{{! Can consider http://fontawesome.io/icon/file-code-o/ when we upgrade to font awesome 4.}}
<i class="{{#if is_editable}}icon-vector-pencil{{else}}icon-vector-file-text-alt{{/if}}"></i> {{editability_menu_item}}
<i class="{{#if use_edit_icon}}icon-vector-pencil{{else}}icon-vector-file-text-alt{{/if}}"></i> {{editability_menu_item}}
</a>
</li>