mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Replace slow auto-filter in site settings with a filter button
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user