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 #3335 from riking/more-choices 

UX: Use ellipsis in topic wrench menu for 'more choices'
This commit is contained in:
Jeff Atwood 2015-04-04 22:42:39 -07:00
parent 0e6c54537a 1d4a6618d0
commit 0fcb98c80a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
View File

@ -2,7 +2,7 @@
{{#if pinned_at}}
<div class="feature-section">
<div class="button">
{{d-button action="unpin" icon="thumb-tack" label="topic.actions.unpin" class="btn-primary"}}
{{d-button action="unpin" icon="thumb-tack" label="topic.feature.unpin" class="btn-primary"}}
</div>
<div class="desc">
<p>{{{unPinMessage}}}</p>
@ -26,7 +26,7 @@
{{else}}
<div class="feature-section">
<div class="button">
{{d-button action="pin" icon="thumb-tack" label="topic.actions.pin" class="btn-primary"}}
{{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}}
</div>
<div class="desc">
<p>{{{pinMessage}}}</p>
@ -41,7 +41,7 @@
<hr>
<div class="feature-section">
<div class="button">
{{d-button action="pinGlobally" icon="thumb-tack" label="topic.actions.pin_globally" class="btn-primary"}}
{{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}}
</div>
<div class="desc">
<p>{{i18n "topic.feature_topic.pin_globally"}}</p>
@ -58,9 +58,9 @@
<div class="feature-section">
<div class="button">
{{#if isBanner}}
{{d-button action="removeBanner" icon="thumb-tack" label="topic.actions.remove_banner" class="btn-primary"}}
{{d-button action="removeBanner" icon="thumb-tack" label="topic.feature.remove_banner" class="btn-primary"}}
{{else}}
{{d-button action="makeBanner" icon="thumb-tack" label="topic.actions.make_banner" class="btn-primary"}}
{{d-button action="makeBanner" icon="thumb-tack" label="topic.feature.make_banner" class="btn-primary"}}
{{/if}}
</div>
<div class="desc">

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

@ -1003,18 +1003,22 @@ en:
delete: "Delete Topic"
open: "Open Topic"
close: "Close Topic"
auto_close: "Auto Close"
make_banner: "Banner Topic"
remove_banner: "Remove Banner Topic"
pin: "Pin Topic"
unpin: "Un-Pin Topic"
pin_globally: "Pin Topic Globally"
multi_select: "Select Posts…"
auto_close: "Auto Close…"
pin: "Pin Topic…"
unpin: "Un-Pin Topic…"
unarchive: "Unarchive Topic"
archive: "Archive Topic"
invisible: "Make Unlisted"
visible: "Make Listed"
reset_read: "Reset Read Data"
multi_select: "Select Posts"
feature:
pin: "Pin Topic"
unpin: "Un-Pin Topic"
pin_globally: "Pin Topic Globally"
make_banner: "Banner Topic"
remove_banner: "Remove Banner Topic"
reply:
title: 'Reply'