You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2013/10/17 18:10:14 UTC
git commit: AMBARI-3538 Reassign Master: Some command labels links to
empty host progress pop-up. (akovalenko)
Updated Branches:
refs/heads/trunk cd0517afb -> d6aca0b4d
AMBARI-3538 Reassign Master: Some command labels links to empty host progress pop-up. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/d6aca0b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/d6aca0b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/d6aca0b4
Branch: refs/heads/trunk
Commit: d6aca0b4dae8c9ec0b5101eae891ba434921225b
Parents: cd0517a
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Thu Oct 17 19:08:47 2013 +0300
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Thu Oct 17 19:08:47 2013 +0300
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 8 ++++++++
.../app/views/main/admin/highAvailability/progress_view.js | 7 ++++---
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d6aca0b4/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index cd95024..baaf372 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -482,6 +482,14 @@ h1 {
cursor: pointer;
}
}
+ .active-text{
+ a{
+ pointer-events: none;
+ text-decoration: none;
+ color: #0088cc;
+ cursor: auto;
+ }
+ }
.retry {
cursor: pointer;
margin-left: 15px;
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d6aca0b4/ambari-web/app/views/main/admin/highAvailability/progress_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/highAvailability/progress_view.js b/ambari-web/app/views/main/admin/highAvailability/progress_view.js
index 750db4f..f5712c5 100644
--- a/ambari-web/app/views/main/admin/highAvailability/progress_view.js
+++ b/ambari-web/app/views/main/admin/highAvailability/progress_view.js
@@ -81,7 +81,8 @@ App.HighAvailabilityProgressPageView = Em.View.extend({
}.property('content.progress'),
onStatus: function () {
- this.set('linkClass', 'active-link');
+ var linkClass = !!this.get('content.hosts.length') ? 'active-link' : 'active-text';
+ this.set('linkClass', linkClass);
if (this.get('content.status') === 'IN_PROGRESS') {
this.set('icon', 'icon-cog');
this.set('iconColor', 'text-info');
@@ -96,7 +97,7 @@ App.HighAvailabilityProgressPageView = Em.View.extend({
this.set('iconColor', '');
this.set('linkClass', 'not-active-link');
}
- }.observes('content.status'),
+ }.observes('content.status', 'content.hosts.length'),
showProgressBar: function () {
return this.get('content.status') === "IN_PROGRESS";
@@ -107,7 +108,7 @@ App.HighAvailabilityProgressPageView = Em.View.extend({
* @param event
*/
hostsLogPopup: function(event){
- if(event.contexts[0].linkClass != "not-active-link"){
+ if(!!this.get('content.hosts.length')){
var serviceName = event.contexts[0].title;
var controller = this.get("controller");
App.HostPopup.initPopup(serviceName, controller);