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 2017/05/10 14:20:21 UTC
ambari git commit: AMBARI-20979. Outstanding Alerts UI issues
(akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 80ef77299 -> 4595f00b0
AMBARI-20979. Outstanding Alerts UI issues (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4595f00b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4595f00b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4595f00b
Branch: refs/heads/trunk
Commit: 4595f00b0ec6bfd86eb8270d3af2f6876080a84f
Parents: 80ef772
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed May 10 16:49:25 2017 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed May 10 16:49:25 2017 +0300
----------------------------------------------------------------------
.../app/controllers/main/service/info/summary.js | 2 +-
ambari-web/app/styles/alerts.less | 19 +++++++++++++++++--
ambari-web/app/styles/top-nav.less | 2 +-
ambari-web/app/templates/main/alerts.hbs | 16 ++++++++--------
4 files changed, 27 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4595f00b/ambari-web/app/controllers/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js
index 1554c61..d7fff18 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -369,7 +369,7 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix
return App.ModalPopup.show({
header: Em.I18n.t('services.service.summary.alerts.popup.header').format(context.get('displayName')),
autoHeight: false,
- classNames: ['sixty-percent-width-modal'],
+ classNames: ['sixty-percent-width-modal', 'service-alerts-popup'],
bodyClass: Em.View.extend({
templateName: require('templates/main/service/info/service_alert_popup'),
classNames: ['service-alerts'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/4595f00b/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index 5134daf..e4b21a7 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -104,14 +104,14 @@
.col0,
td:first-child,
th:first-child {
- width: 35%;
+ width: 15%;
}
.col1,
td:first-child + td,
th:first-child + th {
- width: 15%;
+ width: 35%;
}
.col2,
@@ -388,6 +388,21 @@
padding-right: 5px;
min-width: 20px;
}
+ .row {
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
+}
+
+.service-alerts-popup {
+ .modal {
+ .modal-content {
+ .modal-body {
+ padding-left: 0;
+ padding-right: 0;
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4595f00b/ambari-web/app/styles/top-nav.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/top-nav.less b/ambari-web/app/styles/top-nav.less
index 4ba11e5..2fd7db0 100644
--- a/ambari-web/app/styles/top-nav.less
+++ b/ambari-web/app/styles/top-nav.less
@@ -66,7 +66,7 @@
border-radius: 50%;
min-width: 20px;
height: 20px;
- padding: 0px 0px;
+ padding: 0 4px;
color: @top-nav-ops-count-color;
background-color: @top-nav-ops-count-bg-color;
text-align: center;
http://git-wip-us.apache.org/repos/asf/ambari/blob/4595f00b/ambari-web/app/templates/main/alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs
index a8cc513..40469d3 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -33,15 +33,15 @@
<table class="table advanced-header-table table-hover alerts-table" id="alert-definitions-table">
<thead>
{{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
- {{view view.parentView.nameSort class="first name-sorting"}}
- {{view view.parentView.statusSort class="status-sorting"}}
+ {{view view.parentView.statusSort class="first status-sorting"}}
+ {{view view.parentView.nameSort class="name-sorting"}}
{{view view.parentView.serviceSort class="service-sorting"}}
{{view view.parentView.lastTriggeredSort class="last-triggred-sorting"}}
{{view view.parentView.enabledSort class="enabled-sorting"}}
{{/view}}
<tr class="filter-row">
- <th class="first">{{view view.nameFilterView class="name-filter"}}</th>
- <th>{{view view.stateFilterView class="status-filter"}}</th>
+ <th class="first">{{view view.stateFilterView class="status-filter"}}</th>
+ <th>{{view view.nameFilterView class="name-filter"}}</th>
<th>{{view view.serviceFilterView class="service-filter"}}</th>
<th>{{view view.triggeredFilterView class="last-triggered-filter"}}</th>
<th>{{view view.enabledFilterView class="enabled-filter"}}</th>
@@ -52,13 +52,13 @@
{{#if view.pageContent}}
{{#each alertDefinition in view.pageContent}}
<tr>
- <td class="first alert-name">
+ <td class="first alert-status">
+ {{view App.AlertDefinitionSummary contentBinding="alertDefinition"}}
+ </td>
+ <td class="alert-name">
<span {{bindAttr title="alertDefinition.type"}} {{bindAttr class=":type-icon alertDefinition.typeIconClass"}}></span>
<a href="#" {{action "gotoAlertDetails" alertDefinition}}>{{alertDefinition.label}}</a>
</td>
- <td class="alert-status">
- {{view App.AlertDefinitionSummary contentBinding="alertDefinition"}}
- </td>
<td class="alert-service">{{alertDefinition.serviceDisplayName}}</td>
<td class="alert-time">
<time class="timeago" {{bindAttr data-original-title="alertDefinition.lastTriggeredFormatted"}}>{{alertDefinition.lastTriggeredAgoFormatted}}</time>