瀏覽代碼

HUE-8071 [dashboard] Rename widget bar to promote analytics functions

Hide tree widget until it is ready.
Romain Rigaux 7 年之前
父節點
當前提交
6d0acc1c56

+ 3 - 0
desktop/conf.dist/hue.ini

@@ -883,6 +883,9 @@
   # Activate the widget filter and comparison (beta).
   # Activate the widget filter and comparison (beta).
   ## has_widget_filter=false
   ## has_widget_filter=false
 
 
+  # Activate the tree widget (to drill down fields as dimensions, alpha).
+  ## has_tree_widget=false
+
   [[engines]]
   [[engines]]
 
 
     #  [[[solr]]]
     #  [[[solr]]]

+ 3 - 0
desktop/conf/pseudo-distributed.ini.tmpl

@@ -885,6 +885,9 @@
   # Activate the widget filter and comparison (beta).
   # Activate the widget filter and comparison (beta).
   ## has_widget_filter=false
   ## has_widget_filter=false
 
 
+  # Activate the tree widget (to drill down fields as dimensions, alpha).
+  ## has_tree_widget=false
+
   [[engines]]
   [[engines]]
 
 
     #  [[[solr]]]
     #  [[[solr]]]

+ 2 - 2
desktop/core/src/desktop/templates/common_dashboard.mako

@@ -85,7 +85,7 @@
   <div data-bind="dockable: { scrollable: '.page-content', jumpCorrection: 50, topSnap: '${ conf.CUSTOM.BANNER_TOP_HTML.get() and "78px" or "50px" }', triggerAdjust: 0 }">
   <div data-bind="dockable: { scrollable: '.page-content', jumpCorrection: 50, topSnap: '${ conf.CUSTOM.BANNER_TOP_HTML.get() and "78px" or "50px" }', triggerAdjust: 0 }">
     %if hasattr(caller, "results"):
     %if hasattr(caller, "results"):
     <div style="float: left; margin-left: 20px">
     <div style="float: left; margin-left: 20px">
-      <div class="toolbar-label">${_('RESULTS')}</div>
+      <div class="toolbar-label">${_('DISPLAY')}</div>
       ${caller.results()}
       ${caller.results()}
     </div>
     </div>
     %endif
     %endif
@@ -95,7 +95,7 @@
       %if hasattr(caller, "widgetSectionName"):
       %if hasattr(caller, "widgetSectionName"):
         <div class="toolbar-label">${caller.widgetSectionName()}</div>
         <div class="toolbar-label">${caller.widgetSectionName()}</div>
       %else:
       %else:
-        <div class="toolbar-label margin-left-20">${_('WIDGETS')}</div>
+        <div class="toolbar-label margin-left-20">${_('ANALYTICS')}</div>
       %endif
       %endif
       ${caller.widgets()}
       ${caller.widgets()}
     </div>
     </div>

+ 8 - 0
desktop/libs/dashboard/src/dashboard/conf.py

@@ -72,6 +72,14 @@ HAS_WIDGET_FILTER = Config(
   type=coerce_bool
   type=coerce_bool
 )
 )
 
 
+HAS_TREE_WIDGET = Config(
+  key="has_tree_widget",
+  help=_t("Activate the tree widget (to drill down fields as dimensions, alpha)."),
+  default=False,
+  type=coerce_bool
+)
+
+
 def get_properties():
 def get_properties():
   if ENGINES.get():
   if ENGINES.get():
     engines = ENGINES.get()
     engines = ENGINES.get()

+ 7 - 6
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _
 from desktop import conf
 from desktop import conf
 from desktop.views import commonheader, commonfooter, _ko, commonshare
 from desktop.views import commonheader, commonfooter, _ko, commonshare
 
 
-from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
+from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER, HAS_TREE_WIDGET
 %>
 %>
 
 
 <%namespace name="dashboard" file="common_dashboard.mako" />
 <%namespace name="dashboard" file="common_dashboard.mako" />
@@ -264,7 +264,9 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
              <i class="fa fa-map-marker"></i>
              <i class="fa fa-map-marker"></i>
          </a>
          </a>
     </div>
     </div>
