Răsfoiți Sursa

HUE-2173 [search] Have pie and bucket widgets use the same dimension snippet

Romain Rigaux 9 ani în urmă
părinte
comite
3fbb7f4
1 a modificat fișierele cu 43 adăugiri și 115 ștergeri
  1. 43 115
      apps/search/src/search/templates/search.mako

+ 43 - 115
apps/search/src/search/templates/search.mako

@@ -480,7 +480,7 @@ ${ dashboard.layout_skeleton() }
       <div class="content">
         <div class="facet-field-cnt">
           <span class="spinedit-cnt">
-            <span class="facet-field-label facet-field-label-fixed-width">${ _('Metric') }</span>
+            <span class="facet-field-label">${ _('Metric') }</span>
             <select data-bind="options: HIT_OPTIONS, optionsText: 'label', optionsValue: 'value', value: aggregate" class="hit-options"></select>
           </span>
         </div>
@@ -528,7 +528,45 @@ ${ dashboard.layout_skeleton() }
       </select>
     </span>
   </div>
-<!-- /ko -->
+  <!-- /ko -->
+
+  <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
+    <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
+      <a data-bind="visible: ko.toJSON(properties.facets_form.field), click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
+        <i class="fa fa-plus"></i> ${ _('Add') }
+      </a>
+      <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0"></select>
+      <div class="clearfix"></div>
+    </div>
+    <div class="content" style="border: 1px dashed #d8d8d8; border-top: none">
+      <div class="facet-field-cnt">
+        <span class="spinedit-cnt">
+          <span class="facet-field-label">
+            ${ _('Metric') }
+          </span>
+          <select data-bind="options: HIT_OPTIONS, optionsText: 'label', optionsValue: 'value', value: properties.facets_form.aggregate" class="hit-options"></select>
+        </span>
+      </div>
+
+      <div class="facet-field-cnt">
+        <span class="spinedit-cnt">
+          <span class="facet-field-label">
+            ${ _('Limit') }
+          </span>
+          <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.limit"/>
+        </span>
+      </div>
+
+      <div class="facet-field-cnt">
+        <span class="spinedit-cnt">
+          <span class="facet-field-label">
+            ${ _('Min Count') }
+          </span>
+          <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.mincount"/>
+        </span>
+      </div>
+    </div>
+  </div>
 </script>
 
 
@@ -1280,79 +1318,8 @@ ${ dashboard.layout_skeleton() }
   <!-- ko if: $root.getFacetFromQuery(id()).has_data() -->
   <div class="row-fluid" data-bind="with: $root.getFacetFromQuery(id())">
     <div data-bind="with: $root.collection.getFacetById($parent.id())">
-      <span data-bind="foreach: properties.facets, visible: !$parents[1].isLoading()">
-        <div class="filter-box">
-          <div class="title">
-            <a data-bind="click: function() { $root.collection.removePivotFacetValue({'pivot_facet': $parent, 'value': $data}); }" class="pull-right" href="javascript:void(0)">
-              <i class="fa fa-times"></i>
-            </a>
-            <div class="hit-title" data-bind="text: field, attr: {'title': field}"></div>
-            <div class="clearfix"></div>
-          </div>
-
-          <div class="content">
-            <div class="facet-field-cnt">
-              <span class="facet-field-label">${ _('Metric') }</span>
-              <select data-bind="options: HIT_OPTIONS, optionsText: 'label', optionsValue: 'value', value: aggregate" class="hit-options"></select>
-            </div>
-
-            <div class="facet-field-cnt" data-bind="visible: $root.isEditing()">
-              <span class="spinedit-cnt">
-                <span class="facet-field-label">
-                  ${ _('Limit') }
-                </span>
-                <input type="text" class="input-medium" data-bind="spinedit: limit"/>
-              </span>
-            </div>
-
-            <div class="facet-field-cnt" data-bind="visible: $root.isEditing()">
-              <span class="spinedit-cnt">
-                <span class="facet-field-label">
-                  ${ _('Min Count') }
-                </span>
-                <input type="text" class="input-medium" data-bind="spinedit: mincount"/>
-              </span>
-            </div>
-          </div>
-        </div>
-      </span>
-      <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
-        <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
-          <a data-bind="visible: ko.toJSON(properties.facets_form.field), click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
-            <i class="fa fa-plus"></i> ${ _('Add') }
-          </a>
-          <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0; height: 20px"></select>
-          <div class="clearfix"></div>
-        </div>
-        <div class="content" style="border: 1px dashed #d8d8d8; border-top: none">
-          <div class="facet-field-cnt">
-            <span class="spinedit-cnt">
-              <span class="facet-field-label">
-                ${ _('Metric') }
-              </span>
-              <select data-bind="options: HIT_OPTIONS, optionsText: 'label', optionsValue: 'value', value: properties.facets_form.aggregate" class="hit-options"></select>
-            </span>
-          </div>
-
-          <div class="facet-field-cnt">
-            <span class="spinedit-cnt">
-              <span class="facet-field-label">
-                ${ _('Limit') }
-              </span>
-              <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.limit"/>
-            </span>
-          </div>
-
-          <div class="facet-field-cnt">
-            <span class="spinedit-cnt">
-              <span class="facet-field-label">
-                ${ _('Min Count') }
-              </span>
-              <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.mincount"/>
-            </span>
-          </div>
-        </div>
-      </div>
+      
+      <span data-bind="template: { name: 'facet-toggle2' }"></span>
 
       <div class="pull-right" style="margin-top: 40px">
 
@@ -1365,7 +1332,6 @@ ${ dashboard.layout_skeleton() }
           </a>
         </div>
 
-
       <!-- ko if: properties.isDate -->
         <div class="inline-block" style="padding-bottom: 10px; padding-right: 20px">
           <span class="facet-field-label">${ _('Chart Type') }</span>
@@ -1521,45 +1487,7 @@ ${ dashboard.layout_skeleton() }
 
   <div class="row-fluid" data-bind="with: $root.getFacetFromQuery(id())">
     <div data-bind="visible: $root.isEditing, with: $root.collection.getFacetById($parent.id())" style="margin-bottom: 20px">
-    <span data-bind="template: { name: 'facet-toggle2' }"></span>
-
-      <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
-        <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
-          <a data-bind="visible: ko.toJSON(properties.facets_form.field), click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
-            <i class="fa fa-plus"></i> ${ _('Add') }
-          </a>
-          <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0; height: 20px"></select>
-          <div class="clearfix"></div>
-        </div>
-        <div class="content" style="border: 1px dashed #d8d8d8; border-top: none">
-          <div class="facet-field-cnt">
-            <span class="spinedit-cnt">
-              <span class="facet-field-label">
-                ${ _('Metric') }
-              </span>
-              <select data-bind="options: HIT_OPTIONS, optionsText: 'label', optionsValue: 'value', value: properties.facets_form.aggregate" class="hit-options"></select>
-            </span>
-          </div>
-
-          <div class="facet-field-cnt">
-            <span class="spinedit-cnt">
-              <span class="facet-field-label">
-                ${ _('Limit') }
-              </span>
-              <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.limit"/>
-            </span>
-          </div>
-
-          <div class="facet-field-cnt">
-            <span class="spinedit-cnt">
-              <span class="facet-field-label">
-                ${ _('Min Count') }
-              </span>
-              <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.mincount"/>
-            </span>
-          </div>
-        </div>
-      </div>
+      <span data-bind="template: { name: 'facet-toggle2' }"></span>
     </div>
 
     <div class="clearfix"></div>