diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs index 0993610aa..6285d9e93 100644 --- a/app/assets/javascripts/admin/templates/flags-list.hbs +++ b/app/assets/javascripts/admin/templates/flags-list.hbs @@ -29,7 +29,7 @@ <td class='excerpt'> <h3> {{#if flaggedPost.topic.isPrivateMessage}} - <span class="private-message-glyph">{{fa-icon envelope}}</span> + <span class="private-message-glyph">{{fa-icon "envelope"}}</span> {{/if}} {{topic-status topic=flaggedPost.topic}} <a href='{{unbound flaggedPost.url}}'>{{flaggedPost.topic.title}}</a> diff --git a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs index 7d5f954ad..4234d0673 100644 --- a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs +++ b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs @@ -1,7 +1,7 @@ <div class="auto-close-fields"> <div> <label> - {{fa-icon clock-o}} + {{fa-icon "clock-o"}} {{i18n 'composer.auto_close.label'}} {{text-field value=autoCloseTime}} {{autoCloseUnits}} diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index 702a2f2dc..3b4503618 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -11,14 +11,14 @@ </button> {{/if}} <button {{action "showLogin"}} class='btn btn-primary btn-small login-button'> - {{fa-icon user}} {{i18n 'log_in'}} + {{fa-icon "user"}} {{i18n 'log_in'}} </button> {{/unless}} <ul class='icons clearfix' role='navigation'> {{#if currentUser}} <li class='notifications'> <a class='icon' href="#" {{action "showNotifications" target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n 'notifications.title'}}'> - {{fa-icon comment label="notifications.title"}} + {{fa-icon "comment" label="notifications.title"}} </a> {{#if currentUser.unread_notifications}} <a href='#' class='badge-notification unread-notifications'>{{currentUser.unread_notifications}}</a> @@ -31,7 +31,7 @@ <li> {{#if loginRequired}} <a id='search-button' class='icon expand' href='#' aria-hidden="true" {{action "showLogin"}}> - {{fa-icon search}} + {{fa-icon "search"}} </a> {{else}} <a id='search-button' @@ -39,7 +39,7 @@ href='#' data-dropdown="search-dropdown" title='{{i18n 'search.title'}}'> - {{fa-icon search label="search.title"}} + {{fa-icon "search" label="search.title"}} </a> {{/if}} </li> @@ -50,7 +50,7 @@ aria-hidden="true" id="site-map" {{action "showLogin"}}> - {{fa-icon bars}} + {{fa-icon "bars"}} </a> {{else}} <a class='icon' @@ -59,7 +59,7 @@ href="#" title='{{i18n 'site_map'}}' id="site-map"> - {{fa-icon bars label="site_map"}} + {{fa-icon "bars" label="site_map"}} </a> {{/if}} {{#if currentUser.site_flagged_posts_count}} @@ -102,7 +102,7 @@ <div class="title-wrapper"> <h1> {{#if showPrivateMessageGlyph}} - <span class="private-message-glyph">{{fa-icon envelope}}</span> + <span class="private-message-glyph">{{fa-icon "envelope"}}</span> {{/if}} {{#if topic.details.loaded}} diff --git a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs index 6460b9217..50d67754c 100644 --- a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs +++ b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs @@ -2,48 +2,48 @@ <ul> <li> - <button {{action "toggleMultiSelect"}} class='btn btn-admin'>{{fa-icon tasks}} {{i18n 'topic.actions.multi_select'}}</button> + <button {{action "toggleMultiSelect"}} class='btn btn-admin'>{{fa-icon "tasks"}} {{i18n 'topic.actions.multi_select'}}</button> </li> {{#if details.can_delete}} <li> - <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'>{{fa-icon trash-o}} {{i18n 'topic.actions.delete'}}</button> + <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'>{{fa-icon "trash-o"}} {{i18n 'topic.actions.delete'}}</button> </li> {{/if}} {{#if showRecover}} <li> - <button {{action "recoverTopic"}} class='btn btn-admin'>{{fa-icon undo}} {{i18n 'topic.actions.recover'}}</button> + <button {{action "recoverTopic"}} class='btn btn-admin'>{{fa-icon "undo"}} {{i18n 'topic.actions.recover'}}</button> </li> {{/if}} <li> {{#if closed}} - <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon unlock}} {{i18n 'topic.actions.open'}}</button> + <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon "unlock"}} {{i18n 'topic.actions.open'}}</button> {{else}} - <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon lock}} {{i18n 'topic.actions.close'}}</button> - <button {{action "showAutoClose"}} class='btn btn-admin'>{{fa-icon clock-o}} {{i18n 'topic.actions.auto_close'}}</button> + <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon "lock"}} {{i18n 'topic.actions.close'}}</button> + <button {{action "showAutoClose"}} class='btn btn-admin'>{{fa-icon "clock-o"}} {{i18n 'topic.actions.auto_close'}}</button> {{/if}} </li> {{#unless isPrivateMessage}} <li> {{#if isBanner}} - <button {{action "removeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n 'topic.actions.remove_banner'}}</button> + <button {{action "removeBanner"}} class='btn btn-admin'>{{fa-icon "bullhorn"}} {{i18n 'topic.actions.remove_banner'}}</button> {{else}} {{#if visible}} - <button {{action "makeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n 'topic.actions.make_banner'}}</button> + <button {{action "makeBanner"}} class='btn btn-admin'>{{fa-icon "bullhorn"}} {{i18n 'topic.actions.make_banner'}}</button> {{/if}} {{/if}} </li> <li> {{#if pinned_at}} - <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.unpin'}}</button> + <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon "thumb-tack"}} {{i18n 'topic.actions.unpin'}}</button> {{else}} {{#if visible}} - <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.pin'}}</button> - <button {{action "togglePinnedGlobally"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.pin_globally'}}</button> + <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon "thumb-tack"}} {{i18n 'topic.actions.pin'}}</button> + <button {{action "togglePinnedGlobally"}} class='btn btn-admin'>{{fa-icon "thumb-tack"}} {{i18n 'topic.actions.pin_globally'}}</button> {{/if}} {{/if}} </li> @@ -51,17 +51,17 @@ <li> {{#if archived}} - <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n 'topic.actions.unarchive'}}</button> + <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon "folder"}} {{i18n 'topic.actions.unarchive'}}</button> {{else}} - <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n 'topic.actions.archive'}}</button> + <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon "folder"}} {{i18n 'topic.actions.archive'}}</button> {{/if}} </li> <li> {{#if visible}} - <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye-slash}} {{i18n 'topic.actions.invisible'}}</button> + <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon "eye-slash"}} {{i18n 'topic.actions.invisible'}}</button> {{else}} - <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye}} {{i18n 'topic.actions.visible'}}</button> + <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon "eye"}} {{i18n 'topic.actions.visible'}}</button> {{/if}} </li> diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 16f7054ff..252a1cdc6 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -12,7 +12,7 @@ <div class="title-wrapper"> {{#if editingTopic}} {{#if isPrivateMessage}} - <span class="private-message-glyph">{{fa-icon envelope}}</span> + <span class="private-message-glyph">{{fa-icon "envelope"}}</span> {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}} {{else}} {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}} @@ -22,12 +22,12 @@ {{plugin-outlet "edit-topic"}} - <button class='btn btn-primary btn-small no-text' {{action "finishedEditingTopic"}}>{{fa-icon check}}</button> - <button class='btn btn-small no-text' {{action "cancelEditingTopic"}}>{{fa-icon times}}</button> + <button class='btn btn-primary btn-small no-text' {{action "finishedEditingTopic"}}>{{fa-icon "check"}}</button> + <button class='btn btn-small no-text' {{action "cancelEditingTopic"}}>{{fa-icon "times"}}</button> {{else}} <h1> {{#unless is_warning}} - <span class="private-message-glyph">{{fa-icon envelope}}</span> + <span class="private-message-glyph">{{fa-icon "envelope"}}</span> {{/unless}} {{#if details.loaded}} @@ -38,7 +38,7 @@ {{/if}} {{#if details.can_edit}} - <a href {{action "editTopic"}} class='edit-topic' title='{{i18n 'edit'}}'>{{fa-icon pencil}}</a> + <a href {{action "editTopic"}} class='edit-topic' title='{{i18n 'edit'}}'>{{fa-icon "pencil"}}</a> {{/if}} </h1> @@ -118,7 +118,7 @@ <div>{{message}}</div> {{#if noRetry}} {{#unless currentUser}} - <button {{action "showLogin"}} class='btn btn-primary topic-retry'>{{fa-icon user}} {{i18n 'log_in'}}</button> + <button {{action "showLogin"}} class='btn btn-primary topic-retry'>{{fa-icon "user"}} {{i18n 'log_in'}}</button> {{/unless}} {{else}} <button class="btn btn-primary topic-retry" {{action "retryLoading"}}>{{fa-icon "refresh"}} {{i18n 'errors.buttons.again'}}</button>