Browse Source

HUE-6077 [frontend] Use the CUI top navbar in responsive

Johan Ahlen 8 years ago
parent
commit
cb08009
32 changed files with 203 additions and 198 deletions
  1. 1 1
      apps/about/src/about/templates/header.mako
  2. 2 2
      apps/beeswax/src/beeswax/templates/execute.mako
  3. 2 2
      apps/beeswax/src/beeswax/templates/layout.mako
  4. 1 1
      apps/filebrowser/src/filebrowser/templates/fb_components.mako
  5. 1 1
      apps/hbase/src/hbase/templates/app.mako
  6. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job_browser.mako
  7. 1 1
      apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako
  8. 1 1
      apps/jobsub/src/jobsub/templates/designs.mako
  9. 1 1
      apps/metastore/src/metastore/templates/components.mako
  10. 1 1
      apps/oozie/src/oozie/templates/navigation-bar.mako
  11. 2 2
      apps/pig/src/pig/templates/app.mako
  12. 1 1
      apps/rdbms/src/rdbms/templates/common.mako
  13. 1 1
      apps/security/src/security/templates/layout.mako
  14. 1 1
      apps/useradmin/src/useradmin/templates/layout.mako
  15. 1 1
      apps/zookeeper/src/zookeeper/templates/shared_components.mako
  16. 1 1
      desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako
  17. 0 0
      desktop/core/src/desktop/static/desktop/css/hue.css
  18. 0 0
      desktop/core/src/desktop/static/desktop/css/hue3-extra.css
  19. 0 50
      desktop/core/src/desktop/static/desktop/css/hue3.css
  20. 11 20
      desktop/core/src/desktop/static/desktop/less/hue.less
  21. 71 0
      desktop/core/src/desktop/static/desktop/less/hue3-extra.less
  22. 1 1
      desktop/core/src/desktop/templates/about_layout.mako
  23. 1 1
      desktop/core/src/desktop/templates/common_header.mako
  24. 1 1
      desktop/core/src/desktop/templates/common_header_m.mako
  25. 1 1
      desktop/core/src/desktop/templates/common_home.mako
  26. 1 1
      desktop/core/src/desktop/templates/home.mako
  27. 4 12
      desktop/core/src/desktop/templates/hue_icons.mako
  28. 89 88
      desktop/core/src/desktop/templates/responsive.mako
  29. 1 1
      desktop/libs/indexer/src/indexer/templates/importer.mako
  30. 1 1
      desktop/libs/indexer/src/indexer/templates/indexer.mako
  31. 1 1
      desktop/libs/notebook/src/notebook/templates/editor_components.mako
  32. 1 1
      desktop/libs/notebook/src/notebook/templates/notebooks.mako

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

@@ -18,7 +18,7 @@ from django.utils.translation import ugettext as _
 %>
 %>
 
 
 <%def name="menubar()">
 <%def name="menubar()">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 2 - 2
apps/beeswax/src/beeswax/templates/execute.mako

@@ -2642,7 +2642,7 @@ $(document).ready(function () {
     $('#queryContainer').show();
     $('#queryContainer').show();
     $('#resizePanel').show();
     $('#resizePanel').show();
     $('a[href="#query"]').parent().show();
     $('a[href="#query"]').parent().show();
-    $('.navbar-fixed-top').show();
+    $('.hue3-navbar-fixed-top').show();
     $('.resultsContainer').css('marginTop', '20px');
     $('.resultsContainer').css('marginTop', '20px');
   }
   }
 
 
@@ -2655,7 +2655,7 @@ $(document).ready(function () {
     $('a[href="#query"]').parent().hide();
     $('a[href="#query"]').parent().hide();
     $('a[href="#recentTab"]').parent().hide();
     $('a[href="#recentTab"]').parent().hide();
     $('a[href="#queryBuilderTab"]').parent().hide();
     $('a[href="#queryBuilderTab"]').parent().hide();
-    $('.navbar-fixed-top').hide();
+    $('.hue3-navbar-fixed-top').hide();
     $('.resultsContainer').css('marginTop', '-50px');
     $('.resultsContainer').css('marginTop', '-50px');
   }
   }
 
 

+ 2 - 2
apps/beeswax/src/beeswax/templates/layout.mako

@@ -25,7 +25,7 @@ def is_selected(section, matcher):
 %>
 %>
 
 
 <%def name="menubar(section='')">
 <%def name="menubar(section='')">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">
@@ -56,7 +56,7 @@ def is_selected(section, matcher):
 </%def>
 </%def>
 
 
 <%def name="metastore_menubar()">
 <%def name="metastore_menubar()">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/fb_components.mako

@@ -91,7 +91,7 @@ from aws import get_client
 
 
 
 
 <%def name="menubar()">
 <%def name="menubar()">
-  <div class="navbar navbar-fixed-top nokids">
+  <div class="navbar hue3-navbar-fixed-top nokids">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
apps/hbase/src/hbase/templates/app.mako

