浏览代码

HUE-8330 [core] Move app switcher to the right

Note: the icon disappear on mouse over currently
Romain Rigaux 7 年之前
父节点
当前提交
675807e6d3

+ 1 - 0
desktop/core/src/desktop/static/desktop/ext/css/cui/cui.css

@@ -197,6 +197,7 @@
   background-color: #0B7FAD;
   color: white;
 }
+*/
 .cui-card {
   border: 1px solid #DCDCDC;
   padding: 19px 23px 19px 23px;

+ 7 - 7
desktop/core/src/desktop/templates/hue.mako

@@ -170,13 +170,9 @@ ${ hueIcons.symbols() }
     <div class="navbar-inner top-nav">
       <div class="top-nav-left">
         % if not IS_EMBEDDED.get():
-        % if IS_MULTICLUSTER_ONLY.get():
-          <!-- ko component: { name: 'hue-app-switcher', params: { onPrem: ko.observable(false) } } --><!-- /ko -->
-        % else:
-          <a class="hamburger hamburger-hue pull-left" data-bind="toggle: leftNavVisible, css: { 'is-active': leftNavVisible }">
-            <span class="hamburger-box"><span class="hamburger-inner"></span></span>
-          </a>
-        % endif
+        <a class="hamburger hamburger-hue pull-left" data-bind="toggle: leftNavVisible, css: { 'is-active': leftNavVisible }">
+          <span class="hamburger-box"><span class="hamburger-inner"></span></span>
+        </a>
 
         <a class="brand" data-bind="hueLink: '/home/'" href="javascript: void(0);" title="${_('Documents')}">
           % if IS_MULTICLUSTER_ONLY.get():
@@ -238,6 +234,10 @@ ${ hueIcons.symbols() }
 
         % if user.is_authenticated() and section != 'login' and (cluster != ANALYTIC_DB or IS_MULTICLUSTER_ONLY.get()):
         <div class="dropdown navbar-dropdown pull-right">
+          % if IS_MULTICLUSTER_ONLY.get():
+            <!-- ko component: { name: 'hue-app-switcher', params: { onPrem: ko.observable(false) } } --><!-- /ko -->
+          % endif
+
           <%
             view_profile = user.has_hue_permission(action="access_view:useradmin:edit_user", app="useradmin") or user.is_superuser
           %>

+ 11 - 42
desktop/core/src/desktop/templates/ko_components/ko_app_switcher.mako

@@ -27,8 +27,8 @@ from desktop.views import _ko
   <script type="text/html" id="hue-app-switcher-template">
     <ul class="cui-app-switcher nav navbar-nav">
       <li class="dropdown">
-        <a class="hamburger hamburger-hue dropdown-toggle" style="padding: 10px 5px 0 5px; margin: 8px 24px 0 -5px;" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" role="button">
-          <span class="hamburger-box"><span class="hamburger-inner"></span></span>
+        <a style="padding: 10px 5px 0 5px; margin: 8px 24px 0 -5px;" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" role="button">
+          <i class="fa fa-th"></i>
         </a>
 
         <ul class="dropdown-menu" style="margin: 7px 0 0 -5px;" role="menu">
@@ -64,6 +64,10 @@ from desktop.views import _ko
           label: 'Data Science',
           img:'hi-as-cdsw'
         },
+        altusAdmin: {
+          label: 'Altus Admin',
+          img:'hi-as-nav'
+        },
         hue: {
           label: 'Data Analytics (Hue)',
           img: 'hi-as-hue'
@@ -88,49 +92,15 @@ from desktop.views import _ko
         self.links = ko.observableArray([]);
 
         var altusLinks = [{
-          label: 'Dashboard',
-          icon: 'fa fa-home',
-          link: 'http://localhost:3001'
-        }, {
-          divider: true
-        }, {
-          label: 'Data Engineering',
-          link: '/',
-          icon: 'fa fa-gear'
-        },
-          {
-            product: 'cdsw',
-            link: '/'
-          }, {
-            product: 'hue',
-            link: '/'
-          },
-          {
-            divider: true
-          },
-          {
-            product: 'navigator',
-            link: '/'
-          }, {
-            label: 'Navigator Optimizer',
-            link: '/',
-            icon: 'fa fa-gear'
+            product: 'altusAdmin',
+            link: 'https://sso.staging.aem.cloudera.com'
           }
         ];
 
         var onPremLinks = [{
-          label: 'Dashboard',
-          icon: 'fa fa-home',
-          link: '/'
-        }, {
-          divider: true
-        }, {
-          product: 'cdsw',
-          link: '/'
-        }, {
-          product: 'hue',
-          link: '/'
-        },
+            product: 'cdsw',
+            link: '/'
+          },
           {
             divider: true
           }
@@ -141,7 +111,6 @@ from desktop.views import _ko
             product: 'navigator',
             link: '/'
           }
-
         ];
 
         var applyLinks = function (links) {