IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UX: replace closed topic icon with discourse-no-entry"

Browse Source 
This reverts commit 040b8c00a4.

We decided to keep status quo for now
This commit is contained in:
Sam Saffron
2020-04-25 13:01:25 +10:00
parent d516a88b4c
commit 1f6eaf26a1
10 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/components/topic-status.js
View File

@@ -23,17 +23,15 @@ export default Component.extend({
@discourseComputed("topic.closed", "topic.archived")
topicClosedArchived(closed, archived) {
if (closed && archived) {
this._set("closedArchived", "discourse-no-entry", "locked_and_archived");
this._set("closedArchived", "lock", "locked_and_archived");
this._reset("closed");
this._reset("archived");
return true;
} else {
this._reset("closedArchived");
closed
? this._set("closed", "discourse-no-entry", "locked")
: this._reset("closed");
closed ? this._set("closed", "lock", "locked") : this._reset("closed");
archived
? this._set("archived", "discourse-no-entry", "archived")
? this._set("archived", "lock", "archived")
: this._reset("archived");
return false;
}

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

@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
class: "btn-default"
});
addBulkButton("closeTopics", "close_topics", {
icon: "discourse-no-entry",
icon: "lock",
class: "btn-default"
});
addBulkButton("archiveTopics", "archive_topics", {

6
app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
View File

@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
};
if (topic.get("closed") && topic.get("archived")) {
renderIcon("discourse-no-entry", "locked_and_archived");
renderIcon("lock", "locked_and_archived");
} else {
renderIconIf("closed", "discourse-no-entry", "locked");
renderIconIf("archived", "discourse-no-entry", "archived");
renderIconIf("closed", "lock", "locked");
renderIconIf("archived", "lock", "archived");
}
this.forEach(args => renderIconIf(...args));

9
app/assets/javascripts/discourse/app/raw-views/topic-status.js
View File

@@ -38,14 +38,11 @@ export default EmberObject.extend({
}
if (topic.get("closed") && topic.get("archived")) {
results.push({
icon: "discourse-no-entry",
key: "locked_and_archived"
});
results.push({ icon: "lock", key: "locked_and_archived" });
} else if (topic.get("closed")) {
results.push({ icon: "discourse-no-entry", key: "locked" });
results.push({ icon: "lock", key: "locked" });
} else if (topic.get("archived")) {
results.push({ icon: "discourse-no-entry", key: "archived" });
results.push({ icon: "lock", key: "archived" });
}
if (topic.get("pinned")) {

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

@@ -233,7 +233,7 @@
{{#if showNotificationsTab}}
<li>
{{#link-to 'userNotifications'}}
{{d-icon "discourse-comment" class="glyph"}}{{i18n 'user.notifications'}}
{{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
{{/link-to}}
</li>
{{/if}}

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

@@ -32,8 +32,10 @@ export function actionDescription(actionCode, createdAt, username) {
}
const icons = {
"closed.enabled": "discourse-no-entry",
"autoclosed.enabled": "discourse-no-entry",
"closed.enabled": "lock",
"closed.disabled": "unlock-alt",
"autoclosed.enabled": "lock",
"autoclosed.disabled": "unlock-alt",
"archived.enabled": "folder",
"archived.disabled": "folder-open",
"pinned.enabled": "thumbtack",
@@ -50,7 +52,7 @@ const icons = {
user_left: "minus-circle",
removed_user: "minus-circle",
removed_group: "minus-circle",
public_topic: "discourse-comment",
public_topic: "comment",
private_topic: "envelope",
autobumped: "hand-point-right"
};

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

@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
className: "topic-admin-open",
buttonClass: "btn-default",
action: "toggleClosed",
icon: "discourse-comment",
icon: "unlock",
label: "actions.open"
});
} else {
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
className: "topic-admin-close",
buttonClass: "btn-default",
action: "toggleClosed",
icon: "discourse-no-entry",
icon: "lock",
label: "actions.close"
});
}
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
action: isPrivateMessage
? "convertToPublicTopic"
: "convertToPrivateMessage",
icon: isPrivateMessage ? "discourse-comment" : "envelope",
icon: isPrivateMessage ? "comment" : "envelope",
label: isPrivateMessage
? "actions.make_public"
: "actions.make_private"