@@ -25,7 +25,7 @@ ${ commonheader(None, "hbase", user, request) | n,unicode }
 <div id="hbaseComponents">
 <div id="hbaseComponents">
 <link href="${ static('hbase/css/hbase.css') }" rel="stylesheet" type="text/css" />
 <link href="${ static('hbase/css/hbase.css') }" rel="stylesheet" type="text/css" />
 
 
-<div class="navbar navbar-fixed-top nokids">
+<div class="navbar hue3-navbar-fixed-top nokids">
     <div class="navbar-inner">
     <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="nav-collapse">
       <div class="nav-collapse">

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -70,7 +70,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
 
 
 
 % if not is_mini:
 % if not is_mini:
-<div class="navbar navbar-fixed-top">
+<div class="navbar hue3-navbar-fixed-top">
     <div class="navbar-inner">
     <div class="navbar-inner">
       <div class="container-fluid">
       <div class="container-fluid">
         <div class="nav-collapse">
         <div class="nav-collapse">

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako

@@ -230,7 +230,7 @@
 </%def>
 </%def>
 
 
 <%def name="menubar(hiveserver2_impersonation_enabled=True)">
 <%def name="menubar(hiveserver2_impersonation_enabled=True)">
-  <div class="navbar navbar-fixed-top nokids">
+  <div class="navbar hue3-navbar-fixed-top nokids">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
apps/jobsub/src/jobsub/templates/designs.mako

@@ -37,7 +37,7 @@ ${ commonheader(None, "jobsub", user, request) | n,unicode }
 <script src="${ static('jobsub/js/jobsub.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('jobsub/js/jobsub.js') }" type="text/javascript" charset="utf-8"></script>
 
 
 
 
-<div class="navbar navbar-fixed-top nokids">
+<div class="navbar hue3-navbar-fixed-top nokids">
     <div class="navbar-inner">
     <div class="navbar-inner">
       <div class="container-fluid">
       <div class="container-fluid">
         <div class="nav-collapse">
         <div class="nav-collapse">

+ 1 - 1
apps/metastore/src/metastore/templates/components.mako

@@ -19,7 +19,7 @@
 %>
 %>
 
 
 <%def name="menubar()">
 <%def name="menubar()">
-  <div class="navbar navbar-fixed-top nokids">
+  <div class="navbar hue3-navbar-fixed-top nokids">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -23,7 +23,7 @@
 
 
 
 
 <%def name="menubar(section='', dashboard=False, is_editor=False, pullright=None)">
 <%def name="menubar(section='', dashboard=False, is_editor=False, pullright=None)">
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           %if pullright:
           %if pullright:

+ 2 - 2
apps/pig/src/pig/templates/app.mako

@@ -23,7 +23,7 @@
 ${ commonheader(None, "pig", user, request) | n,unicode }
 ${ commonheader(None, "pig", user, request) | n,unicode }
 
 
 <div id="pig-editor-app">
 <div id="pig-editor-app">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">
@@ -1300,7 +1300,7 @@ ${ commonshare() | n,unicode }
     }
     }
 
 
     function highlightMainMenu(mainSection) {
     function highlightMainMenu(mainSection) {
-      $(".navbar-fixed-top .nav li").removeClass("active");
+      $(".hue3-navbar-fixed-top .nav li").removeClass("active");
       $("a[href='#" + mainSection + "']").parent().addClass("active");
       $("a[href='#" + mainSection + "']").parent().addClass("active");
     }
     }
 
 

+ 1 - 1
apps/rdbms/src/rdbms/templates/common.mako

@@ -16,7 +16,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.utils.translation import ugettext as _ %>
 
 
 <%def name="navbar()">
 <%def name="navbar()">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
     <div class="navbar-inner">
     <div class="navbar-inner">
       <div class="container-fluid">
       <div class="container-fluid">
         <div class="nav-collapse">
         <div class="nav-collapse">

+ 1 - 1
apps/security/src/security/templates/layout.mako

@@ -54,7 +54,7 @@ def is_selected(section, matcher):
   <script src="${ static('desktop/js/apiHelper.js') }"></script>
   <script src="${ static('desktop/js/apiHelper.js') }"></script>
 
 
 
 
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
apps/useradmin/src/useradmin/templates/layout.mako

@@ -49,7 +49,7 @@ def is_selected(section, matcher):
 
 
 
 
 <%def name="menubar(section='')">
 <%def name="menubar(section='')">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/shared_components.mako

@@ -70,7 +70,7 @@
 </%def>
 </%def>
 
 
 <%def name="menubar()">
 <%def name="menubar()">
-  <div class="navbar navbar-fixed-top nokids">
+  <div class="navbar hue3-navbar-fixed-top nokids">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako

@@ -26,7 +26,7 @@ def is_selected(section, matcher):
 ${'%>'}
 ${'%>'}
 
 
 ${'<%'}def name="menubar(section='')">
 ${'<%'}def name="menubar(section='')">
-  <div class="navbar navbar-fixed-top nokids">
+  <div class="navbar hue3-navbar-fixed-top nokids">
     <div class="navbar-inner">
     <div class="navbar-inner">
       <div class="container-fluid">
       <div class="container-fluid">
         <div class="nav-collapse">
         <div class="nav-collapse">

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 50
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -1644,10 +1644,6 @@ a#advanced-btn:hover {
   }
   }
 }
 }
 
 
