ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-12789. FE: Alerts counter and restart-icon are overlap each other (alexantonenko)
Date Mon, 17 Aug 2015 14:51:35 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3299ce44e -> 9d9b6c70e


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/9d9b6c70
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d9b6c70
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d9b6c70

Branch: refs/heads/trunk
Commit: 9d9b6c70ef9d7419f69fa9d6d7e33c483be2ac07
Parents: 3299ce4
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Mon Aug 17 17:48:19 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Mon Aug 17 17:51:31 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/9d9b6c70/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index a0bc3d6..f5feffc 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/9d9b6c70/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"}}&nbsp;
-  <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"}}&nbsp;
+    <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>


Mime
View raw message