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

Merge branch 'master' of github.com:discourse/discourse-assign

This commit is contained in:
Penar Musaraj 2018-11-07 09:28:46 -05:00
parent c6f21b667a 69c319e81d
commit b909e933dc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse-assign/connectors/topic-footer-main-buttons-before-create/assign-button.hbs
View File

@ -1,11 +1,11 @@
{{#if topic.assigned_to_user.username}}
{{d-button class="assign"
{{d-button class="btn-default assign"
icon="user-times"
action="unassign"
label="discourse_assign.unassign.title"
title="discourse_assign.unassign.help"}}
{{else}}
{{d-button class="assign"
{{d-button class="btn-default assign"
icon="user-plus"
action="assign"
label="discourse_assign.assign.title"

3
assets/javascripts/discourse/templates/user-activity-assigned.hbs
View File

@ -1,6 +1,6 @@
<div class='assign-controls'>
{{#if model.topic_list.assigned_messages_count}}
{{#link-to 'userPrivateMessages.assigned' user.model class="btn assign-messages-assigned"}}
{{#link-to 'userPrivateMessages.assigned' user.model class="btn btn-default assign-messages-assigned"}}
{{d-icon "envelope" class="glyph"}}
{{i18n 'user.messages.assigned_title' count=model.topic_list.assigned_messages_count}}
{{/link-to}}
@ -9,6 +9,7 @@
{{#if canUnassignAll}}
{{d-button
action=(action "unassignAll")
class="btn-default"
icon="times"
label="discourse_assign.unassign_all.title"}}
{{/if}}