Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

icons deprecations fixes (#6920)

This commit is contained in:
Joffrey JAFFEUX 2019-01-22 12:02:02 +01:00 committed by GitHub
parent ea0e188c8f
commit 80d42b4ea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 151 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/badges-show.hbs
View File

@ -39,7 +39,7 @@
content=badgeGroupings content=badgeGroupings
class="badge-selector" class="badge-selector"
nameProperty="name"}} nameProperty="name"}}
<button {{action "editGroupings"}} class='btn btn-icon no-text btn-default'>{{d-icon 'pencil'}}</button> <button {{action "editGroupings"}} class='btn btn-icon no-text btn-default'>{{d-icon "pencil-alt"}}</button>
</div> </div>
</div> </div>

2
app/assets/javascripts/admin/templates/components/admin-editable-field.hbs
View File

@ -11,6 +11,6 @@
{{d-button class="btn-default" action=(action "save") label="admin.user_fields.save"}} {{d-button class="btn-default" action=(action "save") label="admin.user_fields.save"}}
<a href {{action "edit"}}>{{i18n 'cancel'}}</a> <a href {{action "edit"}}>{{i18n 'cancel'}}</a>
{{else}} {{else}}
{{d-button class="btn-default" action=(action "edit") icon="pencil"}} {{d-button class="btn-default" action=(action "edit") icon="pencil-alt"}}
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
View File

@ -46,9 +46,9 @@
</div> </div>
<div class='form-display'>{{fieldName}}</div> <div class='form-display'>{{fieldName}}</div>
<div class='form-element controls'> <div class='form-element controls'>
{{d-button action=(action "edit") class="btn-default" icon="pencil" label="admin.user_fields.edit"}} {{d-button action=(action "edit") class="btn-default" icon="pencil-alt" label="admin.user_fields.edit"}}
{{d-button action=destroyAction actionParam=userField class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}} {{d-button action=destroyAction actionParam=userField class="btn-danger" icon="far-trash-alt" label="admin.user_fields.delete"}}
{{d-button action=moveUpAction actionParam=userField class="btn-default" icon="arrow-up" disabled=cantMoveUp}} {{d-button action=moveUpAction actionParam=userField class="btn-default" icon="arrow-up" disabled=cantMoveUp}}
{{d-button action=moveDownAction actionParam=userField class="btn-default" icon="arrow-down" disabled=cantMoveDown}} {{d-button action=moveDownAction actionParam=userField class="btn-default" icon="arrow-down" disabled=cantMoveDown}}
</div> </div>

4
app/assets/javascripts/admin/templates/components/embeddable-host.hbs
View File

@ -25,7 +25,7 @@
<td><div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>{{host.path_whitelist}}</td> <td><div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>{{host.path_whitelist}}</td>
<td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td> <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td>
<td class="controls"> <td class="controls">
{{d-button icon="pencil" action=(action "edit")}} {{d-button icon="pencil-alt" action=(action "edit")}}
{{d-button icon="trash-o" action=(action "delete") class='btn-danger'}} {{d-button icon="far-trash-alt" action=(action "delete") class='btn-danger'}}
</td> </td>
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/components/flagged-post.hbs
View File