-.navbar-fixed-top {
-  top: 28px;
-}
-
 .navigator .dropdown-menu {
 .navigator .dropdown-menu {
   z-index: 20000;
   z-index: 20000;
   box-shadow: none;
   box-shadow: none;
@@ -1698,10 +1694,6 @@ a#advanced-btn:hover {
   color: #FFFFFF;
   color: #FFFFFF;
 }
 }
 
 
-.navbar-fixed-top.nokids .navbar-inner {
-  height: 45px;
-}
-
 a, a:hover, a:active, a:focus {
 a, a:hover, a:active, a:focus {
   outline: 0;
   outline: 0;
 }
 }
@@ -2415,11 +2407,6 @@ body {
   border: none;
   border: none;
 }
 }
 
 
-.navbar-fixed-top .navbar-inner {
-  box-shadow: none;
-  border-bottom: 1px solid #DDD;
-}
-
 .hue-drop-down-input {
 .hue-drop-down-input {
   width: 175px !important;
   width: 175px !important;
   height: 12px !important;
   height: 12px !important;
@@ -3422,43 +3409,6 @@ input[type='password']::-ms-reveal {
   font-size: 15px;
   font-size: 15px;
 }
 }
 
 
-.search-container {
-  display: -ms-flexbox;
-  display: flex;
-  position: relative;
-  -ms-flex: 1 1 36px;
-  flex: 1 1 36px;
-  padding: 10px 10px 5px 10px;
-}
-
-.search-container > input {
-  border-bottom-left-radius: 4px;
-  border-top-left-radius: 4px;
-  border: 1px solid #DDD;
-  border-right: none;
-  flex: 1 1 100%;
-  height: 27px;
-  box-shadow: none;
-}
-
-.search-container > a {
-  cursor: pointer;
-  flex: 0 0 31px;
-  border-bottom-right-radius: 4px;
-  border-top-right-radius: 4px;
-  border: 1px solid #DDD;
-  box-shadow: none;
-  font-size: 15px;
-  line-height: 29px;
-  background-color: #f9f9f9;
-  width: 31px;
-  height: 29px;
-}
-
-.search-container > a > i {
-  margin-left: 8px;
-}
-
 .selectize-wrapper {
 .selectize-wrapper {
   display: inline-block;
   display: inline-block;
   float:left;
   float:left;

+ 11 - 20
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -59,18 +59,22 @@ body {
   background-color: @cui-white;
   background-color: @cui-white;
 }
 }
 
 
+.svg-hue-logo-main {
+  fill: @hue-primary-color-dark;
+}
+
+.svg-hue-logo-trunk {
+  fill: #D7B9EB;
+}
+
 .top-nav {
 .top-nav {
-  .flex(0 0 50px);
   .display-flex;
   .display-flex;
   position: relative;
   position: relative;
-  background-color: @hue-primary-color-dark;
-  width: 100%;
   z-index: 1049;
   z-index: 1049;
 }
 }
 
 
 .top-nav-left {
 .top-nav-left {
   .flex(0 0 300px);
   .flex(0 0 300px);
-  line-height: 45px;
 }
 }
 
 
 .top-nav-middle {
 .top-nav-middle {
@@ -82,15 +86,6 @@ body {
   .flex(0 0 300px);
   .flex(0 0 300px);
 }
 }
 
 
-.top-nav-right .compose-action {
-  float: right;
-  margin-right: 15px;
-}
-
-.top-nav-right .dropdown-menu {
-  margin-left: -80px;
-}
-
 .jobs-panel {
 .jobs-panel {
   position: fixed;
   position: fixed;
   z-index: 2999;
   z-index: 2999;
@@ -121,7 +116,6 @@ body {
 }
 }
 
 
 .compose-action {
 .compose-action {
-  float: right;
   margin-top: 10px;
   margin-top: 10px;
   z-index: 999999;
   z-index: 999999;
   line-height: 20px;
   line-height: 20px;
@@ -133,7 +127,7 @@ body {
 }
 }
 
 
 .compose-action .btn {
 .compose-action .btn {
-  color: @cui-gray-050;
+  color: @hue-primary-color-dark;
   border: 1px solid transparent;
   border: 1px solid transparent;
   background-color: transparent;
   background-color: transparent;
   background-image: none;
   background-image: none;
@@ -231,7 +225,6 @@ body {
   .display-flex;
   .display-flex;
   .flex(1 1 29px);
   .flex(1 1 29px);
   position: relative;
   position: relative;
-  padding: 10px;
 }
 }
 
 
 .search-container > input {
 .search-container > input {
@@ -240,7 +233,6 @@ body {
   border-top-left-radius: 4px;
   border-top-left-radius: 4px;
   border: 1px solid @cui-gray-300;
   border: 1px solid @cui-gray-300;
   border-right: none;
   border-right: none;
-  height: 27px;
   box-shadow: none;
   box-shadow: none;
 }
 }
 
 
@@ -255,7 +247,6 @@ body {
   line-height: 29px;
   line-height: 29px;
   background-color: @cui-gray-050;
   background-color: @cui-gray-050;
   width: 31px;
   width: 31px;
-  height: 29px;
 }
 }
 
 
 .search-container > a > i {
 .search-container > a > i {
@@ -466,7 +457,7 @@ a:visited {
  * @link https://github.com/jonsuh/hamburgers
  * @link https://github.com/jonsuh/hamburgers
  */
  */
 .hamburger {
 .hamburger {
-  padding: 9px 12px 0 15px;
+  padding: 18px 8px 0 0;
   display: inline-block;
   display: inline-block;
   cursor: pointer;
   cursor: pointer;
   transition-property: opacity, -webkit-filter;
   transition-property: opacity, -webkit-filter;
@@ -509,7 +500,7 @@ a:visited {
 .hamburger-inner::before, .hamburger-inner::after {
 .hamburger-inner::before, .hamburger-inner::after {
   width: 24px;
   width: 24px;
   height: 3px;
   height: 3px;
-  background-color: @cui-white;
+  background-color: @hue-primary-color-dark;
   border-radius: 4px;
   border-radius: 4px;
   position: absolute;
   position: absolute;
   transition-property: -webkit-transform;
   transition-property: -webkit-transform;

+ 71 - 0
desktop/core/src/desktop/static/desktop/less/hue3-extra.less

@@ -6,6 +6,77 @@
 @import "hue-cui-overrides.less";
 @import "hue-cui-overrides.less";
 @import "hue-cross-version.less";
 @import "hue-cross-version.less";
 
 
+.svg-hue-logo-main {
+  fill: #f2f2f2;
+}
+
+.svg-hue-logo-trunk {
+  fill: #D7B9EB;
+}
+
+.hue3-navbar-fixed-top {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+  top: 28px;
+}
+
+.hue3-navbar-fixed-top.nokids .navbar-inner {
+  height: 45px;
+}
+
+.hue3-navbar-fixed-top .navbar-inner {
+  padding-left: 0;
+  padding-right: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  border-width: 0 0 1px;
+  border-bottom: 1px solid #DDD;
+  -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  box-shadow: 0 1px 10px rgba(0,0,0,.1);
+}
+
+
+.search-container {
+  display: -ms-flexbox;
+  display: flex;
+  position: relative;
+  -ms-flex: 1 1 36px;
+  flex: 1 1 36px;
+  padding: 10px 10px 5px 10px;
+}
+
+.search-container > input {
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
+  border: 1px solid #DDD;
+  border-right: none;
+  flex: 1 1 100%;
+  height: 27px;
+  box-shadow: none;
+}
+
+.search-container > a {
+  cursor: pointer;
+  flex: 0 0 31px;
+  border-bottom-right-radius: 4px;
+  border-top-right-radius: 4px;
+  border: 1px solid #DDD;
+  box-shadow: none;
+  font-size: 15px;
+  line-height: 29px;
+  background-color: #f9f9f9;
+  width: 31px;
+  height: 29px;
+}
+
+.search-container > a > i {
+  margin-left: 8px;
+}
 
 
 // Hue 3 CUI overrides
 // Hue 3 CUI overrides
 
 

+ 1 - 1
desktop/core/src/desktop/templates/about_layout.mako

@@ -25,7 +25,7 @@ def is_selected(section, matcher):
 %>
 %>
 
 
 <%def name="menubar(section='')">
 <%def name="menubar(section='')">
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar hue3-navbar-fixed-top">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">
           <div class="nav-collapse">
           <div class="nav-collapse">

+ 1 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -85,7 +85,7 @@ if USE_NEW_EDITOR.get():
       .navigator {
       .navigator {
         top: 30px!important;
         top: 30px!important;
       }
       }
-      .navbar-fixed-top {
+      .hue3-navbar-fixed-top {
         top: 58px!important;
         top: 58px!important;
       }
       }
       % if current_app == "sqoop":
       % if current_app == "sqoop":

+ 1 - 1
desktop/core/src/desktop/templates/common_header_m.mako

@@ -299,7 +299,7 @@ if USE_NEW_EDITOR.get():
        count += 1
        count += 1
     return found_app, count
     return found_app, count
 %>
 %>
-<div class="navbar navbar-fixed-top">
+<div class="navbar hue3-navbar-fixed-top">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container">
     <div class="container">
       <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
       <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

+ 1 - 1
desktop/core/src/desktop/templates/common_home.mako

@@ -36,7 +36,7 @@
 
 
 
 
 <%def name="navbar()">
 <%def name="navbar()">
-<div class="navbar navbar-fixed-top nokids">
+<div class="navbar hue3-navbar-fixed-top nokids">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="nav-collapse">
       <div class="nav-collapse">

+ 1 - 1
desktop/core/src/desktop/templates/home.mako

@@ -83,7 +83,7 @@ ${ commonheader(_('Welcome Home'), "home", user, request) | n,unicode }
 
 
 </style>
 </style>
 
 
-<div class="navbar navbar-fixed-top nokids">
+<div class="navbar hue3-navbar-fixed-top nokids">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="nav-collapse">
       <div class="nav-collapse">

+ 4 - 12
desktop/core/src/desktop/templates/hue_icons.mako

@@ -25,19 +25,11 @@
         ${ conf.CUSTOM.LOGO_SVG.get()|n }
         ${ conf.CUSTOM.LOGO_SVG.get()|n }
       % else:
       % else:
       <defs>
       <defs>
-        <style>
-          .logo-main {
-            fill: #f2f2f2;
-          }
-          .logo-trunk {
-            fill: #D7B9EB;
-          }
-        </style>
       </defs>
       </defs>
-        <path class="logo-main" d="M26.691,0c-.263,0-.523,0-.784.012l.07,13.609H10.1A26.108,26.108,0,0,1,16.693,1.733C6.906,5.271,0,13.846,0,23.867A22.465,22.465,0,0,0,7.024,40h9.94A26.2,26.2,0,0,1,10.1,27.832H25.977V40h9.187V1.234A29.527,29.527,0,0,0,26.691,0Z"></path>
-        <path class="logo-trunk" d="M37.96,2.316V22.565c2.807.258,5.034,4.249,5.034,9.135,0,3.677-1.262,6.846-3.084,8.3H45.4a23.571,23.571,0,0,0,6.383-16.133A23.842,23.842,0,0,0,37.96,2.316ZM40.717,14.4a1.952,1.952,0,0,1-1.834-2.051A1.952,1.952,0,0,1,40.717,10.3a1.835,1.835,0,0,1,1.668,1.2,1.137,1.137,0,0,0-.943-.537l-.023,0a.576.576,0,0,1,.245.481.506.506,0,1,1-1.006,0,.63.63,0,0,1,.025-.168,1.371,1.371,0,0,0-.408.992,1.244,1.244,0,0,0,1.168,1.308,1.17,1.17,0,0,0,1.058-.754A1.889,1.889,0,0,1,40.717,14.4Z"></path>
-        <path class="logo-main" d="M74.5,40c-14.2,0-18.368-4.38-18.368-16.532V1.71h10.6V23.186c0,6.5,2.19,7.841,8.619,7.841H86.364c6.853,0,8.618-1.341,8.618-7.841V1.71h10.456V23.468C105.439,35.62,101.27,40,86.929,40Z"></path>
-        <path class="logo-main" d="M159.657,24.74V12.165c0-6.076-3.038-10.455-13.988-10.455h-18.51c-13.493,0-17.379,3.744-17.379,14.907v8.83C109.78,35.62,114.513,40,126.664,40h28.19V32.017h-28.19c-4.945,0-6.358-.848-6.358-5.511V24.74Zm-39.35-8.83c0-5.511,1.7-6.076,6.994-6.076H144.82c3.18,0,4.311.636,4.311,3.18v4.945H120.306Z"></path>
+        <path class="svg-hue-logo-main" d="M26.691,0c-.263,0-.523,0-.784.012l.07,13.609H10.1A26.108,26.108,0,0,1,16.693,1.733C6.906,5.271,0,13.846,0,23.867A22.465,22.465,0,0,0,7.024,40h9.94A26.2,26.2,0,0,1,10.1,27.832H25.977V40h9.187V1.234A29.527,29.527,0,0,0,26.691,0Z"></path>
+        <path class="svg-hue-logo-trunk" d="M37.96,2.316V22.565c2.807.258,5.034,4.249,5.034,9.135,0,3.677-1.262,6.846-3.084,8.3H45.4a23.571,23.571,0,0,0,6.383-16.133A23.842,23.842,0,0,0,37.96,2.316ZM40.717,14.4a1.952,1.952,0,0,1-1.834-2.051A1.952,1.952,0,0,1,40.717,10.3a1.835,1.835,0,0,1,1.668,1.2,1.137,1.137,0,0,0-.943-.537l-.023,0a.576.576,0,0,1,.245.481.506.506,0,1,1-1.006,0,.63.63,0,0,1,.025-.168,1.371,1.371,0,0,0-.408.992,1.244,1.244,0,0,0,1.168,1.308,1.17,1.17,0,0,0,1.058-.754A1.889,1.889,0,0,1,40.717,14.4Z"></path>
+        <path class="svg-hue-logo-main" d="M74.5,40c-14.2,0-18.368-4.38-18.368-16.532V1.71h10.6V23.186c0,6.5,2.19,7.841,8.619,7.841H86.364c6.853,0,8.618-1.341,8.618-7.841V1.71h10.456V23.468C105.439,35.62,101.27,40,86.929,40Z"></path>
+        <path class="svg-hue-logo-main" d="M159.657,24.74V12.165c0-6.076-3.038-10.455-13.988-10.455h-18.51c-13.493,0-17.379,3.744-17.379,14.907v8.83C109.78,35.62,114.513,40,126.664,40h28.19V32.017h-28.19c-4.945,0-6.358-.848-6.358-5.511V24.74Zm-39.35-8.83c0-5.511,1.7-6.076,6.994-6.076H144.82c3.18,0,4.311.636,4.311,3.18v4.945H120.306Z"></path>
       % endif
       % endif
     </symbol>
     </symbol>
 
 

+ 89 - 88
desktop/core/src/desktop/templates/responsive.mako

@@ -91,98 +91,98 @@
 ${ hueIcons.symbols() }
 ${ hueIcons.symbols() }
 
 
 <div class="main-page">
 <div class="main-page">
-  <div class="top-nav">
-    <div class="top-nav-left">
-      <a class="hamburger hamburger-hue pull-left" type="button" data-bind="toggle: leftNavVisible, css: { 'is-active': leftNavVisible }">
-      <span class="hamburger-box">
-        <span class="hamburger-inner"></span>
-      </span>
-      </a>
-      <a class="nav-tooltip pull-left" title="${_('Homepage')}" data-rel="navigator-tooltip"  href="#" data-bind="click: function(){ onePageViewModel.currentApp('home') }">
-        <svg style="margin-top:12px;margin-left:8px;height: 24px;width:120px;display: inline-block;">
-          <use xlink:href="#hue-logo"></use>
-        </svg>
-      </a>
-      <div class="compose-action btn-group">
-        <button class="btn" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }" title="${ _('Open editor') }">${ _('Compose') }</button>
-        <button class="btn dropdown-toggle" data-toggle="dropdown">
-          <span class="caret"></span>
-        </button>
-
-        <ul class="dropdown-menu">
-          % if 'beeswax' in apps and 'impala' in apps:
-            <li class="dropdown-submenu">
-              <a title="${_('Query editor')}" data-rel="navigator-tooltip" href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }"><i class="fa fa-fw fa-edit inline-block"></i> ${ _('Query') }</a>
-              <ul class="dropdown-menu">
-                <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['beeswax'].icon_path) }" class="app-icon" alt="${ _('Hive icon') }"/> ${_('Hive Query')}</a></li>
-                <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('impala'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['impala'].icon_path) }" class="app-icon" alt="${ _('Impala icon') }"/> ${_('Impala Query')}</a></li>
-              </ul>
-            </li>
-          % endif
-          % if 'beeswax' in apps and 'impala' not in apps:
-            <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['beeswax'].icon_path) }" class="app-icon" alt="${ _('Hive icon') }"/> ${_('Hive Query')}</a></li>
-          % endif
-          % if 'impala' in apps and 'beeswax' not in apps: ## impala requires beeswax anyway
-            <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('impala'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['impala'].icon_path) }" class="app-icon" alt="${ _('Impala icon') }"/> ${_('Impala Query')}</a></li>
-          % endif
-          % if IS_DASHBOARD_ENABLED.get():
-            <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('dashboard') }"><i class="fa fa-fw fa-area-chart"></i> ${ _('Dashboard') }</a></li>
-          % endif
-          <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('notebook') }"><i class="fa fa-fw fa-file-text-o inline-block"></i> ${ _('Presentation') }</a></li>
-          % if 'oozie' in apps:
-          % if not user.has_hue_permission(action="disable_editor_access", app="oozie") or user.is_superuser:
+  <nav class="navbar">
+    <div class="navbar-inner top-nav">
+      <div class="top-nav-left">
+        <a class="hamburger hamburger-hue pull-left" type="button" data-bind="toggle: leftNavVisible, css: { 'is-active': leftNavVisible }">
+          <span class="hamburger-box"><span class="hamburger-inner"></span></span>
+        </a>
+
+        <a class="brand" href="/" title="${_('Hue home')}">
+          <svg style="height: 24px; width: 120px;"><use xlink:href="#hue-logo"></use></svg>
+        </a>
+
+        <div class="compose-action btn-group">
+          <button class="btn" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }" title="${ _('Open editor') }">${ _('Compose') }</button>
+          <button class="btn dropdown-toggle" data-toggle="dropdown">
+            <span class="caret"></span>
+          </button>
+
+          <ul class="dropdown-menu">
+            % if 'beeswax' in apps and 'impala' in apps:
+              <li class="dropdown-submenu">
+                <a title="${_('Query editor')}" data-rel="navigator-tooltip" href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }"><i class="fa fa-fw fa-edit inline-block"></i> ${ _('Query') }</a>
+                <ul class="dropdown-menu">
+                  <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['beeswax'].icon_path) }" class="app-icon" alt="${ _('Hive icon') }"/> ${_('Hive Query')}</a></li>
+                  <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('impala'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['impala'].icon_path) }" class="app-icon" alt="${ _('Impala icon') }"/> ${_('Impala Query')}</a></li>
+                </ul>
+              </li>
+            % endif
+            % if 'beeswax' in apps and 'impala' not in apps:
+              <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('hive'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['beeswax'].icon_path) }" class="app-icon" alt="${ _('Hive icon') }"/> ${_('Hive Query')}</a></li>
+            % endif
+            % if 'impala' in apps and 'beeswax' not in apps: ## impala requires beeswax anyway
+              <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('impala'); onePageViewModel.currentApp('editor') }"><img src="${ static(apps['impala'].icon_path) }" class="app-icon" alt="${ _('Impala icon') }"/> ${_('Impala Query')}</a></li>
+            % endif
+            % if IS_DASHBOARD_ENABLED.get():
+              <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('dashboard') }"><i class="fa fa-fw fa-area-chart"></i> ${ _('Dashboard') }</a></li>
+            % endif
+            <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('notebook') }"><i class="fa fa-fw fa-file-text-o inline-block"></i> ${ _('Presentation') }</a></li>
+            % if 'oozie' in apps:
+            % if not user.has_hue_permission(action="disable_editor_access", app="oozie") or user.is_superuser:
+              <li class="dropdown-submenu">
+                <a title="${_('Schedule with Oozie')}" data-rel="navigator-tooltip" href="#"><img src="${ static('oozie/art/icon_oozie_editor_48.png') }" class="app-icon"  alt="${ _('Oozie editor icon') }"/> ${ _('Workflow') }</a>
+                <ul class="dropdown-menu">
+                  <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('oozie_workflow') }"><img src="${ static('oozie/art/icon_oozie_workflow_48.png') }" class="app-icon" alt="${ _('Oozie workflow icon') }"/> ${_('Workflow')}</a></li>
+                  <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('oozie_coordinator') }"><img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon" alt="${ _('Oozie coordinator icon') }" /> ${_('Schedule')}</a></li>
+                  <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('oozie_bundle') }"/><img src="${ static('oozie/art/icon_oozie_bundle_48.png') }" class="app-icon" alt="${ _('Oozie bundle icon') }" /> ${_('Bundle')}</a></li>
+                </ul>
+              </li>
+            % endif
+            % endif
+            % if len(interpreters) > 0:
+            <li class="divider"></li>
             <li class="dropdown-submenu">
             <li class="dropdown-submenu">
