You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/10/03 21:45:26 UTC
git commit: AMBARI-3393. Quick Links on service page should be
consistent with the ones on dashboard. (xiwang via yusaku)
Updated Branches:
refs/heads/trunk cbe4b253b -> fb62623e8
AMBARI-3393. Quick Links on service page should be consistent with the ones on dashboard. (xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/fb62623e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/fb62623e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/fb62623e
Branch: refs/heads/trunk
Commit: fb62623e89b6d47335956c0108649054791573ae
Parents: cbe4b25
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Oct 3 12:27:17 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Oct 3 12:45:12 2013 -0700
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 28 +++++++++++++++++----
ambari-web/app/templates/main/service/item.hbs | 28 ++++++++++-----------
2 files changed, 37 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fb62623e/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 3d13a86..5fcb2a6 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2006,6 +2006,29 @@ width:100%;
position: absolute;
}
}
+ .nav li.dropdown.open {
+ .dropdown-toggle{
+ color: #005580;
+ background-color: #eeeeee;
+ border-color: #eeeeee;
+ -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ }
+ a:hover .caret {
+ border-top-color: #005580;
+ border-bottom-color: #005580;
+ }
+ .caret {
+ border-top-color: #005580;
+ border-bottom-color: #005580;
+ }
+ }
+ .disabled-hdfs-quick-link {
+ pointer-events: none;
+ color: #808080;
+ cursor: default;
+ }
}
.service-content {
@@ -2016,11 +2039,6 @@ width:100%;
.service-block {
margin-top: 20px;
- .disabled-hdfs-quick-link {
- pointer-events: none;
- color: #808080;
- cursor: default;
- }
}
.service-configuration {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fb62623e/ambari-web/app/templates/main/service/item.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/item.hbs b/ambari-web/app/templates/main/service/item.hbs
index e584243..343d151 100644
--- a/ambari-web/app/templates/main/service/item.hbs
+++ b/ambari-web/app/templates/main/service/item.hbs
@@ -20,20 +20,20 @@
<div class="span3 quick-links-wrapper">
{{#if view.service.quickLinks.length}}
{{#view App.QuickViewLinks contentBinding="view.service"}}
- <ul class="nav nav-pills move">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{t common.quickLinks}}<b class="caret"></b></a>
- <ul class="dropdown-menu">
- {{#each view.quickLinks}}
- {{#if disabled}}
- <a class="disabled-hdfs-quick-link">{{label}}</a>
- {{else}}
- <a {{bindAttr href="url"}} {{bindAttr target="view.linkTarget"}}>{{label}}</a>
- {{/if}}
- {{/each}}
- </ul>
- </li>
- </ul>
+ <ul class="nav nav-pills move">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{t common.quickLinks}}<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ {{#each view.quickLinks}}
+ {{#if disabled}}
+ <li><a class="disabled-hdfs-quick-link">{{label}}</a></li>
+ {{else}}
+ <li><a {{bindAttr href="url"}} {{bindAttr target="view.linkTarget"}}>{{label}}</a></li>
+ {{/if}}
+ {{/each}}
+ </ul>
+ </li>
+ </ul>
{{/view}}
{{/if}}
</div>