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

View File

@ -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({

View File

@ -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}}

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -1,4 +1,4 @@
<div class="validation-error {{unless message 'hidden'}}">
{{fa-icon "times"}}
{{d-icon "times"}}
{{message}}
</div>

View File

@ -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>

View File

@ -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}}

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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}}

View File

@ -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}}

View File

@ -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>

View File

@ -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>

View File

@ -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}}

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -0,0 +1,6 @@
import { registerUnbound } from 'discourse-common/lib/helpers';
import { renderIcon } from 'discourse-common/lib/icon-library';
registerUnbound('d-icon', function(id, params) {
return new Handlebars.SafeString(renderIcon('string', id, params));
});

View File

@ -1,10 +1,12 @@
import { registerUnbound } from 'discourse-common/lib/helpers';
import { renderIcon } from 'discourse-common/lib/icon-library';
import deprecated from 'discourse-common/lib/deprecated';
export function iconHTML(id, params) {
return renderIcon('string', id, params);
}
registerUnbound('fa-icon', function(icon, params) {
deprecated("Use `{{d-icon}}` instead of `{{fa-icon}}");
return new Handlebars.SafeString(iconHTML(icon, params));
});

View File

@ -29,7 +29,7 @@ export function registerIconRenderer(renderer) {
// Support for font awesome icons
function faClasses(id, params) {
let classNames = `fa fa-${id}`;
let classNames = `fa fa-${id} d-icon d-icon-${id}`;
if (params) {
if (params.modifier) { classNames += " fa-" + params.modifier; }
if (params['class']) { classNames += ' ' + params['class']; }

View File

@ -21,7 +21,7 @@
{{#if model.admins}}
<section class='about admins'>
<h3>{{fa-icon "users"}} {{i18n 'about.our_admins'}}</h3>
<h3>{{d-icon "users"}} {{i18n 'about.our_admins'}}</h3>
{{#each model.admins as |a|}}
{{user-info user=a}}
@ -33,7 +33,7 @@
{{#if model.moderators}}
<section class='about moderators'>
<h3>{{fa-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
<h3>{{d-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
<div class='users'>
{{#each model.moderators as |m|}}
@ -45,7 +45,7 @@
{{/if}}
<section class='about stats'>
<h3>{{fa-icon "bar-chart"}} {{i18n 'about.stats'}}</h3>
<h3>{{d-icon "bar-chart"}} {{i18n 'about.stats'}}</h3>
<table class='table'>
<tr>
@ -89,7 +89,7 @@
{{#if contactInfo}}
<section class='about contact'>
<h3>{{fa-icon "envelope-o"}} {{i18n 'about.contact'}}</h3>
<h3>{{d-icon "envelope-o"}} {{i18n 'about.contact'}}</h3>
<p>{{{contactInfo}}}</p>
</section>
{{/if}}

View File

@ -5,7 +5,7 @@
{{#if option.model}}
<a href>{{category-link option.model allowUncategorized="true" link="false"}}</a>
{{else}}
<a href>{{fa-icon 'tag'}}{{option.text}} x {{option.count}}</a>
<a href>{{d-icon 'tag'}}{{option.text}} x {{option.count}}</a>
{{/if}}
</li>
{{/each}}

View File

@ -14,11 +14,11 @@
{{#if isCustom}}
<div class="control-group">
{{fa-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
{{d-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
</div>
<div class="control-group">
{{fa-icon "clock-o"}}
{{d-icon "clock-o"}}
{{input type="time" value=time}}
</div>
{{/if}}
@ -33,7 +33,7 @@
{{#if willCloseImmediately}}
<div class="warning">
{{fa-icon "warning"}}
{{d-icon "warning"}}
{{willCloseI18n}}
</div>
{{/if}}

View File

@ -1,5 +1,5 @@
<label class="btn" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
{{fa-icon "picture-o"}}&nbsp;{{uploadButtonText}}
{{d-icon "picture-o"}}&nbsp;{{uploadButtonText}}
<input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
</label>
{{#if uploading}}

View File

@ -2,7 +2,7 @@
<span class='grant-count' title={{i18n 'badges.granted' count=displayCount}}>{{displayCount}}</span>
{{/if}}
{{#if badge.has_badge}}
<span class='check-display status-checked'>{{fa-icon "check"}}</span>
<span class='check-display status-checked'>{{d-icon "check"}}</span>
{{/if}}
<div class='badge-contents'>
<div class='badge-icon {{badge.badgeTypeClassName}}'>

View File

@ -9,7 +9,7 @@
<h3>
{{#if c.read_restricted}}
{{fa-icon 'lock'}}
{{d-icon 'lock'}}
{{/if}}
{{c.name}}
</h3>

View File

@ -9,7 +9,7 @@
<h3>
{{#if c.read_restricted}}
{{fa-icon 'lock'}}
{{d-icon 'lock'}}
{{/if}}
{{c.name}}
</h3>

View File

@ -2,7 +2,7 @@
<a href {{action "expand"}} class="badge-category" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
<span class="badge-category-bg" style={{categoryColor}}></span>
{{#if category.read_restricted}}
{{fa-icon "lock"}}
{{d-icon "lock"}}
{{/if}}
{{category.name}}
</a>

View File

@ -1,6 +1,6 @@
<a href={{category.url}}>
{{#if category.read_restricted}}
{{fa-icon 'lock'}}
{{d-icon 'lock'}}
{{/if}}
<span class="category-name">{{category.name}}</span>

View File

@ -30,7 +30,7 @@
{{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
{{uploadProgress}}%
{{#if isCancellable}}
<a href id="cancel-file-upload" {{action "cancelUpload"}}>{{fa-icon "times"}}</a>
<a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
{{/if}}
</div>
{{/if}}

View File

@ -1,5 +1,5 @@
<label class="btn" disabled={{uploadButtonDisabled}}>
{{fa-icon "upload"}}&nbsp;{{uploadButtonText}}
{{d-icon "upload"}}&nbsp;{{uploadButtonText}}
<input disabled={{uploading}} type="file" accept=".csv" style="visibility: hidden; position: absolute;" />
</label>
{{#if uploading}}

View File

@ -1,5 +1,5 @@
{{#if icon}}
{{fa-icon icon}}
{{d-icon icon}}
{{/if}}
{{#if translatedLabel}}

View File

@ -1,5 +1,5 @@
{{fa-icon icon modifier="stack-2x"}}
{{d-icon icon modifier="stack-2x"}}
{{#if disabled}}
{{fa-icon "ban" modifier="stack-2x"}}
{{d-icon "ban" modifier="stack-2x"}}
{{/if}}

View File

@ -9,7 +9,7 @@
{{{i18n "category.can"}}}
<span class="permission">{{p.permission.description}}</span>
{{#if editingPermissions}}
<a href {{action "removePermission" p}}>{{fa-icon "times-circle"}}</a>
<a href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
{{/if}}
</li>
{{/each}}

View File

@ -107,7 +107,7 @@
<section class='field'>
<label>
{{fa-icon "envelope-o"}}
{{d-icon "envelope-o"}}
{{i18n 'category.email_in'}}
{{text-field class="email-in" value=category.email_in}}
</label>

View File

@ -1,6 +1,6 @@
{{text-field name="name" placeholderKey="admin.emoji.name" value=name}}
<label class="btn btn-primary {{if addDisabled 'disabled'}}">
{{fa-icon "plus"}}
{{d-icon "plus"}}
{{i18n 'admin.emoji.add'}}
<input disabled={{addDisabled}} type="file" accept=".png,.gif" style="visibility: hidden; position: absolute;" />
</label>

View File

@ -1,5 +1,5 @@
{{#if item.truncated}}
<a class="expand-item" href {{action "expandItem"}} title={{i18n "post.expand_collapse"}}>
{{fa-icon "chevron-down"}}
{{d-icon "chevron-down"}}
</a>
{{/if}}

View File

@ -1 +1 @@
{{fa-icon icon}}
{{d-icon icon}}

View File

@ -1,6 +1,6 @@
{{#if value}}
{{#d-button class="btn-small group-logs-filter" action="clearFilter" actionParam=type}}
<span>{{label}}</span>: {{filterText}}
{{fa-icon "times-circle"}}
{{d-icon "times-circle"}}
{{/d-button}}
{{/if}}

View File

@ -36,9 +36,9 @@
<td {{action "toggleDetails"}} class="group-logs-expand-details">
{{#if log.prev_value}}
{{#if expandDetails}}
{{fa-icon 'ellipsis-v'}}
{{d-icon 'ellipsis-v'}}
{{else}}
{{fa-icon 'ellipsis-h'}}
{{d-icon 'ellipsis-h'}}
{{/if}}
{{/if}}
</td>

View File

@ -1 +1 @@
<a href={{member.adminPath}}>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "remove"}}>{{fa-icon "times"}}</a>{{/unless}}
<a href={{member.adminPath}}>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "remove"}}>{{d-icon "times"}}</a>{{/unless}}

View File

@ -2,9 +2,9 @@
{{#if model.members}}
<div>
<a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{fa-icon "fast-backward"}}</a>
<a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{d-icon "fast-backward"}}</a>
{{currentPage}}/{{totalPages}}
<a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{fa-icon "fast-forward"}}</a>
<a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{d-icon "fast-forward"}}</a>
</div>
<div class="ac-wrap clearfix">
{{#each model.members as |member|}}

View File

@ -1,11 +1,11 @@
<div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
<div class="image-upload-controls">
<label class="btn pad-left no-text {{if uploading 'disabled'}}">
{{fa-icon "picture-o"}}
{{d-icon "picture-o"}}
<input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
</label>
{{#if backgroundStyle}}
<button {{action "trash"}} class="btn btn-danger pad-left no-text">{{fa-icon "trash-o"}}</button>
<button {{action "trash"}} class="btn btn-danger pad-left no-text">{{d-icon "trash-o"}}</button>
{{/if}}
<span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
</div>

View File

@ -1,11 +1,11 @@
{{#if ip}}
<button class="btn" {{action "lookup"}}>
{{fa-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
{{d-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
</button>
{{/if}}
{{#if show}}
<div class="location-box">
<a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a>
<a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
<h4>{{i18n 'ip_lookup.title'}}</h4>
<dl>
{{#if location}}
@ -42,7 +42,7 @@
<strong>{{totalOthersWithSameIP}}</strong>
{{#if other_accounts.length}}
<button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}>
{{fa-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
{{d-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
</button>
{{/if}}
</dt>

View File

@ -1,5 +1,5 @@
<h2>{{period-title period showDateRange=true}}</h2>
<button>{{fa-icon "caret-down"}}</button>
<button>{{d-icon "caret-down"}}</button>
<div id='period-popup' class="{{unless showPeriods 'hidden'}} period-popup">
<ul>

View File

@ -16,13 +16,13 @@
{{#if topic.details.can_reply_as_new_topic}}
<div class='reply-as-new-topic'>
{{#if topic.isPrivateMessage}}
<a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_private_message'}} title={{i18n 'post.reply_as_new_private_message'}}>{{fa-icon "plus"}}{{i18n 'user.new_private_message'}}</a>
<a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_private_message'}} title={{i18n 'post.reply_as_new_private_message'}}>{{d-icon "plus"}}{{i18n 'user.new_private_message'}}</a>
{{else}}
<a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_topic'}} title={{i18n 'post.reply_as_new_topic'}}>{{fa-icon "plus"}}{{i18n 'topic.create'}}</a>
<a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_topic'}} title={{i18n 'post.reply_as_new_topic'}}>{{d-icon "plus"}}{{i18n 'topic.create'}}</a>
{{/if}}
</div>
{{/if}}
<div class='link'>
<a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{fa-icon "close"}}</a>
<a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "close"}}</a>
</div>

View File

@ -1,10 +1,10 @@
<div class='small-action-desc'>
{{#if post}}
{{#if post.can_delete}}
<button {{action "delete"}} title={{i18n "post.controls.delete"}}>{{fa-icon "times"}}</button>
<button {{action "delete"}} title={{i18n "post.controls.delete"}}>{{d-icon "times"}}</button>
{{/if}}
{{#if post.can_edit}}
<button {{action "edit"}} title={{i18n "post.controls.edit"}}>{{fa-icon "pencil"}}</button>
<button {{action "edit"}} title={{i18n "post.controls.edit"}}>{{d-icon "pencil"}}</button>
{{/if}}
<a href={{post.usernameUrl}} data-user-card={{post.username}}>
{{avatar post imageSize="small"}}

View File

@ -10,7 +10,7 @@
{{#if item.deleted_by}}
<span class="delete-info">
{{fa-icon "trash-o"}}
{{d-icon "trash-o"}}
{{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
{{format-date item.deleted_at leaveAgo="true"}}
</span>
@ -31,7 +31,7 @@
{{#each child.items as |grandChild|}}
{{#if grandChild.removableBookmark}}
<button class="btn btn-default remove-bookmark" {{action removeBookmark grandChild}}>
{{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
{{d-icon 'times'}} {{i18n "bookmarks.remove"}}
</button>
{{else}}
<a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>

View File

@ -1,7 +1,7 @@
{{#d-button action="enterTop" class="full jump-top"}}
{{fa-icon 'caret-up'}} {{{topDate}}}
{{d-icon 'caret-up'}} {{{topDate}}}
{{/d-button}}
{{#d-button action="enterBottom" class="full jump-button"}}
{{{bottomDate}}} {{fa-icon 'caret-down'}}
{{{bottomDate}}} {{d-icon 'caret-down'}}
{{/d-button}}

View File

@ -28,7 +28,7 @@
action=toggleBookmark}}
<button class="btn share" data-share-url={{topic.shareUrl}} title={{i18n "topic.share.help"}}>
{{fa-icon "link"}}
{{d-icon "link"}}
{{i18n "topic.share.title"}}
</button>

View File

@ -36,25 +36,25 @@
<ul class="usercard-controls">
{{#if user.can_send_private_message_to_user}}
<li><a class='btn btn-primary' {{action "composePrivateMessage" user post}}>{{fa-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
<li><a class='btn btn-primary' {{action "composePrivateMessage" user post}}>{{d-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
{{/if}}
{{#if showFilter}}
<li><a class='btn' href {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username=username count=topicPostCount}}</a></li>
<li><a class='btn' href {{action "togglePosts" user}}>{{d-icon "filter"}}{{i18n 'topic.filter_to' username=username count=topicPostCount}}</a></li>
{{/if}}
{{#if hasUserFilters}}
<li><a class='btn' href {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
<li><a class='btn' href {{action "cancelFilter"}}>{{d-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
{{/if}}
{{#if showDelete}}
<li><a class='btn btn-danger' href {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
<li><a class='btn btn-danger' href {{action "deleteUser" user}}>{{d-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
{{/if}}
</ul>
{{#if isSuspended}}
<div class='suspended'>
{{fa-icon "ban"}}
{{d-icon "ban"}}
<b>{{i18n 'user.suspended_notice' date=user.suspendedTillDate}}</b><br/>
<b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}}
</div>
@ -71,12 +71,12 @@
{{#if hasLocationOrWebsite}}
<div class="location-and-website">
{{#if user.location}}
<span class='location'>{{fa-icon "map-marker"}} {{user.location}}</span>
<span class='location'>{{d-icon "map-marker"}} {{user.location}}</span>
{{/if}}
{{#if user.website_name}}
<span class='website-name'>
{{fa-icon "globe"}}
{{d-icon "globe"}}
{{#if linkWebsite}}
<a href={{user.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{user.website_name}}</a>
{{else}}

View File

@ -1,5 +1,5 @@
<span class='value'>
{{#if icon}}{{fa-icon icon}}{{/if}}
{{#if icon}}{{d-icon icon}}{{/if}}
{{number value}}
</span>
<span class='label'>{{{i18n label count=value}}}</span>

View File

@ -130,7 +130,7 @@
</div>
<div class='draft-text'>
{{#if model.topic}}
{{fa-icon "mail-forward"}} {{{draftTitle}}}
{{d-icon "mail-forward"}} {{{draftTitle}}}
{{else}}
{{i18n "composer.saved_draft"}}
{{/if}}

View File

@ -1,3 +1,3 @@
<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
{{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
<p>{{{message.body}}}</p>

View File

@ -1,2 +1,2 @@
<a href {{action "closeMessage"}} class='close'>{{fa-icon "times"}}</a>
<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
{{{message.body}}}

View File

@ -1,2 +1,2 @@
<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
{{{message.body}}}

View File

@ -1,4 +1,4 @@
<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
<h3>{{i18n 'composer.similar_topics'}}</h3>
<ul class='topics'>

View File

@ -18,10 +18,10 @@
<div class='main-column'>
<div class='filter'>
{{fa-icon 'search'}}
{{d-icon 'search'}}
<input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="off" autofocus/>
<button class='clear-filter'>
{{fa-icon 'times'}}
{{d-icon 'times'}}
</button>
</div>
@ -31,7 +31,7 @@
<div class='section' data-section='recent'>
<div class='section-header'>
<span class="title">{{i18n 'emoji_picker.recent'}}</span>
<a href='#' class='clear-recent'>{{fa-icon 'trash'}}</a>
<a href='#' class='clear-recent'>{{d-icon 'trash'}}</a>
</div>
<div class='section-group'></div>
</div>
@ -67,7 +67,7 @@
<div class='diversity-picker'>
<% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
<a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
{{fa-icon "check"}}
{{d-icon "check"}}
</a>
<% end %>
</div>

View File

@ -1,3 +1,3 @@
<button class='btn-flat {{class}}' title='{{i18n "topics.bulk.toggle"}}'>
{{fa-icon icon}}
{{d-icon icon}}
</button>

View File

@ -116,7 +116,7 @@
{{#if showLikeCount}}
{{#if result.like_count}}
<span class='like-count'>
{{result.like_count}} {{fa-icon "heart"}}
{{result.like_count}} {{d-icon "heart"}}
</span>
{{/if}}
{{/if}}

View File

@ -35,7 +35,7 @@
{{#each getTabs as |tab|}}
<li>
{{#link-to tab.location model title=tab.message}}
{{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
{{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
{{tab.message}}
{{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
{{/link-to}}

View File

@ -4,7 +4,7 @@
<div class="modal-inner-container">
<div class="modal-header">
<div class='modal-close'>
<a class="close" {{action "closeModal"}}>{{fa-icon "times"}}</a>
<a class="close" {{action "closeModal"}}>{{d-icon "times"}}</a>
</div>
<h3>{{title}}</h3>

View File

@ -38,7 +38,7 @@
</p>
<p class="with-validation">
{{{pinMessage}}}
{{fa-icon "clock-o"}}
{{d-icon "clock-o"}}
{{date-picker-future value=model.pinnedInCategoryUntil}}
{{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
</p>
@ -64,7 +64,7 @@
</p>
<p class="with-validation">
{{i18n "topic.feature_topic.pin_globally"}}
{{fa-icon "clock-o"}}
{{d-icon "clock-o"}}
{{date-picker-future value=model.pinnedGloballyUntil}}
{{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
</p>

View File

@ -40,7 +40,7 @@
</div>
</div>
<div id="revision-details">
{{fa-icon "pencil"}}
{{d-icon "pencil"}}
{{#link-to 'user' model.username}}
{{bound-avatar-template model.avatar_template "small"}} {{model.username}}
{{/link-to}}

View File

@ -8,6 +8,6 @@
<div class="modal-footer">
{{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToExistingTopic"}}
{{fa-icon 'sign-out'}} {{buttonTitle}}
{{d-icon 'sign-out'}} {{buttonTitle}}
{{/d-button}}
</div>

View File

@ -12,6 +12,6 @@
<div class="modal-footer">
{{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}}
{{fa-icon 'sign-out'}} {{buttonTitle}}
{{d-icon 'sign-out'}} {{buttonTitle}}
{{/d-button}}
</div>

View File

@ -34,7 +34,7 @@
<div class="controls">
<span class='static'>{{model.email}}</span>
{{#if model.can_edit_email}}
{{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
{{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
{{/if}}
</div>
<div class='instructions'>
@ -53,7 +53,7 @@
<label class="control-label">{{i18n 'user.password.title'}}</label>
<div class="controls">
<a href {{action "changePassword"}} class='btn'>
{{fa-icon "envelope"}}
{{d-icon "envelope"}}
{{#if model.no_password}}
{{i18n 'user.change_password.set_password'}}
{{else}}
@ -81,7 +81,7 @@
<label class="control-label">{{i18n 'user.title.title'}}</label>
<div class="controls">
<span class="static">{{model.title}}</span>
{{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
{{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
</div>
</div>
{{/if}}

View File

@ -56,7 +56,7 @@
{{#if model.card_image_badge}}
{{icon-or-image model.card_image_badge}}
{{/if}}
{{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
{{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
</div>
</div>

View File

@ -30,7 +30,7 @@
{{else}}
<h2 class="tag-show-heading">
{{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
{{fa-icon "angle-right"}}
{{d-icon "angle-right"}}
{{discourse-tag-bound tagRecord=tag style="simple"}}
{{#each additionalTags as |tag|}}
<span>&amp;</span>

View File

@ -13,7 +13,7 @@
{{#topic-title cancelled="cancelEditingTopic" save="finishedEditingTopic" model=model}}
{{#if editingTopic}}
{{#if model.isPrivateMessage}}
<span class="private-message-glyph">{{fa-icon "envelope"}}</span>
<span class="private-message-glyph">{{d-icon "envelope"}}</span>
{{/if}}
{{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
@ -36,7 +36,7 @@
<h1>
{{#unless model.is_warning}}
<a href={{pmPath}}>
<span class="private-message-glyph">{{fa-icon "envelope"}}</span>
<span class="private-message-glyph">{{d-icon "envelope"}}</span>
</a>
{{/unless}}
@ -48,7 +48,7 @@
{{/if}}
{{#if model.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"}}">{{d-icon "pencil"}}</a>
{{/if}}
</h1>
@ -230,7 +230,7 @@
{{#if currentUser.show_queued_posts}}
{{#link-to "queued-posts"}}
{{fa-icon "check"}}
{{d-icon "check"}}
{{i18n "queue.view_pending"}}
{{/link-to}}
{{/if}}

View File

@ -17,7 +17,7 @@
{{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
{{#if canBulkInvite}}
{{csv-uploader uploading=uploading}}
<a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{fa-icon "question-circle"}}</a>
<a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
{{/if}}
{{#if showBulkActionButtons}}
{{#if rescindedAll}}

View File

@ -39,13 +39,13 @@
{{#if model.can_send_private_message_to_user}}
<li>
<a class='btn btn-primary' {{action "composePrivateMessage" model}}>
{{fa-icon "envelope"}}
{{d-icon "envelope"}}
{{i18n 'user.private_message'}}
</a>
</li>
{{/if}}
{{#if currentUser.staff}}
<li><a href={{model.adminPath}} class="btn">{{fa-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
<li><a href={{model.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
{{/if}}
{{plugin-outlet name="user-profile-controls"
connectorTagName="li"
@ -53,7 +53,7 @@
{{#if collapsedInfo}}
{{#if viewingSelf}}
<li><a {{action "expandProfile"}} href class="btn">{{fa-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
<li><a {{action "expandProfile"}} href class="btn">{{d-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
{{/if}}
{{/if}}
@ -68,9 +68,9 @@
{{/if}}
{{plugin-outlet name="user-post-names" args=(hash model=model)}}
<h3>
{{#if model.location}}{{fa-icon "map-marker"}} {{model.location}}{{/if}}
{{#if model.location}}{{d-icon "map-marker"}} {{model.location}}{{/if}}
{{#if model.website_name}}
{{fa-icon "globe"}}
{{d-icon "globe"}}
{{#if linkWebsite}}
<a href={{model.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{model.website_name}}</a>
{{else}}
@ -83,7 +83,7 @@
<div class='bio'>
{{#if model.isSuspended}}
<div class='suspended'>
{{fa-icon "ban"}}
{{d-icon "ban"}}
<b>{{i18n 'user.suspended_notice' date=model.suspendedTillDate}}</b><br/>
<b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
</div>
@ -167,22 +167,22 @@
{{#if showNotificationsTab}}
<li>
{{#link-to 'userNotifications'}}
{{fa-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
{{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
{{/link-to}}
</li>
{{/if}}
{{#if showPrivateMessages}}
<li>{{#link-to 'userPrivateMessages'}}{{fa-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
<li>{{#link-to 'userPrivateMessages'}}{{d-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
{{/if}}
{{#if canInviteToForum}}
<li>{{#link-to 'userInvited'}}{{fa-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
<li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
{{/if}}
{{#if showBadges}}
<li>{{#link-to 'user.badges'}}{{fa-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
<li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
{{/if}}
{{plugin-outlet name="user-main-nav" connectorTagName='li' args=(hash model=model)}}
{{#if model.can_edit}}
<li>{{#link-to 'preferences'}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
<li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
{{/if}}
{{/mobile-nav}}

View File

@ -54,7 +54,7 @@
{{format-date reply.createdAt format="tiny" noTitle="true"}}
{{#if reply.like_count}}
&middot;
{{fa-icon 'heart'}}&nbsp;<span class='like-count'>{{number reply.like_count}}</span>
{{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number reply.like_count}}</span>
{{/if}}
</span>
<br>
@ -79,7 +79,7 @@
{{format-date topic.createdAt format="tiny" noTitle="true"}}
{{#if topic.like_count}}
&middot;
{{fa-icon 'heart'}}&nbsp;<span class='like-count'>{{number topic.like_count}}</span>
{{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number topic.like_count}}</span>
{{/if}}
</span>
<br>
@ -127,7 +127,7 @@
{{#each model.most_replied_to_users as |user|}}
<li>
{{#user-info user=user}}
{{fa-icon "reply"}}
{{d-icon "reply"}}
<span class='replies'>{{number user.count}}</span>
{{/user-info}}
</li>
@ -147,7 +147,7 @@
{{#each model.most_liked_by_users as |user|}}
<li>
{{#user-info user=user}}
{{fa-icon "heart"}}
{{d-icon "heart"}}
<span class='likes'>{{number user.count}}</span>
{{/user-info}}
</li>
@ -164,7 +164,7 @@
{{#each model.most_liked_users as |user|}}
<li>
{{#user-info user=user}}
{{fa-icon "heart"}}
{{d-icon "heart"}}
<span class='likes'>{{number user.count}}</span>
{{/user-info}}
</li>

View File

@ -2,5 +2,5 @@
<span class='role'>{{roleName}}</span>
<button class="wizard-btn small danger remove-user" {{action "removeUser" user}}>
{{fa-icon "times"}}
{{d-icon "times"}}
</button>

View File

@ -15,6 +15,6 @@
{{combo-box value=inviteRole content=roles nameProperty="label" width="200px"}}
<button class="wizard-btn small add-user" {{action "addUser"}}>
{{fa-icon "plus"}}{{i18n "wizard.invites.add_user"}}
{{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
</button>
</div>

View File

@ -2,7 +2,7 @@
<input type="radio" name={{label}} tabindex="9">
<span class='radio-label'>
{{#if icon}}
{{fa-icon icon}}
{{d-icon icon}}
{{/if}}
{{label}}
</span>

View File

@ -7,7 +7,7 @@
{{i18n "wizard.uploading"}}
{{else}}
{{i18n "wizard.upload"}}
{{fa-icon "picture-o"}}
{{d-icon "picture-o"}}
{{/if}}
<input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />

View File

@ -39,7 +39,7 @@
{{#if showNextButton}}
<button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="10">
{{i18n "wizard.next"}}
{{fa-icon "chevron-right"}}
{{d-icon "chevron-right"}}
</button>
{{/if}}