Explorar o código

HUE-5853 [frontend] Route the oozie document lists to Home

Enrico Berti %!s(int64=8) %!d(string=hai) anos
pai
achega
bc3cc0f

+ 5 - 22
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -62,11 +62,12 @@
                 % if dashboard:
                 <a title="${ _('Switch to the editor') }" href="${getURL(section, dashboard, ENABLE_V2.get())}">
                   <img src="${ static('oozie/art/icon_oozie_dashboard_48.png') }" class="app-icon" alt="${ _('Oozie dashboard icon') }" /> ${ _('Oozie Dashboard') }
+                </a>
                 % else:
                 <a title="${ _('Switch to the dashboard') }" href="${getURL(section, dashboard, ENABLE_V2.get())}">
                   <svg class="svg-app-icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#hi-oozie"></use></svg> ${ _('Oozie Editor') }
-                % endif
                 </a>
+                % endif
                </li>
               % if dashboard:
                 <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_oozie_workflows')}">${ _('Workflows') }</a></li>
@@ -77,31 +78,13 @@
               % else:
                 % if is_editor:
                   <li class="${utils.is_selected(section, 'workflows')}">
-                    % if is_embeddable:
-                    <a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/workflow/new/') }">
-                    % else:
-                    <a href="${url('oozie:list_editor_workflows')}">
-                    % endif
-                      ${ _('Workflows') }
-                    </a>
+                    <a href="${url('oozie:list_editor_workflows')}">${ _('Workflows') }</a>
                   </li>
                   <li class="${utils.is_selected(section, 'coordinators')}">
-                    % if is_embeddable:
-                    <a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/coordinator/new/') }">
-                    % else:
-                    <a href="${url('oozie:list_editor_coordinators')}">
-                    % endif
-                      ${ _('Coordinators') }
-                    </a>
+                    <a href="${url('oozie:list_editor_coordinators')}">${ _('Coordinators') }</a>
                   </li>
                   <li class="${utils.is_selected(section, 'bundles')}">
-                    % if is_embeddable:
-                    <a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/bundle/new/') }">
-                    % else:
-                    <a href="${url('oozie:list_editor_bundles')}">
-                    % endif
-                      ${ _('Bundles') }
-                    </a>
+                    <a href="${url('oozie:list_editor_bundles')}">${ _('Bundles') }</a>
                   </li>
                 % else:
                   <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_workflows')}">${ _('Workflows') }</a></li>

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


+ 1 - 0
desktop/core/src/desktop/static/desktop/less/hue-cui-overrides.less

@@ -20,6 +20,7 @@
   border: none;
   margin-left: 0;
   margin-right: 0;
+  padding-top: 0;
 }
 
 .navbar .navbar-inner {

+ 9 - 0
desktop/core/src/desktop/templates/hue.mako

@@ -780,8 +780,17 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           { url: '/notebook/notebooks', app: function (ctx) {
             page('/home?' + ctx.querystring);
           }},
+          { url: '/oozie/editor/bundle/list', app: function (ctx) {
+            page('/home?type=oozie-bundle');
+          }},
           { url: '/oozie/editor/bundle/*', app: 'oozie_bundle' },
+          { url: '/oozie/editor/coordinator/list', app: function (ctx) {
+            page('/home?type=oozie-coordinator');
+          }},
           { url: '/oozie/editor/coordinator/*', app: 'oozie_coordinator' },
+          { url: '/oozie/editor/workflow/list', app: function (ctx) {
+            page('/home?type=oozie-workflow');
+          }},
           { url: '/oozie/editor/workflow/*', app: 'oozie_workflow' },
           { url: '/pig', app: function () {
             self.loadApp('editor');

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