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 2015/11/12 01:01:30 UTC
ambari git commit: AMBARI-13848. Need IDs or classes for messages in
Rolling Upgrade window.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk a4fd7223a -> 9e97d97e3
AMBARI-13848. Need IDs or classes for messages in Rolling Upgrade window.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e97d97e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e97d97e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e97d97e
Branch: refs/heads/trunk
Commit: 9e97d97e32e13f04fb1b26b640f3b9ce3b43f83b
Parents: a4fd722
Author: Xi Wang <xi...@apache.org>
Authored: Wed Nov 11 15:44:44 2015 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Wed Nov 11 15:44:44 2015 -0800
----------------------------------------------------------------------
.../stack_upgrade/stack_upgrade_wizard.hbs | 84 +++++++++++---------
.../main/admin/stack_upgrade/upgrade_group.hbs | 4 +-
2 files changed, 47 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e97d97e/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index eeefbe1..3a5db4a 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -90,23 +90,25 @@
{{#if view.manualItem}}
{{#if view.isSlaveComponentFailuresItem}}
<div class="box details-box">
- <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
- <p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p>
- <p>
- {{#if areSlaveComponentFailuresHostsLoaded}}
- {{t admin.stackUpgrade.failedHosts.message}}
- <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a>
- {{else}}
- <div class="spinner"></div>
- {{/if}}
- </p>
- <p>
- {{t admin.stackUpgrade.failedHosts.options}}
- <ul>
- <li>{{t admin.stackUpgrade.failedHosts.options.first}}</li>
- <li>{{t admin.stackUpgrade.failedHosts.options.second}}</li>
- </ul>
- </p>
+ <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
+ <div class="slave-failures-info">
+ <p class="slave-failures-title"><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p>
+ <p>
+ {{#if areSlaveComponentFailuresHostsLoaded}}
+ {{t admin.stackUpgrade.failedHosts.message}}
+ <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a>
+ {{else}}
+ <div class="spinner"></div>
+ {{/if}}
+ </p>
+ <p>
+ {{t admin.stackUpgrade.failedHosts.options}}
+ <ul>
+ <li>{{t admin.stackUpgrade.failedHosts.options.first}}</li>
+ <li>{{t admin.stackUpgrade.failedHosts.options.second}}</li>
+ </ul>
+ </p>
+ </div>
<label class="message">
{{view Em.Checkbox checkedBinding="view.isManualDone"}}
@@ -129,32 +131,36 @@
{{else}}
{{#if view.isServiceCheckFailuresItem}}
<div class="box details-box">
- <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
+ <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
{{#if areServiceCheckFailuresServicenamesLoaded}}
{{#if serviceCheckFailuresServicenames.length}}
- <p><strong>{{t admin.stackUpgrade.dialog.manual.serviceCheckFailures.title}}</strong></p>
- <div>{{t admin.stackUpgrade.dialog.manual.serviceCheckFailures.msg1}}</div>
- <ul class="failed-info-list">
- {{#each serviceName in serviceCheckFailuresServicenames}}
- <li>{{serviceName}}</li>
- {{/each}}
- </ul>
- <div>{{t admin.stackUpgrade.dialog.manual.serviceCheckFailures.msg2}}</div>
+ <div class="service-check-failures-info">
+ <p class="service-check-failures-title"><strong>{{t admin.stackUpgrade.dialog.manual.serviceCheckFailures.title}}</strong></p>
+ <div>{{t admin.stackUpgrade.dialog.manual.serviceCheckFailures.msg1}}</div>
+ <ul class="failed-info-list">
+ {{#each serviceName in serviceCheckFailuresServicenames}}
+ <li>{{serviceName}}</li>
+ {{/each}}
+ </ul>
+ <div>{{t admin.stackUpgrade.dialog.manual.serviceCheckFailures.msg2}}</div>
+ </div>
{{/if}}
{{#if slaveComponentFailuresHosts.length}}
- <p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p>
- <p>
- {{t admin.stackUpgrade.failedHosts.message}}
- <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a>
- </p>
- <p>
- {{t admin.stackUpgrade.failedHosts.options}}
+ <div class="slave-failures-info">
+ <p class="slave-failures-title"><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p>
+ <p>
+ {{t admin.stackUpgrade.failedHosts.message}}
+ <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a>
+ </p>
+ <p>
+ {{t admin.stackUpgrade.failedHosts.options}}
<ul>
<li>{{t admin.stackUpgrade.failedHosts.options.first}}</li>
<li>{{t admin.stackUpgrade.failedHosts.options.second}}</li>
</ul>
- </p>
+ </p>
+ </div>
{{/if}}
{{else}}
<div class="spinner"></div>
@@ -181,11 +187,11 @@
{{else}}
{{#if view.isFinalizeItem}}
<div class="box details-box">
- <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
+ <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
{{#if isDowngrade}}
- <p>{{t admin.stackUpgrade.finalize.message.downgrade}}</p>
+ <p class="manual-steps-content">{{t admin.stackUpgrade.finalize.message.downgrade}}</p>
{{else}}
- <p>{{t admin.stackUpgrade.finalize.message.upgrade}}</p>
+ <p class="manual-steps-content">{{t admin.stackUpgrade.finalize.message.upgrade}}</p>
{{/if}}
{{#if areSkippedServiceChecksLoaded}}
@@ -218,8 +224,8 @@
</div>
{{else}}
<div class="box details-box">
- <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
- <p>{{view.manualItem.text}}</p>
+ <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
+ <p class="manual-steps-content">{{view.manualItem.text}}</p>
<label class="message">
{{view Em.Checkbox checkedBinding="view.isManualDone"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e97d97e/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
index 7de9cb0..ab0d70e 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
@@ -18,7 +18,7 @@
<div class="row-fluid">
- <div {{bindAttr class="view.content.isExpandableGroup::not-active-link :span8"}}>
+ <div {{bindAttr class="view.content.isExpandableGroup::not-active-link :span8 :upgrade-group-text"}}>
{{statusIcon view.content.upgradeGroupStatus}}
<a href="#" {{action toggleExpanded view.content controller.upgradeData.upgradeGroups target="view"}}>{{view.content.title}}</a>
</div>
@@ -43,7 +43,7 @@
{{#each item in view.content.upgradeItems}}
{{#if item.isVisible}}
<div class="row-fluid">
- <div {{bindAttr class="item.isActive::not-active-link :span8"}}>
+ <div {{bindAttr class="item.isActive::not-active-link :span8 :upgrade-item-text"}}>
{{statusIcon item.status}}
<a href="#" {{action toggleExpanded item view.content.upgradeItems target="view"}}>{{item.context}}</a>
</div>