Browse Source

HUE-6077 [frontend] Fix app header positioning

Johan Ahlen 8 years ago
parent
commit
1dfeef8ba1
28 changed files with 55 additions and 79 deletions
  1. 1 1
      apps/about/src/about/templates/header.mako
  2. 2 2
      apps/beeswax/src/beeswax/templates/layout.mako
  3. 1 1
      apps/filebrowser/src/filebrowser/templates/fb_components.mako
  4. 1 1
      apps/hbase/src/hbase/templates/app.mako
  5. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job_browser.mako
  6. 1 1
      apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako
  7. 1 1
      apps/jobsub/src/jobsub/templates/designs.mako
  8. 1 1
      apps/metastore/src/metastore/templates/components.mako
  9. 1 1
      apps/oozie/src/oozie/templates/navigation-bar.mako
  10. 1 1
      apps/pig/src/pig/templates/app.mako
  11. 1 1
      apps/rdbms/src/rdbms/templates/common.mako
  12. 1 1
      apps/security/src/security/templates/layout.mako
  13. 1 1
      apps/useradmin/src/useradmin/templates/layout.mako
  14. 1 1
      apps/zookeeper/src/zookeeper/templates/shared_components.mako
  15. 1 1
      desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako
  16. 0 0
      desktop/core/src/desktop/static/desktop/css/hue.css
  17. 0 0
      desktop/core/src/desktop/static/desktop/css/hue3-extra.css
  18. 0 25
      desktop/core/src/desktop/static/desktop/css/hue3.css
  19. 27 0
      desktop/core/src/desktop/static/desktop/less/hue-cross-version.less
  20. 3 7
      desktop/core/src/desktop/static/desktop/less/hue.less
  21. 1 23
      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_home.mako
  24. 2 2
      desktop/core/src/desktop/templates/home.mako
  25. 1 1
      desktop/libs/indexer/src/indexer/templates/importer.mako
  26. 1 1
      desktop/libs/indexer/src/indexer/templates/indexer.mako
  27. 1 1
      desktop/libs/notebook/src/notebook/templates/editor_components.mako
  28. 1 1
      desktop/libs/notebook/src/notebook/templates/notebooks.mako

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

@@ -23,7 +23,7 @@ from django.utils.translation import ugettext as _
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}"><img src="${ static('desktop/art/icon_hue_48.png') }" class="app-icon" alt="${ _('Hue Logo') }" />
                 ${ _('About Hue') }</a>
                </li>

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

@@ -30,7 +30,7 @@ def is_selected(section, matcher):
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                 % if app_name == 'impala':
                   <img src="${ static('impala/art/icon_impala_48.png') }" class="app-icon" alt="${ _('Impala icon') }" />
@@ -61,7 +61,7 @@ def is_selected(section, matcher):
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/metastore">
                   <img src="${ static('metastore/art/icon_metastore_48.png') }" class="app-icon" alt="${ _('Metastore icon') }" />
                   ${ _('Metastore Manager') }

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

@@ -96,7 +96,7 @@ from aws import get_client
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <img src="${ static('filebrowser/art/icon_filebrowser_48.png') }" class="app-icon" alt="${ _('File browser icon') }" />
                   ${ _('File Browser') }

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

@@ -30,7 +30,7 @@ ${ commonheader(None, "hbase", user, request) | n,unicode }
     <div class="container-fluid">
       <div class="nav-collapse">
         <ul class="nav">
-          <li class="currentApp">
+          <li class="app-header">
             <a href="/${app_name}">
               <img src="${ static('hbase/art/icon_hbase_48.png') }" class="app-icon" alt="${ _('HBase icon') }" />
               ${ _('HBase Browser') }

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

@@ -75,7 +75,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
       <div class="container-fluid">
         <div class="nav-collapse">
           <ul class="nav">
-            <li class="currentApp">
+            <li class="app-header">
               <a href="/${app_name}">
                 <img src="${ static('jobbrowser/art/icon_jobbrowser_48.png') }" class="app-icon" alt="${ _('Job browser icon') }"/>
                 ${ _('Job Browser') }

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

@@ -235,7 +235,7 @@
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <img src="${ static('jobbrowser/art/icon_jobbrowser_48.png') }" class="app-icon" alt="${ _('Job browser icon') }"/>
                   ${ _('Job Browser') }

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

@@ -42,7 +42,7 @@ ${ commonheader(None, "jobsub", user, request) | n,unicode }
       <div class="container-fluid">
         <div class="nav-collapse">
           <ul class="nav">
