You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/08/22 19:28:04 UTC
[1/2] git commit: Revert "AMBARI-2993. NameNode HA Wizard: Progress
page UI tweaks. (Aleksandr Kovalenko via yusaku)"
Updated Branches:
refs/heads/trunk 93f607e53 -> 60e1efd0d
Revert "AMBARI-2993. NameNode HA Wizard: Progress page UI tweaks. (Aleksandr Kovalenko via yusaku)"
This reverts commit 93f607e535f500114f70850a97a6314532cd52cd.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7677554d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7677554d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7677554d
Branch: refs/heads/trunk
Commit: 7677554d812866fa6f90c2a80925d7d622722cfb
Parents: 93f607e
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Aug 22 10:26:58 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Aug 22 10:26:58 2013 -0700
----------------------------------------------------------------------
.../admin/highAvailability/step5_controller.js | 2 --
.../admin/highAvailability/step7_controller.js | 2 --
.../admin/highAvailability/step9_controller.js | 2 --
ambari-web/app/styles/application.less | 31 ++--------------
.../main/admin/highAvailability/progress.hbs | 38 +++++++++-----------
5 files changed, 20 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7677554d/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
index 9218765..74ec3dd 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
@@ -20,8 +20,6 @@ var App = require('app');
App.HighAvailabilityWizardStep5Controller = App.HighAvailabilityProgressPageController.extend({
- name:"highAvailabilityWizardStep5Controller",
-
commands: ['stopAllServices', 'installNameNode', 'installJournalNodes', 'startJournalNodes', 'disableSNameNode', 'reconfigureHDFS'],
stopAllServices: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7677554d/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
index d26bdbd..ce75863 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
@@ -20,8 +20,6 @@ var App = require('app');
App.HighAvailabilityWizardStep7Controller = App.HighAvailabilityProgressPageController.extend({
- name:"highAvailabilityWizardStep7Controller",
-
commands: ['startZooKeeperServers', 'startNameNode'],
startZooKeeperServers: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7677554d/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
index 7eafcc4..90fd51b 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
@@ -20,8 +20,6 @@ var App = require('app');
App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageController.extend({
- name:"highAvailabilityWizardStep9Controller",
-
commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'startAllServices'],
startSecondNameNode: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7677554d/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index ea934b4..16d84df 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -446,30 +446,16 @@ h1 {
}
}
}
- #step14 {
+ #step14, #ha-progress-page {
.item {
line-height: 30px;
i {
font-size: 20px;
}
- }
- .row {
- margin-left: 0;
- }
- }
- #ha-progress-page {
- .item {
- line-height: 40px;
- width:100%;
- float:left;
-
- i {
- font-size: 20px;
- }
.not-active-link{
text-decoration: none;
pointer-events: none;
- color: #999;
+ color: black;
cursor: default;
}
.active-link{
@@ -484,17 +470,6 @@ h1 {
font-size: 14px;
}
}
- .pull-left{
- float: left;
- }
- .progress-bar{
- margin-top: 10px;
-
- .progress{
- margin-bottom: 0px;
- }
- }
-
}
.row {
margin-left: 0;
@@ -4016,7 +3991,7 @@ i.icon-asterisks {
//when screen is wide, the modal width is fixed
.full-width-modal {
.modal{
- width: 1155px;
+ width: 1170px;
margin: -350px 0 0 -583px;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7677554d/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
index c20cb63..5256e76 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
@@ -21,31 +21,27 @@
<div {{bindAttr class="view.noticeClass"}}>{{view.notice}}</div>
{{#each task in controller.tasks}}
{{#view view.taskView contentBinding="task"}}
- <div class="item">
- <div class="pull-left span4">
- <i {{bindAttr class="view.icon view.iconColor"}}></i>
- <a {{bindAttr class="view.linkClass"}} {{action "hostsLogPopup" task target="view"}} >{{task.title}}</a>
- </div>
- <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}>
- <div class="progress-bar span8">
- <div class="progress-striped active progress-info progress">
- <div class="bar" {{bindAttr style="view.barWidth"}}></div>
- </div>
- </div>
- <div class="span1">{{task.progress}}%</div>
- </div>
- <div>
- {{#if task.showRetry}}
- <a {{action retryTask target="controller"}} class="btn btn-primary retry">
- <i class="icon-repeat icon-white"></i>
- {{t common.retry}}
- </a>
- {{/if}}
+ <div class="item">
+ <i {{bindAttr class="view.icon view.iconColor"}}></i>
+ <a {{bindAttr class="view.linkClass"}} {{action "hostsLogPopup" task target="view"}} >{{task.title}}</a>
+ {{#if task.showRetry}}
+ <a {{action retryTask target="controller"}} class="btn btn-primary retry">
+ <i class="icon-repeat icon-white"></i>
+ {{t common.retry}}
+ </a>
+ {{/if}}
+ </div>
+ <div {{bindAttr class="view.showProgressBar::hide :row :span12" }}>
+ <div class="progress-bar span4">
+ <div class="progress-striped active progress-info progress">
+ <div class="bar" {{bindAttr style="view.barWidth"}}></div>
</div>
</div>
+ <div class="span1">{{task.progress}}%</div>
+ </div>
{{/view}}
{{/each}}
<div class="btn-area">
- <a {{bindAttr class=":btn controller.isSubmitDisabled:disabled :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.next}}</a>
+ <a {{bindAttr class=":btn controller.isSubmitDisabled:disabled :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.done}}</a>
</div>
</div>
[2/2] git commit: AMBARI-2993. NameNode HA Wizard: Progress page UI
tweaks. (Antonenko Alexander via yusaku)
Posted by yu...@apache.org.
AMBARI-2993. NameNode HA Wizard: Progress page UI tweaks. (Antonenko Alexander via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/60e1efd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/60e1efd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/60e1efd0
Branch: refs/heads/trunk
Commit: 60e1efd0d96c7a477757c0df86e7ad70e03fefcd
Parents: 7677554
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Aug 22 10:27:34 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Aug 22 10:27:34 2013 -0700
----------------------------------------------------------------------
.../admin/highAvailability/step5_controller.js | 2 ++
.../admin/highAvailability/step7_controller.js | 2 ++
.../admin/highAvailability/step9_controller.js | 2 ++
ambari-web/app/styles/application.less | 31 ++++++++++++++--
.../main/admin/highAvailability/progress.hbs | 38 +++++++++++---------
5 files changed, 55 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/60e1efd0/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
index 74ec3dd..9218765 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step5_controller.js
@@ -20,6 +20,8 @@ var App = require('app');
App.HighAvailabilityWizardStep5Controller = App.HighAvailabilityProgressPageController.extend({
+ name:"highAvailabilityWizardStep5Controller",
+
commands: ['stopAllServices', 'installNameNode', 'installJournalNodes', 'startJournalNodes', 'disableSNameNode', 'reconfigureHDFS'],
stopAllServices: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/60e1efd0/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
index ce75863..d26bdbd 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step7_controller.js
@@ -20,6 +20,8 @@ var App = require('app');
App.HighAvailabilityWizardStep7Controller = App.HighAvailabilityProgressPageController.extend({
+ name:"highAvailabilityWizardStep7Controller",
+
commands: ['startZooKeeperServers', 'startNameNode'],
startZooKeeperServers: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/60e1efd0/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
index 90fd51b..7eafcc4 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
@@ -20,6 +20,8 @@ var App = require('app');
App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageController.extend({
+ name:"highAvailabilityWizardStep9Controller",
+
commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'startAllServices'],
startSecondNameNode: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/60e1efd0/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 16d84df..ea934b4 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -446,16 +446,30 @@ h1 {
}
}
}
- #step14, #ha-progress-page {
+ #step14 {
.item {
line-height: 30px;
i {
font-size: 20px;
}
+ }
+ .row {
+ margin-left: 0;
+ }
+ }
+ #ha-progress-page {
+ .item {
+ line-height: 40px;
+ width:100%;
+ float:left;
+
+ i {
+ font-size: 20px;
+ }
.not-active-link{
text-decoration: none;
pointer-events: none;
- color: black;
+ color: #999;
cursor: default;
}
.active-link{
@@ -470,6 +484,17 @@ h1 {
font-size: 14px;
}
}
+ .pull-left{
+ float: left;
+ }
+ .progress-bar{
+ margin-top: 10px;
+
+ .progress{
+ margin-bottom: 0px;
+ }
+ }
+
}
.row {
margin-left: 0;
@@ -3991,7 +4016,7 @@ i.icon-asterisks {
//when screen is wide, the modal width is fixed
.full-width-modal {
.modal{
- width: 1170px;
+ width: 1155px;
margin: -350px 0 0 -583px;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/60e1efd0/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
index 5256e76..c20cb63 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs
@@ -21,27 +21,31 @@
<div {{bindAttr class="view.noticeClass"}}>{{view.notice}}</div>
{{#each task in controller.tasks}}
{{#view view.taskView contentBinding="task"}}
- <div class="item">
- <i {{bindAttr class="view.icon view.iconColor"}}></i>
- <a {{bindAttr class="view.linkClass"}} {{action "hostsLogPopup" task target="view"}} >{{task.title}}</a>
- {{#if task.showRetry}}
- <a {{action retryTask target="controller"}} class="btn btn-primary retry">
- <i class="icon-repeat icon-white"></i>
- {{t common.retry}}
- </a>
- {{/if}}
- </div>
- <div {{bindAttr class="view.showProgressBar::hide :row :span12" }}>
- <div class="progress-bar span4">
- <div class="progress-striped active progress-info progress">
- <div class="bar" {{bindAttr style="view.barWidth"}}></div>
+ <div class="item">
+ <div class="pull-left span4">
+ <i {{bindAttr class="view.icon view.iconColor"}}></i>
+ <a {{bindAttr class="view.linkClass"}} {{action "hostsLogPopup" task target="view"}} >{{task.title}}</a>
+ </div>
+ <div {{bindAttr class="view.showProgressBar::hide :row :span5 :pull-left" }}>
+ <div class="progress-bar span8">
+ <div class="progress-striped active progress-info progress">
+ <div class="bar" {{bindAttr style="view.barWidth"}}></div>
+ </div>
+ </div>
+ <div class="span1">{{task.progress}}%</div>
+ </div>
+ <div>
+ {{#if task.showRetry}}
+ <a {{action retryTask target="controller"}} class="btn btn-primary retry">
+ <i class="icon-repeat icon-white"></i>
+ {{t common.retry}}
+ </a>
+ {{/if}}
</div>
</div>
- <div class="span1">{{task.progress}}%</div>
- </div>
{{/view}}
{{/each}}
<div class="btn-area">
- <a {{bindAttr class=":btn controller.isSubmitDisabled:disabled :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.done}}</a>
+ <a {{bindAttr class=":btn controller.isSubmitDisabled:disabled :btn-success :pull-right"}} {{action done target="controller"}}>{{t common.next}}</a>
</div>
</div>