+      </%def>
 
 
+      <%def name="widgets()">
     <div data-bind="visible: $root.collection.supportAnalytics,
     <div data-bind="visible: $root.collection.supportAnalytics,
                     css: { 'draggable-widget': true, 'disabled': !hasAvailableFields() },
                     css: { 'draggable-widget': true, 'disabled': !hasAvailableFields() },
                     draggable: {data: draggableCounter(), isEnabled: hasAvailableFields,
                     draggable: {data: draggableCounter(), isEnabled: hasAvailableFields,
@@ -274,9 +276,6 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
                        <i class="fa fa-superscript" style="font-size: 110%"></i>
                        <i class="fa fa-superscript" style="font-size: 110%"></i>
          </a>
          </a>
     </div>
     </div>
-      </%def>
-
-      <%def name="widgets()">
     <div data-bind="visible: ! $root.collection.supportAnalytics(), css: { 'draggable-widget': true, 'disabled': !availableDraggableChart() },
     <div data-bind="visible: ! $root.collection.supportAnalytics(), css: { 'draggable-widget': true, 'disabled': !availableDraggableChart() },
                     draggable: {data: draggableFacet(), isEnabled: availableDraggableChart,
                     draggable: {data: draggableFacet(), isEnabled: availableDraggableChart,
                     options: getDraggableOptions({ data: draggableFacet() }) }"
                     options: getDraggableOptions({ data: draggableFacet() }) }"
@@ -288,7 +287,7 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
     <div data-bind="visible: $root.collection.supportAnalytics(), css: { 'draggable-widget': true, 'disabled': !availableDraggableChart() },
     <div data-bind="visible: $root.collection.supportAnalytics(), css: { 'draggable-widget': true, 'disabled': !availableDraggableChart() },
                     draggable: {data: draggableTextFacet(), isEnabled: availableDraggableChart,
                     draggable: {data: draggableTextFacet(), isEnabled: availableDraggableChart,
                     options: getDraggableOptions({ data: draggableTextFacet() }) }"
                     options: getDraggableOptions({ data: draggableTextFacet() }) }"
-         title="${_('Text Facet')}" rel="tooltip" data-placement="top">
+         title="${_('Value List')}" rel="tooltip" data-placement="top">
          <a data-bind="style: { cursor: $root.availableDraggableChart() ? 'move' : 'default' }">
          <a data-bind="style: { cursor: $root.availableDraggableChart() ? 'move' : 'default' }">
                        <i class="fa fa-sort-amount-asc"></i>
                        <i class="fa fa-sort-amount-asc"></i>
          </a>
          </a>
@@ -322,7 +321,7 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
                     css: { 'draggable-widget': true, 'disabled': ! availableDraggableChart() },
                     css: { 'draggable-widget': true, 'disabled': ! availableDraggableChart() },
                     draggable: {data: draggableBucket(), isEnabled: availableDraggableChart,
                     draggable: {data: draggableBucket(), isEnabled: availableDraggableChart,
                     options: getDraggableOptions({ data: draggableBucket() }) }"
                     options: getDraggableOptions({ data: draggableBucket() }) }"
-         title="${_('Chart')}" rel="tooltip" data-placement="top">
+         title="${_('Bar Chart')}" rel="tooltip" data-placement="top">
          <a data-bind="style: { cursor: $root.availableDraggableChart() ? 'move' : 'default' }">
          <a data-bind="style: { cursor: $root.availableDraggableChart() ? 'move' : 'default' }">
                        <i class="fa fa-bar-chart"></i>
                        <i class="fa fa-bar-chart"></i>
          </a>
          </a>
@@ -344,6 +343,7 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
                        <i class="fa fa-sitemap fa-rotate-270"></i>
                        <i class="fa fa-sitemap fa-rotate-270"></i>
          </a>
          </a>
     </div>
     </div>
+    % if HAS_TREE_WIDGET.get():
     <div data-bind="visible: $root.collection.supportAnalytics(), css: { 'draggable-widget': true, 'disabled': false },
     <div data-bind="visible: $root.collection.supportAnalytics(), css: { 'draggable-widget': true, 'disabled': false },
                     draggable: {data: draggableTree2(), isEnabled: true,
                     draggable: {data: draggableTree2(), isEnabled: true,
                     options: getDraggableOptions({ data: draggableTree2() }) }"
                     options: getDraggableOptions({ data: draggableTree2() }) }"
@@ -352,6 +352,7 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED, HAS_WIDGET_FILTER
                        <i class="fa fa-sitemap fa-rotate-270"></i>
                        <i class="fa fa-sitemap fa-rotate-270"></i>
          </a>
          </a>
     </div>
     </div>
+    % endif
     <div data-bind="visible: ! $root.collection.supportAnalytics(),
     <div data-bind="visible: ! $root.collection.supportAnalytics(),
                     css: { 'draggable-widget': true, 'disabled': false },
                     css: { 'draggable-widget': true, 'disabled': false },
                     draggable: {data: draggableHeatmap(), isEnabled: true,
                     draggable: {data: draggableHeatmap(), isEnabled: true,