Browse Source

HUE-7731 [core] Move new and document list to top menu

Based on usage, new and list of collections are usually more used than editor properties.
Romain Rigaux 8 năm trước cách đây
mục cha
commit
24281e5

+ 11 - 11
apps/oozie/src/oozie/templates/editor2/bundle_editor.mako

@@ -53,17 +53,6 @@ ${ commonheader(_("Bundle Editor"), "Oozie", user, request) | n,unicode }
         <i class="fa fa-fw fa-ellipsis-v"></i>
       </a>
       <ul class="dropdown-menu">
-        <li data-bind="visible: canEdit">
-          <a class="pointer" data-toggle="modal" data-target="#settingsModal">
-            <i class="fa fa-fw fa-cog"></i> ${ _('Settings') }
-          </a>
-        </li>
-        <li data-bind="visible: bundle.id() != null && canEdit()">
-          <a class="pointer share-link" rel="tooltip" data-placement="bottom" data-bind="click: openShareModal, css: {'isShared': isShared()}">
-            <i class="fa fa-fw fa-users"></i> ${ _("Share") }
-          </a>
-        </li>
-        <li class="divider"></li>
         <li>
           <a href="javascript: void(0)" data-bind="hueLink: '${ url('oozie:new_bundle') }'">
             <i class="fa fa-fw fa-file-o"></i> ${ _('New') }
@@ -76,6 +65,17 @@ ${ commonheader(_("Bundle Editor"), "Oozie", user, request) | n,unicode }
             </a>
           </li>
         %endif
+        <li class="divider"></li>
+        <li data-bind="visible: canEdit">
+          <a class="pointer" data-toggle="modal" data-target="#settingsModal">
+            <i class="fa fa-fw fa-cog"></i> ${ _('Settings') }
+          </a>
+        </li>
+        <li data-bind="visible: bundle.id() != null && canEdit()">
+          <a class="pointer share-link" rel="tooltip" data-placement="bottom" data-bind="click: openShareModal, css: {'isShared': isShared()}">
+            <i class="fa fa-fw fa-users"></i> ${ _("Share") }
+          </a>
+        </li>
       </ul>
     </div>
   </div>

+ 11 - 11
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -55,17 +55,6 @@ ${ commonheader(_("Coordinator Editor"), "Oozie", user, request) | n,unicode }
         <i class="fa fa-fw fa-ellipsis-v"></i>
       </a>
       <ul class="dropdown-menu">
-        <li data-bind="visible: canEdit">
-          <a class="pointer" data-toggle="modal" data-target="#settingsModal">
-            <i class="fa fa-fw fa-cog"></i> ${ _('Settings') }
-          </a>
-        </li>
-        <li data-bind="visible: coordinator.id() != null && canEdit()">
-          <a class="pointer share-link" rel="tooltip" data-placement="bottom" data-bind="click: openShareModal, css: {'isShared': isShared()}">
-            <i class="fa fa-fw fa-users"></i> ${ _("Share") }
-          </a>
-        </li>
-        <li class="divider"></li>
         <li>
           <a href="javascript: void(0)" data-bind="hueLink: '${ url('oozie:new_coordinator') }'">
             <i class="fa fa-fw fa-file-o"></i> ${ _('New') }
@@ -78,6 +67,17 @@ ${ commonheader(_("Coordinator Editor"), "Oozie", user, request) | n,unicode }
             </a>
           </li>
         %endif
+        <li class="divider"></li>
+        <li data-bind="visible: canEdit">
+          <a class="pointer" data-toggle="modal" data-target="#settingsModal">
+            <i class="fa fa-fw fa-cog"></i> ${ _('Settings') }
+          </a>
+        </li>
+        <li data-bind="visible: coordinator.id() != null && canEdit()">
+          <a class="pointer share-link" rel="tooltip" data-placement="bottom" data-bind="click: openShareModal, css: {'isShared': isShared()}">
+            <i class="fa fa-fw fa-users"></i> ${ _("Share") }
+          </a>
+        </li>
       </ul>
     </div>
 

+ 13 - 13
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -57,6 +57,19 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, request, "40px") | n,unicod
         <i class="fa fa-fw fa-ellipsis-v"></i>
       </a>
       <ul class="dropdown-menu">
+        <li>
+          <a href="javascript: void(0)" data-bind="hueLink: '${ url('oozie:new_workflow') }'">
+            <i class="fa fa-fw fa-file-o"></i> ${ _('New') }
+          </a>
+        </li>
+        %if is_embeddable:
+          <li>
+            <a href="javascript: void(0)" data-bind="hueLink: '/home/?type=oozie-workflow2'">
+              <svg class="hi hi-fw hi-bigger"><use xlink:href="#hi-documents"></use></svg> ${ _('Workflows') }
+            </a>
+          </li>
+        %endif
+        <li class="divider"></li>
         <li data-bind="visible: workflow.id() != null, css: {'disabled': workflow.isDirty()}">
           <a class="pointer" data-bind="click: schedule">
             <i class="fa fa-fw fa-calendar"></i> ${ _('Schedule') }