-              <a title="${_('Schedule with Oozie')}" data-rel="navigator-tooltip" href="#"><img src="${ static('oozie/art/icon_oozie_editor_48.png') }" class="app-icon"  alt="${ _('Oozie editor icon') }"/> ${ _('Workflow') }</a>
+              <a title="${_('More...')}" data-rel="navigator-tooltip" href="#"><span class="dropdown-no-icon">${ _('More') }</span></a>
               <ul class="dropdown-menu">
               <ul class="dropdown-menu">
-                <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('oozie_workflow') }"><img src="${ static('oozie/art/icon_oozie_workflow_48.png') }" class="app-icon" alt="${ _('Oozie workflow icon') }"/> ${_('Workflow')}</a></li>
-                <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('oozie_coordinator') }"><img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon" alt="${ _('Oozie coordinator icon') }" /> ${_('Schedule')}</a></li>
-                <li><a href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.currentApp('oozie_bundle') }"/><img src="${ static('oozie/art/icon_oozie_bundle_48.png') }" class="app-icon" alt="${ _('Oozie bundle icon') }" /> ${_('Bundle')}</a></li>
+                % for interpreter in interpreters:
+                  % if interpreter['name'] != 'Hive' and interpreter['name'] != 'Impala':
+                  <li><a  href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('${ interpreter['type'] }'); onePageViewModel.currentApp('editor') }"><span class="dropdown-no-icon">${ interpreter['name'] }</span></a></li>
+                  % endif
+                % endfor
+                % if user.is_superuser:
+                  <li class="divider"></li>
+                  <li><a href="gethue.com" class="dropdown-no-icon">${ _('Add more...') }</a></li>
+                % endif
               </ul>
               </ul>
             </li>
             </li>
