You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/08/29 23:59:16 UTC
git commit: AMBARI-7091. Config History: assign specific ids and
classes to DOM elements ease test automation.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk fa7341fe4 -> 1af0a4417
AMBARI-7091. Config History: assign specific ids and classes to DOM elements ease test automation.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1af0a441
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1af0a441
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1af0a441
Branch: refs/heads/trunk
Commit: 1af0a44173d65690804be0aeda746c7ee4088877
Parents: fa7341f
Author: Xi Wang <xi...@apache.org>
Authored: Fri Aug 29 14:36:58 2014 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Aug 29 14:58:52 2014 -0700
----------------------------------------------------------------------
.../common/configs/config_history_flow.hbs | 18 +++++++++---------
.../templates/main/dashboard/config_history.hbs | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1af0a441/ambari-web/app/templates/common/configs/config_history_flow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs
index 9825fe4..a900760 100644
--- a/ambari-web/app/templates/common/configs/config_history_flow.hbs
+++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs
@@ -25,7 +25,7 @@
<div {{bindAttr class=":flow-element :pull-left serviceVersion.first:first"}}>
<div class="arrow-box pull-left"><i class="icon-arrow-right icon-3x"></i></div>
<div class="version-box">
- <div {{bindAttr class=":box :pull-right serviceVersion.isDisplayed:displayed serviceVersion.isDisabled:grayedOut"}} {{action switchVersion serviceVersion target="view"}}>
+ <div {{bindAttr class=":version-info :box :pull-right serviceVersion.isDisplayed:displayed serviceVersion.isDisabled:grayedOut"}} {{action switchVersion serviceVersion target="view"}}>
<div class="top-label">
<span class="label label-info">{{serviceVersion.versionText}}</span>
{{#if serviceVersion.isCurrent}}
@@ -44,7 +44,7 @@
<strong>{{t services.service.config.configHistory.configGroup}}:{{serviceVersion.configGroupName}}</strong>
<div class="notes">{{serviceVersion.briefNotes}}</div>
</div>
- <div>
+ <div class="version-operations-buttons">
<button {{bindAttr disabled="serviceVersion.disabledActionAttr.view" class=":btn serviceVersion.isDisplayed:not-allowed-cursor" title="serviceVersion.disabledActionMessages.view"}} {{action switchVersion serviceVersion target="view"}}><i class="icon-search"></i> {{t common.view}}</button>
<button {{bindAttr disabled="serviceVersion.disabledActionAttr.compare" class=":btn serviceVersion.isDisplayed:not-allowed-cursor" title="serviceVersion.disabledActionMessages.compare"}} {{action compare serviceVersion target="view"}}><i class="icon-copy"></i> {{t common.compare}}</button>
<button {{bindAttr disabled="serviceVersion.disabledActionAttr.revert" class=":btn serviceVersion.isCurrent:not-allowed-cursor" title="serviceVersion.disabledActionMessages.revert"}} {{action revert serviceVersion target="view"}}>{{t dashboard.configHistory.info-bar.revert.button}}</button>
@@ -59,7 +59,7 @@
<div class="version-info-bar-wrapper">
<div {{bindAttr class="view.showCompareVersionBar::hidden :version-info-bar"}}>
<div class="row-fluid">
- <div class="span1" {{action removeCompareVersionBar target="view"}} data-toggle="arrow-tooltip" {{translateAttr data-original-title="services.service.config.configHistory.dismissIcon.tooltip"}}>
+ <div class="span1 remove-compare-bar" {{action removeCompareVersionBar target="view"}} data-toggle="arrow-tooltip" {{translateAttr data-original-title="services.service.config.configHistory.dismissIcon.tooltip"}}>
<i class="icon-remove-circle icon-large"></i>
</div>
<div class="label-wrapper span9"
@@ -74,7 +74,7 @@
<strong>{{view.compareServiceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}}
<strong>{{view.compareServiceVersion.modifiedDate}}</strong>
</div>
- <div class="pull-right">
+ <div class="pull-right operations-button">
<div {{bindAttr class="view.compareServiceVersion.isCurrent::hidden"}}>
<button class="btn" {{action doCancel target="controller"}} {{bindAttr disabled="view.versionActionsDisabled"}}>{{t common.cancel}}</button>
<button class="btn btn-success" {{action save target="view"}} {{bindAttr disabled="view.isSaveDisabled"}}>{{t common.save}}</button>
@@ -86,25 +86,25 @@
<div class="version-info-bar">
<div class="row-fluid">
<div class="btn-group pull-left">
- <button class="btn dropdown-toggle" data-toggle="dropdown" href="#" {{action hideFullList target="view"}} {{bindAttr disabled="view.versionActionsDisabled"}}>
+ <button id="toggle-dropdown-button" class="btn dropdown-toggle" data-toggle="dropdown" href="#" {{action hideFullList target="view"}} {{bindAttr disabled="view.versionActionsDisabled"}}>
<i class="icon-random"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{{#each serviceVersion in view.dropDownList}}
<li class="pointer dropdown-submenu">
- <div class="row-fluid" {{action switchVersion serviceVersion target="view"}}>
+ <div class="row-fluid version-in-dropdown" {{action switchVersion serviceVersion target="view"}}>
<div class="span2">{{serviceVersion.versionText}}</div>
<div class="span6">{{serviceVersion.modifiedDate}}</div>
<div class="span3">{{serviceVersion.author}}</div>
<div class="pull-right"><i class="icon-caret-right"></i></div>
</div>
- <ul class="dropdown-menu">
+ <ul class="dropdown-menu version-info-operations">
<div class="content"> <strong>{{serviceVersion.displayName}}</strong> <span class="label label-info">{{serviceVersion.versionText}}</span>
<strong>{{t services.service.config.configHistory.configGroup}}:{{serviceVersion.configGroupName}}</strong>
<div class="notes">{{serviceVersion.briefNotes}}</div>
</div>
- <div>
+ <div class="version-operations-buttons">
<button {{bindAttr disabled="serviceVersion.disabledActionAttr.view" class=":btn serviceVersion.isDisplayed:not-allowed-cursor" title="serviceVersion.disabledActionMessages.view"}} {{action switchVersion serviceVersion target="view"}}><i class="icon-search"></i> {{t common.view}}</button>
<button {{bindAttr disabled="serviceVersion.disabledActionAttr.compare" class=":btn serviceVersion.isDisplayed:not-allowed-cursor" title="serviceVersion.disabledActionMessages.compare"}} {{action compare serviceVersion target="view"}}><i class="icon-copy"></i> {{t common.compare}}</button>
<button {{bindAttr disabled="serviceVersion.disabledActionAttr.revert" class=":btn serviceVersion.isCurrent:not-allowed-cursor" title="serviceVersion.disabledActionMessages.revert"}} {{action revert serviceVersion target="view"}}>{{t dashboard.configHistory.info-bar.revert.button}}</button>
@@ -129,7 +129,7 @@
{{/if}}
<strong>{{view.displayedServiceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}} <strong>{{view.displayedServiceVersion.modifiedDate}}</strong>
</div>
- <div class="pull-right">
+ <div class="pull-right operations-button">
<div {{bindAttr class="view.displayedServiceVersion.isCurrent::hidden"}}>
<button class="btn" {{action doCancel target="controller"}} {{bindAttr disabled="view.versionActionsDisabled"}}>{{t common.cancel}}</button>
<button class="btn btn-success" {{action save target="view"}} {{bindAttr disabled="view.isSaveDisabled"}}>{{t common.save}}</button>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1af0a441/ambari-web/app/templates/main/dashboard/config_history.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/config_history.hbs b/ambari-web/app/templates/main/dashboard/config_history.hbs
index 6c86a24..ac5a2b8 100644
--- a/ambari-web/app/templates/main/dashboard/config_history.hbs
+++ b/ambari-web/app/templates/main/dashboard/config_history.hbs
@@ -19,7 +19,7 @@
<div id="config_history">
<table class="table advanced-header-table table-bordered table-striped" >
<thead>
- {{#view view.sortView classNames="label-row"}}
+ {{#view view.sortView classNames="label-row config-history-sort-row"}}
{{view view.parentView.versionSort}}
{{view view.parentView.configGroupSort}}
{{view view.parentView.modifiedSort}}
@@ -27,7 +27,7 @@
{{view view.parentView.notesSort}}
{{/view}}
- <tr class="filter-row">
+ <tr class="filter-row config-history-filter-row">
<th class="first">{{view view.serviceFilterView}}</th>
<th>{{view view.configGroupFilterView}}</th>
<th>{{view view.modifiedFilterView}}</th>
@@ -42,7 +42,7 @@
{{#view view.ConfigVersionView contentBinding="item"}}
<td class="first">
<span class="label label-info">{{item.versionText}}</span>
- <a {{action goToServiceConfigs item.serviceName}}>
+ <a {{action goToServiceConfigs item.serviceName}} class="service-name">
{{item.displayName}}
</a>
<i {{bindAttr class=":icon-refresh :restart-required-service item.isRestartRequired::hidden"}}