github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 10:54:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More deprecation fixes for {{action}}

Browse Source
This commit is contained in:
Robin Ward 2014-09-30 16:04:04 -04:00
parent 91cbdb565d
commit 6746d96336
23 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
View File

@ -1,5 +1,5 @@
<button title="{{i18n admin.flags.delete_post_defer_flag_title}}" {{action deletePostDeferFlag}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n admin.flags.delete_post_defer_flag}}</button> <button title="{{i18n admin.flags.delete_post_defer_flag_title}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n admin.flags.delete_post_defer_flag}}</button>
<button title="{{i18n admin.flags.delete_post_agree_flag_title}}" {{action deletePostAgreeFlag}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.delete_post_agree_flag}}</button> <button title="{{i18n admin.flags.delete_post_agree_flag_title}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.delete_post_agree_flag}}</button>
{{#if canDeleteAsSpammer}} {{#if canDeleteAsSpammer}}
<button title="{{i18n admin.flags.delete_spammer_title}}" {{action deleteSpammer user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button> <button title="{{i18n admin.flags.delete_spammer_title}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
{{/if}} {{/if}}

16
app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
View File

@ -6,23 +6,23 @@
<li> <li>
{{#if editing}} {{#if editing}}
{{input value=this.name}} {{input value=this.name}}
<button {{action save this}}><i class="fa fa-check"></i></button> <button {{action "save" this}}><i class="fa fa-check"></i></button>
{{else}} {{else}}
{{this.name}} {{this.name}}
{{/if}} {{/if}}
<div class='actions'> <div class='actions'>
<button {{action edit this}}><i class="fa fa-pencil"></i></button> <button {{action "edit" this}}><i class="fa fa-pencil"></i></button>
<button {{action up this}}><i class="fa fa-toggle-up"></i></button> <button {{action "up" this}}><i class="fa fa-toggle-up"></i></button>
<button {{action down this}}><i class="fa fa-toggle-down"></i></button> <button {{action "down" this}}><i class="fa fa-toggle-down"></i></button>
<button {{action delete this}}><i class="fa fa-times"></i></button> <button {{action "delete" this}}><i class="fa fa-times"></i></button>
</div> </div>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
</div> </div>
<button class='btn' {{action add}}>{{i18n admin.badges.new}}</button> <button class='btn' {{action "add"}}>{{i18n admin.badges.new}}</button>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-primary' {{action saveAll}} {{bind-attr disabled="submitDisabled"}}>{{i18n admin.badges.save}}</button> <button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n admin.badges.save}}</button>
<a {{action cancel}}>{{i18n cancel}}</a> <a {{action "cancel"}}>{{i18n cancel}}</a>
</div> </div>

6
app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
View File

@ -1,3 +1,3 @@
<button {{action startBackup}} class="btn btn-primary">{{i18n yes_value}}</button> <button {{action "startBackup"}} class="btn btn-primary">{{i18n yes_value}}</button>
<button {{action startBackupWithoutUpload}} class="btn">{{i18n admin.backups.operations.backup.without_uploads}}</button> <button {{action "startBackupWithoutUpload"}} class="btn">{{i18n admin.backups.operations.backup.without_uploads}}</button>
<button {{action cancel}} class="btn">{{i18n no_value}}</button> <button {{action "cancel"}} class="btn">{{i18n no_value}}</button>

4
app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
View File

@ -10,6 +10,6 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class='btn btn-danger' {{action suspend}} {{bind-attr disabled="submitDisabled"}}><i class='fa fa-ban'></i>{{i18n admin.user.suspend}}</button> <button class='btn btn-danger' {{action "suspend"}} {{bind-attr disabled="submitDisabled"}}><i class='fa fa-ban'></i>{{i18n admin.user.suspend}}</button>
<a {{action closeModal}}>{{i18n cancel}}</a> <a {{action "closeModal"}}>{{i18n cancel}}</a>
</div> </div>

4
app/assets/javascripts/admin/templates/reports.hbs
View File

@ -2,11 +2,11 @@
<h3>{{title}}</h3> <h3>{{title}}</h3>
<button class='btn' <button class='btn'
{{action viewAsTable}} {{action "viewAsTable"}}
{{bind-attr disabled="viewingTable"}}>{{i18n admin.dashboard.reports.view_table}}</button> {{bind-attr disabled="viewingTable"}}>{{i18n admin.dashboard.reports.view_table}}</button>
<button class='btn' <button class='btn'
{{action viewAsBarChart}} {{action "viewAsBarChart"}}
{{bind-attr disabled="viewingBarChart"}}>{{i18n admin.dashboard.reports.view_chart}}</button> {{bind-attr disabled="viewingBarChart"}}>{{i18n admin.dashboard.reports.view_chart}}</button>
<table class='table report'> <table class='table report'>

2
app/assets/javascripts/admin/templates/site_settings.hbs
View File

@ -7,7 +7,7 @@
</div> </div>
<div class='controls'> <div class='controls'>
{{text-field value=filter placeholderKey="type_to_filter"}} {{text-field value=filter placeholderKey="type_to_filter"}}
<button {{action clearFilter}} class="btn">{{i18n admin.site_settings.clear_filter}}</button> <button {{action "clearFilter"}} class="btn">{{i18n admin.site_settings.clear_filter}}</button>
</div> </div>
</div> </div>

6
app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
View File

@ -9,11 +9,11 @@
</div> </div>
{{#if dirty}} {{#if dirty}}
<div class='setting-controls'> <div class='setting-controls'>
<button class='btn ok no-text' {{action save this}}><i class='fa fa-check'></i></button> <button class='btn ok no-text' {{action "save" this}}><i class='fa fa-check'></i></button>
<button class='btn cancel no-text' {{action cancel this}}><i class='fa fa-times'></i></button> <button class='btn cancel no-text' {{action "cancel" this}}><i class='fa fa-times'></i></button>
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#if overridden}}
<button class='btn' href='#' {{action resetDefault this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button> <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}

6
app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
View File

@ -7,11 +7,11 @@
</div> </div>
{{#if dirty}} {{#if dirty}}
<div class='setting-controls'> <div class='setting-controls'>
<button class='btn ok no-text' {{action save this}}><i class='fa fa-check'></i></button> <button class='btn ok no-text' {{action "save" this}}><i class='fa fa-check'></i></button>
<button class='btn cancel no-text' {{action cancel this}}><i class='fa fa-times'></i></button> <button class='btn cancel no-text' {{action "cancel" this}}><i class='fa fa-times'></i></button>
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#if overridden}}
<button class='btn' href='#' {{action resetDefault this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button> <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}

6
app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
View File

@ -7,11 +7,11 @@
</div> </div>
{{#if dirty}} {{#if dirty}}
<div class='setting-controls'> <div class='setting-controls'>
<button class='btn ok no-text' {{action save this}}><i class='fa fa-check'></i></button> <button class='btn ok no-text' {{action "save" this}}><i class='fa fa-check'></i></button>
<button class='btn cancel no-text' {{action cancel this}}><i class='fa fa-times'></i></button> <button class='btn cancel no-text' {{action "cancel" this}}><i class='fa fa-times'></i></button>
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#if overridden}}
<button class='btn' href='#' {{action resetDefault this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button> <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}

6
app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
View File

@ -8,11 +8,11 @@
</div> </div>
{{#if dirty}} {{#if dirty}}
<div class='setting-controls'> <div class='setting-controls'>
<button class='btn ok no-text' {{action save this}}><i class='fa fa-check'></i></button> <button class='btn ok no-text' {{action "save" this}}><i class='fa fa-check'></i></button>
<button class='btn cancel no-text' {{action cancel this}}><i class='fa fa-times'></i></button> <button class='btn cancel no-text' {{action "cancel" this}}><i class='fa fa-times'></i></button>
</div> </div>
{{else}} {{else}}
{{#if overridden}} {{#if overridden}}
<button class='btn' href='#' {{action resetDefault this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button> <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/user-fields.hbs
View File

@ -40,7 +40,7 @@
{{/each}} {{/each}}
{{/if}} {{/if}}
<button {{bind-attr disabled="createDisabled"}} class='btn btn-primary' {{action createField}}> <button {{bind-attr disabled="createDisabled"}} class='btn btn-primary' {{action "createField"}}>
{{fa-icon "plus"}} {{fa-icon "plus"}}
{{i18n admin.user_fields.create}} {{i18n admin.user_fields.create}}
</button> </button>

14
app/assets/javascripts/discourse/templates/composer.hbs
View File

@ -5,7 +5,7 @@
{{render "composer-messages"}} {{render "composer-messages"}}
<div class='control'> <div class='control'>
<a href='#' class='toggler' {{action toggle bubbles=false}} title='{{i18n composer.toggler}}'></a> <a href='#' class='toggler' {{action "toggle" bubbles=false}} title='{{i18n composer.toggler}}'></a>
{{#if model.viewOpen}} {{#if model.viewOpen}}
<div class='control-row reply-area'> <div class='control-row reply-area'>
@ -19,7 +19,7 @@
{{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}} {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
</div> </div>
{{else}} {{else}}
<a {{action displayEditReason}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a> <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a>
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
@ -56,7 +56,7 @@
{{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}} {{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}}
</div> </div>
{{#if model.archetype.hasOptions}} {{#if model.archetype.hasOptions}}
<button class='btn' {{action showOptions}}>{{i18n topic.options}}</button> <button class='btn' {{action "showOptions"}}>{{i18n topic.options}}</button>
{{/if}} {{/if}}
{{render "additional-composer-buttons" model}} {{render "additional-composer-buttons" model}}
{{/unless}} {{/unless}}
@ -75,7 +75,7 @@
<div id='wmd-preview' {{bind-attr class="hidePreview:hidden :cooked"}}></div> <div id='wmd-preview' {{bind-attr class="hidePreview:hidden :cooked"}}></div>
</div> </div>
<div class="composer-bottom-right"> <div class="composer-bottom-right">
<a href="#" {{action togglePreview}} class='toggle-preview'>{{{model.toggleText}}}</a> <a href="#" {{action "togglePreview"}} class='toggle-preview'>{{{model.toggleText}}}</a>
<div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}> <div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}>
{{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a> {{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a>
</div> </div>
@ -89,8 +89,8 @@
{{#if currentUser}} {{#if currentUser}}
<div class='submit-panel'> <div class='submit-panel'>
<button {{action save}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n composer.title}}">{{{model.saveIcon}}}{{model.saveText}}</button> <button {{action "save"}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n composer.title}}">{{{model.saveIcon}}}{{model.saveText}}</button>
<a href='#' {{action cancel}} class='cancel' tabindex="6">{{i18n cancel}}</a> <a href='#' {{action "cancel"}} class='cancel' tabindex="6">{{i18n cancel}}</a>
</div> </div>
{{/if}} {{/if}}
@ -100,7 +100,7 @@
<div class='span24'> <div class='span24'>
<div class='saving-text'> <div class='saving-text'>
{{#if model.createdPost}} {{#if model.createdPost}}
{{i18n composer.saved}} <a class='permalink' href="{{unbound createdPost.url}}" {{action viewNewReply}}>{{i18n composer.view_new_post}}</a> {{i18n composer.saved}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n composer.view_new_post}}</a>
{{else}} {{else}}
{{i18n composer.saving}} {{i18n composer.saving}}
{{/if}} {{/if}}

20
app/assets/javascripts/discourse/templates/discovery/topics.hbs
View File

@ -5,18 +5,18 @@
{{#if showDismissAtTop}} {{#if showDismissAtTop}}
<div class="row"> <div class="row">
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics-top' class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button> <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts-top' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button> <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts-top' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new-top' class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button> <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
{{#if selected}} {{#if selected}}
<div id='bulk-select'> <div id='bulk-select'>
<button class='btn no-text' {{action showBulkActions}}><i class="fa fa-wrench"></i></button> <button class='btn no-text' {{action "showBulkActions"}}><i class="fa fa-wrench"></i></button>
</div> </div>
{{/if}} {{/if}}
@ -33,7 +33,7 @@
{{#if currentUser}} {{#if currentUser}}
<th class='star'> <th class='star'>
{{#if canBulkSelect}} {{#if canBulkSelect}}
<button class='btn bulk-select' {{action toggleBulkSelect}} title="{{i18n topics.bulk.toggle}}"><i class='fa fa-list'></i></button> <button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n topics.bulk.toggle}}"><i class='fa fa-list'></i></button>
{{/if}} {{/if}}
</th> </th>
{{/if}} {{/if}}
@ -64,7 +64,7 @@
<tbody> <tbody>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<div class='alert alert-info clickable' {{action showInserted}}> <div class='alert alert-info clickable' {{action "showInserted"}}>
{{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}} {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n click_to_show}} {{i18n click_to_show}}
</div> </div>
@ -87,11 +87,11 @@
{{/if}} {{/if}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button> <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button> <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new' class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button> <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
{{/if}} {{/if}}
{{#if latest}} {{#if latest}}
@ -100,7 +100,7 @@
</div> </div>
<h3> <h3>
{{footerMessage}} {{footerMessage}}
{{#if can_create_topic}}<a href='#' {{action createTopic}}>{{i18n topic.suggest_create_topic}}</a>{{/if}} {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
</h3> </h3>
{{else}} {{else}}
{{#if top}} {{#if top}}

8
app/assets/javascripts/discourse/templates/header.hbs
View File

@ -30,7 +30,7 @@
{{/if}} {{/if}}
<li> <li>
{{#if loginRequired}} {{#if loginRequired}}
<a id='search-button' class='icon expand' href='#' aria-hidden="true" {{action showLogin}}> <a id='search-button' class='icon expand' href='#' aria-hidden="true" {{action "showLogin"}}>
{{fa-icon search}} {{fa-icon search}}
</a> </a>
{{else}} {{else}}
@ -49,7 +49,7 @@
href="#" href="#"
aria-hidden="true" aria-hidden="true"
id="site-map" id="site-map"
{{action showLogin}}> {{action "showLogin"}}>
{{fa-icon bars}} {{fa-icon bars}}
</a> </a>
{{else}} {{else}}
@ -96,7 +96,7 @@
<div class="extra-info-wrapper"> <div class="extra-info-wrapper">
<div class="extra-info"> <div class="extra-info">
{{#if showStarButton}} {{#if showStarButton}}
<a {{bind-attr class=":star topic.starred:starred"}} {{action toggleStar}} href='#' {{bind-attr title="topic.starTooltip"}}></a> <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
{{/if}} {{/if}}
<h1> <h1>
{{#if showPrivateMessageGlyph}} {{#if showPrivateMessageGlyph}}
@ -108,7 +108,7 @@
{{bound-category-link topic.category}} {{bound-category-link topic.category}}
{{#if topic.details.loaded}} {{#if topic.details.loaded}}
{{topic-status topic=topic}} {{topic-status topic=topic}}
<a class='topic-link' href='{{unbound topic.url}}' {{action jumpToTopPost}}>{{{topic.fancy_title}}}</a> <a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
{{else}} {{else}}
{{#if topic.errorLoading}} {{#if topic.errorLoading}}
{{topic.errorTitle}} {{topic.errorTitle}}

10
app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
View File

@ -10,7 +10,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<div class='alert alert-info' {{action showInserted}}> <div class='alert alert-info' {{action "showInserted"}}>
{{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}} {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n click_to_show}} {{i18n click_to_show}}
</div> </div>
@ -29,11 +29,11 @@
{{/if}} {{/if}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action dismissRead "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button> <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
<button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action dismissRead "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button> <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new' class='btn dismiss-read' {{action resetNew}}>{{i18n topics.bulk.dismiss_new}}</button> <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
{{/if}} {{/if}}
{{#if latest}} {{#if latest}}
@ -42,7 +42,7 @@
</div> </div>
<h3> <h3>
{{footerMessage}} {{footerMessage}}
{{#if can_create_topic}}<a href='#' {{action createTopic}}>{{i18n topic.suggest_create_topic}}</a>{{/if}} {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
</h3> </h3>
{{else}} {{else}}
{{#if top}} {{#if top}}

12
app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
View File

@ -1,16 +1,16 @@
<div class="modal-body"> <div class="modal-body">
<div> <div>
<div> <div>
<input type="radio" id="system-avatar" name="avatar" value="system" {{action useSystem}}> <input type="radio" id="system-avatar" name="avatar" value="system" {{action "useSystem"}}>
<label class="radio" for="system-avatar">{{bound-avatar controller "large" system_avatar_upload_id}} {{{i18n user.change_avatar.letter_based}}}</label> <label class="radio" for="system-avatar">{{bound-avatar controller "large" system_avatar_upload_id}} {{{i18n user.change_avatar.letter_based}}}</label>
</div> </div>
<div> <div>
<input type="radio" id="gravatar" name="avatar" value="gravatar" {{action useGravatar}}> <input type="radio" id="gravatar" name="avatar" value="gravatar" {{action "useGravatar"}}>
<label class="radio" for="gravatar">{{bound-avatar controller "large" gravatar_avatar_upload_id}} {{{i18n user.change_avatar.gravatar}}} {{email}}</label> <label class="radio" for="gravatar">{{bound-avatar controller "large" gravatar_avatar_upload_id}} {{{i18n user.change_avatar.gravatar}}} {{email}}</label>
<button href {{action refreshGravatar}} title="{{i18n user.change_avatar.refresh_gravatar_title}}" {{bind-attr enabled="view.gravatarRefreshEnabled"}} class="btn no-text"><i class="fa fa-refresh"></i></button> <button href {{action "refreshGravatar"}} title="{{i18n user.change_avatar.refresh_gravatar_title}}" {{bind-attr enabled="view.gravatarRefreshEnabled"}} class="btn no-text"><i class="fa fa-refresh"></i></button>
</div> </div>
<div> <div>
<input type="radio" id="uploaded_avatar" name="avatar" value="uploaded" {{action useUploadedAvatar}}> <input type="radio" id="uploaded_avatar" name="avatar" value="uploaded" {{action "useUploadedAvatar"}}>
<label class="radio" for="uploaded_avatar"> <label class="radio" for="uploaded_avatar">
{{#if view.hasUploadedAvatar}} {{#if view.hasUploadedAvatar}}
{{#if view.uploadedAvatarTemplate}} {{#if view.uploadedAvatarTemplate}}
@ -30,6 +30,6 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" {{action saveAvatarSelection}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n save}}</button> <button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n save}}</button>
<a {{action closeModal}}>{{i18n cancel}}</a> <a {{action "closeModal"}}>{{i18n cancel}}</a>
</div> </div>

14
app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
View File

@ -1,10 +1,10 @@
<p> <p>
<button class='btn' {{action showChangeCategory}}>{{i18n topics.bulk.change_category}}</button> <button class='btn' {{action "showChangeCategory"}}>{{i18n topics.bulk.change_category}}</button>
<button class='btn' {{action deleteTopics}}>{{i18n topics.bulk.delete}}</button> <button class='btn' {{action "deleteTopics"}}>{{i18n topics.bulk.delete}}</button>
<button class='btn' {{action closeTopics}}>{{i18n topics.bulk.close_topics}}</button> <button class='btn' {{action "closeTopics"}}>{{i18n topics.bulk.close_topics}}</button>
<button class='btn' {{action archiveTopics}}>{{i18n topics.bulk.archive_topics}}</button> <button class='btn' {{action "archiveTopics"}}>{{i18n topics.bulk.archive_topics}}</button>
</p> </p>
<p> <p>
<button class='btn' {{action showNotificationLevel}}>{{i18n topics.bulk.notification_level}}</button> <button class='btn' {{action "showNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button>
<button class='btn' {{action resetRead}}>{{i18n topics.bulk.reset_read}}</button> <button class='btn' {{action "resetRead"}}>{{i18n topics.bulk.reset_read}}</button>
</p> </p>

10
app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
View File

@ -1,7 +1,7 @@
<div class="modal-body"> <div class="modal-body">
{{#if allowLocal}} {{#if allowLocal}}
<div class="radios"> <div class="radios">
<input type="radio" id="local" value="local" name="upload" {{action useLocal}}> <input type="radio" id="local" value="local" name="upload" {{action "useLocal"}}>
<label class="radio" for="local">{{i18n upload_selector.from_my_computer}}</label> <label class="radio" for="local">{{i18n upload_selector.from_my_computer}}</label>
{{#if local}} {{#if local}}
<div class="inputs"> <div class="inputs">
@ -12,7 +12,7 @@
</div> </div>
{{/if}} {{/if}}
<div class="radios"> <div class="radios">
<input type="radio" id="remote" value="remote" name="upload" {{action useRemote}}> <input type="radio" id="remote" value="remote" name="upload" {{action "useRemote"}}>
<label class="radio" for="remote">{{i18n upload_selector.from_the_web}}</label> <label class="radio" for="remote">{{i18n upload_selector.from_the_web}}</label>
{{#if remote}} {{#if remote}}
<div class="inputs"> <div class="inputs">
@ -37,10 +37,10 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" {{action upload target="view"}}> <button class="btn btn-primary" {{action "upload" target="view"}}>
<span class='add-upload'><i {{bind-attr class=":fa view.uploadIcon"}}></i><i class='fa fa-plus'></i></span> <span class='add-upload'><i {{bind-attr class=":fa view.uploadIcon"}}></i><i class='fa fa-plus'></i></span>
{{i18n upload}} {{i18n upload}}
</button> </button>
<a {{action closeModal}}>{{i18n cancel}}</a> <a {{action "closeModal"}}>{{i18n cancel}}</a>
{{#if remote}}<a {{action toggleShowMore}} class="pull-right">{{i18n show_more}}</a>{{/if}} {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n show_more}}</a>{{/if}}
</div> </div>

14
app/assets/javascripts/discourse/templates/post.hbs
View File

@ -7,7 +7,7 @@
<article class='boxed' {{bind-attr id="postElementId" data-post-id="id" data-user-id="user_id"}}> <article class='boxed' {{bind-attr id="postElementId" data-post-id="id" data-user-id="user_id"}}>
<div class='row'> <div class='row'>
{{#if showUserReplyTab}} {{#if showUserReplyTab}}
<a href {{action toggleReplyHistory this target="view"}} class='reply-to-tab'> <a href {{action "toggleReplyHistory" this target="view"}} class='reply-to-tab'>
{{#if loadingReplyHistory}} {{#if loadingReplyHistory}}
{{i18n loading}} {{i18n loading}}
{{else}} {{else}}
@ -37,7 +37,7 @@
{{#if hasHistory}} {{#if hasHistory}}
<div class='post-info edits'> <div class='post-info edits'>
{{#if can_view_edit_history}} {{#if can_view_edit_history}}
<a href class="{{unbound view.historyHeat}}" {{action showHistory this}} title="{{i18n post.last_edited_on}} {{raw-date updated_at}}"> <a href class="{{unbound view.historyHeat}}" {{action "showHistory" this}} title="{{i18n post.last_edited_on}} {{raw-date updated_at}}">
{{editCount}} {{editCount}}
<i class='fa fa-pencil'></i> <i class='fa fa-pencil'></i>
</a> </a>
@ -50,7 +50,7 @@
</div> </div>
{{/if}} {{/if}}
{{#if wiki}} {{#if wiki}}
<div class="post-info wiki" title="{{i18n post.wiki.about}}" {{action editPost this}}><i class="fa fa-pencil-square-o"></i></div> <div class="post-info wiki" title="{{i18n post.wiki.about}}" {{action "editPost" this}}><i class="fa fa-pencil-square-o"></i></div>
{{/if}} {{/if}}
{{#if via_email}} {{#if via_email}}
<div class="post-info via-email" title="{{i18n post.via_email}}"><i class="fa fa-envelope-o"></i></div> <div class="post-info via-email" title="{{i18n post.via_email}}"><i class="fa fa-envelope-o"></i></div>
@ -59,8 +59,8 @@
</div> </div>
<div {{bind-attr class=":select-posts controller.multiSelect::hidden"}}> <div {{bind-attr class=":select-posts controller.multiSelect::hidden"}}>
<button {{action toggledSelectedPostReplies this}} {{bind-attr class="view.canSelectReplies::hidden"}}>{{i18n topic.multi_select.select_replies}}</button> <button {{action "toggledSelectedPostReplies" this}} {{bind-attr class="view.canSelectReplies::hidden"}}>{{i18n topic.multi_select.select_replies}}</button>
<button {{action toggledSelectedPost this}} class="select-post">{{view.selectPostText}}</button> <button {{action "toggledSelectedPost" this}} class="select-post">{{view.selectPostText}}</button>
</div> </div>
<!-- keep the classes here in sync with composer.hbs --> <!-- keep the classes here in sync with composer.hbs -->
@ -69,13 +69,13 @@
{{{cooked}}} {{{cooked}}}
</div> </div>
{{#if cooked_hidden}} {{#if cooked_hidden}}
<a href {{action expandHidden this}}>{{i18n post.show_hidden}}</a> <a href {{action "expandHidden" this}}>{{i18n post.show_hidden}}</a>
{{/if}} {{/if}}
{{#if view.showExpandButton}} {{#if view.showExpandButton}}
{{#if controller.loadingExpanded}} {{#if controller.loadingExpanded}}
<button class="btn expand-post" disabled>{{i18n loading}}</button> <button class="btn expand-post" disabled>{{i18n loading}}</button>
{{else}} {{else}}
<button {{action expandFirstPost this}} class='btn expand-post'>{{i18n post.show_full}}&hellip;</button> <button {{action "expandFirstPost" this}} class='btn expand-post'>{{i18n post.show_full}}&hellip;</button>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{view 'post-menu' post=this adminMenu=view.adminMenu}} {{view 'post-menu' post=this adminMenu=view.adminMenu}}

14
app/assets/javascripts/discourse/templates/selected_posts.hbs
View File

@ -1,25 +1,25 @@
<p>{{countI18n topic.multi_select.description countBinding="selectedPostsCount"}}</p> <p>{{countI18n topic.multi_select.description countBinding="selectedPostsCount"}}</p>
{{#if canSelectAll}} {{#if canSelectAll}}
<p><a href='#' {{action selectAll}}>{{i18n topic.multi_select.select_all}}</a></p> <p><a href='#' {{action "selectAll"}}>{{i18n topic.multi_select.select_all}}</a></p>
{{/if}} {{/if}}
{{#if canDeselectAll}} {{#if canDeselectAll}}
<p><a href='#' {{action deselectAll}}>{{i18n topic.multi_select.deselect_all}}</a></p> <p><a href='#' {{action "deselectAll"}}>{{i18n topic.multi_select.deselect_all}}</a></p>
{{/if}} {{/if}}
{{#if canDeleteSelected}} {{#if canDeleteSelected}}
<button class='btn' {{action deleteSelected}}><i class='fa fa-trash-o'></i> {{i18n topic.multi_select.delete}}</button> <button class='btn' {{action "deleteSelected"}}><i class='fa fa-trash-o'></i> {{i18n topic.multi_select.delete}}</button>
{{/if}} {{/if}}
{{#if canSplitTopic}} {{#if canSplitTopic}}
<button class='btn' {{action splitTopic}}><i class='fa fa-sign-out'></i> {{i18n topic.split_topic.action}}</button> <button class='btn' {{action "splitTopic"}}><i class='fa fa-sign-out'></i> {{i18n topic.split_topic.action}}</button>
{{/if}} {{/if}}
{{#if canMergeTopic}} {{#if canMergeTopic}}
<button class='btn' {{action mergeTopic}}><i class='fa fa-sign-out'></i> {{i18n topic.merge_topic.action}}</button> <button class='btn' {{action "mergeTopic"}}><i class='fa fa-sign-out'></i> {{i18n topic.merge_topic.action}}</button>
{{/if}} {{/if}}
{{#if canChangeOwner}} {{#if canChangeOwner}}
<button class='btn' {{action changeOwner}}><i class='fa fa-user'></i> {{i18n topic.change_owner.action}}</button> <button class='btn' {{action "changeOwner"}}><i class='fa fa-user'></i> {{i18n topic.change_owner.action}}</button>
{{/if}} {{/if}}
<p class='cancel'><a href='#' {{action toggleMultiSelect}}>{{i18n topic.multi_select.cancel}}</a></p> <p class='cancel'><a href='#' {{action "toggleMultiSelect"}}>{{i18n topic.multi_select.cancel}}</a></p>

34
app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
View File

@ -4,48 +4,48 @@
<ul> <ul>
<li> <li>
<button {{action toggleMultiSelect}} class='btn btn-admin'><i class='fa fa-tasks'></i> {{i18n topic.actions.multi_select}}</button> <button {{action "toggleMultiSelect"}} class='btn btn-admin'><i class='fa fa-tasks'></i> {{i18n topic.actions.multi_select}}</button>
</li> </li>
{{#if details.can_delete}} {{#if details.can_delete}}
<li> <li>
<button {{action deleteTopic}} class='btn btn-admin btn-danger'><i class='fa fa-trash-o'></i> {{i18n topic.actions.delete}}</button> <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'><i class='fa fa-trash-o'></i> {{i18n topic.actions.delete}}</button>
</li> </li>
{{/if}} {{/if}}
{{#if showRecover}} {{#if showRecover}}
<li> <li>
<button {{action recoverTopic}} class='btn btn-admin'><i class='fa fa-undo'></i> {{i18n topic.actions.recover}}</button> <button {{action "recoverTopic"}} class='btn btn-admin'><i class='fa fa-undo'></i> {{i18n topic.actions.recover}}</button>
</li> </li>
{{/if}} {{/if}}
<li> <li>
{{#if closed}} {{#if closed}}
<button {{action toggleClosed}} class='btn btn-admin'><i class='fa fa-unlock'></i> {{i18n topic.actions.open}}</button> <button {{action "toggleClosed"}} class='btn btn-admin'><i class='fa fa-unlock'></i> {{i18n topic.actions.open}}</button>
{{else}} {{else}}
<button {{action toggleClosed}} class='btn btn-admin'><i class='fa fa-lock'></i> {{i18n topic.actions.close}}</button> <button {{action "toggleClosed"}} class='btn btn-admin'><i class='fa fa-lock'></i> {{i18n topic.actions.close}}</button>
<button {{action showAutoClose}} class='btn btn-admin'><i class='fa fa-clock-o'></i> {{i18n topic.actions.auto_close}}</button> <button {{action "showAutoClose"}} class='btn btn-admin'><i class='fa fa-clock-o'></i> {{i18n topic.actions.auto_close}}</button>
{{/if}} {{/if}}
</li> </li>
{{#unless isPrivateMessage}} {{#unless isPrivateMessage}}
<li> <li>
{{#if isBanner}} {{#if isBanner}}
<button {{action removeBanner}} class='btn btn-admin'><i class='fa fa-bullhorn'></i> {{i18n topic.actions.remove_banner}}</button> <button {{action "removeBanner"}} class='btn btn-admin'><i class='fa fa-bullhorn'></i> {{i18n topic.actions.remove_banner}}</button>
{{else}} {{else}}
{{#if visible}} {{#if visible}}
<button {{action makeBanner}} class='btn btn-admin'><i class='fa fa-bullhorn'></i> {{i18n topic.actions.make_banner}}</button> <button {{action "makeBanner"}} class='btn btn-admin'><i class='fa fa-bullhorn'></i> {{i18n topic.actions.make_banner}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}
</li> </li>
<li> <li>
{{#if pinned_at}} {{#if pinned_at}}
<button {{action togglePinned}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.unpin}}</button> <button {{action "togglePinned"}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.unpin}}</button>
{{else}} {{else}}
{{#if visible}} {{#if visible}}
<button {{action togglePinned}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.pin}}</button> <button {{action "togglePinned"}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.pin}}</button>
<button {{action togglePinnedGlobally}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.pin_globally}}</button> <button {{action "togglePinnedGlobally"}} class='btn btn-admin'><i class='fa fa-thumb-tack'></i> {{i18n topic.actions.pin_globally}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}
</li> </li>
@ -53,22 +53,22 @@
<li> <li>
{{#if archived}} {{#if archived}}
<button {{action toggleArchived}} class='btn btn-admin'><i class='fa fa-folder'></i> {{i18n topic.actions.unarchive}}</button> <button {{action "toggleArchived"}} class='btn btn-admin'><i class='fa fa-folder'></i> {{i18n topic.actions.unarchive}}</button>
{{else}} {{else}}
<button {{action toggleArchived}} class='btn btn-admin'><i class='fa fa-folder'></i> {{i18n topic.actions.archive}}</button> <button {{action "toggleArchived"}} class='btn btn-admin'><i class='fa fa-folder'></i> {{i18n topic.actions.archive}}</button>
{{/if}} {{/if}}
</li> </li>
<li> <li>
{{#if visible}} {{#if visible}}
<button {{action toggleVisibility}} class='btn btn-admin'><i class='fa fa-eye-slash'></i> {{i18n topic.actions.invisible}}</button> <button {{action "toggleVisibility"}} class='btn btn-admin'><i class='fa fa-eye-slash'></i> {{i18n topic.actions.invisible}}</button>
{{else}} {{else}}
<button {{action toggleVisibility}} class='btn btn-admin'><i class='fa fa-eye'></i> {{i18n topic.actions.visible}}</button> <button {{action "toggleVisibility"}} class='btn btn-admin'><i class='fa fa-eye'></i> {{i18n topic.actions.visible}}</button>
{{/if}} {{/if}}
</li> </li>
</ul> </ul>
</div> </div>
{{else}} {{else}}
<button class='btn no-text' id='show-topic-admin' {{action show}}><i class='fa fa-wrench'></i></button> <button class='btn no-text' id='show-topic-admin' {{action "show"}}><i class='fa fa-wrench'></i></button>
{{/if}} {{/if}}

14
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -12,7 +12,7 @@
<div class='inner'> <div class='inner'>
{{#if showStarButton}} {{#if showStarButton}}
<a {{bind-attr class=":star starred:starred"}} {{action toggleStar}} href='#' {{bind-attr title="starTooltip"}}></a> <a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
{{/if}} {{/if}}
{{#if editingTopic}} {{#if editingTopic}}
@ -23,8 +23,8 @@
{{/if}} {{/if}}
{{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}} {{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
<button class='btn btn-primary btn-small no-text' {{action finishedEditingTopic}}><i class='fa fa-check'></i></button> <button class='btn btn-primary btn-small no-text' {{action "finishedEditingTopic"}}><i class='fa fa-check'></i></button>
<button class='btn btn-small no-text' {{action cancelEditingTopic}}><i class='fa fa-times'></i></button> <button class='btn btn-small no-text' {{action "cancelEditingTopic"}}><i class='fa fa-times'></i></button>
{{else}} {{else}}
<h1> <h1>
{{#unless is_warning}} {{#unless is_warning}}
@ -38,7 +38,7 @@
{{/unless}} {{/unless}}
{{#if details.loaded}} {{#if details.loaded}}
{{topic-status topic=model}} {{topic-status topic=model}}
<a href='{{unbound url}}' {{action jumpTop}}> <a href='{{unbound url}}' {{action "jumpTop"}}>
{{#if topicSaving}} {{#if topicSaving}}
{{fancy_title}} {{fancy_title}}
{{else}} {{else}}
@ -49,7 +49,7 @@
{{#if details.can_edit}} {{#if details.can_edit}}
<a href='#' {{action editTopic}} class='edit-topic' title='{{i18n edit}}'><i class="fa fa-pencil"></i></a> <a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n edit}}'><i class="fa fa-pencil"></i></a>
{{/if}} {{/if}}
</h1> </h1>
{{/if}} {{/if}}
@ -128,10 +128,10 @@
{{message}} {{message}}
{{#if noRetry}} {{#if noRetry}}
{{#unless currentUser}} {{#unless currentUser}}
<button {{action showLogin}} class='btn btn-primary topic-retry'><i class="fa fa-user"></i>{{i18n log_in}}</button> <button {{action "showLogin"}} class='btn btn-primary topic-retry'><i class="fa fa-user"></i>{{i18n log_in}}</button>
{{/unless}} {{/unless}}
{{else}} {{else}}
<button class="btn btn-primary topic-retry" {{action retryLoading}}>{{i18n errors.buttons.again}}</button> <button class="btn btn-primary topic-retry" {{action "retryLoading"}}>{{i18n errors.buttons.again}}</button>
{{/if}} {{/if}}
</div> </div>
{{#if retrying}} {{#if retrying}}

8
app/assets/javascripts/discourse/templates/user/preferences.hbs
View File

@ -62,7 +62,7 @@
</div> </div>
{{else}} {{else}}
<div class="controls"> <div class="controls">
<button class="btn" title="{{i18n admin.users.check_email.title}}" {{action checkEmail this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button> <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -72,7 +72,7 @@
<div class="control-group pref-password"> <div class="control-group pref-password">
<label class="control-label">{{i18n user.password.title}}</label> <label class="control-label">{{i18n user.password.title}}</label>
<div class="controls"> <div class="controls">
<a href="#" {{action changePassword}} class='btn'><i class="fa fa-envelope"></i> <a href="#" {{action "changePassword"}} class='btn'><i class="fa fa-envelope"></i>
{{#if no_password}} {{#if no_password}}
{{i18n user.change_password.set_password}} {{i18n user.change_password.set_password}}
{{else}} {{else}}
@ -89,7 +89,7 @@
<div class="controls"> <div class="controls">
{{bound-avatar model "large"}} {{bound-avatar model "large"}}
{{#if allowAvatarUpload}} {{#if allowAvatarUpload}}
<button {{action showAvatarSelector}} class="btn pad-left no-text"><i class="fa fa-pencil"></i></button> <button {{action "showAvatarSelector"}} class="btn pad-left no-text"><i class="fa fa-pencil"></i></button>
{{else}} {{#unless ssoOverridesAvatar}} {{else}} {{#unless ssoOverridesAvatar}}
<a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn no-text"><i class="fa fa-pencil"></i></a> <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
{{/unless}} {{/if}} {{/unless}} {{/if}}
@ -215,7 +215,7 @@
<div class="control-group delete-account"> <div class="control-group delete-account">
<hr/> <hr/>
<div class="controls"> <div class="controls">
<button {{action delete}} {{bind-attr disabled="deleteDisabled"}} class="btn btn-danger"><i class="fa fa-trash-o"></i> {{i18n user.delete_account}}</button> <button {{action "delete"}} {{bind-attr disabled="deleteDisabled"}} class="btn btn-danger"><i class="fa fa-trash-o"></i> {{i18n user.delete_account}}</button>
</div> </div>
</div> </div>
{{/if}} {{/if}}