You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/09/29 17:43:03 UTC
ambari git commit: AMBARI-13270. Service tabs are not visible on
Customize service page of SAPHD (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk a1488cec7 -> d4edf4619
AMBARI-13270. Service tabs are not visible on Customize service page of SAPHD (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4edf461
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4edf461
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4edf461
Branch: refs/heads/trunk
Commit: d4edf4619c1c0bb309920ba86e66012a2a2e7090
Parents: a1488ce
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Sep 29 18:31:38 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Sep 29 18:31:38 2015 +0300
----------------------------------------------------------------------
.../resources/SAPHD/custom_ui.less | 21 ++++++++++++--------
.../templates/common/configs/service_config.hbs | 2 +-
ambari-web/app/templates/main/dashboard.hbs | 2 +-
.../views/main/admin/stack_upgrade/menu_view.js | 2 +-
ambari-web/app/views/main/host/menu.js | 2 +-
ambari-web/app/views/main/service/info/menu.js | 2 +-
6 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4edf461/ambari-common/src/main/python/pluggable_stack_definition/resources/SAPHD/custom_ui.less
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/pluggable_stack_definition/resources/SAPHD/custom_ui.less b/ambari-common/src/main/python/pluggable_stack_definition/resources/SAPHD/custom_ui.less
index 055a680..c8aba39 100644
--- a/ambari-common/src/main/python/pluggable_stack_definition/resources/SAPHD/custom_ui.less
+++ b/ambari-common/src/main/python/pluggable_stack_definition/resources/SAPHD/custom_ui.less
@@ -36,16 +36,21 @@ body {
&.text-success {
color: @green-on-background;
}
-}
-// Text color for not-active nav tab
-.nav-tabs > li > a {
- color: @text-on-background;
-}
+ // Text color for not-active nav tab
+ &.nav-tabs > li > a {
+ color: @text-on-background;
+ }
-// Text color for hovered nav tab
-.nav-tabs > li:hover > a {
- color: #000000;
+ // Text color for hovered nav tab
+ &.nav-tabs > li:hover > a {
+ color: #000000;
+ }
+
+ // Text color for active nav tab
+ &.nav-tabs > li.active > a {
+ color: #000000;
+ }
}
// Text and caret color for quick links dropdown (not active)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4edf461/ambari-web/app/templates/common/configs/service_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 72c7c35..29b05fe 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -109,7 +109,7 @@
</div>
{{/unless}}
{{#if view.supportsConfigLayout}}
- <ul class="nav nav-tabs mbm config-tabs">
+ <ul class="nav nav-tabs mbm config-tabs background-text">
{{#each tab in view.tabs}}
<li rel='tooltip' {{bindAttr class="tab.isActive:active tab.isHiddenByFilter:disabled" data-original-title="tab.tooltipMsg"}}>
<a href="#" {{action "setActiveTab" tab target="view"}} {{bindAttr data-target="tab.headingClass"}} data-toggle="tab">
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4edf461/ambari-web/app/templates/main/dashboard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard.hbs b/ambari-web/app/templates/main/dashboard.hbs
index 707c5df..f020162 100644
--- a/ambari-web/app/templates/main/dashboard.hbs
+++ b/ambari-web/app/templates/main/dashboard.hbs
@@ -22,7 +22,7 @@
{{view App.AllServicesActionView}}
</div>
<div class="summary-width span10" id="dashboard-widgets-container">
- <ul class="nav nav-tabs">
+ <ul class="nav nav-tabs background-text">
{{#each category in view.categories}}
{{#view view.NavItemView itemBinding="category.name" }}
<a href="#" {{action "goToDashboardView" category.url}} >{{category.label}}</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4edf461/ambari-web/app/views/main/admin/stack_upgrade/menu_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/menu_view.js b/ambari-web/app/views/main/admin/stack_upgrade/menu_view.js
index 1006013..1e84f1c 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/menu_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/menu_view.js
@@ -20,7 +20,7 @@ var App = require('app');
App.MainAdminStackMenuView = Em.CollectionView.extend({
tagName: 'ul',
- classNames: ["nav", "nav-tabs"],
+ classNames: ["nav", "nav-tabs", "background-text"],
defaultRoute: 'services',
content: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4edf461/ambari-web/app/views/main/host/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/menu.js b/ambari-web/app/views/main/host/menu.js
index 92c123c..15608d1 100644
--- a/ambari-web/app/views/main/host/menu.js
+++ b/ambari-web/app/views/main/host/menu.js
@@ -20,7 +20,7 @@ var App = require('app');
App.MainHostMenuView = Em.CollectionView.extend({
tagName: 'ul',
- classNames: ["nav", "nav-tabs"],
+ classNames: ["nav", "nav-tabs", "background-text"],
host: null,
content: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4edf461/ambari-web/app/views/main/service/info/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/menu.js b/ambari-web/app/views/main/service/info/menu.js
index c2577ca..3de23fd 100644
--- a/ambari-web/app/views/main/service/info/menu.js
+++ b/ambari-web/app/views/main/service/info/menu.js
@@ -20,7 +20,7 @@ var App = require('app');
App.MainServiceInfoMenuView = Em.CollectionView.extend({
tagName: 'ul',
- classNames: ["nav", "nav-tabs"],
+ classNames: ["nav", "nav-tabs", "background-text"],
content:function(){
var menuItems = [
{ label: Em.I18n.t('services.service.info.menu.summary'), id: 'summary-service-tab',routing:'summary', active:"active"}