You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/10/01 13:35:27 UTC
[1/2] git commit: AMBARI-3397. Deploy progress bar is not correct.
(onechiporenko)
Updated Branches:
refs/heads/branch-1.4.1 5e617ff9d -> 83044c0a7
AMBARI-3397. Deploy progress bar is not correct. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/83044c0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/83044c0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/83044c0a
Branch: refs/heads/branch-1.4.1
Commit: 83044c0a7032f666f7b1c2b26696da50594c035b
Parents: 8e0c5cf
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Tue Oct 1 14:18:20 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Tue Oct 1 14:35:22 2013 +0300
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 10 ++++++++++
ambari-web/app/templates/wizard/step8_log_popup.hbs | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/83044c0a/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index cae9d72..9c21b10 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -3946,6 +3946,16 @@ ul.inline li {
max-height: 440px;
}
+.log_popup {
+ .bar {
+ -webkit-transition: width 0.0s ease;
+ -moz-transition: width 0.0s ease;
+ -ms-transition: width 0.0s ease;
+ -o-transition: width 0.0s ease;
+ transition: width 0.0s ease;
+ }
+}
+
#step10-content {
max-height: 440px;
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/83044c0a/ambari-web/app/templates/wizard/step8_log_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step8_log_popup.hbs b/ambari-web/app/templates/wizard/step8_log_popup.hbs
index c6abe08..fafb0b3 100644
--- a/ambari-web/app/templates/wizard/step8_log_popup.hbs
+++ b/ambari-web/app/templates/wizard/step8_log_popup.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
<p>{{view.message}}</p>
-<div class="progress">
+<div class="progress log_popup">
<div class="bar" {{bindAttr style="view.barWidth"}}>
</div>
</div>
\ No newline at end of file
[2/2] git commit: AMBARI-3224. Progress bar is shown in green rather
than blue. (onechiporenko)
Posted by on...@apache.org.
AMBARI-3224. Progress bar is shown in green rather than blue. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/8e0c5cff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/8e0c5cff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/8e0c5cff
Branch: refs/heads/branch-1.4.1
Commit: 8e0c5cff4031e53a5809ccddd46d080fbbb798f8
Parents: 5e617ff
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Tue Oct 1 14:16:59 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Tue Oct 1 14:35:22 2013 +0300
----------------------------------------------------------------------
ambari-web/app/views/wizard/step9_view.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8e0c5cff/ambari-web/app/views/wizard/step9_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step9_view.js b/ambari-web/app/views/wizard/step9_view.js
index 3c57db3..47833f9 100644
--- a/ambari-web/app/views/wizard/step9_view.js
+++ b/ambari-web/app/views/wizard/step9_view.js
@@ -92,12 +92,10 @@ App.HostStatusView = Em.View.extend({
if (this.get('obj.progress') === '100') {
this.set('obj.message', Em.I18n.t('installer.step9.host.status.failed'));
}
- } else if (this.get('obj.status') === 'success' && this.get('isHostCompleted')) {
- if (this.get('obj.progress') == 100) {
+ } else if (this.get('obj.status') === 'success' && this.get('isHostCompleted') && parseInt(this.get('controller.progress')) > 35) {
this.set('barColor', 'progress-success');
this.set('obj.message', Em.I18n.t('installer.step9.host.status.success'));
}
- }
}.observes('obj.status', 'obj.progress'),
isFailed:function () {
@@ -340,4 +338,4 @@ App.HostStatusView = Em.View.extend({
});
}
-});
\ No newline at end of file
+});