-          % endif
-          % endif
-          % if len(interpreters) > 0:
-          <li class="divider"></li>
-          <li class="dropdown-submenu">
-            <a title="${_('More...')}" data-rel="navigator-tooltip" href="#"><span class="dropdown-no-icon">${ _('More') }</span></a>
-            <ul class="dropdown-menu">
-              % for interpreter in interpreters:
-                % if interpreter['name'] != 'Hive' and interpreter['name'] != 'Impala':
-                <li><a  href="javascript: void(0)" data-bind="click: function(){ onePageViewModel.changeEditorType('${ interpreter['type'] }'); onePageViewModel.currentApp('editor') }"><span class="dropdown-no-icon">${ interpreter['name'] }</span></a></li>
-                % endif
-              % endfor
-              % if user.is_superuser:
-                <li class="divider"></li>
-                <li><a href="gethue.com" class="dropdown-no-icon">${ _('Add more...') }</a></li>
-              % endif
-            </ul>
-          </li>
-          % endif
-        </ul>
+            % endif
+          </ul>
+        </div>
       </div>
       </div>
-    </div>
-    <div class="top-nav-middle">
-      <div class="search-container">
-        <input placeholder="${ _('Search all data and saved documents...') }" type="text"
-          data-bind="autocomplete: {
-              source: searchAutocompleteSource,
-              itemTemplate: 'nav-search-autocomp-item',
-              noMatchTemplate: 'nav-search-autocomp-no-match',
-              classPrefix: 'nav-',
-              showOnFocus: true,
-              onEnter: performSearch,
-              reopenPattern: /.*:$/
-            },
-            hasFocus: searchHasFocus,
-            clearable: { value: searchInput, onClear: function () { searchActive(false); huePubSub.publish('autocomplete.close'); } },
-            textInput: searchInput,
-            valueUpdate: 'afterkeydown'"
-        >
-        <a class="inactive-action" data-bind="click: performSearch"><i class="fa fa-search" data-bind="css: { 'blue': searchHasFocus() || searchActive() }"></i></a>
+
+      <div class="top-nav-middle">
+        <div class="search-container">
+          <input placeholder="${ _('Search all data and saved documents...') }" type="text"
+            data-bind="autocomplete: {
+                source: searchAutocompleteSource,
+                itemTemplate: 'nav-search-autocomp-item',
+                noMatchTemplate: 'nav-search-autocomp-no-match',
+                classPrefix: 'nav-',
+                showOnFocus: true,
+                onEnter: performSearch,
+                reopenPattern: /.*:$/
+              },
+              hasFocus: searchHasFocus,
+              clearable: { value: searchInput, onClear: function () { searchActive(false); huePubSub.publish('autocomplete.close'); } },
+              textInput: searchInput,
+              valueUpdate: 'afterkeydown'">
+          <a class="inactive-action" data-bind="click: performSearch"><i class="fa fa-search" data-bind="css: { 'blue': searchHasFocus() || searchActive() }"></i></a>
+        </div>
       </div>
       </div>
