Rename {{fa-icon}} to {{d-icon}} so it can be more generic

This commit is contained in:
Robin Ward
2017-07-26 16:25:09 -04:00
parent 68b3dd43ce
commit d0c41a578e
92 changed files with 178 additions and 170 deletions
@@ -1,4 +1,4 @@
import { iconHTML } from 'discourse-common/helpers/fa-icon';
import { iconHTML } from 'discourse-common/lib/icon-library';
import { bufferedRender } from 'discourse-common/lib/buffered-render';
export default Ember.Component.extend(bufferedRender({
@@ -3,7 +3,7 @@
<div>
{{#link-to 'adminBadges.show' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
{{d-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}}
</div>
{{/d-section}}
@@ -38,7 +38,7 @@
content=badgeGroupings
optionValuePath="content.id"
optionLabelPath="content.displayName"}}
&nbsp;<button {{action "editGroupings"}} class='btn'>{{fa-icon 'pencil'}}</button>
&nbsp;<button {{action "editGroupings"}} class='btn'>{{d-icon 'pencil'}}</button>
</div>
@@ -15,7 +15,7 @@
{{/each}}
</ul>
{{#link-to 'adminBadges.show' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
{{d-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}}
<br>
<br>
@@ -1,6 +1,6 @@
<td class="title">
{{#if report.icon}}
{{fa-icon report.icon}}
{{d-icon report.icon}}
{{/if}}
<a href="{{report.reportUrl}}">{{report.title}}</a>
</td>
@@ -8,15 +8,15 @@
<td class="value">{{number report.todayCount}}</td>
<td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>
{{number report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
{{number report.yesterdayCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
</td>
<td class="value {{report.sevenDayTrend}}" title={{report.sevenDayCountTitle}}>
{{number report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
{{number report.lastSevenDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
</td>
<td class="value {{report.thirtyDayTrend}}" title={{report.thirtyDayCountTitle}}>
{{number report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
{{number report.lastThirtyDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
</td>
<td class="value">{{number report.total}}</td>
@@ -1,4 +1,4 @@
<div class="validation-error {{unless message 'hidden'}}">
{{fa-icon "times"}}
{{d-icon "times"}}
{{message}}
</div>
@@ -1,5 +1,5 @@
<label class="btn {{if addDisabled 'disabled'}}">
{{fa-icon "upload"}}
{{d-icon "upload"}}
{{i18n 'admin.watched_words.form.upload'}}
<input disabled={{addDisabled}} type="file" accept="text/plain,text/csv" style="visibility: hidden; position: absolute;" />
</label>
@@ -4,12 +4,12 @@
{{#each model as |scheme|}}
{{#unless scheme.is_base}}
<li>
{{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{fa-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
{{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{d-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
</li>
{{/unless}}
{{/each}}
</ul>
<button {{action "newColorScheme"}} class='btn'>{{fa-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
<button {{action "newColorScheme"}} class='btn'>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
</div>
{{outlet}}
@@ -19,7 +19,7 @@
<li>
{{#link-to 'adminCustomizeThemes.edit' model.id 'desktop' fieldName replace=true title=field.title}}
{{i18n 'admin.customize.theme.desktop'}}
{{fa-icon 'desktop'}}
{{d-icon 'desktop'}}
{{/link-to}}
</li>
{{/if}}
@@ -27,7 +27,7 @@
<li class='mobile'>
{{#link-to 'adminCustomizeThemes.edit' model.id 'mobile' fieldName replace=true title=field.title}}
{{i18n 'admin.customize.theme.mobile'}}
{{fa-icon 'mobile'}}
{{d-icon 'mobile'}}
{{/link-to}}
</li>
{{/if}}
@@ -46,7 +46,7 @@
{{#each fields as |field|}}
<li>
{{#link-to 'adminCustomizeThemes.edit' model.id currentTargetName field.name replace=true title=field.title}}
{{#if field.icon}}{{fa-icon field.icon}} {{/if}}
{{#if field.icon}}{{d-icon field.icon}} {{/if}}
{{i18n field.key}}
{{/link-to}}
</li>
@@ -5,7 +5,7 @@
{{d-button action="finishedEditingName" class="btn-primary btn-small submit-edit" icon="check"}}
{{d-button action="cancelEditingName" class="btn-small cancel-edit" icon="times"}}
{{else}}
{{model.name}} <a {{action "startEditingName"}}>{{fa-icon "pencil"}}</a>
{{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
{{/if}}
</h2>
@@ -15,7 +15,7 @@
</p>
{{#if model.remote_theme.license_url}}
<p>
<a href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}} {{fa-icon "copyright"}}</a>
<a href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}} {{d-icon "copyright"}}</a>
</p>
{{/if}}
{{/if}}
@@ -133,8 +133,8 @@
{{/if}}
{{/if}}
<a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{fa-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
<a class="btn export" target="_blank" href={{downloadUrl}}>{{fa-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
<a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
<a class="btn export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
{{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}}
</div>
@@ -7,10 +7,10 @@
{{#link-to 'adminCustomizeThemes.show' theme replace=true}}
{{theme.name}}
{{#if theme.user_selectable}}
{{fa-icon "user"}}
{{d-icon "user"}}
{{/if}}
{{#if theme.default}}
{{fa-icon "asterisk"}}
{{d-icon "asterisk"}}
{{/if}}
{{/link-to}}
</li>
@@ -29,15 +29,15 @@
<div class="dashboard-stats totals">
<table>
<tr>
<td class="title">{{fa-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
<td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
<td class="title">{{fa-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
<td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
</tr>
<tr>
<td class="title">{{fa-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
<td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
<td class="title">{{fa-icon "ban"}} {{i18n 'admin.dashboard.blocked'}}</td>
<td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.blocked'}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}</td>
</tr>
</table>
@@ -87,7 +87,7 @@
<table class="table table-condensed table-hover">
<thead>
<tr>
<th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}">{{fa-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}}</th>
<th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}">{{d-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}}</th>
<th>{{i18n 'admin.dashboard.reports.today'}}</th>
<th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
<th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
@@ -176,7 +176,7 @@
<div class="dashboard-right">
{{#if foundProblems}}
<div class="dashboard-stats detected-problems">
<div class="look-here">{{fa-icon "exclamation-triangle"}}</div>
<div class="look-here">{{d-icon "exclamation-triangle"}}</div>
<div class="problem-messages">
{{#conditional-loading-spinner condition=loadingProblems}}
<p>
@@ -30,7 +30,7 @@
{{/if}}
</td>
<td>
{{#if l.bounced}}{{fa-icon "repeat" title="admin.email.bounced"}}{{/if}}
{{#if l.bounced}}{{d-icon "repeat" title="admin.email.bounced"}}{{/if}}
<a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a>
</td>
<td>{{l.email_type}}</td>
@@ -20,7 +20,7 @@
<tr>
<th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
<th>:{{e.name}}:</th>
<th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{fa-icon 'trash-o'}} </button></th>
<th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon 'trash-o'}} </button></th>
</tr>
{{/each}}
</tbody>
@@ -31,7 +31,7 @@
<div class="topic-excerpt">
<h3>
{{#if flaggedPost.topic.isPrivateMessage}}
<span class="private-message-glyph">{{fa-icon "envelope"}}</span>
<span class="private-message-glyph">{{d-icon "envelope"}}</span>
{{/if}}
{{topic-status topic=flaggedPost.topic}}
<a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
@@ -133,7 +133,7 @@
<div class='buttons'>
<button {{action "save"}} disabled={{disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
{{#unless model.automatic}}
<button {{action "destroy"}} class='btn btn-danger'>{{fa-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
<button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
{{/unless}}
<span class="saving {{unless savingStatus 'hidden'}}">{{savingStatus}}</span>
@@ -3,7 +3,7 @@
<div>
{{#link-to 'adminGroup' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
{{d-icon "plus"}} {{i18n 'admin.groups.new'}}
{{/link-to}}
</div>
</div>
@@ -18,7 +18,7 @@
{{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
{{else}}
{{#link-to 'adminGroup' 'new' class="btn"}}
{{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
{{d-icon "plus"}} {{i18n 'admin.groups.new'}}
{{/link-to}}
{{/if}}
</div>
@@ -1,6 +1,6 @@
<p>
{{i18n 'admin.logs.screened_emails.description'}}
<button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
<button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
</p>
<br>
@@ -41,9 +41,9 @@
</div>
<div class="col action">
{{#if item.isBlocked}}
{{fa-icon "ban"}}
{{d-icon "ban"}}
{{else}}
{{fa-icon "check"}}
{{d-icon "check"}}
{{/if}}
{{item.actionName}}
</div>
@@ -1,6 +1,6 @@
<p>
{{i18n 'admin.logs.screened_urls.description'}}
<button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
<button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
</p>
<br>
@@ -7,25 +7,25 @@
{{#if actionFilter}}
<a {{action "clearFilter" "actionFilter"}} class="filter">
<span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
{{fa-icon "times-circle"}}
{{d-icon "times-circle"}}
</a>
{{/if}}
{{#if filters.acting_user}}
<a {{action "clearFilter" "acting_user"}} class="filter">
<span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
{{fa-icon "times-circle"}}
{{d-icon "times-circle"}}
</a>
{{/if}}
{{#if filters.target_user}}
<a {{action "clearFilter" "target_user"}} class="filter">
<span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
{{fa-icon "times-circle"}}
{{d-icon "times-circle"}}
</a>
{{/if}}
{{#if filters.subject}}
<a {{action "clearFilter" "subject"}} class="filter">
<span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
{{fa-icon "times-circle"}}
{{d-icon "times-circle"}}
</a>
{{/if}}
</div>
@@ -7,6 +7,6 @@
valueAttribute="base_scheme_id"}}
{{/d-modal-body}}
<div class="modal-footer">
<button class='btn btn-primary' {{action "selectBase"}}>{{fa-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
<button class='btn btn-primary' {{action "selectBase"}}>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
</div>
</div>
@@ -5,15 +5,15 @@
<li>
{{#if wc.editing}}
{{input value=wc.name}}
<button {{action "save" wc}} class="btn no-text">{{fa-icon 'check'}}</button>
<button {{action "save" wc}} class="btn no-text">{{d-icon 'check'}}</button>
{{else}}
{{wc.displayName}}
{{/if}}
<div class='actions'>
<button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{fa-icon 'pencil'}}</button>
<button {{action "up" wc}} class="btn no-text">{{fa-icon 'toggle-up'}}</button>
<button {{action "down" wc}} class="btn no-text">{{fa-icon 'toggle-down'}}</button>
<button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{fa-icon 'times'}}</button>
<button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon 'pencil'}}</button>
<button {{action "up" wc}} class="btn no-text">{{d-icon 'toggle-up'}}</button>
<button {{action "down" wc}} class="btn no-text">{{d-icon 'toggle-down'}}</button>
<button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{d-icon 'times'}}</button>
</div>
</li>
{{/each}}
@@ -13,7 +13,7 @@
{{/save-controls}}
{{#link-to 'adminSiteText.index' class="go-back"}}
{{fa-icon 'arrow-left'}}
{{d-icon 'arrow-left'}}
{{i18n 'admin.site_text.go_back'}}
{{/link-to}}
@@ -3,7 +3,7 @@
<div class='user-controls'>
{{#if model.canViewProfile}}
{{#link-to 'user' model class="btn"}}
{{fa-icon "user"}}
{{d-icon "user"}}
{{i18n 'admin.user.show_public_profile'}}
{{/link-to}}
{{/if}}
@@ -151,7 +151,7 @@
{{i18n 'badges.badge_count' count=model.badge_count}}
</div>
<div class='controls'>
{{#link-to 'adminUser.badges' model class="btn"}}{{fa-icon "certificate"}}{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
{{#link-to 'adminUser.badges' model class="btn"}}{{d-icon "certificate"}}{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
</div>
</div>
{{/if}}
@@ -487,7 +487,7 @@
<div class="clearfix"></div>
<br/>
<div class="pull-right">
{{fa-icon "exclamation-triangle"}} {{model.deleteExplanation}}
{{d-icon "exclamation-triangle"}} {{model.deleteExplanation}}
</div>
{{/if}}
</section>
@@ -92,10 +92,10 @@
{{/if}}
<td>
{{#if user.admin}}
{{fa-icon "shield" title="admin.title" }}
{{d-icon "shield" title="admin.title" }}
{{/if}}
{{#if user.moderator}}
{{fa-icon "shield" title="admin.moderator" }}
{{d-icon "shield" title="admin.moderator" }}
{{/if}}
</td>
</tr>
@@ -18,7 +18,7 @@
{{#if versionCheck.noCheckPerformed}}
<td class="version-number">&mdash;</td>
<td class="face">
<span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
<span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
</td>
<td class="version-notes">
<span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
@@ -28,9 +28,9 @@
<td class="version-number">{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</td>
<td class="face">
{{#if versionCheck.version_check_pending}}
<span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
<span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
{{else}}
<span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
<span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
{{/if}}
</td>
<td class="version-notes">
@@ -46,13 +46,13 @@
<td class="version-number">{{dash-if-empty versionCheck.latest_version}}</td>
<td class="face">
{{#if versionCheck.upToDate }}
<span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
<span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
{{else}}
<span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
{{#if versionCheck.behindByOneVersion}}
{{fa-icon "meh-o"}}
{{d-icon "meh-o"}}
{{else}}
{{fa-icon "frown-o"}}
{{d-icon "frown-o"}}
{{/if}}
</span>
{{/if}}
@@ -1,10 +1,10 @@
<div class="web-hook-direction">
{{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
{{fa-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
{{d-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
{{/link-to}}
{{d-button icon="send" label="admin.web_hooks.events.ping" action="ping" disabled=pingDisabled}}
{{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
{{fa-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
{{d-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
{{/link-to}}
</div>
@@ -1,5 +1,5 @@
{{#link-to 'adminWebHooks' class="go-back"}}
{{fa-icon 'arrow-left'}}
{{d-icon 'arrow-left'}}
{{i18n 'admin.web_hooks.go_back'}}
{{/link-to}}
@@ -49,12 +49,12 @@
<div class='filters'>
<div>
<label>{{fa-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
<label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
{{category-selector categories=model.categories blacklist=model.categories}}
<div class="instructions">{{i18n 'admin.web_hooks.categories_filter_instructions'}}</div>
</div>
<div>
<label>{{fa-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
<label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
{{group-selector groupNames=model.groupsFilterInName groupFinder=model.groupFinder}}
<div class="instructions">{{i18n 'admin.web_hooks.groups_filter_instructions'}}</div>
</div>
@@ -1,6 +1,6 @@
<div class='pull-right'>
{{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}}
{{fa-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
{{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
{{/link-to}}
</div>
<div class='clearfix'></div>
@@ -24,7 +24,7 @@
<td>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
<td class='description'>{{webHook.description}}</td>
<td class='controls'>
{{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{fa-icon 'edit'}}{{/link-to}}
{{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'edit'}}{{/link-to}}
{{d-button class="destroy btn-danger" action='destroy' actionParam=webHook icon="remove"}}
</td>
</tr>