Replace slow auto-filter in site settings with a filter button

2024-11-23 23:58:31 -05:00 · 2013-10-29 17:03:28 -04:00 · 2013-10-29 17:03:28 -04:00 · bb135fafb4
commit bb135fafb4
parent caeb91a55f
22 changed files with 25 additions and 26 deletions
--- a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js
@ -40,6 +40,16 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
  }.property('filter', 'content.@each', 'onlyOverridden'),

  actions: {
+
+    /**
+      Changes the currently active filter
+
+      @method changeFilter
+    **/
+    changeFilter: function() {
+      this.set('filter', this.get('newFilter'));
+    },
+
    /**
      Reset a setting to its default value

--- a/app/assets/javascripts/admin/templates/site_settings.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
@ -5,8 +5,9 @@
    {{i18n admin.site_settings.show_overriden}}
  </label>
  </div>
-  <div class='search controls'>
-    {{textField value=filter placeHolderKey="type_to_filter"}}
+  <div class='controls'>
+    {{textField value=newFilter}}
+    <button class="btn btn-primary" {{action changeFilter}}>{{i18n filter}}</button>
  </div>

 </div>
--- a/app/assets/javascripts/discourse/views/discourse_text_field.js
+++ b/app/assets/javascripts/discourse/views/discourse_text_field.js
@ -10,6 +10,7 @@ Discourse.TextField = Ember.TextField.extend({
  attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus'],

  placeholder: function() {
+
    if( this.get('placeholderKey') ) {
      return I18n.t(this.get('placeholderKey'));
    } else {
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@ -82,7 +82,7 @@ td {border-bottom: 1px solid #ddd; border-top: 1px solid #ddd;}
  @include border-radius-all(5px);
  background-color: darken($white, 5%);
  border: 1px solid darken($white, 10%);
-  padding: 5px 10px 3px 0px;
+  padding: 10px 10px 3px 0px;
  margin-bottom: 20px;
  height: 35px;
  .nav.nav-pills {
@ -102,11 +102,15 @@ td {border-bottom: 1px solid #ddd; border-top: 1px solid #ddd;}
    color: $darkish_gray;
  }
  .controls {
-    padding-top: 3px;
+    margin-left: 10px;
  }
  button {
-    float: left;
    margin-right: 5px;
+    margin-left: 5px;
+  }
+  input[type=text] {
+    display: inline-block;
+    float: left;
  }
  .result-message {
    display: inline-block;
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@ -1063,7 +1063,6 @@ cs:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "zadejte text pro filtrování..."

    admin:
      title: 'Discourse Administrace'
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@ -684,7 +684,6 @@ da:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "type to filter..."

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@ -1050,7 +1050,6 @@ de:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "Tippe etwas ein, um zu filtern..."

    admin:
      title: 'Discourse Administrator'
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@ -1075,7 +1075,7 @@ en:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "type to filter..."
+    filter: "filter"

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@ -794,7 +794,6 @@ es:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "type to filter..."

    admin:
      title: 'Administrador'
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@ -1033,7 +1033,6 @@ fr:
      create_post: "Répondre / Voir"
      readonly: "Voir"
  admin_js:
-    type_to_filter: "Commencez à taper pour filtrer..."
    admin:
      title: 'Administation Discourse'
      moderator: 'Modérateur'
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@ -639,7 +639,6 @@ id:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "type to filter..."

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@ -1002,7 +1002,6 @@ it:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "scrivi per filtrare..."

    admin:
      title: 'Amministrazione Discourse'
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@ -842,7 +842,6 @@ ko:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "필터를 입력하세요"

    admin:
      title: 'Discourse 관리자'
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@ -915,7 +915,6 @@ nb_NO:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "skriv for å filtrere..."

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@ -1015,7 +1015,6 @@ nl:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: typ om te filteren...

    admin:
      title: Discourse Beheer
--- a/config/locales/client.pseudo.yml
+++ b/config/locales/client.pseudo.yml
@ -970,7 +970,6 @@ pseudo:
      ƀřóŵšéř íš ťóó ółď ťó ŵóřǩ óɳ ťĥíš Ďíščóůřšé ƒóřůɱ</á>. Рłéášé <á ĥřéƒ="ĥťťƿ://ƀřóŵšéĥáƿƿý.čóɱ">ůƿǧřáďé
      ýóůř ƀřóŵšéř</á>. ]]'
  admin_js:
-    type_to_filter: '[[ ťýƿé ťó ƒíłťéř... ]]'
    admin:
      title: '[[ Ďíščóůřšé Áďɱíɳ ]]'
      moderator: '[[ Ϻóďéřáťóř ]]'
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@ -603,7 +603,6 @@ pt:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "escreve para filtrar..."

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@ -1070,7 +1070,6 @@ pt_BR:

  # Essa seção é para o javascript para i18n no admin
  admin_js:
-    type_to_filter: "escreva para filtrar..."

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@ -1086,7 +1086,6 @@ ru:
      create_post: 'Отвечать / Просматривать'
      readonly: Просматривать
  admin_js:
-    type_to_filter: 'Введите текст для фильтрации...'
    admin:
      title: 'Discourse Admin'
      moderator: Модератор
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@ -789,7 +789,6 @@ sv:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "skriv för att filtrera..."

    admin:
      title: 'Discourse Admin'
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@ -1073,7 +1073,6 @@ zh_CN:

  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "输入过滤条件……"

    admin:
      title: '论道 管理'
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@ -969,7 +969,6 @@ zh_TW:
      readonly: "觀看"
  # This section is exported to the javascript for i18n in the admin section
  admin_js:
-    type_to_filter: "輸入過濾條件……"

    admin:
      title: '論道 管理'