Explorar o código

HUE-6200 [assist] First iteration of improved look and feel for the assistant panel

Johan Ahlen %!s(int64=8) %!d(string=hai) anos
pai
achega
5c523ae

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 18 - 0
desktop/core/src/desktop/static/desktop/less/hue-assist.less

@@ -448,6 +448,7 @@
 }
 }
 
 
 .assist-no-entries {
 .assist-no-entries {
+  color: @cui-gray-600;
   font-style: italic;
   font-style: italic;
 }
 }
 
 
@@ -464,6 +465,11 @@
   position: relative;
   position: relative;
   .flex(0 0 25px);
   .flex(0 0 25px);
   white-space: nowrap;
   white-space: nowrap;
+
+  &.assist-divider {
+    padding-top: 10px;
+    border-top: 1px solid @cui-default-border-color;
+  }
 }
 }
 
 
 .assist-flex-table-search {
 .assist-flex-table-search {
@@ -846,4 +852,16 @@
 
 
 .sql-context-flex-fill.context-sample-container {
 .sql-context-flex-fill.context-sample-container {
   margin: 0;
   margin: 0;
+}
+
+.assist-assistant-panel {
+  left: 0;
+
+  .assist-flex-panel > div {
+    padding-left: 10px;
+  }
+
+  .assist-no-entries {
+    padding: 5px 10px;
+  }
 }
 }

+ 39 - 34
desktop/core/src/desktop/templates/assist.mako

@@ -1721,34 +1721,38 @@ from notebook.conf import get_ordered_interpreters
   </script>
   </script>
 
 
   <script type="text/html" id="assistant-panel-template">
   <script type="text/html" id="assistant-panel-template">
-    <div class="assist-inner-panel">
-      <!-- ko if: statementCount() > 1 -->
-      <div class="assist-inner-header">
-      ${ _('Statement') } <span data-bind="text: activeStatementIndex() + '/' + statementCount()"></span>
-      </div>
-      <br/>
-      <!-- /ko -->
-      <div class="assist-inner-header">
-      ${ _('Tables') }
-      </div>
-      <ul data-bind="foreach: activeTables">
-        <li>
-          ## Click name to select
-          <span data-bind="text: name"></span>
-          <div class="pull-right margin-right-10">
-            <a class="inactive-action" href="javascript:void(0)" data-bind="click: function (data, event) { showContextPopover(data, event, 'left') }">
-              <i class="fa fa-info"></i>
-            </a>
-            <i class="fa fa-fw fa-clock-o muted" title="02/01/2017 10:15 PM"></i>
-          </div>
-        </li>
-      </ul>
+    <div class="assist-inner-panel assist-assistant-panel">
+      <div class="assist-flex-panel">
+        <!-- ko if: statementCount() > 1 -->
+        <div class="assist-flex-header">${ _('Statement') } <span data-bind="text: activeStatementIndex() + '/' + statementCount()"></span></div>
+        <!-- /ko -->
+
+        <div class="assist-flex-header"><div class="assist-inner-header">${ _('Tables') }</div></div>
+        <div class="assist-flex-half">
+          <!-- ko if: activeTables().length === 0 -->
+          <div class="assist-no-entries">${ _('No tables identified.') }</div>
+          <!-- /ko -->
+          <!-- ko if: activeTables().length > 0 -->
+          <ul data-bind="foreach: activeTables">
+            <li>
+              <span data-bind="text: name"></span>
+              <div class="pull-right margin-right-10">
+                <a class="inactive-action" href="javascript:void(0)" data-bind="click: function (data, event) { showContextPopover(data, event, 'left') }"><i class="fa fa-info"></i></a>
+                <i class="fa fa-fw fa-clock-o muted" title="02/01/2017 10:15 PM"></i>
+              </div>
+            </li>
+          </ul>
+          <!-- /ko -->
+        </div>
 
 
-      <form class="form-horizontal">
-        <fieldset>
-          <div>${ _('Suggestions') }</div>
-          <!-- ko if: hasActiveRisks -->
-          <ul data-bind="foreach: activeRisks()['hints']">
+        <!-- ko if: HAS_OPTIMIZER -->
+        <div class="assist-flex-header assist-divider"><div class="assist-inner-header">${ _('Suggestions') }</div></div>
+        <div class="assist-flex-half">
+          <!-- ko if: !activeRisks().hints || activeRisks().hints.length === 0 -->
+          <div class="assist-no-entries">${ _('No optimization hints identified.') }</div>
+          <!-- /ko -->
+          <!-- ko if: activeRisks().hints && activeRisks().hints.lenth > 0 -->
+          <ul data-bind="foreach: activeRisks().hints">
             <li>
             <li>
               <span data-bind="text: risk"></span>
               <span data-bind="text: risk"></span>
               <span data-bind="text: riskAnalysis"></span>
               <span data-bind="text: riskAnalysis"></span>
@@ -1756,16 +1760,17 @@ from notebook.conf import get_ordered_interpreters
             </li>
             </li>
           </ul>
           </ul>
           <!-- /ko -->
           <!-- /ko -->
-        </fieldset>
-      </form>
+        </div>
 
 
-      <!-- ko if: HAS_OPTIMIZER -->
         <!-- ko if: hasActiveRisks() && activeRisks()['noDDL'].length > 0 -->
         <!-- ko if: hasActiveRisks() && activeRisks()['noDDL'].length > 0 -->
-        <a href="javascript:void(0)" data-bind="visible: activeTables().length > 0, click: function() { huePubSub.publish('editor.table.stats.upload', activeTables()); }" title="${ _('Load table and columns DDL/stats in order to improve recommendations') }">
-          <i class="fa fa-fw fa-gears"></i> ${_('Optimize Analysis')}
-        </a>
+        <div class="assist-flex-fill">
+          <a href="javascript:void(0)" data-bind="visible: activeTables().length > 0, click: function() { huePubSub.publish('editor.table.stats.upload', activeTables()); }" title="${ _('Load table and columns DDL/stats in order to improve recommendations') }">
+            <i class="fa fa-fw fa-gears"></i> ${_('Optimize Analysis')}
+          </a>
+        </div>
         <!-- /ko -->
         <!-- /ko -->
-      <!-- /ko -->
+        <!-- /ko -->
+      </div>
     </div>
     </div>
   </script>
   </script>
 
 

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio