mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 17:46:05 -05:00
Replace slow auto-filter in site settings with a filter button
This commit is contained in:
Robin Ward
parent
caeb91a55f
commit
bb135fafb4
22 changed files with 25 additions and 26 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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 관리자'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -970,7 +970,6 @@ pseudo:
|
|||
ƀřóŵšéř íš ťóó ółď ťó ŵóřǩ óɳ ťĥíš Ďíščóůřšé ƒóřůɱ</á>. Рłéášé <á ĥřéƒ="ĥťťƿ://ƀřóŵšéĥáƿƿý.čóɱ">ůƿǧřáďé
|
||||
ýóůř ƀřóŵšéř</á>. ]]'
|
||||
admin_js:
|
||||
type_to_filter: '[[ ťýƿé ťó ƒíłťéř... ]]'
|
||||
admin:
|
||||
title: '[[ Ďíščóůřšé Áďɱíɳ ]]'
|
||||
moderator: '[[ Ϻóďéřáťóř ]]'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -1086,7 +1086,6 @@ ru:
|
|||
create_post: 'Отвечать / Просматривать'
|
||||
readonly: Просматривать
|
||||
admin_js:
|
||||
type_to_filter: 'Введите текст для фильтрации...'
|
||||
admin:
|
||||
title: 'Discourse Admin'
|
||||
moderator: Модератор
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ zh_CN:
|
|||
moderator: "{{user}} 是版主"
|
||||
admin: "{{user}} 是管理员"
|
||||
deleted: "（已删除）"
|
||||
|
||||
|
||||
messages:
|
||||
all: "所有"
|
||||
mine: "我的"
|
||||
|
|
@ -535,7 +535,7 @@ zh_CN:
|
|||
remote_tip_with_attachments: "输入图片或文件的网址，格式为：http://example.com/file.ext （支持的格式： {{authorized_extensions}}）。"
|
||||
local_tip: "点击从你的设备中选择一张图片。"
|
||||
local_tip_with_attachments: "点击从你的设备中选择图片或文件（支持的格式： {{authorized_extensions}}）。"
|
||||
hint: "（你也可以通过拖放至编辑器的方式来上传）"
|
||||
hint: "（你也可以通过拖放至编辑器的方式来上传）"
|
||||
hint_for_chrome: "（你也可以通过拖放或复制粘帖至编辑器的方式来上传）"
|
||||
uploading: "上传图片中"
|
||||
|
||||
|
|
@ -597,7 +597,7 @@ zh_CN:
|
|||
other: '{{count}}个新主题'
|
||||
unread_topics:
|
||||
one: '1个未读主题'
|
||||
other: '{{count}}个未读主题'
|
||||
other: '{{count}}个未读主题'
|
||||
title: '主题'
|
||||
loading_more: "载入更多主题中……"
|
||||
loading: '载入主题中……'
|
||||
|
|
@ -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: '论道 管理'
|
||||
|
|
|
|||
|
|
@ -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: '論道 管理'
|
||||
|
|
|
|||
Loading…
Reference in a new issue