codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: used 'pin' terminology instead of 'feature topic'

Browse source
This commit is contained in:
Régis Hanol 2015-03-20 11:43:05 +01:00
parent e70597a0d0
commit 18f4f60956
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/discourse/controllers/feature-topic.js.es6
View file

@ -29,23 +29,19 @@ export default ObjectController.extend(ModalFunctionality, {
}.property("categoryLink", "pinnedInCategoryCount"), }.property("categoryLink", "pinnedInCategoryCount"),
onShow() { onShow() {
const self = this;
this.set("loading", true); this.set("loading", true);
return Discourse.ajax("/topics/feature_stats.json", { return Discourse.ajax("/topics/feature_stats.json", {
data: { category_id: this.get("category.id") } data: { category_id: this.get("category.id") }
}).then(function(result) { }).then(result => {
if (result) { if (result) {
self.setProperties({ this.setProperties({
pinnedInCategoryCount: result.pinned_in_category_count, pinnedInCategoryCount: result.pinned_in_category_count,
pinnedGloballyCount: result.pinned_globally_count, pinnedGloballyCount: result.pinned_globally_count,
bannerCount: result.banner_count, bannerCount: result.banner_count,
}); });
} }
}).finally(function() { }).finally(() => this.set("loading", false));
self.set("loading", false);
});
}, },
_forwardAction(name) { _forwardAction(name) {

4
app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
View file

@ -58,9 +58,9 @@
<div class="feature-section"> <div class="feature-section">
<div class="button"> <div class="button">
{{#if isBanner}} {{#if isBanner}}
{{d-button action="removeBanner" icon="bullhorn" label="topic.actions.remove_banner" class="btn-primary"}} {{d-button action="removeBanner" icon="thumb-tack" label="topic.actions.remove_banner" class="btn-primary"}}
{{else}} {{else}}
{{d-button action="makeBanner" icon="bullhorn" label="topic.actions.make_banner" class="btn-primary"}} {{d-button action="makeBanner" icon="thumb-tack" label="topic.actions.make_banner" class="btn-primary"}}
{{/if}} {{/if}}
</div> </div>
<div class="desc"> <div class="desc">

4
app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
View file

@ -30,9 +30,9 @@
{{#if visible}} {{#if visible}}
<li> <li>
{{#if isFeatured}} {{#if isFeatured}}
{{d-button action="showFeatureTopic" icon="bullhorn" label="topic.actions.remove_feature" class="btn-admin"}} {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin" class="btn-admin"}}
{{else}} {{else}}
{{d-button action="showFeatureTopic" icon="bullhorn" label="topic.actions.feature" class="btn-admin"}} {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.pin" class="btn-admin"}}
{{/if}} {{/if}}
</li> </li>
{{/if}} {{/if}}

2
config/locales/client.en.yml
View file

@ -988,8 +988,6 @@ en:
open: "Open Topic" open: "Open Topic"
close: "Close Topic" close: "Close Topic"
auto_close: "Auto Close" auto_close: "Auto Close"
feature: "Feature Topic"
remove_feature: "Remove Feature"
make_banner: "Banner Topic" make_banner: "Banner Topic"
remove_banner: "Remove Banner Topic" remove_banner: "Remove Banner Topic"
pin: "Pin Topic" pin: "Pin Topic"