From 8f27456acbc172e98558ebda436210d65a46adc9 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 26 Feb 2018 16:35:43 -0500
Subject: [PATCH] UX: Move 'show words' checkbox close to the words in the
 Watched Words UI

---
 .../javascripts/admin/templates/watched-words-action.hbs    | 6 ++++++
 app/assets/javascripts/admin/templates/watched-words.hbs    | 6 ------
 app/assets/stylesheets/common/admin/admin_base.scss         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index 8377c28bd50..d58f1a9430e 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -10,6 +10,12 @@
 {{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
 
 <div class='clearfix'></div>
+<div>
+  <label class="show-words-checkbox">
+    {{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
+    {{i18n 'admin.watched_words.show_words'}}
+  </label>
+</div>
 <div class="watched-words-list">
   {{#if showWordsList}}
     {{#each filteredContent as |word| }}
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index 7bec3d88120..dccbdb29ccc 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -1,10 +1,4 @@
 <div class='admin-controls'>
-  <div class='search controls'>
-    <label class="show-words-checkbox">
-      {{input type="checkbox" checked=showWords disabled=disableShowWords}}
-      {{i18n 'admin.watched_words.show_words'}}
-    </label>
-  </div>
   <div class='controls'>
     {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
     {{d-button action="clearFilter" label="admin.watched_words.clear_filter"}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 1b199179aae..2248da22a67 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1778,7 +1778,7 @@ table#user-badges {
 }
 
 .watched-words-list {
-  margin-top: 40px;
+  margin-top: 20px;
 }
 .watched-word {
   display: inline-block;