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 #474 from ZogStriP/bind-category-text-field-to-category-badge 

bind the text entered in the category name text field to the badge
This commit is contained in:
Robin Ward 2013-03-16 08:20:10 -07:00
parent ab2073f152 a500f6b307
commit e4dfb0a935
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
View File

@ -1,4 +1,4 @@
<div class="modal-body"> <div class="modal-body">
<form> <form>
<label>{{i18n category.name}}</label> <label>{{i18n category.name}}</label>
{{view Discourse.TextField valueBinding="view.category.name" placeholderKey="category.name_placeholder"}} {{view Discourse.TextField valueBinding="view.category.name" placeholderKey="category.name_placeholder"}}
@ -12,7 +12,7 @@
<a href="#" {{action showCategoryTopic target="view"}}>{{i18n category.change_in_category_topic}}</a> <a href="#" {{action showCategoryTopic target="view"}}>{{i18n category.change_in_category_topic}}</a>
{{/if}} {{/if}}
{{else}} {{else}}
{{i18n category.no_description}} {{i18n category.no_description}}
{{#if view.category.topic_url}} {{#if view.category.topic_url}}
<a {{action showCategoryTopic target="view"}} href="#">{{i18n category.change_in_category_topic}}</a> <a {{action showCategoryTopic target="view"}} href="#">{{i18n category.change_in_category_topic}}</a>
{{/if}}} {{/if}}}
@ -23,7 +23,7 @@
<label>{{i18n category.badge_colors}}</label> <label>{{i18n category.badge_colors}}</label>
<div class="category-color-editor"> <div class="category-color-editor">
<span class='badge-category' {{bindAttr style="view.colorStyle"}}>{{i18n preview}}</span> <span class='badge-category' {{bindAttr style="view.colorStyle"}}>{{view.categoryName}}</span>
<div class='input-prepend input-append' style="margin-top: 10px;"> <div class='input-prepend input-append' style="margin-top: 10px;">
<span class='color-title'>{{i18n category.background_color}}:</span> <span class='color-title'>{{i18n category.background_color}}:</span>
@ -42,4 +42,4 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-primary' {{bindAttr disabled="view.disabled"}} {{action saveCategory target="view"}}>{{view.buttonTitle}}</button> <button class='btn btn-primary' {{bindAttr disabled="view.disabled"}} {{action saveCategory target="view"}}>{{view.buttonTitle}}</button>
</div> </div>

7
app/assets/javascripts/discourse/views/modal/edit_category_view.js
View File

@ -29,6 +29,11 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
return Em.String.i18n("category.create"); return Em.String.i18n("category.create");
}).property('category.id'), }).property('category.id'),
categoryName: (function() {
var name = this.get('category.name') || "";
return name.trim().length > 0 ? name : Em.String.i18n("preview");
}).property('category.name'),
buttonTitle: (function() { buttonTitle: (function() {
if (this.get('saving')) return Em.String.i18n("saving"); if (this.get('saving')) return Em.String.i18n("saving");
return this.get('title'); return this.get('title');
@ -69,5 +74,3 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
} }
}); });