You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/08/17 16:51:01 UTC
ambari git commit: AMBARI-12789. FE: Alerts counter and restart-icon
are overlap each other (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 f9f7836eb -> ae80339c4
AMBARI-12789. FE: Alerts counter and restart-icon are overlap each other (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae80339c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae80339c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae80339c
Branch: refs/heads/branch-2.1
Commit: ae80339c43e4688fb8e062a13594a683a947d53b
Parents: f9f7836
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Aug 17 17:48:19 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Aug 17 17:50:56 2015 +0300
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 34 ++++++++++++++++++++
.../app/templates/main/service/menu_item.hbs | 21 +++++++-----
2 files changed, 47 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae80339c/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 2f18c17..3097a08 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -376,6 +376,40 @@ footer {
}
}
+.nav.top-nav-menu,
+.nav-list.nav-services {
+ .service-caption {
+ display: inline-block;
+ width: 100%;
+ &.with-alert {
+ width: 80%;
+ }
+ }
+ .icon-caption {
+ display: inline-block;
+ width: 20%;
+ }
+}
+
+.nav.top-nav-menu {
+ .icon-caption {
+ .alerts-count {
+ position: relative;
+ top: 1px;
+ }
+ }
+}
+
+.nav-list.nav-services {
+ .icon-caption {
+ .alerts-count {
+ position: relative;
+ top: 2px;
+ }
+ }
+}
+
+
.row-fluid .tinyoffset {
margin-left: 3%!important;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae80339c/ambari-web/app/templates/main/service/menu_item.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/menu_item.hbs b/ambari-web/app/templates/main/service/menu_item.hbs
index 1dc64fa..8842858 100644
--- a/ambari-web/app/templates/main/service/menu_item.hbs
+++ b/ambari-web/app/templates/main/service/menu_item.hbs
@@ -17,12 +17,17 @@
}}
<a {{bindAttr href="view.link"}}>
- {{#if view.alertsCount}}
- <span {{bindAttr class=":label :alerts-count view.hasCriticalAlerts:alerts-crit-count:alerts-warn-count"}}>
- {{view.alertsCount}}
- </span>
- {{/if}}
- {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}}
- <span>{{unbound view.content.displayName}}</span>
- <i rel="tooltip" {{action goToConfigs target="view"}}{{bindAttr class=":icon-refresh :restart-required-service view.content.isRestartRequired::hidden" data-original-title="view.restartRequiredMessage"}}></i>
+ <div {{bindAttr class="view.alertsCount:with-alert :service-caption"}}>
+ {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}}
+ <span>{{unbound view.content.displayName}}</span>
+ <i rel="tooltip" {{action goToConfigs target="view"}}{{bindAttr class=":icon-refresh :restart-required-service view.content.isRestartRequired::hidden" data-original-title="view.restartRequiredMessage"}}></i>
+ </div>
+
+ <div class="icon-caption">
+ {{#if view.alertsCount}}
+ <span {{bindAttr class=":label :alerts-count view.hasCriticalAlerts:alerts-crit-count:alerts-warn-count"}}>
+ {{view.alertsCount}}
+ </span>
+ {{/if}}
+ </div>
</a>