-    </div>
-    <div class="top-nav-right">
-      % if user.is_authenticated() and section != 'login':
+
+      <div class="top-nav-right">
+        % if user.is_authenticated() and section != 'login':
         <div class="compose-action btn-group">
         <div class="compose-action btn-group">
           <%
           <%
             view_profile = user.has_hue_permission(action="access_view:useradmin:edit_user", app="useradmin") or user.is_superuser
             view_profile = user.has_hue_permission(action="access_view:useradmin:edit_user", app="useradmin") or user.is_superuser
@@ -214,9 +214,10 @@ ${ hueIcons.symbols() }
         % if 'jobbrowser' in apps:
         % if 'jobbrowser' in apps:
         <!-- ko component: { name: 'hue-job-browser-panel', params: { processHeaders: onePageViewModel.processHeaders }} --><!-- /ko -->
         <!-- ko component: { name: 'hue-job-browser-panel', params: { processHeaders: onePageViewModel.processHeaders }} --><!-- /ko -->
         % endif
         % endif
-      % endif
+        % endif
+      </div>
     </div>
     </div>
-  </div>
+  </nav>
 
 
   <div class="content-wrapper">
   <div class="content-wrapper">
     <div class="left-nav" data-bind="css: { 'left-nav-visible': leftNavVisible }, niceScroll">
     <div class="left-nav" data-bind="css: { 'left-nav-visible': leftNavVisible }, niceScroll">

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -264,7 +264,7 @@ ${ assist.assistPanel() }
 
 
 <span id="importerComponents" class="notebook" data-bind="dropzone: { url: '/filebrowser/upload/file?dest=' + DropzoneGlobals.homeDir, params: {dest: DropzoneGlobals.homeDir}, paramName: 'hdfs_file', onComplete: function(path){ createWizard.source.path(path); } }">
 <span id="importerComponents" class="notebook" data-bind="dropzone: { url: '/filebrowser/upload/file?dest=' + DropzoneGlobals.homeDir, params: {dest: DropzoneGlobals.homeDir}, paramName: 'hdfs_file', onComplete: function(path){ createWizard.source.path(path); } }">
 <div class="dz-message" data-dz-message></div>
 <div class="dz-message" data-dz-message></div>
