Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3332 from techAPJ/patch-2 

UX: add reply-to glyph in composer
This commit is contained in:
Jeff Atwood 2015-04-04 02:46:09 -07:00
parent 6182af5e37 3f59cf752d
commit 09b1125bc3
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/models/composer.js.es6
View File

@ -86,7 +86,7 @@ const Composer = Discourse.Model.extend({
const replyUsername = post.get('reply_to_user.username');
const replyAvatarTemplate = post.get('reply_to_user.avatar_template');
if (replyUsername && replyAvatarTemplate && this.get('action') === EDIT) {
postDescription += " " + I18n.t("post.in_reply_to") + " " + Discourse.Utilities.tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
postDescription += " <i class='fa fa-mail-forward reply-to-glyph'></i> " + Discourse.Utilities.tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
}
}
}

4
app/assets/stylesheets/desktop/compose.scss
View File

@ -324,6 +324,10 @@
.reply-to {
margin-bottom: 10px;
.reply-to-glyph {
color: scale-color($primary, $lightness: 50%);
}
}
#reply-control {

1
config/locales/client.en.yml
View File

@ -1139,7 +1139,6 @@ en:
edit: "Editing {{link}} {{replyAvatar}} {{username}}"
edit_reason: "Reason: "
post_number: "post {{number}}"
in_reply_to: "reply to"
last_edited_on: "post last edited on"
reply_as_new_topic: "Reply as linked Topic"
continue_discussion: "Continuing the discussion from {{postLink}}:"