You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/04/27 12:22:32 UTC
[ambari] branch trunk updated: AMBARI-23706 NameNode HA wizard
style changes
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7765c69 AMBARI-23706 NameNode HA wizard style changes
7765c69 is described below
commit 7765c69ea225b23a152928150e39825a57cabcef
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Thu Apr 26 18:00:36 2018 +0300
AMBARI-23706 NameNode HA wizard style changes
---
ambari-web/app/messages.js | 17 ++++++-----------
ambari-web/app/styles/theme/bootstrap-ambari.css | 4 ++--
ambari-web/app/styles/wizard.less | 2 +-
.../main/admin/highAvailability/nameNode/step1.hbs | 4 ++--
.../main/admin/highAvailability/nameNode/step3.hbs | 2 +-
.../main/admin/highAvailability/nameNode/step4.hbs | 8 +++++---
.../main/admin/highAvailability/nameNode/step6.hbs | 8 +++++---
.../main/admin/highAvailability/nameNode/step8.hbs | 11 +++++++++--
8 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0e68bdb..edd0d15 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1562,22 +1562,17 @@ Em.I18n.translations = {
'</ol>',
'admin.highAvailability.wizard.step8.body':
- '<div class="alert alert-info">' +
'<ol>' +
'<li>Login to the NameNode host <b>{1}</b>.</li>' +
'<li>Initialize the metadata for NameNode automatic failover by running:' +
'<div class="code-snippet">sudo su {0} -l -c \'hdfs zkfc -formatZK\'</div></li>' +
- '</div>' +
- '<div class="alert alert-info">' +
- '<ol start="3">' +
'<li>Login to the Additional NameNode host <b>{2}</b>.<br>' +
'<div class="alert alert-warning"><strong>Important!</strong> Be sure to login to the Additional NameNode host.<br>This is a different host from the Steps 1 and 2 above.</div>' +
'</li>' +
'<li>Initialize the metadata for the Additional NameNode by running:' +
'<div class="code-snippet">sudo su {0} -l -c \'hdfs namenode -bootstrapStandby\'</div></li>' +
- '</ol>' +
- '</div>' +
- 'Please proceed once you have completed the steps above.',
+ '</ol>',
+ 'admin.highAvailability.wizard.step8.proceed': 'Please proceed once you have completed the steps above.',
'admin.highAvailability.wizard.step6.body':
'<ol>' +
'<li>Login to the NameNode host <b>{1}</b>.</li>' +
@@ -1602,11 +1597,11 @@ Em.I18n.translations = {
'</div>',
'admin.highAvailability.wizard.step2.body':'Select a host that will be running the additional NameNode.<br/> In addition,' +
' select the hosts to run JournalNodes, which store NameNode edit logs in a fault tolerant manner.',
- 'admin.highAvailability.wizard.step1.body':'This wizard will walk you through enabling NameNode HA on your cluster.<br/>' +
- 'Once enabled, you will be running a Standby NameNode in addition to your Active NameNode.<br/>' +
- 'This allows for an Active-Standby NameNode configuration that automatically performs failover.<br/><br/>' +
+ 'admin.highAvailability.wizard.step1.body':'This wizard will walk you through enabling NameNode HA on your cluster.' +
+ 'Once enabled, you will be running a Standby NameNode in addition to your Active NameNode.' +
+ 'This allows for an Active-Standby NameNode configuration that automatically performs failover.' +
'The process to enable HA involves a combination of <b>automated steps</b> (that will be handled by the wizard) and ' +
- '<b>manual steps</b> (that you must perform in sequence as instructed by the wizard).<br/><br/>' +
+ '<b>manual steps</b> (that you must perform in sequence as instructed by the wizard).' +
'<b>You should plan a cluster maintenance window and prepare for cluster downtime when enabling NameNode HA.</b>',
'admin.highAvailability.wizard.step1.alert':'If you have HBase running, please exit this wizard and stop HBase first.',
'admin.highAvailability.wizard.step1.hawq.alert':'<br/><br/>You will need to perform additional manual ' +
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 4a94e91..1f01a3b 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -527,7 +527,7 @@ h2.table-title {
border-left: 3px solid #3FAE2A !important;
}
.wizard {
- border: 2px solid #ebecf1;
+ border: 2px solid rgba(233, 233, 233, 0.5);
}
.wizard .wizard-header h3 {
font-family: 'Roboto', sans-serif;
@@ -543,7 +543,7 @@ h2.table-title {
margin: 0;
}
.wizard .wizard-body .wizard-content {
- background: #ebecf1;
+ background: rgba(233, 233, 233, 0.5);
padding-top: 15px;
float: left;
margin-bottom: -99999px;
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 4f1614a..8fe9de8 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -443,7 +443,7 @@
}
}
#ha-step1, #ha-step4, #ha-step8, #manage-journal-node-step7 {
- .alert.alert-warn {
+ .alert.alert-warning {
margin-top: 10px;
margin-bottom: 10px;
}
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
index db88b63..f5a7b2c 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
@@ -28,7 +28,7 @@
</div>
<div class="panel panel-default">
<div class="panel-body">
- <div {{bindAttr class=":form-group view.showInputError:has-error :form-horizontal"}}>
+ <div {{bindAttr class="view.showInputError:has-error :form-horizontal"}}>
<div class="row">
<div class="col-md-2">
<label class="control-label">{{t admin.highAvailability.wizard.step1.nameserviceid}}:</label>
@@ -48,6 +48,6 @@
</div>
<div class="wizard-footer col-md-12">
<div class="btn-area">
- <a {{bindAttr class=":btn controller.isNameServiceIdValid::disabled :btn-success :pull-right"}} {{action next target="controller"}}>{{t common.next}} →</a>
+ <button {{bindAttr class=":btn controller.isNameServiceIdValid::disabled :btn-success :pull-right"}} {{action next target="controller"}}>{{t common.next}} →</button>
</div>
</div>
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
index 116845c..5d29edf 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step3.hbs
@@ -74,7 +74,7 @@
<div class="wizard-footer col-md-12">
<div class="btn-area">
- <a class="btn btn-default" {{action back}}>← {{t common.back}}</a>
+ <button class="btn btn-default" {{action back}}>← {{t common.back}}</button>
<button class="btn btn-success pull-right" {{bindAttr disabled="controller.isNextDisabled"}} {{action next}}>{{t common.next}} →</button>
{{#if App.router.nextBtnClickInProgress}}
{{view App.SpinnerView tagName="span" classNames="pull-right"}}
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
index 384f827..9303cd7 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step4.hbs
@@ -22,13 +22,15 @@
{{t admin.highAvailability.wizard.step4.error.nameNode}}
</p>
{{/unless}}
- <div class="alert alert-info">
- {{{view.step4BodyText}}}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ {{{view.step4BodyText}}}
+ </div>
</div>
</div>
<div class="wizard-footer col-md-12">
<div class="btn-area">
- <a {{bindAttr class="controller.isNextEnabled::disabled :btn :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.next}} →</a>
+ <button {{bindAttr class="controller.isNextEnabled::disabled :btn :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.next}} →</button>
<span class="pull-right btn-extra-info">{{view.nnCheckPointText}}</span>
</div>
</div>
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step6.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step6.hbs
index d6ecf3e..b6833c6 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step6.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step6.hbs
@@ -17,13 +17,15 @@
}}
<div id="ha-step6" class="wizard-content col-md-9">
<h4 class="step-title">{{t admin.highAvailability.wizard.step6.bodyHeader}}</h4>
- <div class="alert alert-info">
- {{{view.step6BodyText}}}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ {{{view.step6BodyText}}}
+ </div>
</div>
</div>
<div class="wizard-footer col-md-12">
<div class="btn-area">
- <a {{bindAttr class="controller.isNextEnabled::disabled :btn :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.next}} →</a>
+ <button {{bindAttr class="controller.isNextEnabled::disabled :btn :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.next}} →</button>
<span class="pull-right btn-extra-info">{{view.jnCheckPointText}}</span>
</div>
</div>
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step8.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step8.hbs
index cb1c2ce..ea8cd3f 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step8.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step8.hbs
@@ -17,11 +17,18 @@
}}
<div id="ha-step8" class="wizard-content col-md-9">
<h4 class="step-title">{{t admin.highAvailability.wizard.step8.bodyHeader}}</h4>
- {{{view.step8BodyText}}}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ {{{view.step8BodyText}}}
+ </div>
+ </div>
+ <div>
+ {{t admin.highAvailability.wizard.step8.proceed}}
+ </div>
</div>
<div class="wizard-footer col-md-12">
<div class="btn-area">
- <a class="btn btn-success pull-right" {{action done target="controller"}}>{{t common.next}} →</a>
+ <button class="btn btn-success pull-right" {{action done target="controller"}}>{{t common.next}} →</button>
<span class="pull-right btn-extra-info">{{!t admin.highAvailability.wizard.step8.metaNoInit}}</span>
</div>
</div>
--
To stop receiving notification emails like this one, please contact
atkach@apache.org.