From 448e95b97d5c4ddac64438fc49af2c67a3058ce4 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Sat, 11 Aug 2018 21:51:13 +0200
Subject: [PATCH] UX: Show anchor icon instead of text when topic bump is
 disabled

---
 .../javascripts/discourse/controllers/composer.js.es6  |  7 -------
 .../javascripts/discourse/templates/composer.hbs       | 10 ++++------
 app/assets/stylesheets/common/base/compose.scss        |  1 -
 config/locales/client.en.yml                           |  1 -
 .../acceptance/composer-actions-test.js.es6            |  9 ++++-----
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 3f52b692ecd..dc298f88f42 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -195,13 +195,6 @@ export default Ember.Controller.extend({
     }
   },
 
-  @computed("model.noBump")
-  topicBumpText(noBump) {
-    if (noBump) {
-      return I18n.t("composer.no_topic_bump");
-    }
-  },
-
   @computed
   isStaffUser() {
     const currentUser = this.currentUser;
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 712dd870188..94e8d44b643 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -21,8 +21,8 @@
                   {{#if whisperOrUnlistTopicText}}
                     <span class='whisper'>({{whisperOrUnlistTopicText}})</span>
                   {{/if}}
-                  {{#if topicBumpText}}
-                    <span class="no-bump">{{topicBumpText}}</span>
+                  {{#if model.noBump}}
+                    <span class="no-bump">{{d-icon "anchor"}}</span>
                   {{/if}}
                 {{/unless}}
 
@@ -123,10 +123,8 @@
                     {{d-icon "eye-slash"}}
                   </span>
                 {{/if}}
-                {{#if topicBumpText}}
-                  <span class="no-bump">
-                    {{d-icon "anchor"}}
-                  </span>
+                {{#if model.noBump}}
+                  <span class="no-bump">{{d-icon "anchor"}}</span>
                 {{/if}}
               {{/if}}
 
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index fde1550de0a..1d355ac9e8a 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -153,7 +153,6 @@
   }
 
   .whisper,
-  .no-bump,
   .display-edit-reason {
     font-style: italic;
   }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9c6f2f74823..b76a8e3b5d7 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1318,7 +1318,6 @@ en:
       whisper: "whisper"
       unlist: "unlisted"
       blockquote_text: "Blockquote"
-      no_topic_bump: "(no bump)"
 
       add_warning: "This is an official warning."
       toggle_whisper: "Toggle Whisper"
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
index 7a104fb0a3c..f94897e99cf 100644
--- a/test/javascripts/acceptance/composer-actions-test.js.es6
+++ b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -261,10 +261,9 @@ QUnit.test("replying to post - toggle_topic_bump", async assert => {
   await composerActions.expand();
   await composerActions.selectRowByValue("toggle_topic_bump");
 
-  assert.equal(
-    find(".composer-fields .no-bump").text(),
-    I18n.t("composer.no_topic_bump"),
-    "no-bump text is visible"
+  assert.ok(
+    find(".composer-fields .no-bump").length === 1,
+    "no-bump icon is visible"
   );
 
   await composerActions.expand();
@@ -272,7 +271,7 @@ QUnit.test("replying to post - toggle_topic_bump", async assert => {
 
   assert.ok(
     find(".composer-fields .no-bump").length === 0,
-    "no-bump text is not visible"
+    "no-bump icon is not visible"
   );
 });