-            <li class="currentApp">
+            <li class="app-header">
               <a href="/${app_name}">
                 <img src="${ static('jobsub/art/icon_jobsub_48.png') }" class="app-icon" alt="${ _('Job Designer icon') }" />
                 ${ _('Job Designer') }

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

@@ -24,7 +24,7 @@
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <img src="${ static('metastore/art/icon_metastore_48.png') }" class="app-icon" alt="${ _('Metastore icon') }" />
                   ${ _('Metastore Manager') }

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

@@ -31,7 +31,7 @@
           %endif
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <%def name="getURL(section, dashboard, is_v2)">
                 <%
                   if dashboard:

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

@@ -28,7 +28,7 @@ ${ commonheader(None, "pig", user, request) | n,unicode }
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <img src="${ static('pig/art/icon_pig_48.png') }" class="app-icon" alt="${ _('Pig icon') }"/>
                   ${ _('Pig Editor') }

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

@@ -21,7 +21,7 @@
       <div class="container-fluid">
         <div class="nav-collapse">
           <ul class="nav">
-            <li class="currentApp">
+            <li class="app-header">
               <a href="/rdbms">
                 <img src="${ static('rdbms/art/icon_rdbms_48.png') }" class="app-icon" alt="${ _('DBQuery icon') }" />
                 ${ _('DB Query') }

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

@@ -59,7 +59,7 @@ def is_selected(section, matcher):
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <i class="fa fa-lock"></i>
                   ${ _('Hadoop Security') }

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

@@ -54,7 +54,7 @@ def is_selected(section, matcher):
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <img src="${ static('useradmin/art/icon_useradmin_48.png') }" class="app-icon" alt="${ _('User admin icon') }" />
                   ${ _('User Admin') }

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

@@ -75,7 +75,7 @@
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/${app_name}">
                   <img src="${ static('zookeeper/art/icon_zookeeper_48.png') }" class="app-icon" alt="${ _('Zookeeper icon') }"/>
                   ${ _('ZooKeeper Browser') }

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

@@ -31,7 +31,7 @@ ${'<%'}def name="menubar(section='')">
       <div class="container-fluid">
         <div class="nav-collapse">
           <ul class="nav">
-            <li class="currentApp">
+            <li class="app-header">
               <a href="/${app_name}">
                 <img src="${"${"} static('${app_name}/art/icon_${app_name}_48.png') }" class="app-icon"  alt="${ _('App icon') }"/>
                 ${" ".join(word.capitalize() for word in app_name.split("_"))}

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 - 25
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -1698,31 +1698,6 @@ a#advanced-btn:hover {
   color: #FFFFFF;
 }
 
-.currentApp {
-  font-size: 20px;
-  padding-top: 13px;
-  padding-left: 0;
-  color: #338BB8;
-  cursor: pointer;
-}
-
-.currentApp a {
-  font-size: 20px !important;
-  color: #338BB8 !important;
-  padding: 0 !important;
-  margin-top: -4px !important;
-  border: none !important;
-  max-width: none!important;
-}
-
-.currentApp a:focus, .currentApp a:hover {
-  color: #338BB8 !important;
-}
-
-.currentApp img {
-  margin-top: -3px;
-}
-
 .navbar-fixed-top.nokids .navbar-inner {
   height: 45px;
 }

+ 27 - 0
desktop/core/src/desktop/static/desktop/less/hue-cross-version.less

@@ -0,0 +1,27 @@
+@import (reference) "cui/colors.less";
+@import (reference) "hue-attributes.less";
+
+.app-header {
+  font-size: 20px;
+  padding-top: 13px;
+  padding-left: 0;
+  color: @hue-primary-color-dark;
+  cursor: pointer;
+}
+
+.app-header a {
+  font-size: 20px !important;
+  color: @hue-primary-color-dark !important;
+  padding: 0 !important;
+  border: none !important;
+  max-width: none!important;
+}
+
+.app-header a:focus, .app-header a:hover {
+  color: @hue-primary-color-dark !important;
+}
+
+.selectize-error {
+  color: @hue-error-color;
+  font-size: 12px;
+}

+ 3 - 7
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -18,9 +18,10 @@
 @import (reference) "cui/colors.less";
 @import (reference) "hue-attributes.less";
 
