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:36:37 UTC
[1/2] git commit: AMBARI-3224. Progress bar is shown in green rather
than blue. (onechiporenko)
Updated Branches:
refs/heads/trunk 66236fe78 -> 75b670775
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/c9b5b00a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c9b5b00a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c9b5b00a
Branch: refs/heads/trunk
Commit: c9b5b00ad002792da2144ddc3f875cc7a10230cf
Parents: 66236fe
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Tue Oct 1 14:12:58 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Tue Oct 1 14:36:33 2013 +0300
----------------------------------------------------------------------
ambari-web/app/views/wizard/step9_view.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c9b5b00a/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..633c4ec 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 () {
[2/2] git commit: AMBARI-3397. Deploy progress bar is not correct.
(onechiporenko)
Posted by on...@apache.org.
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/75b67077
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/75b67077
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/75b67077
Branch: refs/heads/trunk
Commit: 75b6707759914b44f418662aaca98051c840c1bf
Parents: c9b5b00
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Tue Oct 1 14:14:24 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Tue Oct 1 14:36:34 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/75b67077/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/75b67077/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