@ -7,7 +7,7 @@
{{/link-to}} {{/link-to}}
{{#if flaggedPost.wasEdited}} {{#if flaggedPost.wasEdited}}
<div class='edited-after'> <div class='edited-after'>
{{d-icon "pencil" title="admin.flags.was_edited"}} {{d-icon "pencil-alt" title="admin.flags.was_edited"}}
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/components/site-setting.hbs
View File

@ -11,7 +11,7 @@
</div> </div>
{{else if setting.overridden}} {{else if setting.overridden}}
{{#if setting.secret}} {{#if setting.secret}}
{{d-button action=(action "toggleSecret") icon="eye-slash"}} {{d-button action=(action "toggleSecret") icon="far-eye-slash"}}
{{/if}} {{/if}}
{{d-button class="btn-default undo" action=(action "resetDefault") icon="undo" label="admin.settings.reset"}} {{d-button class="btn-default undo" action=(action "resetDefault") icon="undo" label="admin.settings.reset"}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/customize-colors-show.hbs
View File

@ -11,7 +11,7 @@
{{i18n "admin.customize.theme_owner"}} {{i18n "admin.customize.theme_owner"}}
{{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}} {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
{{else}} {{else}}
<button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'admin.customize.delete'}}</button> <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'admin.customize.delete'}}</button>
{{/if}} {{/if}}
<span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span> <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
</div> </div>

4
app/assets/javascripts/admin/templates/customize-themes-show.hbs
View File

@ -5,7 +5,7 @@
{{d-button action=(action "finishedEditingName") class="btn-primary submit-edit" icon="check"}} {{d-button action=(action "finishedEditingName") class="btn-primary submit-edit" icon="check"}}
{{d-button action=(action "cancelEditingName") class="btn-default cancel-edit" icon="times"}} {{d-button action=(action "cancelEditingName") class="btn-default cancel-edit" icon="times"}}
{{else}} {{else}}
{{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a> {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil-alt"}}</a>
{{/if}} {{/if}}
</div> </div>
@ -178,5 +178,5 @@
<a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a> <a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
{{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}} {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
{{d-button action=(action "destroy") label="admin.customize.delete" icon="trash" class="btn-danger"}} {{d-button action=(action "destroy") label="admin.customize.delete" icon="trash-alt" class="btn-danger"}}
</div> </div>

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

@ -20,7 +20,7 @@
<tr> <tr>
<th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th> <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
<th>:{{e.name}}:</th> <th>:{{e.name}}:</th>
<th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon 'trash-o'}} </button></th> <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon "far-trash-alt"}} </button></th>
</tr> </tr>
{{/each}} {{/each}}
</tbody> </tbody>

4
app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
View File

@ -57,8 +57,8 @@
</td> </td>
<td class="col actions"> <td class="col actions">
{{#unless item.editing}} {{#unless item.editing}}
{{d-button class="btn-default" action=(action "destroy") actionParam=item icon="trash-o" class="btn-danger"}} {{d-button class="btn-default" action=(action "destroy") actionParam=item icon="far-trash-alt" class="btn-danger"}}
{{d-button class="btn-default"action=(action "edit") actionParam=item icon="pencil"}} {{d-button class="btn-default"action=(action "edit") actionParam=item icon="pencil-alt"}}
{{#if item.isBlocked}} {{#if item.isBlocked}}
{{d-button class="btn-default" action=(action "allow") actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}} {{d-button class="btn-default" action=(action "allow") actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
{{else}} {{else}}

2
app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
View File

@ -62,7 +62,7 @@
<a {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a> <a {{action "filterByStaffUser" item.acting_user}}>{{item.acting_user.username}}</a>
{{else}} {{else}}
<span class="deleted-user" title="{{i18n 'admin.user.deleted'}}"> <span class="deleted-user" title="{{i18n 'admin.user.deleted'}}">
{{d-icon "trash-o"}} {{d-icon "far-trash-alt"}}
</span> </span>
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
View File

@ -12,7 +12,7 @@
{{/if}} {{/if}}
</div> </div>
<div class='actions'> <div class='actions'>
<button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon 'pencil'}}</button> <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon "pencil-alt"}}</button>
<button {{action "up" wc}} class="btn no-text">{{d-icon 'toggle-up'}}</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 "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> <button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{d-icon 'times'}}</button>

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

@ -42,7 +42,7 @@
{{/if}} {{/if}}
</td> </td>
<td class="col action"> <td class="col action">
{{d-button action=(action "destroy") actionParam=pl icon="trash-o" class="btn-danger"}} {{d-button action=(action "destroy") actionParam=pl icon="far-trash-alt" class="btn-danger"}}
</td> </td>
</tr> </tr>
{{/each}} {{/each}}

2
app/assets/javascripts/admin/templates/plugins-index.hbs
View File

@ -49,7 +49,7 @@
<td class="settings"> <td class="settings">
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{#if plugin.enabled_setting}} {{#if plugin.enabled_setting}}
{{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}} {{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="cog" label="admin.plugins.change_settings_short"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</td> </td>

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

@ -5,7 +5,7 @@
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button label="admin.plugins.change_settings" {{d-button label="admin.plugins.change_settings"
icon="gear" icon="cog"
class="btn-default settings-button" class="btn-default settings-button"
action=(route-action "showSettings")}} action=(route-action "showSettings")}}
{{/if}} {{/if}}

10
app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -259,10 +259,10 @@
<div class='value'>{{i18n-yes-no model.admin}}</div> <div class='value'>{{i18n-yes-no model.admin}}</div>
<div class='controls'> <div class='controls'>
{{#if model.can_revoke_admin}} {{#if model.can_revoke_admin}}
{{d-button class="btn-default" action=(action "revokeAdmin") icon="shield" label="admin.user.revoke_admin"}} {{d-button class="btn-default" action=(action "revokeAdmin") icon="shield-alt" label="admin.user.revoke_admin"}}
{{/if}} {{/if}}
{{#if model.can_grant_admin}} {{#if model.can_grant_admin}}
{{d-button class="btn-default" action=(action "grantAdmin") icon="shield" label="admin.user.grant_admin"}} {{d-button class="btn-default" action=(action "grantAdmin") icon="shield-alt" label="admin.user.grant_admin"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -272,10 +272,10 @@
<div class='value'>{{i18n-yes-no model.moderator}}</div> <div class='value'>{{i18n-yes-no model.moderator}}</div>
<div class='controls'> <div class='controls'>
{{#if model.can_revoke_moderation}} {{#if model.can_revoke_moderation}}
{{d-button class="btn-default" action=(action "revokeModeration") icon="shield" label="admin.user.revoke_moderation"}} {{d-button class="btn-default" action=(action "revokeModeration") icon="shield-alt" label="admin.user.revoke_moderation"}}
{{/if}} {{/if}}
{{#if model.can_grant_moderation}} {{#if model.can_grant_moderation}}
{{d-button class="btn-default" action=(action "grantModeration") icon="shield" label="admin.user.grant_moderation"}} {{d-button class="btn-default" action=(action "grantModeration") icon="shield-alt" label="admin.user.grant_moderation"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -480,7 +480,7 @@
<div class='controls'> <div class='controls'>
{{#if model.can_delete_all_posts}} {{#if model.can_delete_all_posts}}
{{#if model.post_count}} {{#if model.post_count}}
{{d-button class="btn-danger" action=(action "deleteAllPosts") icon="trash-o" label="admin.user.delete_all_posts"}} {{d-button class="btn-danger" action=(action "deleteAllPosts") icon="far-trash-alt" label="admin.user.delete_all_posts"}}
{{/if}} {{/if}}
{{else}} {{else}}
{{deleteAllPostsExplanation}} {{deleteAllPostsExplanation}}

2
app/assets/javascripts/discourse/components/auth-token-dropdown.es6
View File

@ -16,7 +16,7 @@ export default DropdownSelectBoxComponent.extend({
}, },
{ {
id: "logOut", id: "logOut",
icon: "sign-out", icon: "sign-out-alt",
name: I18n.t("user.log_out"), name: I18n.t("user.log_out"),
description: "" description: ""
} }

2
app/assets/javascripts/discourse/components/composer-editor.js.es6
View File

@ -835,7 +835,7 @@ export default Ember.Component.extend({
toolbar.addButton({ toolbar.addButton({
id: "options", id: "options",
group: "extras", group: "extras",
icon: "gear", icon: "cog",
title: "composer.options", title: "composer.options",
sendAction: this.onExpandPopupMenuOptions.bind(this), sendAction: this.onExpandPopupMenuOptions.bind(this),
popupMenu: true popupMenu: true

4
app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
View File

@ -32,7 +32,7 @@ export default DropdownSelectBoxComponent.extend({
description: I18n.t("groups.members.remove_owner_description", { description: I18n.t("groups.members.remove_owner_description", {
username: this.get("member.username") username: this.get("member.username")
}), }),
icon: "shield" icon: "shield-alt"
}); });
} else { } else {
items.push({ items.push({
@ -41,7 +41,7 @@ export default DropdownSelectBoxComponent.extend({
description: I18n.t("groups.members.make_owner_description", { description: I18n.t("groups.members.make_owner_description", {
username: this.get("member.username") username: this.get("member.username")
}), }),
icon: "shield" icon: "shield-alt"
}); });
} }
} }

2
app/assets/javascripts/discourse/components/topic-timer-info.js.es6
View File

@ -41,7 +41,7 @@ export default Ember.Component.extend(
let autoCloseHours = this.get("duration") || 0; let autoCloseHours = this.get("duration") || 0;
buffer.push(`<h3>${iconHTML("clock-o")} `); buffer.push(`<h3>${iconHTML("far-clock")} `);
let options = { let options = {
timeLeft: duration.humanize(true), timeLeft: duration.humanize(true),

6
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -222,7 +222,7 @@ export default Ember.Controller.extend({
@computed("model.action", "isWhispering") @computed("model.action", "isWhispering")
saveIcon(action, isWhispering) { saveIcon(action, isWhispering) {
if (isWhispering) { if (isWhispering) {
return "eye-slash"; return "far-eye-slash";
} }
return SAVE_ICONS[action]; return SAVE_ICONS[action];
}, },
@ -267,7 +267,7 @@ export default Ember.Controller.extend({
this._setupPopupMenuOption(() => { this._setupPopupMenuOption(() => {
return { return {
action: "toggleInvisible", action: "toggleInvisible",
icon: "eye-slash", icon: "far-eye-slash",
label: "composer.toggle_unlisted", label: "composer.toggle_unlisted",
condition: "canUnlistTopic" condition: "canUnlistTopic"
}; };
@ -278,7 +278,7 @@ export default Ember.Controller.extend({
this._setupPopupMenuOption(() => { this._setupPopupMenuOption(() => {
return { return {
action: "toggleWhisper", action: "toggleWhisper",
icon: "eye-slash", icon: "far-eye-slash",
label: "composer.toggle_whisper", label: "composer.toggle_whisper",
condition: "showWhisperToggle" condition: "showWhisperToggle"
}; };

6
app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
View File

@ -22,7 +22,7 @@ function addBulkButton(action, key, opts) {
// Default buttons // Default buttons
addBulkButton("showChangeCategory", "change_category", { addBulkButton("showChangeCategory", "change_category", {
icon: "pencil", icon: "pencil-alt",
class: "btn-default" class: "btn-default"
}); });
addBulkButton("closeTopics", "close_topics", { addBulkButton("closeTopics", "close_topics", {
@ -42,12 +42,12 @@ addBulkButton("resetRead", "reset_read", {
class: "btn-default" class: "btn-default"
}); });
addBulkButton("unlistTopics", "unlist_topics", { addBulkButton("unlistTopics", "unlist_topics", {
icon: "eye-slash", icon: "far-eye-slash",
class: "btn-default", class: "btn-default",
buttonVisible: topics => topics.some(t => t.visible) buttonVisible: topics => topics.some(t => t.visible)
}); });
addBulkButton("relistTopics", "relist_topics", { addBulkButton("relistTopics", "relist_topics", {
icon: "eye", icon: "far-eye",
class: "btn-default", class: "btn-default",
buttonVisible: topics => topics.some(t => !t.visible) buttonVisible: topics => topics.some(t => !t.visible)
}); });

6
app/assets/javascripts/discourse/helpers/user-status.js.es6
View File

@ -14,10 +14,12 @@ export default htmlHelper((user, args) => {
} }
if (currentUser && user.get("admin") && currentUser.get("staff")) { if (currentUser && user.get("admin") && currentUser.get("staff")) {
return iconHTML("shield", { label: I18n.t("user.admin", { user: name }) }); return iconHTML("shield-alt", {
label: I18n.t("user.admin", { user: name })
});
} }
if (user.get("moderator")) { if (user.get("moderator")) {
return iconHTML("shield", { return iconHTML("shield-alt", {
label: I18n.t("user.moderator", { user: name }) label: I18n.t("user.moderator", { user: name })
}); });
} }

2
app/assets/javascripts/discourse/lib/plugin-api.js.es6
View File

@ -369,7 +369,7 @@ class PluginApi {
* api.addToolbarPopupMenuOptionsCallback(() => { * api.addToolbarPopupMenuOptionsCallback(() => {
* return { * return {
* action: 'toggleWhisper', * action: 'toggleWhisper',
* icon: 'eye-slash', * icon: 'far-eye-slash',
* label: 'composer.toggle_whisper', * label: 'composer.toggle_whisper',
* condition: "canWhisper" * condition: "canWhisper"
* }; * };

2
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -415,7 +415,7 @@ export function allowsAttachments() {
} }
export function uploadIcon() { export function uploadIcon() {
return allowsAttachments() ? "upload" : "picture-o"; return allowsAttachments() ? "upload" : "far-image";
} }
export function uploadLocation(url) { export function uploadLocation(url) {

2
app/assets/javascripts/discourse/models/user-action.js.es6
View File

@ -141,7 +141,7 @@ const UserAction = RestModel.extend({
groups = { groups = {
likes: UserActionGroup.create({ icon: "heart" }), likes: UserActionGroup.create({ icon: "heart" }),
stars: UserActionGroup.create({ icon: "star" }), stars: UserActionGroup.create({ icon: "star" }),
edits: UserActionGroup.create({ icon: "pencil" }), edits: UserActionGroup.create({ icon: "pencil-alt" }),
bookmarks: UserActionGroup.create({ icon: "bookmark" }) bookmarks: UserActionGroup.create({ icon: "bookmark" })
}; };
} }

2
app/assets/javascripts/discourse/templates/badges/show.hbs
View File

@ -15,7 +15,7 @@
{{d-button {{d-button
class="btn btn-default pad-left no-text" class="btn btn-default pad-left no-text"
action=(action "toggleSetUserTitle") action=(action "toggleSetUserTitle")
icon="pencil"}} icon="pencil-alt"}}
</div> </div>
{{/if}} {{/if}}
{{#if model.multiple_grant}} {{#if model.multiple_grant}}

2
app/assets/javascripts/discourse/templates/components/activation-controls.hbs
View File

@ -7,5 +7,5 @@
{{d-button action=editActivationEmail {{d-button action=editActivationEmail
label="login.change_email" label="login.change_email"
icon="pencil" icon="pencil-alt"
class="edit-email"}} class="edit-email"}}

2
app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
View File

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

2
app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
View File

@ -1,5 +1,5 @@
{{#if isEditing}} {{#if isEditing}}
{{d-icon "pencil"}} {{d-icon "pencil-alt"}}
{{else}} {{else}}
{{composer-actions {{composer-actions
composerModel=model composerModel=model

2
app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
View File

@ -31,7 +31,7 @@
{{/if}} {{/if}}
{{#if category.topic_url}} {{#if category.topic_url}}
<br> <br>
{{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}} {{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil-alt" label="category.change_in_category_topic"}}
{{/if}} {{/if}}
</section> </section>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/components/future-date-input.hbs
View File

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

4
app/assets/javascripts/discourse/templates/components/image-uploader.hbs
View File

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

2
app/assets/javascripts/discourse/templates/components/images-uploader.hbs
View File

@ -1,5 +1,5 @@
<label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}"> <label class="btn" disabled={{uploading}} title="{{i18n "admin.site_settings.uploaded_image_list.upload.title"}}">
{{d-icon "picture-o"}}&nbsp;{{uploadButtonText}} {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple />
</label> </label>
{{#if uploading}} {{#if uploading}}

4
app/assets/javascripts/discourse/templates/components/queued-post.hbs
View File

@ -81,13 +81,13 @@
{{d-button action=(action "deleteUser") {{d-button action=(action "deleteUser")
disabled=post.isSaving disabled=post.isSaving
label="queue.delete_user" label="queue.delete_user"
icon="trash" icon="trash-alt"
class="btn-danger delete-user"}} class="btn-danger delete-user"}}
{{/if}} {{/if}}
{{d-button action=(action "edit") {{d-button action=(action "edit")
disabled=post.isSaving disabled=post.isSaving
label="queue.edit" label="queue.edit"
icon="pencil" icon="pencil-alt"
class="edit"}} class="edit"}}
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/discourse/templates/components/share-popup.hbs
View File

@ -24,5 +24,5 @@
{{/if}} {{/if}}
<div class='link'> <div class='link'>
<a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "close"}}</a> <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "times"}}</a>
</div> </div>

2
app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
View File

@ -64,7 +64,7 @@
{{d-button class="btn-default edit-message" {{d-button class="btn-default edit-message"
title="topic.edit_message.help" title="topic.edit_message.help"
label="topic.edit_message.title" label="topic.edit_message.title"
icon="pencil" icon="pencil-alt"
action=editFirstPost}} action=editFirstPost}}
{{/if}} {{/if}}

6
app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
View File

@ -22,7 +22,7 @@
{{#if item.deleted_by}} {{#if item.deleted_by}}
<span class="delete-info"> <span class="delete-info">
{{d-icon "trash-o"}} {{d-icon "far-trash-alt"}}
{{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
{{format-date item.deleted_at leaveAgo="true"}} {{format-date item.deleted_at leaveAgo="true"}}
</span> </span>
@ -61,7 +61,7 @@
{{#if item.editableDraft}} {{#if item.editableDraft}}
<div class='user-stream-item-draft-actions'> <div class='user-stream-item-draft-actions'>
{{d-button action=resumeDraft actionParam=item icon="pencil" label='drafts.resume' class="btn-default resume-draft"}} {{d-button action=resumeDraft actionParam=item icon="pencil-alt" label='drafts.resume' class="btn-default resume-draft"}}
{{d-button action=removeDraft actionParam=item icon="trash-o" label='drafts.remove' class="btn-default remove-draft"}} {{d-button action=removeDraft actionParam=item icon="far-trash-alt" label='drafts.remove' class="btn-default remove-draft"}}
</div> </div>
{{/if}} {{/if}}

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

@ -26,7 +26,7 @@
{{#unless site.mobileView}} {{#unless site.mobileView}}
{{#if isWhispering}} {{#if isWhispering}}
<span class='whisper'>{{d-icon 'eye-slash'}}</span> <span class='whisper'>{{d-icon "far-eye-slash"}}</span>
{{/if}} {{/if}}
{{#if model.unlistTopic}} {{#if model.unlistTopic}}
<span class='whisper'>({{i18n 'composer.unlist'}})</span> <span class='whisper'>({{i18n 'composer.unlist'}})</span>
@ -128,7 +128,7 @@
{{#if canEdit}} {{#if canEdit}}
{{d-icon "times"}} {{d-icon "times"}}
{{else}} {{else}}
{{d-icon "trash-o"}} {{d-icon "far-trash-alt"}}
{{/if}} {{/if}}
</a> </a>
{{else}} {{else}}
@ -140,7 +140,7 @@
{{#if site.mobileView}} {{#if site.mobileView}}
{{#if whisperOrUnlistTopic}} {{#if whisperOrUnlistTopic}}
<span class='whisper'> <span class='whisper'>
{{d-icon "eye-slash"}} {{d-icon "far-eye-slash"}}
</span> </span>
{{/if}} {{/if}}
{{#if model.noBump}} {{#if model.noBump}}

2
app/assets/javascripts/discourse/templates/composer/custom-body.hbs
View File

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

2
app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
View File

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

2
app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
View File

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

2
app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
View File

@ -31,7 +31,7 @@
<div class='section' data-section='recent'> <div class='section' data-section='recent'>
<div class='section-header'> <div class='section-header'>
<span class="title">{{i18n 'emoji_picker.recent'}}</span> <span class="title">{{i18n 'emoji_picker.recent'}}</span>
<a href='#' class='clear-recent'>{{d-icon 'trash'}}</a> <a href='#' class='clear-recent'>{{d-icon "trash-alt"}}</a>
</div> </div>
<div class='section-group'></div> <div class='section-group'></div>
</div> </div>

2
app/assets/javascripts/discourse/templates/group.hbs
View File

@ -47,7 +47,7 @@
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button action=(action "destroy") {{d-button action=(action "destroy")
disabled=destroying disabled=destroying
icon="trash" icon="trash-alt"
class='btn-danger' class='btn-danger'
label="admin.groups.delete"}} label="admin.groups.delete"}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/groups/index.hbs
View File

@ -60,7 +60,7 @@
{{#if group.public_admission}} {{#if group.public_admission}}
{{i18n 'groups.index.public'}} {{i18n 'groups.index.public'}}
{{else if group.isPrivate}} {{else if group.isPrivate}}
{{d-icon "eye-slash"}} {{d-icon "far-eye-slash"}}
{{i18n 'groups.index.private'}} {{i18n 'groups.index.private'}}
{{else}} {{else}}
{{#if group.automatic}} {{#if group.automatic}}

2
app/assets/javascripts/discourse/templates/modal/auth-token.hbs
View File

@ -7,7 +7,7 @@
<div> <div>
<h3>{{i18n 'user.auth_tokens.details'}}</h3> <h3>{{i18n 'user.auth_tokens.details'}}</h3>
<ul style="list-style-type:none"> <ul style="list-style-type:none">
<li>{{d-icon "clock-o"}} {{format-date model.seen_at}}</li> <li>{{d-icon "far-clock"}} {{format-date model.seen_at}}</li>
<li>{{d-icon "map-marker"}} {{model.location}}</li> <li>{{d-icon "map-marker"}} {{model.location}}</li>
<li>{{d-icon model.icon}} {{i18n "user.auth_tokens.browser_and_device" browser=model.browser device=model.device}}</li> <li>{{d-icon model.icon}} {{i18n "user.auth_tokens.browser_and_device" browser=model.browser device=model.device}}</li>
</ul> </ul>

2
app/assets/javascripts/discourse/templates/modal/edit-category.hbs
View File

@ -25,7 +25,7 @@
{{d-button class="btn-danger pull-right" {{d-button class="btn-danger pull-right"
disabled=deleteDisabled disabled=deleteDisabled
action=(action "deleteCategory") action=(action "deleteCategory")
icon="trash-o" icon="far-trash-alt"
label="category.delete"}} label="category.delete"}}
{{else if model.id}} {{else if model.id}}
<div class="disable_info_wrap"> <div class="disable_info_wrap">

4
app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
View File

@ -51,7 +51,7 @@
{{else}} {{else}}
<p class="with-validation"> <p class="with-validation">
{{{pinMessage}}} {{{pinMessage}}}
{{d-icon "clock-o"}} {{d-icon "far-clock"}}
{{future-date-input {{future-date-input
class="pin-until" class="pin-until"
includeFarFuture=true includeFarFuture=true
@ -95,7 +95,7 @@
{{else}} {{else}}
<p class="with-validation"> <p class="with-validation">
{{i18n "topic.feature_topic.pin_globally"}} {{i18n "topic.feature_topic.pin_globally"}}
{{d-icon "clock-o"}} {{d-icon "far-clock"}}
{{future-date-input {{future-date-input
class="pin-until" class="pin-until"
includeFarFuture=true includeFarFuture=true

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

@ -15,7 +15,7 @@
{{#if displayEdit}} {{#if displayEdit}}
{{d-button action=(action "editPost") {{d-button action=(action "editPost")
class="btn-default" class="btn-default"
icon="pencil" icon="pencil-alt"
label=editButtonLabel}} label=editButtonLabel}}
{{/if}} {{/if}}
@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div id="revision-details"> <div id="revision-details">
{{d-icon "pencil"}} {{d-icon "pencil-alt"}}
{{#link-to 'user' model.username}} {{#link-to 'user' model.username}}
{{bound-avatar-template model.avatar_template "small"}} {{model.username}} {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
{{/link-to}} {{/link-to}}
@ -58,7 +58,7 @@
&mdash; {{disabled-icon icon="pencil-square-o" disabled=wikiDisabled}} &mdash; {{disabled-icon icon="pencil-square-o" disabled=wikiDisabled}}
{{/if}} {{/if}}
{{#if model.post_type_changes}} {{#if model.post_type_changes}}
&mdash; {{disabled-icon icon="shield" disabled=postTypeDisabled}} &mdash; {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
{{/if}} {{/if}}
{{#if model.category_id_changes}} {{#if model.category_id_changes}}
&mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}} &mdash; {{{previousCategory}}} &rarr; {{{currentCategory}}}
@ -85,7 +85,7 @@
{{/if}} {{/if}}
{{#if model.post_type_changes}} {{#if model.post_type_changes}}
<div class="row"> <div class="row">
{{disabled-icon icon="shield" disabled=postTypeDisabled}} {{disabled-icon icon="shield-alt" disabled=postTypeDisabled}}
</div> </div>
{{/if}} {{/if}}
{{#if model.category_id_changes}} {{#if model.category_id_changes}}
@ -128,7 +128,7 @@
{{/if}} {{/if}}
{{#if displayHide}} {{#if displayHide}}
{{d-button action=(action "hideVersion") icon="eye-slash" label="post.revisions.controls.hide" class="btn-danger" disabled=loading}} {{d-button action=(action "hideVersion") icon="far-eye-slash" label="post.revisions.controls.hide" class="btn-danger" disabled=loading}}
{{/if}} {{/if}}
{{#if displayShow}} {{#if displayShow}}
@ -137,7 +137,7 @@
{{#if displayEdit}} {{#if displayEdit}}
{{d-button action=(action "editPost") {{d-button action=(action "editPost")
icon="pencil" icon="pencil-alt"
class="btn-default" class="btn-default"
label=editButtonLabel}} label=editButtonLabel}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/modal/move-to-topic.hbs
View File

@ -107,6 +107,6 @@
<div class="modal-footer"> <div class="modal-footer">
{{#d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove")}} {{#d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove")}}
{{d-icon 'sign-out'}} {{buttonTitle}} {{d-icon "sign-out-alt"}} {{buttonTitle}}
{{/d-button}} {{/d-button}}
</div> </div>

16
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -4,7 +4,7 @@
<span class='static'>{{model.username}}</span> <span class='static'>{{model.username}}</span>
{{#if model.can_edit_username}} {{#if model.can_edit_username}}
{{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}} {{/link-to}} {{d-icon "pencil-alt"}} {{/link-to}}
{{/if}} {{/if}}
</div> </div>
{{#if siteSettings.enable_mentions}} {{#if siteSettings.enable_mentions}}
@ -37,7 +37,7 @@
<div class="controls"> <div class="controls">
<span class='static'>{{model.email}}</span> <span class='static'>{{model.email}}</span>
{{#if model.can_edit_email}} {{#if model.can_edit_email}}
{{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}} {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil-alt"}}{{/link-to}}
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> <div class='instructions'>
@ -76,7 +76,7 @@
{{#if isCurrentUser}} {{#if isCurrentUser}}
{{#link-to "preferences.second-factor" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.second-factor" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}} {{d-icon "pencil-alt"}}
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
</div> </div>
@ -91,7 +91,7 @@
{{#if isCurrentUser}} {{#if isCurrentUser}}
{{#link-to "preferences.second-factor-backup" class="btn btn-default btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.second-factor-backup" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}} {{d-icon "pencil-alt"}}
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -113,7 +113,7 @@
<td> <td>
{{#if authProvider.method.can_revoke}} {{#if authProvider.method.can_revoke}}
{{#conditional-loading-spinner condition=revoking size='small'}} {{#conditional-loading-spinner condition=revoking size='small'}}
{{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash" }} {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash-alt" }}
{{/conditional-loading-spinner}} {{/conditional-loading-spinner}}
{{/if}} {{/if}}
</td> </td>
@ -144,7 +144,7 @@
<div class="controls"> <div class="controls">
{{! we want the "huge" version even though we're downsizing it in CSS }} {{! we want the "huge" version even though we're downsizing it in CSS }}
{{bound-avatar model "huge"}} {{bound-avatar model "huge"}}
{{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil"}} {{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil-alt"}}
</div> </div>
</div> </div>
{{/unless}} {{/unless}}
@ -199,7 +199,7 @@
</a> </a>
{{/if}} {{/if}}
<a {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out"}} {{i18n 'user.auth_tokens.log_out_all'}}</a> <a {{action "revokeAuthToken"}} class="pull-right text-danger">{{d-icon "sign-out-alt"}} {{i18n 'user.auth_tokens.log_out_all'}}</a>
</div> </div>
{{/if}} {{/if}}
@ -222,7 +222,7 @@
<div class="control-group delete-account"> <div class="control-group delete-account">
<br/> <br/>
<div class="controls"> <div class="controls">
{{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="trash-o" label="user.delete_account"}} {{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="far-trash-alt" label="user.delete_account"}}
</div> </div>
</div> </div>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/selected-posts.hbs
View File

@ -9,11 +9,11 @@
{{/if}} {{/if}}
{{#if canDeleteSelected}} {{#if canDeleteSelected}}
{{d-button action=(action "deleteSelected") icon="trash-o" label="topic.multi_select.delete" class="btn-danger"}} {{d-button action=(action "deleteSelected") icon="far-trash-alt" label="topic.multi_select.delete" class="btn-danger"}}
{{/if}} {{/if}}
{{#if canMergeTopic}} {{#if canMergeTopic}}
{{d-button action=(route-action "moveToTopic") icon="sign-out" label="topic.move_to.action" class="move-to-topic"}} {{d-button action=(route-action "moveToTopic") icon="sign-out-alt" label="topic.move_to.action" class="move-to-topic"}}
{{/if}} {{/if}}
{{#if canChangeOwner}} {{#if canChangeOwner}}

2
app/assets/javascripts/discourse/templates/tag-groups-show.hbs
View File

@ -44,6 +44,6 @@
</section> </section>
<button {{action "save"}} disabled={{model.disableSave}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button> <button {{action "save"}} disabled={{model.disableSave}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button>
<button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button> <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "far-trash-alt"}} {{i18n 'tagging.groups.delete'}}</button>
<span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span> <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
</div> </div>

4
app/assets/javascripts/discourse/templates/tags/show.hbs
View File

@ -40,8 +40,8 @@
action=(route-action "createTopic")}} action=(route-action "createTopic")}}
{{#if showAdminControls}} {{#if showAdminControls}}
{{d-button action=(route-action "renameTag") actionParam=tag icon="pencil" class="admin-tag"}} {{d-button action=(route-action "renameTag") actionParam=tag icon="pencil-alt" class="admin-tag"}}
{{d-button action=(action "deleteTag") icon="trash-o" class="admin-tag btn-danger"}} {{d-button action=(action "deleteTag") icon="far-trash-alt" class="admin-tag btn-danger"}}
{{/if}} {{/if}}
</section> </section>
</div> </div>

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

@ -63,7 +63,7 @@
{{/if}} {{/if}}
{{#if model.details.can_edit}} {{#if model.details.can_edit}}
<a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil"}}</a> <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil-alt"}}</a>
{{/if}} {{/if}}
</h1> </h1>

2
app/assets/javascripts/discourse/widgets/actions-summary.js.es6
View File

@ -162,7 +162,7 @@ createWidget("deleted-post", {
html(attrs) { html(attrs) {
return [ return [
iconNode("trash-o"), iconNode("far-trash-alt"),
" ", " ",
avatarFor.call(this, "small", { avatarFor.call(this, "small", {
template: attrs.deletedByAvatarTemplate, template: attrs.deletedByAvatarTemplate,

2
app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
View File

@ -80,7 +80,7 @@ export default createWidget("hamburger-menu", {
if (currentUser.admin) { if (currentUser.admin) {
links.push({ links.push({
href: "/admin/site_settings/category/required", href: "/admin/site_settings/category/required",
icon: "gear", icon: "cog",
label: "admin.site_settings.title", label: "admin.site_settings.title",
className: "settings-link" className: "settings-link"
}); });

4
app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
View File

@ -31,7 +31,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
if (!attrs.isWhisper && currentUser.staff) { if (!attrs.isWhisper && currentUser.staff) {
const buttonAtts = { const buttonAtts = {
action: "togglePostType", action: "togglePostType",
icon: "shield", icon: "shield-alt",
className: "btn-default toggle-post-type" className: "btn-default toggle-post-type"
}; };
@ -53,7 +53,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
if (attrs.hidden) { if (attrs.hidden) {
contents.push({ contents.push({
icon: "eye", icon: "far-eye",
label: "post.controls.unhide", label: "post.controls.unhide",
action: "unhidePost", action: "unhidePost",
className: "btn-default unhide-post" className: "btn-default unhide-post"

2
app/assets/javascripts/discourse/widgets/post-cooked.js.es6
View File

@ -164,7 +164,7 @@ export default class PostCooked {
}) })
.catch(e => { .catch(e => {
if ([403, 404].includes(e.jqXHR.status)) { if ([403, 404].includes(e.jqXHR.status)) {
const icon = e.jqXHR.status === 403 ? "lock" : "trash-o"; const icon = e.jqXHR.status === 403 ? "lock" : "far-trash-alt";
$blockQuote.showHtml( $blockQuote.showHtml(
$(`<div class='expanded-quote'>${iconHTML(icon)}</div>`), $(`<div class='expanded-quote'>${iconHTML(icon)}</div>`),
"fast", "fast",

2
app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
View File

@ -33,7 +33,7 @@ export default createWidget("post-edits-indicator", {
}, },
html(attrs) { html(attrs) {
let icon = "pencil"; let icon = "pencil-alt";
const updatedAt = new Date(attrs.updated_at); const updatedAt = new Date(attrs.updated_at);
let className = this.historyHeat(updatedAt); let className = this.historyHeat(updatedAt);
const date = longDate(updatedAt); const date = longDate(updatedAt);

8
app/assets/javascripts/discourse/widgets/post-menu.js.es6
View File

@ -125,7 +125,7 @@ registerButton("edit", attrs => {
action: "editPost", action: "editPost",
className: "edit", className: "edit",
title: "post.controls.edit", title: "post.controls.edit",
icon: "pencil", icon: "pencil-alt",
alwaysShowYours: true alwaysShowYours: true
}; };
} }
@ -268,7 +268,7 @@ registerButton("delete", attrs => {
id: "delete_topic", id: "delete_topic",
action: "deletePost", action: "deletePost",
title: "post.controls.delete_topic", title: "post.controls.delete_topic",
icon: "trash-o", icon: "far-trash-alt",
className: "delete" className: "delete"
}; };
} else if (attrs.canRecover) { } else if (attrs.canRecover) {
@ -284,7 +284,7 @@ registerButton("delete", attrs => {
id: "delete", id: "delete",
action: "deletePost", action: "deletePost",
title: "post.controls.delete", title: "post.controls.delete",
icon: "trash-o", icon: "far-trash-alt",
className: "delete" className: "delete"
}; };
} else if (!attrs.canDelete && attrs.firstPost && attrs.yours) { } else if (!attrs.canDelete && attrs.firstPost && attrs.yours) {
@ -292,7 +292,7 @@ registerButton("delete", attrs => {
id: "delete_topic", id: "delete_topic",
action: "showDeleteTopicModal", action: "showDeleteTopicModal",
title: "post.controls.delete_topic_disallowed", title: "post.controls.delete_topic_disallowed",
icon: "trash-o", icon: "far-trash-alt",
className: "delete" className: "delete"
}; };
} }

4
app/assets/javascripts/discourse/widgets/post-small-action.js.es6
View File

@ -81,7 +81,7 @@ export default createWidget("post-small-action", {
contents.push( contents.push(
this.attach("button", { this.attach("button", {
className: "small-action-delete", className: "small-action-delete",
icon: "trash", icon: "trash-alt",
action: "deletePost", action: "deletePost",
title: "post.controls.delete" title: "post.controls.delete"
}) })
@ -92,7 +92,7 @@ export default createWidget("post-small-action", {
contents.push( contents.push(
this.attach("button", { this.attach("button", {
className: "small-action-edit", className: "small-action-edit",
icon: "pencil", icon: "pencil-alt",
action: "editPost", action: "editPost",
title: "post.controls.edit" title: "post.controls.edit"
}) })

4
app/assets/javascripts/discourse/widgets/post.js.es6
View File

@ -153,7 +153,7 @@ createWidget("post-avatar", {
html(attrs) { html(attrs) {
let body; let body;
if (!attrs.user_id) { if (!attrs.user_id) {
body = iconNode("trash-o", { class: "deleted-user-avatar" }); body = iconNode("far-trash-alt", { class: "deleted-user-avatar" });
} else { } else {
body = avatarFor.call(this, this.settings.size, { body = avatarFor.call(this, this.settings.size, {
template: attrs.avatar_template, template: attrs.avatar_template,
@ -236,7 +236,7 @@ createWidget("post-meta-data", {
{ {
attributes: { title: I18n.t("post.whisper") } attributes: { title: I18n.t("post.whisper") }
}, },
iconNode("eye-slash") iconNode("far-eye-slash")
) )
); );
} }

4
app/assets/javascripts/discourse/widgets/poster-name.js.es6
View File

@ -42,7 +42,9 @@ export default createWidget("poster-name", {
// TODO: Allow extensibility // TODO: Allow extensibility
posterGlyph(attrs) { posterGlyph(attrs) {
if (attrs.moderator) { if (attrs.moderator) {
return iconNode("shield", { title: I18n.t("user.moderator_tooltip") }); return iconNode("shield-alt", {
title: I18n.t("user.moderator_tooltip")
});
} }
}, },

8
app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
View File

@ -147,7 +147,7 @@ export default createWidget("topic-admin-menu", {
className: "topic-admin-delete", className: "topic-admin-delete",
buttonClass: "btn-danger", buttonClass: "btn-danger",
action: "deleteTopic", action: "deleteTopic",
icon: "trash-o", icon: "far-trash-alt",
label: "actions.delete" label: "actions.delete"
}); });
} }
@ -184,7 +184,7 @@ export default createWidget("topic-admin-menu", {
className: "topic-admin-status-update", className: "topic-admin-status-update",
buttonClass: "btn-default", buttonClass: "btn-default",
action: "showTopicStatusUpdate", action: "showTopicStatusUpdate",
icon: "clock-o", icon: "far-clock",
label: "actions.timed_update" label: "actions.timed_update"
}); });
@ -206,7 +206,7 @@ export default createWidget("topic-admin-menu", {
className: "topic-admin-change-timestamp", className: "topic-admin-change-timestamp",
buttonClass: "btn-default", buttonClass: "btn-default",
action: "showChangeTimestamp", action: "showChangeTimestamp",
icon: "calendar", icon: "calendar-alt",
label: "change_timestamp.title" label: "change_timestamp.title"
}); });
} }
@ -234,7 +234,7 @@ export default createWidget("topic-admin-menu", {
className: "topic-admin-visible", className: "topic-admin-visible",
buttonClass: "btn-default", buttonClass: "btn-default",
action: "toggleVisibility", action: "toggleVisibility",
icon: visible ? "eye-slash" : "eye", icon: visible ? "far-eye-slash" : "far-eye",
label: visible ? "actions.invisible" : "actions.visible" label: visible ? "actions.invisible" : "actions.visible"
}); });

4
app/assets/javascripts/discourse/widgets/user-menu.js.es6
View File

@ -89,7 +89,7 @@ createWidget("user-menu-links", {
glyphs.push({ glyphs.push({
label: "user.preferences", label: "user.preferences",
className: "user-preferences-link", className: "user-preferences-link",
icon: "gear", icon: "cog",
href: `${path}/preferences/account` href: `${path}/preferences/account`
}); });
@ -161,7 +161,7 @@ export default createWidget("user-menu", {
this.attach("link", { this.attach("link", {
action: "logout", action: "logout",
className: "logout", className: "logout",
icon: "sign-out", icon: "sign-out-alt",
href: "", href: "",
label: "user.log_out" label: "user.log_out"
}) })

4
app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
View File

@ -32,7 +32,7 @@ export default DropdownSelectBox.extend({
if (post.user_deleted) { if (post.user_deleted) {
content.push({ content.push({
icon: "eye", icon: "far-eye",
id: "confirm-agree-restore", id: "confirm-agree-restore",
action: () => this.send("perform", "restore"), action: () => this.send("perform", "restore"),
label: I18n.t("admin.flags.agree_flag_restore_post"), label: I18n.t("admin.flags.agree_flag_restore_post"),
@ -41,7 +41,7 @@ export default DropdownSelectBox.extend({
} else { } else {
if (!post.get("postHidden")) { if (!post.get("postHidden")) {
content.push({ content.push({
icon: "eye-slash", icon: "far-eye-slash",
action: () => this.send("perform", "hide"), action: () => this.send("perform", "hide"),
id: "confirm-agree-hide", id: "confirm-agree-hide",
label: I18n.t("admin.flags.agree_flag_hide_post"), label: I18n.t("admin.flags.agree_flag_hide_post"),

2
app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
View File

@ -6,7 +6,7 @@ export default DropdownSelectBox.extend({
classNames: ["delete-flag", "admin-delete-flag-dropdown"], classNames: ["delete-flag", "admin-delete-flag-dropdown"],
adminTools: Ember.inject.service(), adminTools: Ember.inject.service(),
nameProperty: "label", nameProperty: "label",
headerIcon: "trash-o", headerIcon: "far-trash-alt",
computeHeaderContent() { computeHeaderContent() {
let content = this._super(...arguments); let content = this._super(...arguments);

4
app/assets/javascripts/select-kit/components/composer-actions.js.es6
View File

@ -63,7 +63,7 @@ export default DropdownSelectBoxComponent.extend({
content.title = I18n.t("composer.composer_actions.reply"); content.title = I18n.t("composer.composer_actions.reply");
break; break;
case EDIT: case EDIT:
content.icon = "pencil"; content.icon = "pencil-alt";
content.title = I18n.t("composer.composer_actions.edit"); content.title = I18n.t("composer.composer_actions.edit");
break; break;
case CREATE_SHARED_DRAFT: case CREATE_SHARED_DRAFT:
@ -151,7 +151,7 @@ export default DropdownSelectBoxComponent.extend({
items.push({ items.push({
name: I18n.t("composer.composer_actions.toggle_whisper.label"), name: I18n.t("composer.composer_actions.toggle_whisper.label"),
description: I18n.t("composer.composer_actions.toggle_whisper.desc"), description: I18n.t("composer.composer_actions.toggle_whisper.desc"),
icon: "eye-slash", icon: "far-eye-slash",
id: "toggle_whisper" id: "toggle_whisper"
}); });
} }

8
app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
View File

@ -19,7 +19,7 @@ export const TIMEFRAMES = [
format: "h a", format: "h a",
enabled: opts => opts.canScheduleToday, enabled: opts => opts.canScheduleToday,
when: time => time.hour(18).minute(0), when: time => time.hour(18).minute(0),
icon: "moon-o" icon: "far-moon"
}), }),
buildTimeframe({ buildTimeframe({
id: "tomorrow", id: "tomorrow",
@ -29,7 +29,7 @@ export const TIMEFRAMES = [
.add(1, "day") .add(1, "day")
.hour(timeOfDay) .hour(timeOfDay)
.minute(0), .minute(0),
icon: "sun-o" icon: "far-sun"
}), }),
buildTimeframe({ buildTimeframe({
id: "later_this_week", id: "later_this_week",
@ -139,12 +139,12 @@ export const TIMEFRAMES = [
}), }),
buildTimeframe({ buildTimeframe({
id: "pick_date_and_time", id: "pick_date_and_time",
icon: "calendar-plus-o" icon: "far-calendar-plus"
}), }),
buildTimeframe({ buildTimeframe({
id: "set_based_on_last_post", id: "set_based_on_last_post",
enabled: opts => opts.includeBasedOnLastPost, enabled: opts => opts.includeBasedOnLastPost,
icon: "clock-o" icon: "far-clock"
}) })
]; ];

2
app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
View File

@ -7,7 +7,7 @@
{{i18n "wizard.uploading"}} {{i18n "wizard.uploading"}}
{{else}} {{else}}
{{i18n "wizard.upload"}} {{i18n "wizard.upload"}}
{{d-icon "picture-o"}} {{d-icon "far-image"}}
{{/if}} {{/if}}
<input class="wizard-hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" /> <input class="wizard-hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" />

4
plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
View File

@ -435,7 +435,7 @@ createWidget("discourse-poll-buttons", {
className: "btn toggle-results", className: "btn toggle-results",
label: "poll.hide-results.label", label: "poll.hide-results.label",
title: "poll.hide-results.title", title: "poll.hide-results.title",
icon: "eye-slash", icon: "far-eye-slash",
disabled: hideResultsDisabled, disabled: hideResultsDisabled,
action: "toggleResults" action: "toggleResults"
}) })
@ -451,7 +451,7 @@ createWidget("discourse-poll-buttons", {
className: "btn toggle-results", className: "btn toggle-results",
label: "poll.show-results.label", label: "poll.show-results.label",
title: "poll.show-results.title", title: "poll.show-results.title",
icon: "eye", icon: "far-eye",
disabled: poll.get("voters") === 0, disabled: poll.get("voters") === 0,
action: "toggleResults" action: "toggleResults"
}) })

6
test/javascripts/acceptance/composer-actions-test.js.es6
View File

@ -89,7 +89,9 @@ QUnit.test("replying to post - toggle_whisper", async assert => {
await composerActions.expand(); await composerActions.expand();
await composerActions.selectRowByValue("toggle_whisper"); await composerActions.selectRowByValue("toggle_whisper");
assert.ok(find(".composer-fields .whisper .d-icon-eye-slash").length === 1); assert.ok(
find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1
);
}); });
QUnit.test("replying to post - reply_as_new_topic", async assert => { QUnit.test("replying to post - reply_as_new_topic", async assert => {
@ -100,7 +102,7 @@ QUnit.test("replying to post - reply_as_new_topic", async assert => {
await visit("/t/internationalization-localization/280"); await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil"); await click("#topic-title .d-icon-pencil-alt");
await categoryChooser.expand(); await categoryChooser.expand();
await categoryChooser.selectRowByValue(4); await categoryChooser.selectRowByValue(4);
await click("#topic-title .submit-edit"); await click("#topic-title .submit-edit");

14
test/javascripts/acceptance/composer-test.js.es6
View File

@ -384,7 +384,7 @@ QUnit.test("Composer can toggle whispers", async assert => {
await menu.selectRowByValue("toggleWhisper"); await menu.selectRowByValue("toggleWhisper");
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 1, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
"it sets the post type to whisper" "it sets the post type to whisper"
); );
@ -392,7 +392,7 @@ QUnit.test("Composer can toggle whispers", async assert => {
await menu.selectRowByValue("toggleWhisper"); await menu.selectRowByValue("toggleWhisper");
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 0, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
"it removes the whisper mode" "it removes the whisper mode"
); );
@ -424,7 +424,7 @@ QUnit.test("Switching composer whisper state", async assert => {
await click("#topic-footer-buttons .btn.create"); await click("#topic-footer-buttons .btn.create");
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 0, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
"doesn’t set topic reply as whisper" "doesn’t set topic reply as whisper"
); );
@ -432,7 +432,7 @@ QUnit.test("Switching composer whisper state", async assert => {
assert.ok(find(".topic-post:last").hasClass("whisper")); assert.ok(find(".topic-post:last").hasClass("whisper"));
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 1, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
"sets post reply as a whisper" "sets post reply as a whisper"
); );
@ -440,7 +440,7 @@ QUnit.test("Switching composer whisper state", async assert => {
assert.notOk(find(".topic-post:nth-last-child(2)").hasClass("whisper")); assert.notOk(find(".topic-post:nth-last-child(2)").hasClass("whisper"));
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 0, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
"doesn’t set post reply as a whisper" "doesn’t set post reply as a whisper"
); );
}); });
@ -499,7 +499,7 @@ QUnit.test(
); );
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 1, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 1,
"it sets the post type to whisper" "it sets the post type to whisper"
); );
@ -508,7 +508,7 @@ QUnit.test(
await click("#create-topic"); await click("#create-topic");
assert.ok( assert.ok(
find(".composer-fields .whisper .d-icon-eye-slash").length === 0, find(".composer-fields .whisper .d-icon-far-eye-slash").length === 0,
"it should reset the state of the composer's model" "it should reset the state of the composer's model"
); );

6
test/javascripts/acceptance/topic-test.js.es6
View File

@ -48,7 +48,7 @@ QUnit.test("Share Popup", async assert => {
QUnit.test("Showing and hiding the edit controls", async assert => { QUnit.test("Showing and hiding the edit controls", async assert => {
await visit("/t/internationalization-localization/280"); await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil"); await click("#topic-title .d-icon-pencil-alt");
assert.ok(exists("#edit-title"), "it shows the editing controls"); assert.ok(exists("#edit-title"), "it shows the editing controls");
assert.ok( assert.ok(
@ -66,7 +66,7 @@ QUnit.test("Updating the topic title and category", async assert => {
await visit("/t/internationalization-localization/280"); await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil"); await click("#topic-title .d-icon-pencil-alt");
await fillIn("#edit-title", "this is the new title"); await fillIn("#edit-title", "this is the new title");
await categoryChooser.expand(); await categoryChooser.expand();
await categoryChooser.selectRowByValue(4); await categoryChooser.selectRowByValue(4);
@ -185,7 +185,7 @@ QUnit.test("Visit topic routes", async assert => {
QUnit.test("Updating the topic title with emojis", async assert => { QUnit.test("Updating the topic title with emojis", async assert => {
await visit("/t/internationalization-localization/280"); await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil"); await click("#topic-title .d-icon-pencil-alt");
await fillIn("#edit-title", "emojis title :bike: :blonde_woman:t6:"); await fillIn("#edit-title", "emojis title :bike: :blonde_woman:t6:");

8
test/javascripts/components/image-uploader-test.js.es6
View File

@ -6,13 +6,13 @@ componentTest("with image", {
test(assert) { test(assert) {
assert.equal( assert.equal(
this.$(".d-icon-picture-o").length, this.$(".d-icon-far-image").length,
1, 1,
"it displays the upload icon" "it displays the upload icon"
); );
assert.equal( assert.equal(
this.$(".d-icon-trash-o").length, this.$(".d-icon-far-trash-alt").length,
1, 1,
"it displays the trash icon" "it displays the trash icon"
); );
@ -24,13 +24,13 @@ componentTest("without image", {
test(assert) { test(assert) {
assert.equal( assert.equal(
this.$(".d-icon-picture-o").length, this.$(".d-icon-far-image").length,
1, 1,
"it displays the upload icon" "it displays the upload icon"
); );
assert.equal( assert.equal(
this.$(".d-icon-trash-o").length, this.$(".d-icon-far-trash-alt").length,
0, 0,
"it does not display trash icon" "it does not display trash icon"
); );

2
test/javascripts/widgets/actions-summary-test.js.es6
View File

@ -80,7 +80,7 @@ widgetTest("post deleted", {
}, },
test(assert) { test(assert) {
assert.ok( assert.ok(
this.$(".post-action .d-icon-trash-o").length === 1, this.$(".post-action .d-icon-far-trash-alt").length === 1,
"it has the deleted icon" "it has the deleted icon"
); );
assert.ok( assert.ok(

2
test/javascripts/widgets/poster-name-test.js.es6
View File

@ -39,7 +39,7 @@ widgetTest("extra classes and glyphs", {
assert.ok(this.$("span.staff").length); assert.ok(this.$("span.staff").length);
assert.ok(this.$("span.admin").length); assert.ok(this.$("span.admin").length);
assert.ok(this.$("span.moderator").length); assert.ok(this.$("span.moderator").length);
assert.ok(this.$(".d-icon-shield").length); assert.ok(this.$(".d-icon-shield-alt").length);
assert.ok(this.$("span.new-user").length); assert.ok(this.$("span.new-user").length);
assert.ok(this.$("span.fish").length); assert.ok(this.$("span.fish").length);
} }