@@ -80,19 +93,6 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, request, "40px") | n,unicod
             <i class="fa fa-fw fa-users"></i> ${ _("Share") }
           </a>
         </li>
-        <li class="divider"></li>
-        <li>
-          <a href="javascript: void(0)" data-bind="hueLink: '${ url('oozie:new_workflow') }'">
-            <i class="fa fa-fw fa-file-o"></i> ${ _('New') }
-          </a>
-        </li>
-        %if is_embeddable:
-          <li>
-            <a href="javascript: void(0)" data-bind="hueLink: '/home/?type=oozie-workflow2'">
-              <svg class="hi hi-fw hi-bigger"><use xlink:href="#hi-documents"></use></svg> ${ _('Workflows') }
-            </a>
-          </li>
-        %endif
       </ul>
     </div>
 

+ 20 - 20
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -152,6 +152,26 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED
           <i class="fa fa-fw fa-ellipsis-v"></i>
         </a>
         <ul class="dropdown-menu">
+          <li>
+            <a href="javascript:void(0)" data-bind="click: newSearch">
+              <i class="fa fa-fw fa-file-o"></i> ${ _('New') }
+            </a>
+          </li>
+          <!-- ko if: IS_HUE_4 -->
+          <li>
+            <a href="/home/?type=search-dashboard">
+              <svg class="hi hi-fw hi-bigger"><use xlink:href="#hi-documents"></use></svg> ${ _('Dashboards') }
+            </a>
+          </li>
+          <!-- /ko -->
+          <!-- ko ifnot: IS_HUE_4 -->
+          <li>
+            <a href="${ url('dashboard:admin_collections') }">
+              <svg class="hi hi-fw hi-bigger"><use xlink:href="#hi-documents"></use></svg> ${ _('Dashboards') }
+            </a>
+          </li>
+          <!-- /ko -->
+          <li data-bind="visible: columns().length != 0" class="divider"></li>
           <li data-bind="visible: isSaved()">
             <a class="share-link" data-bind="click: prepareShareModal, css: {'isShared': isShared()}">
               <i class="fa fa-fw fa-users"></i> ${ _('Share') }
@@ -175,26 +195,6 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED
               <i class="fa fa-fw fa-bookmark-o"></i> ${ _('Saved Queries') }
             </a>
           </li>
-          <li data-bind="visible: columns().length != 0" class="divider"></li>
-          <li>
-            <a href="javascript:void(0)" data-bind="click: newSearch">
-              <i class="fa fa-fw fa-file-o"></i> ${ _('New') }
-            </a>
-          </li>
-          <!-- ko if: IS_HUE_4 -->
-          <li>
-            <a href="/home/?type=search-dashboard">
-              <svg class="hi hi-fw hi-bigger"><use xlink:href="#hi-documents"></use></svg> ${ _('Dashboards') }
-            </a>
-          </li>
-          <!-- /ko -->
-          <!-- ko ifnot: IS_HUE_4 -->
-          <li>
-            <a href="${ url('dashboard:admin_collections') }">
-              <svg class="hi hi-fw hi-bigger"><use xlink:href="#hi-documents"></use></svg> ${ _('Dashboards') }
-            </a>
-          </li>
-          <!-- /ko -->
         </ul>
       </div>
     </div>

+ 14 - 14
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -196,20 +196,6 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
             <i class="fa fa-fw fa-ellipsis-v"></i>
           </a>
           <ul class="dropdown-menu">
-            <!-- ko if: $root.canSave -->
-            <li>
-              <a class="share-link" data-bind="click: prepareShareModal,
-                css: {'isShared': isShared()}">
-                <i class="fa fa-fw fa-users"></i> ${ _('Share') }
-              </a>
-            </li>
-            <!-- /ko -->
-            <li>
-              <a class="pointer" data-bind="css: {'active': $root.isContextPanelVisible }, click: function() { $root.isContextPanelVisible(!$root.isContextPanelVisible()); }">
-                <i class="fa fa-fw fa-cogs"></i> ${ _('Session') }
-              </a>
-            </li>
-            <li class="divider"></li>
             <li>
             <!-- ko if: editorMode -->
               <a href="javascript:void(0)" data-bind="click: function() { newNotebook($root.editorType(), null, selectedNotebook() ? $root.selectedNotebook().snippets()[0].currentQueryTab() : null); }, attr: { 'title': '${ _('New ') }' +  editorTypeTitle() + '${ _(' Query') }' }">
@@ -234,6 +220,20 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
               </a>
               <!-- /ko -->
             </li>
+            <li class="divider"></li>
+            <!-- ko if: $root.canSave -->
+            <li>
+              <a class="share-link" data-bind="click: prepareShareModal,
+                css: {'isShared': isShared()}">
+                <i class="fa fa-fw fa-users"></i> ${ _('Share') }
+              </a>
+            </li>
+            <!-- /ko -->
+            <li>
+              <a class="pointer" data-bind="css: {'active': $root.isContextPanelVisible }, click: function() { $root.isContextPanelVisible(!$root.isContextPanelVisible()); }">
+                <i class="fa fa-fw fa-cogs"></i> ${ _('Session') }
+              </a>
+            </li>
           </ul>
         </div>
       </div>