From b6489d269045d28ad1f8c6dc7e41f991390f002c Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 21 Apr 2020 17:34:59 -0400 Subject: [PATCH] UX: Replaced locked topic "lock" icon with "comment-slash" icon --- .../javascripts/discourse/components/topic-status.js | 12 +++++++++--- .../discourse/controllers/topic-bulk-actions.js | 2 +- .../discourse/helpers/topic-status-icons.js | 6 +++--- .../javascripts/discourse/raw-views/topic-status.js | 9 ++++++--- app/assets/javascripts/discourse/templates/user.hbs | 2 +- .../discourse/widgets/post-small-action.js | 10 +++++----- .../discourse/widgets/topic-admin-menu.js | 6 +++--- lib/svg_sprite/svg_sprite.rb | 2 ++ vendor/assets/svg-icons/discourse-additional.svg | 9 +++++++++ 9 files changed, 39 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-status.js b/app/assets/javascripts/discourse/components/topic-status.js index 569292eb5ef..19f16b3ca36 100644 --- a/app/assets/javascripts/discourse/components/topic-status.js +++ b/app/assets/javascripts/discourse/components/topic-status.js @@ -23,15 +23,21 @@ export default Component.extend({ @discourseComputed("topic.closed", "topic.archived") topicClosedArchived(closed, archived) { if (closed && archived) { - this._set("closedArchived", "lock", "locked_and_archived"); + this._set( + "closedArchived", + "discourse-comment-slash", + "locked_and_archived" + ); this._reset("closed"); this._reset("archived"); return true; } else { this._reset("closedArchived"); - closed ? this._set("closed", "lock", "locked") : this._reset("closed"); + closed + ? this._set("closed", "discourse-comment-slash", "locked") + : this._reset("closed"); archived - ? this._set("archived", "lock", "archived") + ? this._set("archived", "discourse-comment-slash", "archived") : this._reset("archived"); return false; } diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js index 723e7fee54a..d8416436b55 100644 --- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js +++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js @@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", { class: "btn-default" }); addBulkButton("closeTopics", "close_topics", { - icon: "lock", + icon: "discourse-comment-slash", class: "btn-default" }); addBulkButton("archiveTopics", "archive_topics", { diff --git a/app/assets/javascripts/discourse/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/helpers/topic-status-icons.js index 2f2da65a250..a1776e4f6f2 100644 --- a/app/assets/javascripts/discourse/helpers/topic-status-icons.js +++ b/app/assets/javascripts/discourse/helpers/topic-status-icons.js @@ -10,10 +10,10 @@ export default ArrayProxy.extend({ }; if (topic.get("closed") && topic.get("archived")) { - renderIcon("lock", "locked_and_archived"); + renderIcon("discourse-comment-slash", "locked_and_archived"); } else { - renderIconIf("closed", "lock", "locked"); - renderIconIf("archived", "lock", "archived"); + renderIconIf("closed", "discourse-comment-slash", "locked"); + renderIconIf("archived", "discourse-comment-slash", "archived"); } this.forEach(args => renderIconIf(...args)); diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js b/app/assets/javascripts/discourse/raw-views/topic-status.js index d6b2c749995..ba8bf335113 100644 --- a/app/assets/javascripts/discourse/raw-views/topic-status.js +++ b/app/assets/javascripts/discourse/raw-views/topic-status.js @@ -38,11 +38,14 @@ export default EmberObject.extend({ } if (topic.get("closed") && topic.get("archived")) { - results.push({ icon: "lock", key: "locked_and_archived" }); + results.push({ + icon: "discourse-comment-slash", + key: "locked_and_archived" + }); } else if (topic.get("closed")) { - results.push({ icon: "lock", key: "locked" }); + results.push({ icon: "discourse-comment-slash", key: "locked" }); } else if (topic.get("archived")) { - results.push({ icon: "lock", key: "archived" }); + results.push({ icon: "discourse-comment-slash", key: "archived" }); } if (topic.get("pinned")) { diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs index 9290b1d8327..ceed565516b 100644 --- a/app/assets/javascripts/discourse/templates/user.hbs +++ b/app/assets/javascripts/discourse/templates/user.hbs @@ -233,7 +233,7 @@ {{#if showNotificationsTab}}
  • {{#link-to 'userNotifications'}} - {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}} + {{d-icon "discourse-comment" class="glyph"}}{{i18n 'user.notifications'}} {{/link-to}}
    • {{/if}} diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/widgets/post-small-action.js index 709d70153a9..19e4531259e 100644 --- a/app/assets/javascripts/discourse/widgets/post-small-action.js +++ b/app/assets/javascripts/discourse/widgets/post-small-action.js @@ -32,10 +32,10 @@ export function actionDescription(actionCode, createdAt, username) { } const icons = { - "closed.enabled": "lock", - "closed.disabled": "unlock-alt", - "autoclosed.enabled": "lock", - "autoclosed.disabled": "unlock-alt", + "closed.enabled": "discourse-comment-slash", + "closed.disabled": "discourse-comment", + "autoclosed.enabled": "discourse-comment-slash", + "autoclosed.disabled": "discourse-comment", "archived.enabled": "folder", "archived.disabled": "folder-open", "pinned.enabled": "thumbtack", @@ -52,7 +52,7 @@ const icons = { user_left: "minus-circle", removed_user: "minus-circle", removed_group: "minus-circle", - public_topic: "comment", + public_topic: "discourse-comment", private_topic: "envelope", autobumped: "hand-point-right" }; diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js index e5c81386732..edf9d4a14a6 100644 --- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js +++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js @@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", { className: "topic-admin-open", buttonClass: "btn-default", action: "toggleClosed", - icon: "unlock", + icon: "discourse-comment", label: "actions.open" }); } else { @@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", { className: "topic-admin-close", buttonClass: "btn-default", action: "toggleClosed", - icon: "lock", + icon: "discourse-comment-slash", label: "actions.close" }); } @@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", { action: isPrivateMessage ? "convertToPublicTopic" : "convertToPrivateMessage", - icon: isPrivateMessage ? "comment" : "envelope", + icon: isPrivateMessage ? "discourse-comment" : "envelope", label: isPrivateMessage ? "actions.make_public" : "actions.make_private" diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb index f2c4bcdbb72..4fdc3e5a87e 100644 --- a/lib/svg_sprite/svg_sprite.rb +++ b/lib/svg_sprite/svg_sprite.rb @@ -62,6 +62,8 @@ module SvgSprite "discourse-bell-one", "discourse-bell-slash", "discourse-compress", + "discourse-comment", + "discourse-comment-slash", "discourse-expand", "download", "ellipsis-h", diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg index 343b5b6abce..e3adf58e0c2 100644 --- a/vendor/assets/svg-icons/discourse-additional.svg +++ b/vendor/assets/svg-icons/discourse-additional.svg @@ -27,4 +27,13 @@ Additional SVG icons + + + + + + + + +