-<div class="navbar navbar-fixed-top">
+<div class="navbar hue3-navbar-fixed-top">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="nav-collapse">
       <div class="nav-collapse">

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -114,7 +114,7 @@ ${ assist.assistPanel() }
 </style>
 </style>
 
 
 <span id="indexerComponents" class="notebook">
 <span id="indexerComponents" class="notebook">
-<div class="navbar navbar-fixed-top">
+<div class="navbar hue3-navbar-fixed-top">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="nav-collapse">
       <div class="nav-collapse">

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

@@ -209,7 +209,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
   <img class="pull-right" src="${ static('desktop/art/icon_hue_48.png') }"  alt="${ _('Hue logo') }"/>
   <img class="pull-right" src="${ static('desktop/art/icon_hue_48.png') }"  alt="${ _('Hue logo') }"/>
 </div>
 </div>
 
 
-<div class="navbar navbar-fixed-top" data-bind="visible: ! $root.isPlayerMode()">
+<div class="navbar hue3-navbar-fixed-top" data-bind="visible: ! $root.isPlayerMode()">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="pull-right">
       <div class="pull-right">

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/notebooks.mako

@@ -23,7 +23,7 @@
 ${ commonheader(_("Notebooks"), "spark", user, request, "60px") | n,unicode }
 ${ commonheader(_("Notebooks"), "spark", user, request, "60px") | n,unicode }
 
 
 
 
-<div class="navbar navbar-fixed-top" data-bind="visible: ! $root.isPlayerMode()">
+<div class="navbar hue3-navbar-fixed-top" data-bind="visible: ! $root.isPlayerMode()">
   <div class="navbar-inner">
   <div class="navbar-inner">
     <div class="container-fluid">
     <div class="container-fluid">
       <div class="nav-collapse">
       <div class="nav-collapse">

Some files were not shown because too many files changed in this diff