You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/12/04 21:09:51 UTC
ambari git commit: AMBARI-8541. Alerts UI: Miscellaneous alerts UI
style corrections (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk f6e34a544 -> 472206f10
AMBARI-8541. Alerts UI: Miscellaneous alerts UI style corrections (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/472206f1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/472206f1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/472206f1
Branch: refs/heads/trunk
Commit: 472206f10792e9c00a1c34dfb220184d615efebe
Parents: f6e34a5
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Thu Dec 4 00:37:41 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Thu Dec 4 12:04:14 2014 -0800
----------------------------------------------------------------------
ambari-web/app/app.js | 2 ++
ambari-web/app/messages.js | 10 +++---
ambari-web/app/models/alert_instance.js | 8 ++---
ambari-web/app/styles/alerts.less | 33 +++++++++++++++-----
.../app/templates/common/alerts_popup.hbs | 9 +++---
ambari-web/app/templates/main/alerts.hbs | 18 ++++++++---
.../main/alerts/definition_details.hbs | 33 +++++++++++---------
.../app/views/main/alert_definitions_view.js | 2 +-
8 files changed, 76 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 945b3e1..a36087d 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -70,6 +70,8 @@ module.exports = Em.Application.create({
switch (type) {
case 'ADMIN':
return this.get('isAdmin');
+ case 'NON_ADMIN':
+ return !this.get('isAdmin');
case 'MANAGER':
return this.get('isAdmin') || this.get('isOperator');
case 'OPERATOR':
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 38cdd49..7752fde 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -848,7 +848,7 @@ Em.I18n.translations = {
'alerts.fastAccess.popup.header': '{0} Critical or Warning Alerts',
'alerts.fastAccess.popup.body.name': 'Alert Name',
- 'alerts.fastAccess.popup.body.showmore': 'Show all Alerts Definitions',
+ 'alerts.fastAccess.popup.body.showmore': 'Go to Alerts Definitions',
'alerts.fastAccess.popup.body.noalerts': 'No critical or warning alerts to display',
'alerts.actions.create': 'Create Alert',
@@ -858,12 +858,14 @@ Em.I18n.translations = {
'alerts.table.noAlerts': 'No Alerts to display',
'alerts.table.header.lastTriggered': 'Last Triggered',
+ 'alerts.table.header.lastTrigger': 'Last Trigger',
'alerts.table.header.definitionName': 'Definition Name',
'alerts.table.header.notification': 'Notification',
+ 'alerts.table.state': 'State',
'alerts.table.state.enabled': 'Enabled',
'alerts.table.state.disabled': 'Disabled',
- 'alerts.table.state.enabled.tooltip': 'Disable this alert definition',
- 'alerts.table.state.disabled.tooltip': 'Enable this alert definition',
+ 'alerts.table.state.enabled.tooltip': 'Click to disable this alert definition',
+ 'alerts.table.state.disabled.tooltip': 'Click to enable this alert definition',
'alerts.table.state.enabled.confirm.msg': 'You are about to Disable this alert definition.',
'alerts.table.state.disabled.confirm.msg': 'You are about to Enable this alert definition.',
'alerts.table.state.enabled.confirm.btn': 'Confirm Disable',
@@ -875,7 +877,7 @@ Em.I18n.translations = {
'alerts.definition.details.enableDisable': 'Enable / Disable',
'alerts.definition.details.groups': 'Groups',
'alerts.definition.details.instances': 'Instances',
- 'alerts.definition.details.serviceHost': 'Service: Host',
+ 'alerts.definition.details.serviceHost': 'Service / Host',
'alerts.definition.details.24-hour': '24-Hour',
'alerts.definition.details.notification': 'Notification',
'alerts.definition.details.noAlerts': 'No alert instances to show',
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/models/alert_instance.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alert_instance.js b/ambari-web/app/models/alert_instance.js
index 86ab4b7..6a84465 100644
--- a/ambari-web/app/models/alert_instance.js
+++ b/ambari-web/app/models/alert_instance.js
@@ -54,17 +54,17 @@ App.AlertInstance = DS.Model.extend({
* @type {string}
*/
lastTriggered: function() {
- return dateUtils.dateFormat(this.get('latestTimestamp'));
- }.property('latestTimestamp'),
+ return dateUtils.dateFormat(this.get('originalTimestamp'));
+ }.property('originalTimestamp'),
/**
* Formatted timestamp with <code>$.timeago</code>
* @type {string}
*/
lastTriggeredAgoFormatted: function () {
- var lastTriggered = this.get('latestTimestamp');
+ var lastTriggered = this.get('originalTimestamp');
return lastTriggered ? $.timeago(new Date(lastTriggered)): '';
- }.property('latestTimestamp'),
+ }.property('originalTimestamp'),
/**
* List of css-classes for alert instance status
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index 855d039..b203698 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -53,6 +53,14 @@
}
}
+.alert-definition-enable {
+ color: @health-status-green;
+}
+
+.alert-definition-disable {
+ color: gray;
+}
+
.alerts-table {
margin-top: 10px;
@@ -169,6 +177,9 @@
hr {
margin: 10px 0 0 0;
}
+ .edit-description-button {
+ font-size: 14px;
+ }
.edit-description-button:hover {
text-decoration: none;
}
@@ -191,6 +202,9 @@
.properties-list {
margin-top: 50px;
text-align: left;
+ .property-name {
+ font-weight: bold;
+ }
ul {
list-style: none;
margin: 0;
@@ -216,6 +230,8 @@
.edit-buttons {
margin-bottom: 0px;
margin-top: -4px;
+ float: left;
+ margin-left: 7px;
}
}
@@ -389,22 +405,23 @@
border-bottom: 1px solid #CCC;
text-align: center;
font-size: 15px;
- padding: 0 0 20px 0;
+ padding: 0px 0px 20px 0px;
height: 20px;
.status-top {
- width: 5%;
- padding-left: 20px;
+ width: 12%;
+ padding-left: 5px;
+ min-width: 20px;
}
.name-top {
- width: 30%;
- padding-left: 110px;
+ width: 33%;
+ padding-left: 10px;
}
.service-top {
- width: 30%;
- padding-left: 5px;
+ width: 28%;
+ padding-left: 10px;
}
.last-triggered-top {
- padding-left: 5px;
+ padding-left: 10px;
}
.status-top,.name-top,.service-top,.last-triggered-top {
float: left;
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/templates/common/alerts_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/alerts_popup.hbs b/ambari-web/app/templates/common/alerts_popup.hbs
index ff29fce..1c19074 100644
--- a/ambari-web/app/templates/common/alerts_popup.hbs
+++ b/ambari-web/app/templates/common/alerts_popup.hbs
@@ -20,7 +20,7 @@
{{#if view.isLoaded}}
<div class="alert-list-main-warp">
<div class="top-wrap">
- <div class="status-top"></div>
+ <div class="status-top"> </div>
<div class="name-top">{{t alerts.fastAccess.popup.body.name}}</div>
<div class="service-top">{{t alerts.definition.details.serviceHost}}</div>
<div class="last-triggered-top">{{t alerts.table.header.lastTriggered}}</div>
@@ -34,11 +34,12 @@
<div class="alert-list-line-cursor">
<div class="status-icon">{{{alertInstance.status}}}</div>
<div class="name-text"><a href="#" {{action "gotoAlertDetails" alertInstance target="view"}}>{{alertInstance.label}}</a></div>
- <div class="service-text"><a href="#" {{action "gotoService" alertInstance.service target="view"}}>{{alertInstance.service.displayName}}</a>:
+ <div class="service-text"><a href="#" {{action "gotoService" alertInstance.service target="view"}}>{{alertInstance.service.displayName}}</a>
{{#if alertInstance.host}}
+ {{#if alertInstance.service.displayName}}
+ /
+ {{/if}}
<a {{action "goToHostAlerts" alertInstance.host target="view"}} href="#">{{alertInstance.host.hostName}}</a>
- {{else}}
- <span class="na-text">{{t common.na}}</span>
{{/if}}
</div>
<div class="last-triggered-text">{{alertInstance.lastTriggered}}</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/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 b18eb54..d95c4ac 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -58,23 +58,33 @@
<td><time class="timeago" {{bindAttr data-original-title="alertDefinition.lastTriggeredFormatted"}}>{{alertDefinition.lastTriggeredAgoFormatted}}</time></td>
<td class="last toggle-state-button">
{{#if alertDefinition.enabled}}
- {{t alerts.table.state.enabled}}
{{#isAccessible ADMIN}}
<span class="enable-disable-button" {{bindAttr data-original-title="view.enabledTooltip"}}>
- <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class="alertDefinition.enabled:enabled:disabled"}}>
+ <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class="alertDefinition.enabled:alert-definition-enable:alert-definition-disable"}}>
<span class="icon-off"></span>
+ {{t alerts.table.state.enabled}}
</a>
</span>
{{/isAccessible}}
+ {{#isAccessible NON_ADMIN}}
+ <span {{bindAttr class="alertDefinition.enabled:alert-definition-enable:alert-definition-disable"}}>
+ {{t alerts.table.state.enabled}}
+ </span>
+ {{/isAccessible}}
{{else}}
- {{t alerts.table.state.disabled}}
{{#isAccessible ADMIN}}
<span class="enable-disable-button" {{bindAttr data-original-title="view.disabledTooltip"}}>
- <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class="alertDefinition.enabled:enabled:disabled"}}>
+ <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class="alertDefinition.enabled:alert-definition-enable:alert-definition-disable"}}>
<span class="icon-off"></span>
+ {{t alerts.table.state.disabled}}
</a>
</span>
{{/isAccessible}}
+ {{#isAccessible NON_ADMIN}}
+ <span {{bindAttr class="alertDefinition.enabled:alert-definition-enable:alert-definition-disable"}}>
+ {{t alerts.table.state.disabled}}
+ </span>
+ {{/isAccessible}}
{{/if}}
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/templates/main/alerts/definition_details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs
index 7f53a6b..3598664 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -25,10 +25,10 @@
<div class="span9">
<div class="definition-name row-fluid">
{{#if controller.editing.label.isEditing}}
- <div {{bindAttr class="controller.editing.label.isError:error :span8 :name-text-field :control-group"}}>
+ <div {{bindAttr class="controller.editing.label.isError:error :span5 :name-text-field :control-group"}}>
{{view Em.TextField valueBinding="controller.editing.label.value"}}
</div>
- <div class="edit-buttons span3">
+ <div class="edit-buttons">
<button {{action cancelEdit controller.editing.label target="controller"}} class="btn">{{t common.cancel}}</button>
<button {{bindAttr disabled="controller.editing.label.isError"}} {{action saveEdit controller.editing.label target="controller"}}
class="btn btn-primary">{{t common.save}}
@@ -114,21 +114,25 @@
{{/isAccessible}}
</div>
<div class="properties-list">
+ {{#if controller.content.service.displayName}}
<div class="row-fluid">
- <div class="span4">{{t common.service}}:</div>
- <div class="span8"><span class="label label-info">{{controller.content.service.displayName}}</span></div>
- </div>
+ <div class="span4 property-name">{{t common.service}}:</div>
+ <div class="span8"><span>{{controller.content.service.displayName}}</span></div>
+ </div>
+ {{/if}}
+ {{#if controller.content.componentNameFormatted}}
<div class="row-fluid">
- <div class="span4">{{t common.component}}:</div>
+ <div class="span4 property-name">{{t common.component}}:</div>
<div class="span8">{{controller.content.componentNameFormatted}}</div>
- </div>
+ </div>
+ {{/if}}
<div class="row-fluid">
- <div class="span4">{{t common.type}}:</div>
+ <div class="span4 property-name">{{t common.type}}:</div>
<div class="span8"> {{controller.content.type}}</div>
- </div>
+ </div>
{{#if controller.groupsList.length}}
<div class="row-fluid">
- <div class="span4">{{t alerts.definition.details.groups}}:</div>
+ <div class="span4 property-name">{{t alerts.definition.details.groups}}:</div>
<div class="span8">
<ul>
{{#each groupName in controller.groupsList}}
@@ -139,7 +143,7 @@
</div>
{{/if}}
<div class="row-fluid">
- <div class="span4">{{t alerts.table.header.lastTriggered}}:</div>
+ <div class="span4 property-name">{{t alerts.table.header.lastTrigger}}:</div>
<div class="span8">{{controller.content.lastTriggeredFormatted}}</div>
</div>
</div>
@@ -170,11 +174,12 @@
<tr>
<td class="first">{{{instance.status}}}</td>
<td>
- <a {{action goToService instance.service target="controller"}} href="#">{{instance.service.displayName}}</a>:
+ <a {{action goToService instance.service target="controller"}} href="#">{{instance.service.displayName}}</a>
{{#if instance.host}}
+ {{#if instance.service.displayName}}
+ /
+ {{/if}}
<a {{action goToHostAlerts instance.host target="controller"}} href="#">{{instance.host.hostName}}</a>
- {{else}}
- {{t common.na}}
{{/if}}
</td>
<td><time class="timeago" {{bindAttr data-original-title="instance.lastTriggered"}}>{{instance.lastTriggeredAgoFormatted}}</time></td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/472206f1/ambari-web/app/views/main/alert_definitions_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alert_definitions_view.js b/ambari-web/app/views/main/alert_definitions_view.js
index df25bbd..0afb9f2 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -103,7 +103,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
* @type {Em.View}
*/
enabledSort: sort.fieldView.extend({
- template:Em.Handlebars.compile('<span {{bindAttr class="view.status :column-name"}}><span class="icon-off"></span></span>'),
+ template:Em.Handlebars.compile('<span {{bindAttr class="view.status :column-name"}}>{{t alerts.table.state}}</span>'),
column: 6,
name: 'enabled'
}),