FEATURE: show a paintbrush for color schemes

2017-04-19 11:06:06 -04:00
parent 8052218f61
commit c76d780675
4 changed files with 19 additions and 4 deletions
@@ -1,11 +1,10 @@
-<div class='content-list span6'>
+<div class='content-list span6 color-schemes'>
  <h3>{{i18n 'admin.customize.colors.long_title'}}</h3>
  <ul>
    {{#each model as |scheme|}}
      {{#unless scheme.is_base}}
-
      <li>
-        {{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{scheme.description}}{{/link-to}}
+        {{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{fa-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
      </li>
      {{/unless}}
    {{/each}}
@@ -39,6 +39,7 @@
  <p>{{combo-box content=colorSchemes
                 nameProperty="name"
                 value=colorSchemeId
+                 selectionIcon="paint-brush"
                 valueAttribute="id"}}
     {{#if colorSchemeChanged}}
        {{d-button action="changeScheme" class="btn-primary btn-small submit-edit" icon="check"}}
@@ -90,8 +90,17 @@ export default Ember.Component.extend(bufferedRender({
    const $elem = this.$();
    const caps = this.capabilities;
    const minimumResultsForSearch = (caps && caps.isIOS) ? -1 : 5;
+    if (!this.get("selectionTemplate") && this.get("selectionIcon")) {
+      this.selectionTemplate = (item) => {
+        let name = Em.get(item, 'text');
+        name = Handlebars.escapeExpression(name);
+        return `<i class='fa fa-${this.get("selectionIcon")}'></i>${name}`;
+      };
+    }
    $elem.select2({
-      formatResult: this.comboTemplate, minimumResultsForSearch,
+      formatResult: this.comboTemplate,
+      formatSelection: this.selectionTemplate,
+      minimumResultsForSearch,
      width: this.get('width') || 'resolve',
      allowClear: true
    });