Przeglądaj źródła

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

Alex Antonenko 11 lat temu
rodzic
commit
b12c19c3cc

+ 20 - 2
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 {

+ 1 - 23
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;
-  }
-}
+}

+ 3 - 3
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>