ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-4088. UI doesn't select all hosts on Assign Slaves step sometimes. Additional patch. (alexantonenko)
Date Tue, 17 Dec 2013 19:40:07 GMT
Updated Branches:
  refs/heads/branch-1.4.3 4522c0d1b -> b27a56245


AMBARI-4088. UI doesn't select all hosts on Assign Slaves step sometimes. Additional patch.
(alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b27a5624
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b27a5624
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b27a5624

Branch: refs/heads/branch-1.4.3
Commit: b27a5624542a0ae2d5a9ae5e9c49a3e2a9b4f21f
Parents: 4522c0d
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Tue Dec 17 21:40:03 2013 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Dec 17 21:40:03 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/config.js                  |  2 +-
 ambari-web/app/styles/application.less    | 22 ++++++++++++++++++++--
 ambari-web/app/styles/apps.less           | 24 +-----------------------
 ambari-web/app/templates/wizard/step6.hbs |  6 +++---
 4 files changed, 25 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b27a5624/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 4635265..14493ac 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -43,7 +43,7 @@ App.reassignableComponents = ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER',
'R
 App.enableExperimental = false;
 
 App.supports = {
-  addServices: false,
+  addServices: true,
   hostOverrides: true,
   hostOverridesInstaller: true,
   hostOverridesHost: true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/b27a5624/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 9c17e14..c7a15f6 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -400,8 +400,26 @@ h1 {
       color: #FF4B4B;
     }
   }
-  #step6 .pre-scrollable {
-    max-height: 440px;
+  #step6 {
+    .pre-scrollable {
+      max-height: 440px;
+      position: relative;
+    }
+    .hidden-scroll {
+      overflow-y: hidden;
+    }
+    .spinner-overlay {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      background-color: #808080;
+      opacity: 0.2;
+    }
+    .spinner {
+      position: absolute;
+      margin-top: 30%;
+      margin-left: 50%;
+    }
   }
   #deploy {
     #overallProgress {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b27a5624/ambari-web/app/styles/apps.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/apps.less b/ambari-web/app/styles/apps.less
index b52c91f..9745099 100644
--- a/ambari-web/app/styles/apps.less
+++ b/ambari-web/app/styles/apps.less
@@ -531,26 +531,4 @@
       width: 400px;
   }
   }
-}
-
-/*Big modal window end*/
-#step6{
-  .spinner-overlay{
-    z-index: 100;
-    position: absolute;
-    margin-top: 169px;
-    width: 758px;
-    height: 444px;
-    background-color: #808080;
-    opacity:0.2;
-  }
-  .spinner {
-    position: absolute;
-    z-index: 100;
-    margin-top: 369px;
-    margin-left: 362px;
-    display: inline-block;
-    width: 36px;
-    opacity: 1;
-  }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/b27a5624/ambari-web/app/templates/wizard/step6.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step6.hbs b/ambari-web/app/templates/wizard/step6.hbs
index 4dca371..49721c8 100644
--- a/ambari-web/app/templates/wizard/step6.hbs
+++ b/ambari-web/app/templates/wizard/step6.hbs
@@ -17,15 +17,15 @@
 }}
 
 <div id="step6">
-  <div {{bindAttr class=":spinner-overlay controller.isLoaded:hidden"}}></div>
-  <i {{bindAttr class=":icon-spin :spinner controller.isLoaded:hidden"}}></i>
   <h2>{{view.title}}</h2>
   <div class="alert alert-info">{{{view.label}}}</div>
   {{#if errorMessage}}
     <div class="alert alert-error">{{errorMessage}}</div>
   {{/if}}
 
-  <div class="pre-scrollable">
+  <div {{bindAttr class="controller.isLoaded::hidden-scroll :pre-scrollable" }}>
+      <div {{bindAttr class=":spinner-overlay controller.isLoaded:hidden"}}></div>
+      <i {{bindAttr class=":icon-spin :spinner controller.isLoaded:hidden"}}></i>
     <table class="table table-striped">
       <thead>
         <tr>


Mime
View raw message