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 2014/12/08 21:55:31 UTC
ambari git commit: AMBARI-8592. Alerts: Make the markup test
friendly. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 8a322603d -> ed0681a84
AMBARI-8592. Alerts: Make the markup test friendly. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed0681a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed0681a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed0681a8
Branch: refs/heads/trunk
Commit: ed0681a842f7b85882284f231c67354601ba8c43
Parents: 8a32260
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Dec 8 22:13:33 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Dec 8 22:54:45 2014 +0200
----------------------------------------------------------------------
ambari-web/app/templates/main/alerts.hbs | 20 ++++++++++----------
.../app/templates/main/alerts/configs.hbs | 2 +-
.../main/alerts/definition_details.hbs | 10 +++++-----
.../main/alerts/manage_alert_groups_popup.hbs | 14 +++++++-------
.../alerts/manage_alert_notifications_popup.hbs | 6 +++---
.../app/templates/main/host/host_alerts.hbs | 20 ++++++++++----------
6 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed0681a8/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 e6cb034..f406de5 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -32,18 +32,18 @@
<table class="table advanced-header-table table-bordered table-striped alerts-table" id="alert-definitions-table">
<thead>
{{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
- {{view view.parentView.nameSort class="first"}}
- {{view view.parentView.statusSort}}
- {{view view.parentView.serviceSort}}
- {{view view.parentView.lastTriggeredSort}}
- {{view view.parentView.enabledSort}}
+ {{view view.parentView.nameSort class="first name-sorting"}}
+ {{view view.parentView.statusSort class="status-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}}</th>
- <th>{{view view.stateFilterView}}</th>
- <th>{{view view.serviceFilterView}}</th>
- <th>{{view view.triggeredFilterView}}</th>
- <th>{{view view.enabledFilterView}}</th>
+ <th class="first">{{view view.nameFilterView class="name-filter"}}</th>
+ <th>{{view view.stateFilterView class="status-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>
</tr>
</thead>
<tbody>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed0681a8/ambari-web/app/templates/main/alerts/configs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/configs.hbs b/ambari-web/app/templates/main/alerts/configs.hbs
index f4cb521..88911b6 100644
--- a/ambari-web/app/templates/main/alerts/configs.hbs
+++ b/ambari-web/app/templates/main/alerts/configs.hbs
@@ -17,7 +17,7 @@
}}
<form class="form-horizontal alert-configs">
{{#each property in controller.configs}}
- <div class="control-group">
+ <div {{bindAttr class=":control-group property.name"}}>
{{#if property.isPreLabeled}}
<label {{bindAttr class=":control-label property.isShifted:shifted"}}>{{property.label}}</label>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed0681a8/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 6a01acd..93a24bd 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -30,9 +30,9 @@
{{view Em.TextField valueBinding="controller.editing.label.value"}}
</div>
<div class="edit-buttons">
- <button {{action cancelEdit controller.editing.label target="controller"}} class="btn">{{t common.cancel}}</button>
+ <button {{action cancelEdit controller.editing.label target="controller"}} class="btn cancel-button">{{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}}
+ class="btn btn-primary save-button">{{t common.save}}
</button>
</div>
{{else}}
@@ -84,13 +84,13 @@
<div class="buttons-block">
{{#isAccessible ADMIN}}
{{#if controller.content.enabled}}
- <button {{action toggleState target="controller"}} class="btn btn-danger"><i
+ <button {{action toggleState target="controller"}} class="btn btn-danger disable-button"><i
class="icon-power-off"></i> {{t alerts.definition.details.disable}}</button>
{{else}}
- <button {{action toggleState target="controller"}} class="btn btn-success"><i
+ <button {{action toggleState target="controller"}} class="btn btn-success enable-button"><i
class="icon-power-off"></i> {{t alerts.definition.details.enable}}</button>
{{/if}}
- <button {{action deleteAlertDefinition target="controller"}} class="btn"><i
+ <button {{action deleteAlertDefinition target="controller"}} class="btn delete-button"><i
class="icon-trash"></i> {{t common.delete}}</button>
{{/isAccessible}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed0681a8/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
index 81d86a4..15cf3b1 100644
--- a/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
+++ b/ambari-web/app/templates/main/alerts/manage_alert_groups_popup.hbs
@@ -27,15 +27,15 @@
optionLabelPath="content.displayNameDefinitions"
selectionBinding="view.selectedAlertGroup"
multiple="multiple"
- class="group-select"
+ class="group-select select-group-box"
}}
<div class="btn-toolbar pull-right">
- <button rel="button-info" class="btn" {{bindAttr data-original-title="view.addButtonTooltip"}}
+ <button rel="button-info" class="btn add-group-button" {{bindAttr data-original-title="view.addButtonTooltip"}}
{{action addAlertGroup target="controller"}}><i class="icon-plus"></i></button>
- <a rel="button-info" class="btn" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="controller.isRemoveButtonDisabled"}}
+ <a rel="button-info" class="btn remove-group-button" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="controller.isRemoveButtonDisabled"}}
{{action confirmDelete target="controller"}}><i class="icon-minus"></i></a>
<div class="btn-group">
- <button class="btn dropdown-toggle" data-toggle="dropdown">
+ <button class="btn dropdown-toggle actions-group-button" data-toggle="dropdown">
<i class="icon-cog"></i> <span class="caret"></span>
</button>
<ul class="dropdown-menu">
@@ -57,13 +57,13 @@
contentBinding="selectedAlertGroup.definitions"
optionLabelPath="content.label"
multiple="multiple"
- class="group-select"
+ class="group-select select-definiton-box"
selectionBinding="selectedDefinitions"
}}
</div>
<div class="button-group pull-right">
- <a rel="button-info" {{bindAttr data-original-title="view.addDefinitionTooltip" class=":btn selectedAlertGroup.isAddDefinitionsDisabled:disabled"}} {{action addDefinitions target="controller"}} ><i class="icon-plus"></i></a>
- <a rel="button-info" {{bindAttr data-original-title="view.removeDefinitionTooltip" class=":btn isDeleteDefinitionsDisabled:disabled"}} {{action deleteDefinitions target="controller"}} ><i class="icon-minus"></i></a>
+ <a rel="button-info" {{bindAttr data-original-title="view.addDefinitionTooltip" class=":btn selectedAlertGroup.isAddDefinitionsDisabled:disabled :add-definition"}} {{action addDefinitions target="controller"}} ><i class="icon-plus"></i></a>
+ <a rel="button-info" {{bindAttr data-original-title="view.removeDefinitionTooltip" class=":btn isDeleteDefinitionsDisabled:disabled :remove-definition"}} {{action deleteDefinitions target="controller"}} ><i class="icon-minus"></i></a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed0681a8/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs b/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs
index e778360..97b1f5d 100644
--- a/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs
+++ b/ambari-web/app/templates/main/alerts/manage_alert_notifications_popup.hbs
@@ -30,14 +30,14 @@
selectionBinding="view.selectedAlertNotification"
}}
<div class="btn-toolbar pull-right">
- <button rel="button-info" class="btn"
+ <button rel="button-info" class="btn add-notification-button"
{{translateAttr data-original-title="alerts.actions.manage_alert_notifications_popup.addButton"}}
{{action addAlertNotification target="controller"}}><i class="icon-plus"></i></button>
- <button rel="button-info" class="btn"
+ <button rel="button-info" class="btn remove-notification-button"
{{translateAttr data-original-title="alerts.actions.manage_alert_notifications_popup.removeButton"}}
{{bindAttr disabled="view.isRemoveButtonDisabled"}}
{{action deleteAlertNotification target="controller"}}><i class="icon-minus"></i></button>
- <div class="btn-group">
+ <div class="btn-group notification-actions-button">
<button class="btn dropdown-toggle" data-toggle="dropdown">
<i class="icon-cog"></i> <span class="caret"></span>
</button>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed0681a8/ambari-web/app/templates/main/host/host_alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/host_alerts.hbs b/ambari-web/app/templates/main/host/host_alerts.hbs
index c660cdf..d1834af 100644
--- a/ambari-web/app/templates/main/host/host_alerts.hbs
+++ b/ambari-web/app/templates/main/host/host_alerts.hbs
@@ -25,18 +25,18 @@
<table class="table advanced-header-table table-bordered table-striped alerts-table" id="host-alerts-table">
<thead>
{{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
- {{view view.parentView.serviceSort class="first"}}
- {{view view.parentView.nameSort}}
- {{view view.parentView.lastCheckedSort}}
- {{view view.parentView.statusSort}}
- {{view view.parentView.textSort}}
+ {{view view.parentView.serviceSort class="first service-sorting"}}
+ {{view view.parentView.nameSort class="name-sorting"}}
+ {{view view.parentView.lastCheckedSort class="last-checked-sorting"}}
+ {{view view.parentView.statusSort class="status-sorting"}}
+ {{view view.parentView.textSort class="text-sorting"}}
{{/view}}
<tr class="filter-row">
- <th class="first">{{view view.serviceFilterView}}</th>
- <th>{{view view.nameFilterView}}</th>
- <th>{{view view.checkedFilterView}}</th>
- <th>{{view view.stateFilterView}}</th>
- <th>{{view view.textView}}</th>
+ <th class="first">{{view view.serviceFilterView class="service-filter"}}</th>
+ <th>{{view view.nameFilterView class="name-filter"}}</th>
+ <th>{{view view.checkedFilterView class="checked-filter"}}</th>
+ <th>{{view view.stateFilterView class="status-filter"}}</th>
+ <th>{{view view.textView class="text-filter"}}</th>
</tr>
</thead>
<tbody>