From 6135d1d21430415c071f8a4ba33e33683f1cd26c Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 20 Dec 2013 11:06:07 -0500
Subject: [PATCH] Add a button to clear filters on site settings page

---
 .../admin/controllers/admin_site_settings_controller.js  | 9 ++++++++-
 .../admin/templates/site_settings.js.handlebars          | 1 +
 app/assets/stylesheets/common/admin/admin_base.scss      | 4 ++++
 config/locales/client.en.yml                             | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
index a466dea6d86..82a152b8fdc 100644
--- a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
@@ -57,6 +57,13 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
     });
 
     this.set('model', matchesGroupedByCategory);
-  }, 250).observes('filter', 'onlyOverridden')
+  }, 250).observes('filter', 'onlyOverridden'),
+
+  actions: {
+    clearFilter: function() {
+      this.set('filter', '');
+      this.set('onlyOverridden', false);
+    }
+  }
 
 });
diff --git a/app/assets/javascripts/admin/templates/site_settings.js.handlebars b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
index 3c87a60e6a1..6a0f3aad6ef 100644
--- a/app/assets/javascripts/admin/templates/site_settings.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
@@ -7,6 +7,7 @@
   </div>
   <div class='controls'>
     {{textField value=filter placeholderKey="type_to_filter"}}
+    <button {{action clearFilter}} class="btn">{{i18n admin.site_settings.clear_filter}}</button>
   </div>
 </div>
 
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 28aa2985ba1..836a9e23ec6 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -144,6 +144,10 @@ td {border-bottom: 1px solid #ddd; border-top: 1px solid #ddd;}
     display: inline-block;
     margin-right: 5px;
   }
+  .btn {
+    background: darken(#e8e8e8, 5%);
+    &:hover { background: #aaa; }
+  }
 }
 
 .site-settings-nav {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3de1eacef12..415c5bb84e2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1450,6 +1450,7 @@ en:
         reset: 'reset to default'
         none: 'none'
         no_results: "No results found."
+        clear_filter: "Clear"
         categories:
           all_results: 'All'
           required: 'Required'