Selaa lähdekoodia

HUE-8758 [connectors] Make top filters and search fixed

Romain Rigaux 6 vuotta sitten
vanhempi
commit
0b900c0ba2

+ 1 - 1
apps/about/src/about/templates/admin_wizard.mako

@@ -79,7 +79,7 @@ ${ layout.menubar(section='quick_start') }
             % else:
               <a href="${ url('desktop.views.dump_config') }" target="_blank">${ _('Configuration') }</a>
               <br>
-              <a href="http://gethue.com" target="_blank"> ${ _('Documentation') }</a>
+              <a href="http://cloudera.github.io/hue/latest/administrator/configuration/" target="_blank">${ _('Documentation') }</a>
             % endif
           </div>
 

+ 46 - 44
desktop/core/src/desktop/templates/connectors.mako

@@ -223,80 +223,82 @@ ${layout.menubar(section='connectors')}
 
 <script type="text/html" id="add-connector-page">
   <div class="card card-small margin-top-10">
-    ##<div data-bind="dockable: { scrollable: ${ MAIN_SCROLLABLE }, jumpCorrection: 0, topSnap: '${ TOP_SNAP }', triggerAdjust: 0 }">
 
     <div class="card-body clearfix">
+
       <div class="span2">
-        <ul class="nav nav-pills nav-stacked">
-          <li data-bind="css: { 'active': $root.selectedConnectorCategory() === 'All' }">
-            <a href="javascript:void(0)" data-bind="text: 'All', click: function(){ $root.selectedConnectorCategory('All') }"></a>
-          </li>
-          <!-- ko foreach: connectors() -->
-          <li data-bind="css: { 'active': $root.selectedConnectorCategory() === category }">
-            <a href="javascript:void(0)" data-bind="text: category, click: function(){ $root.selectedConnectorCategory(category) }"></a>
-          </li>
-          <!-- /ko -->
-        </ul>
+        <div data-bind="dockable: { scrollable: ${ MAIN_SCROLLABLE }, jumpCorrection: 0, topSnap: '${ TOP_SNAP }', triggerAdjust: 0 }">
+          <ul class="nav nav-pills nav-stacked">
+            <li data-bind="css: { 'active': $root.selectedConnectorCategory() === 'All' }">
+              <a href="javascript:void(0)" data-bind="text: 'All', click: function(){ $root.selectedConnectorCategory('All') }"></a>
+            </li>
+            <!-- ko foreach: connectors() -->
+            <li data-bind="css: { 'active': $root.selectedConnectorCategory() === category }">
+              <a href="javascript:void(0)" data-bind="text: category, click: function(){ $root.selectedConnectorCategory(category) }"></a>
+            </li>
+            <!-- /ko -->
+          </ul>
+        </div>
       </div>
 
+
       <div class="span10">
+        <div data-bind="dockable: { scrollable: ${ MAIN_SCROLLABLE }, jumpCorrection: 0, topSnap: '${ TOP_SNAP }', triggerAdjust: 0 }">
           <span class="pull-right">
             <a href="http://gethue.com" target="_blank">
               <i class="fa fa-question-circle"></i> ${ _('Help') }
             </a>
           </span>
-
           <input type="text" data-bind="clearable: connectorsFilter, valueUpdate: 'afterkeydown'"
               class="input-xlarge pull-right margin-bottom-10" placeholder="${ _('Filter...') }">
+        </div>
 
-          <div class="margin-top-10">
-            <div data-bind="foreach: filteredConnectors()">
-              <h4 data-bind="text: category"></h4>
-              <table class="table table-condensed">
-                <thead>
-                  <tr>
-                    <th width="30%">${ _('Name') }</th>
-                    <th>${ _('Description') }</th>
-                  </tr>
-                </thead>
-                <!-- ko if: $data.values -->
-                <tbody data-bind="foreach: values">
-                  <tr data-bind="click: function() { $root.newConnector(type); }">
-                    <td data-bind="text: name"></td>
-                    <td data-bind="text: description"></td>
-                  </tr>
-                </tbody>
-                <!-- /ko -->
-                <!-- ko ifnot: $data.values -->
-                <tfoot>
-                  <tr>
-                    <td colspan="2">${ _('There are no connectors matching your filter') }</td>
-                  </tr>
-                </tfoot>
-                <!-- /ko -->
-              </table>
-            </div>
-
-            <!-- ko if: filteredConnectors().length == 0 -->
+        <div class="margin-top-10">
+          <div data-bind="foreach: filteredConnectors()">
+            <h4 data-bind="text: category"></h4>
             <table class="table table-condensed">
               <thead>
                 <tr>
                   <th width="30%">${ _('Name') }</th>
-                  <th>${ _('Instances') }</th>
+                  <th>${ _('Description') }</th>
                 </tr>
               </thead>
+              <!-- ko if: $data.values -->
+              <tbody data-bind="foreach: values">
+                <tr data-bind="click: function() { $root.newConnector(type); }">
+                  <td data-bind="text: name"></td>
+                  <td data-bind="text: description"></td>
+                </tr>
+              </tbody>
+              <!-- /ko -->
+              <!-- ko ifnot: $data.values -->
               <tfoot>
                 <tr>
                   <td colspan="2">${ _('There are no connectors matching your filter') }</td>
                 </tr>
               </tfoot>
+              <!-- /ko -->
             </table>
-            <!-- /ko -->
           </div>
+
+          <!-- ko if: filteredConnectors().length == 0 -->
+          <table class="table table-condensed">
+            <thead>
+              <tr>
+                <th width="30%">${ _('Name') }</th>
+                <th>${ _('Instances') }</th>
+              </tr>
+            </thead>
+            <tfoot>
+              <tr>
+                <td colspan="2">${ _('There are no connectors matching your filter') }</td>
+              </tr>
+            </tfoot>
+          </table>
+          <!-- /ko -->
         </div>
       </div>
     </div>
-    ## </div>
 
   </div>
 </script>