Merge pull request #127 from hiveww/AMBARI-22793-trunk

AMBARI-22793. Notification popover layout issues
apache · Jan 16, 2018 · 9804cb2 · 9804cb2
2 parents 199e866 + 4653253
commit 9804cb2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
@@ -2596,4 +2596,8 @@ a.abort-icon:hover {
   padding: 10px;
   max-height: 120px;
   overflow: scroll;
+}
+
+#notifications-dropdown.dropdown-menu .notifications-header .notifications-title {
+  line-height: 30px;
 }
diff --git a/ambari-web/app/templates/main/alerts/alert_notifications_popup.hbs b/ambari-web/app/templates/main/alerts/alert_notifications_popup.hbs
@@ -18,25 +18,25 @@
 
 <div class="popup-arrow-up"></div>
 <div class="notifications-header col-sm-12">
-  <div class="notifications-title">{{t alerts.dropdown.dialog.title}} ({{view.alertsNumber}})</div>
+  <div class="notifications-title pull-left">{{t alerts.dropdown.dialog.title}} ({{view.alertsNumber}})</div>
+  {{#if view.isLoaded}}
+    <div class="state-filter pull-right">
+      <span>{{t common.show}}:&nbsp;</span>
+      <div class="btn-group">
+        {{view Ember.Select
+               contentBinding="view.categories"
+               optionValuePath="content.value"
+               optionLabelPath="content.label"
+               selectionBinding="view.selectedCategory"
+               classNames="filter-select form-control"
+        }}
+      </div>
+    </div>
+  {{/if}}
 </div>
 
 <div class="notifications-body col-sm-12">
   {{#if view.isLoaded}}
-    <div class="table-controls row">
-      <div class="state-filter pull-right">
-        <span>{{t common.show}}:&nbsp;</span>
-        <div class="btn-group">
-          {{view Ember.Select
-          contentBinding="view.categories"
-          optionValuePath="content.value"
-          optionLabelPath="content.label"
-          selectionBinding="view.selectedCategory"
-          classNames="filter-select form-control"
-          }}
-        </div>
-      </div>
-    </div>
     <table class="alerts-table table table-hover">
       <tbody>
         {{#if view.isAlertEmptyList}}