ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject [ambari] branch trunk updated: [AMBARI-24859] Admin View: Apache Ambari logo and favicon does not show when using Knox Gateway (#2577)
Date Tue, 06 Nov 2018 17:13:20 GMT
This is an automated email from the ASF dual-hosted git repository.

jaimin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new bec3828  [AMBARI-24859] Admin View: Apache Ambari logo and favicon does not show
when using Knox Gateway (#2577)
bec3828 is described below

commit bec3828fea53c5a822fa5760ac0d8f7a546d2b0b
Author: Jetly <jaimin@hortonworks.com>
AuthorDate: Tue Nov 6 09:13:15 2018 -0800

    [AMBARI-24859] Admin View: Apache Ambari logo and favicon does not show when using Knox
Gateway (#2577)
    
    * AMBARI-24859. Admin View: Apache Ambari logo and favicon does not show when using Knox
Gateway. (jaimin)
    
    * AMBARI-24859. Admin View: Apache Ambari logo in "About" popup modal does not show when
using Knox Gateway. (jaimin)
---
 .../src/main/resources/ui/admin-web/app/images/logo.png  | Bin 0 -> 8350 bytes
 .../src/main/resources/ui/admin-web/app/index.html       |   2 +-
 .../ui/admin-web/app/styles/theme/bootstrap-ambari.css   |   4 ++--
 .../admin-web/app/views/clusters/clusterInformation.html |   2 +-
 .../ui/admin-web/app/views/modals/AboutModal.html        |   2 +-
 .../main/resources/ui/admin-web/app/views/sideNav.html   |   2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/images/logo.png b/ambari-admin/src/main/resources/ui/admin-web/app/images/logo.png
new file mode 100644
index 0000000..f051796
Binary files /dev/null and b/ambari-admin/src/main/resources/ui/admin-web/app/images/logo.png
differ
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index 99f1b94..e505acf 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -23,7 +23,7 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <link rel="shortcut icon" href="/img/logo.png" type="image/x-icon">
+  <link rel="shortcut icon" href="images/logo.png" type="image/x-icon">
   <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
   <!-- build:css styles/vendor.css -->
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/theme/bootstrap-ambari.css
b/ambari-admin/src/main/resources/ui/admin-web/app/styles/theme/bootstrap-ambari.css
index 7d1ad61..d638da9 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/theme/bootstrap-ambari.css
@@ -19,8 +19,8 @@
   font-family: 'Roboto';
   font-weight: normal;
   font-style: normal;
-  src: url('fonts/Roboto-Regular-webfont.eot');
-  src: url('fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('fonts/Roboto-Regular-webfont.woff')
format('woff'), url('fonts/Roboto-Regular-webfont.ttf') format('truetype'), url('fonts/Roboto-Regular-webfont.svg#robotoregular')
format('svg');
+  src: url('../fonts/Roboto-Regular-webfont.eot');
+  src: url('../fonts/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/Roboto-Regular-webfont.woff')
format('woff'), url('../fonts/Roboto-Regular-webfont.ttf') format('truetype'), url('../fonts/Roboto-Regular-webfont.svg#robotoregular')
format('svg');
 }
 .font-mixin {
   font-family: 'Roboto', sans-serif;
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/clusterInformation.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/clusterInformation.html
index 6c7c37e..99edfff 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/clusterInformation.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/clusterInformation.html
@@ -29,7 +29,7 @@
           {{'main.createCluster.description' | translate}}
         </span>
       </div>
-      <div><img id="install-box" src="/img/install-box.svg"></div>
+      <div><img id="install-box" src="{{fromSiteRoot('/img/install-box.svg')}}"></div>
       <div class="install-button">
         <a href="{{fromSiteRoot('/#/installer/step0')}}" class="btn btn-primary">
           {{'main.createCluster.launchInstallWizard' | translate}}
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AboutModal.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AboutModal.html
index e8856d4..91ca7e9 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AboutModal.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AboutModal.html
@@ -22,7 +22,7 @@
 <div class="modal-body">
   <div class="about clearfix">
     <div class="logo">
-      <img src="/img/logo.png" alt="{{'common.apacheAmbari' | translate}}" title="{{'common.apacheAmbari'
| translate}}">
+      <img src={{fromSiteRoot('/img/logo.png')}} alt="{{'common.apacheAmbari' | translate}}"
title="{{'common.apacheAmbari' | translate}}">
     </div>
     <div class="content">
       <div class="project">{{'common.apacheAmbari' | translate}}</div>
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/sideNav.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/sideNav.html
index e273d41..8db2493 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/sideNav.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/sideNav.html
@@ -21,7 +21,7 @@
     <ul class="side-nav-header nav nav-pills nav-stacked">
       <li class="navigation-header active">
         <a href="{{fromSiteRoot('/#/main/dashboard')}}" class="ambari-logo">
-          <img src="/img/ambari-logo.png" alt="{{'common.apacheAmbari' | translate}}"
title="{{'common.apacheAmbari' | translate}}" data-qa="ambari-logo">
+          <img src="{{fromSiteRoot('/img/ambari-logo.png')}}" alt="{{'common.apacheAmbari'
| translate}}" title="{{'common.apacheAmbari' | translate}}" data-qa="ambari-logo">
         </a>
         <div class="btn-group">
           <a href="{{fromSiteRoot('/#/main/dashboard')}}" class="ambari-header-link" title="{{'common.apacheAmbari'
| translate}}" data-qa="ambari-title">


Mime
View raw message