-@import "hue-assist.less";
-@import "hue-autocomplete.less";
+@import "hue-assist";
+@import "hue-autocomplete";
 @import "hue-cui-overrides.less";
+@import "hue-cross-version.less";
 
 html {
   height: 100%;
@@ -923,11 +924,6 @@ a:visited {
   }
 }
 
-.selectize-error {
-  color: @hue-error-color;
-  font-size: 12px;
-}
-
 .uploadstatus {
   border: 1px solid @cui-gray-300;
   border-bottom: none;

+ 1 - 23
desktop/core/src/desktop/static/desktop/less/hue3-extra.less

@@ -1,29 +1,7 @@
-/*
- Licensed to Cloudera, Inc. under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  Cloudera, Inc. licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
 @import (reference) "cui/colors.less";
 @import (reference) "hue-attributes.less";
 
 @import "hue-assist";
 @import "hue-autocomplete";
 @import "hue-cui-overrides.less";
-
-.selectize-error {
-  color: @hue-error-color;
-  font-size: 12px;
-}
+@import "hue-cross-version.less";

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

@@ -30,7 +30,7 @@ def is_selected(section, matcher):
         <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="currentApp">
+              <li class="app-header">
                 <a href="/about">
                   <img src="${ static('desktop/art/icon_hue_48.png') }" class="app-icon"  alt="${ _('Hue icon') }"/>
                   ${ _('About Hue') }

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

@@ -41,7 +41,7 @@
     <div class="container-fluid">
       <div class="nav-collapse">
         <ul class="nav">
-          <li class="currentApp">
+          <li class="app-header">
             <a href="${ url('desktop.views.home2') }">
               <img src="${ static('desktop/art/home.png') }" class="app-icon" alt="${ _('Home icon') }" />
               ${ _('My documents') }

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

@@ -88,7 +88,7 @@ ${ commonheader(_('Welcome Home'), "home", user, request) | n,unicode }
     <div class="container-fluid">
       <div class="nav-collapse">
         <ul class="nav">
-          <li class="currentApp">
+          <li class="app-header">
             <a href="${ url('desktop.views.home') }">
               <img src="${ static('desktop/art/home.png') }" class="app-icon" alt="${ _('Home icon') }" />
               ${ _('My documents') }
@@ -99,7 +99,7 @@ ${ commonheader(_('Welcome Home'), "home", user, request) | n,unicode }
       % if use_new_home:
       <div class="nav-collapse pull-right">
         <ul class="nav">
-          <li class="currentApp">
+          <li class="app-header">
             <a href="${ url('desktop.views.home2') }">
               <img src="${ static('desktop/art/home.png') }" class="app-icon" alt="${ _('Home icon') }" />
               ${ _('New Home') }

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

@@ -269,7 +269,7 @@ ${ assist.assistPanel() }
     <div class="container-fluid">
       <div class="nav-collapse">
         <ul class="nav">
-          <li class="currentApp">
+          <li class="app-header">
             <a href="${ url('indexer:importer') }">
               <i class="fa fa-database app-icon"></i> ${_('Importer')}</a>
             </a>

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

@@ -119,7 +119,7 @@ ${ assist.assistPanel() }
     <div class="container-fluid">
       <div class="nav-collapse">
         <ul class="nav">
-          <li class="currentApp">
+          <li class="app-header">
             <a href="/indexer/indexer">
               <i class="fa fa-database app-icon"></i> ${_('Indexes')}</a>
             </a>

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

@@ -291,7 +291,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 
       <div class="nav-collapse">
         <ul class="nav editor-nav">
-          <li class="currentApp">
+          <li class="app-header">
             <!-- ko if: editorMode -->
               <a data-bind="attr: { href: '${ url('notebook:editor') }?type=' + editorType(), title: editorTypeTitle() + '${ _(' Editor') }' }" style="cursor: pointer">
               <!-- ko if: editorType() == 'impala' -->

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

@@ -28,7 +28,7 @@ ${ commonheader(_("Notebooks"), "spark", user, request, "60px") | n,unicode }
     <div class="container-fluid">
       <div class="nav-collapse">
         <ul class="nav editor-nav">
-          <li class="currentApp">
+          <li class="app-header">
               <a href="${ url('notebook:editor') }?type=${ editor_type }" title="${ _('%s Editor') % editor_type.title() }" style="cursor: pointer">
               % if editor_type == 'impala':
                 <img src="${ static('impala/art/icon_impala_48.png') }" class="app-icon" alt="${ _('Impala icon') }" />

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