From c47b0a8beefd2f4bb8febe0f5fd31abd7098bfa6 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Mon, 18 Mar 2019 11:50:18 +1100 Subject: [PATCH] Revert "UX: Added tooltips to topic admin menu (#7146)" This reverts commit d1c4981f6544740407dcca5fc39bbc737e13a9ee. Per discussion with @coding-horror it was decided this change is to far reaching. Instead we will make smaller strategic changes to tooltips that add value. --- .../discourse/widgets/topic-admin-menu.js.es6 | 50 +++++-------------- config/locales/client.en.yml | 17 ------- 2 files changed, 13 insertions(+), 54 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 index e0f94d7b8ce..2d6e06502ba 100644 --- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 @@ -16,7 +16,6 @@ createWidget("admin-menu-button", { action: attrs.action, icon: attrs.icon, label: attrs.fullLabel || `topic.${attrs.label}`, - title: attrs.title, secondaryAction: "hideAdminMenu" }) ); @@ -137,8 +136,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "toggleMultiSelect", icon: "tasks", - label: "actions.multi_select", - title: "topic.actions.multi_select_tooltip" + label: "actions.multi_select" }); const topic = attrs.topic; @@ -150,8 +148,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-danger", action: "deleteTopic", icon: "far-trash-alt", - label: "actions.delete", - title: "topic.actions.delete_tooltip" + label: "actions.delete" }); } @@ -161,8 +158,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "recoverTopic", icon: "undo", - label: "actions.recover", - title: "topic.actions.recover_tooltip" + label: "actions.recover" }); } @@ -172,8 +168,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "toggleClosed", icon: "unlock", - label: "actions.open", - title: "topic.actions.open_tooltip" + label: "actions.open" }); } else { buttons.push({ @@ -181,8 +176,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "toggleClosed", icon: "lock", - label: "actions.close", - title: "topic.actions.close_tooltip" + label: "actions.close" }); } @@ -191,8 +185,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "showTopicStatusUpdate", icon: "far-clock", - label: "actions.timed_update", - title: "topic.actions.timed_update_tooltip" + label: "actions.timed_update" }); const isPrivateMessage = topic.get("isPrivateMessage"); @@ -204,10 +197,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "showFeatureTopic", icon: "thumbtack", - label: featured ? "actions.unpin" : "actions.pin", - title: featured - ? "topic.actions.unpin_tooltip" - : "topic.actions.pin_tooltip" + label: featured ? "actions.unpin" : "actions.pin" }); } @@ -217,8 +207,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "showChangeTimestamp", icon: "calendar-alt", - label: "change_timestamp.title", - title: "topic.change_timestamp.tooltip" + label: "change_timestamp.title" }); } @@ -227,8 +216,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "resetBumpDate", icon: "anchor", - label: "actions.reset_bump_date", - title: "topic.actions.reset_bump_date_tooltip" + label: "actions.reset_bump_date" }); if (!isPrivateMessage) { @@ -237,10 +225,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "toggleArchived", icon: "folder", - label: topic.get("archived") ? "actions.unarchive" : "actions.archive", - title: topic.get("archived") - ? "topic.actions.unarchive_tooltip" - : "topic.actions.archive_tooltip" + label: topic.get("archived") ? "actions.unarchive" : "actions.archive" }); } @@ -250,10 +235,7 @@ export default createWidget("topic-admin-menu", { buttonClass: "btn-default", action: "toggleVisibility", icon: visible ? "far-eye-slash" : "far-eye", - label: visible ? "actions.invisible" : "actions.visible", - title: visible - ? "topic.actions.invisible_tooltip" - : "topic.actions.visible_tooltip" + label: visible ? "actions.invisible" : "actions.visible" }); if (details.get("can_convert_topic")) { @@ -264,12 +246,7 @@ export default createWidget("topic-admin-menu", { ? "convertToPublicTopic" : "convertToPrivateMessage", icon: isPrivateMessage ? "comment" : "envelope", - label: isPrivateMessage - ? "actions.make_public" - : "actions.make_private", - title: isPrivateMessage - ? "topic.actions.make_public_tooltip" - : "topic.actions.make_private_tooltip" + label: isPrivateMessage ? "actions.make_public" : "actions.make_private" }); } @@ -278,8 +255,7 @@ export default createWidget("topic-admin-menu", { action: "showModerationHistory", buttonClass: "btn-default", icon: "list", - fullLabel: "admin.flags.moderation_history", - title: "admin.flags.moderation_history_tooltip" + fullLabel: "admin.flags.moderation_history" }); } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7413b1d43a4..0221f6faa77 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1932,36 +1932,21 @@ en: actions: recover: "Un-Delete Topic" - recover_tooltip: "Restores the topic." delete: "Delete Topic" - delete_tooltip: "Marks the topic as deleted." open: "Open Topic" - open_tooltip: "Marks the topic as open and allows new replies." close: "Close Topic" - close_tooltip: "Marks the topic as closed and prevents new replies." multi_select: "Select Posts…" - multi_select_tooltip: "Toggles multiselect mode in which multiple posts can be selected." timed_update: "Set Topic Timer..." - timed_update_tooltip: "Opens a new window in which a timer for different actions can be set." pin: "Pin Topic…" - pin_tooltip: "Opens a window in which the topic can be featured in different ways." unpin: "Un-Pin Topic…" - unpin_tooltip: "Unpins the topic and it will no longer be featured." unarchive: "Unarchive Topic" - unarchive_tooltip: "Unfreezes the topic and allows interacting with it." archive: "Archive Topic" - archive_tooltip: "Freezes the topic and prevents interacting with it." invisible: "Make Unlisted" - invisible_tooltip: "Prevents the inclusion of the topic in lists and digest emails." visible: "Make Listed" - visible_tooltip: "Marks the topic as visible and includes the topic in lists and digest emails." reset_read: "Reset Read Data" make_public: "Make Public Topic" - make_public_tooltip: "Converts to public topic and makes it visible for other users." make_private: "Make Personal Message" - make_private_tooltip: "Converts to personal message and makes it invisible for other users." reset_bump_date: "Reset Bump Date" - reset_bump_date_tooltip: "Puts the topic back into chronological order according to when it was originally created." feature: pin: "Pin Topic" @@ -2119,7 +2104,6 @@ en: change_timestamp: title: "Change Timestamp..." - tooltip: "Opens a window in which the timestamp can be changed." action: "change timestamp" invalid_timestamp: "Timestamp cannot be in the future." error: "There was an error changing the timestamp of the topic." @@ -2996,7 +2980,6 @@ en: old_posts: "Old Flagged Posts" topics: "Flagged Topics" moderation_history: "Moderation History" - moderation_history_tooltip: "Shows the moderation history." agree: "Agree" agree_title: "Confirm this flag as valid and correct"