IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] select-box-kit refactoring

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2017-10-19 12:51:08 -07:00
committed by GitHub
parent a9f718fe57
commit ae1743c61f
157 changed files with 3262 additions and 2404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/components/list-setting.js.es6
View File

@@ -50,5 +50,3 @@ export default Ember.Component.extend({
});
}
});

7
app/assets/javascripts/admin/templates/badges-show.hbs
View File

@@ -26,9 +26,7 @@
{{combo-box name="badge_type_id"
value=buffered.badge_type_id
content=badgeTypes
optionValuePath="content.id"
optionLabelPath="content.name"
disabled=readOnly}}
isDisabled=readOnly}}
</div>
<div>
@@ -36,8 +34,7 @@
{{combo-box name="badge_grouping_id"
value=buffered.badge_grouping_id
content=badgeGroupings
optionValuePath="content.id"
optionLabelPath="content.displayName"}}
nameProperty="name"}}
&nbsp;<button {{action "editGroupings"}} class='btn'>{{d-icon 'pencil'}}</button>
</div>

2
app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
View File

@@ -1,6 +1,6 @@
{{#if editing}}
{{#admin-form-row label="admin.user_fields.type"}}
{{combo-box content=fieldTypes valueAttribute="id" value=buffered.field_type}}
{{combo-box content=fieldTypes value=buffered.field_type}}
{{/admin-form-row}}
{{#admin-form-row label="admin.user_fields.name"}}

2
app/assets/javascripts/admin/templates/components/embeddable-host.hbs
View File

@@ -9,7 +9,7 @@
{{input value=buffered.path_whitelist placeholder="/blog/.*" enter="save" class="path-whitelist"}}
</td>
<td>
{{category-select-box value=categoryId class="small"}}
{{category-chooser value=categoryId class="small"}}
</td>
<td>
{{d-button icon="check" action="save" class="btn-primary" disabled=cantSave}}

10
app/assets/javascripts/admin/templates/customize-themes-show.hbs
View File

@@ -36,8 +36,7 @@
<h3>{{i18n "admin.customize.theme.color_scheme"}}</h3>
<p>{{i18n "admin.customize.theme.color_scheme_select"}}</p>
<p>{{select-box content=colorSchemes
textKey="name"
<p>{{combo-box content=colorSchemes
filterable=true
value=colorSchemeId
icon="paint-brush"}}
@@ -123,11 +122,8 @@
</ul>
{{/unless}}
{{#if selectableChildThemes}}
<p>{{combo-box content=selectableChildThemes
nameProperty="name"
value=selectedChildThemeId
valueAttribute="id"}}
<p>
{{combo-box content=selectableChildThemes value=selectedChildThemeId}}
{{#d-button action="addChildTheme" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
</p>
{{/if}}

2
app/assets/javascripts/admin/templates/groups-bulk.hbs
View File

@@ -6,7 +6,7 @@
</div>
<div class='control'>
{{combo-box content=groups valueAttribute="id" value=groupId none="admin.groups.bulk_select"}}
{{combo-box filterable=true content=groups value=groupId none="admin.groups.bulk_select"}}
</div>
<div class='control'>

2
app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
View File

@@ -30,7 +30,7 @@
{{/if}}
</div>
{{else}}
{{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions nameProperty="name" value=filterActionId none="admin.logs.staff_actions.all"}}
{{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}}
{{/if}}
<div class="pull-right">

1
app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
View File

@@ -2,7 +2,6 @@
{{#d-modal-body title="admin.customize.colors.select_base.title"}}
{{i18n "admin.customize.colors.select_base.description"}}
{{combo-box content=model
nameProperty="name"
value=selectedBaseThemeId
valueAttribute="base_scheme_id"}}
{{/d-modal-body}}

4
app/assets/javascripts/admin/templates/reports.hbs
View File

@@ -4,10 +4,10 @@
{{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
{{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
{{#if showCategoryOptions}}
{{combo-box valueAttribute="value" content=categoryOptions value=categoryId}}
{{combo-box filterable=true valueAttribute="value" content=categoryOptions value=categoryId}}
{{/if}}
{{#if showGroupOptions}}
{{combo-box valueAttribute="value" content=groupOptions value=groupId}}
{{combo-box filterable=true valueAttribute="value" content=groupOptions value=groupId}}
{{/if}}
{{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
{{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}

2
app/assets/javascripts/admin/templates/user-badges.hbs
View File

@@ -16,7 +16,7 @@
<form class="form-horizontal">
<div>
<label>{{i18n 'admin.badges.badge'}}</label>
{{combo-box valueAttribute="id" value=selectedBadgeId content=grantableBadges nameProperty="name"}}
{{combo-box filterable=true value=selectedBadgeId content=grantableBadges}}
</div>
<label>
<label>{{i18n 'admin.badges.reason'}}</label>

3
app/assets/javascripts/admin/templates/user-index.hbs
View File

@@ -1,5 +1,4 @@
<section class="details {{unless model.active 'not-activated'}}">
<div class='user-controls'>
{{#if model.canViewProfile}}
{{#link-to 'user' model class="btn"}}
@@ -379,7 +378,7 @@
<div class='controls'>
{{#if model.customGroups}}
{{i18n 'admin.groups.primary'}}
{{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
{{combo-box content=model.customGroups value=model.primary_group_id none="admin.groups.no_primary"}}
{{/if}}
{{#if primaryGroupDirty}}
{{d-button icon="check" class="ok" action="savePrimaryGroup"}}

2
app/assets/javascripts/admin/templates/web-hooks-show.hbs
View File

@@ -16,8 +16,6 @@
<label for='content-type'>{{i18n 'admin.web_hooks.content_type'}}</label>
{{combo-box content=contentTypes
name="content-type"
nameProperty="name"
valueAttribute="id"
value=model.content_type}}
</div>