ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [13/26] ambari git commit: AMBARI-19267. NN HA Namespace input "jumps" when invalid value provided (onechiporenko)
Date Thu, 22 Dec 2016 17:08:17 GMT
AMBARI-19267. NN HA Namespace input "jumps" when invalid value provided (onechiporenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0f2ec4f45fd094397c5eeb5d6f84ce5ed4d3c2dc
Parents: 2b91ffd
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Wed Dec 21 15:33:49 2016 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Wed Dec 21 15:33:49 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/styles/wizard.less               |  3 ---
 .../admin/highAvailability/nameNode/step1.hbs   | 26 ++++++++++++--------
 .../test/controllers/main/host/details_test.js  |  2 --
 3 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f2ec4f4/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 49b6723..1398f12 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -334,9 +334,6 @@
       margin-top: 10px;
       margin-bottom: 10px;
     }
-    .nameserviceid-input {
-      display: inline-block;
-    }
   }
 
   #ha-step4 li, #ha-step6 li, #ha-step8 li, #mjn-step7 li {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f2ec4f4/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
index f5087f9..db88b63 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/nameNode/step1.hbs
@@ -17,24 +17,30 @@
 }}
 <div id="ha-step1" class="wizard-content col-md-9">
   <h4 class="step-title">{{t admin.highAvailability.wizard.step1.header}}</h4>
-  <p class="step-description">
-    {{t admin.highAvailability.wizard.step1.body}}
+  <div class="step-description">
+    <p>{{t admin.highAvailability.wizard.step1.body}}</p>
     <div class="alert alert-warning">
       {{t admin.highAvailability.wizard.step1.alert}}
       {{#if controller.isHawqInstalled}}
         {{{t admin.highAvailability.wizard.step1.hawq.alert}}}
       {{/if}}
     </div>
-  </p>
+  </div>
   <div class="panel panel-default">
     <div class="panel-body">
-      <div {{bindAttr class=":form-group view.showInputError:error view.showInputError:has-error
:form-horizontal :nameserviceid-input"}}>
-        <label class="control-label">{{t admin.highAvailability.wizard.step1.nameserviceid}}:</label>
-        <div>
-          {{view Ember.TextField valueBinding="content.nameServiceId" classNames="input-sm
form-control"}}
-          <span {{bindAttr class=":help-block :validation-block :col-sm-9 :pull-right
view.showInputError::hidden"}}>
-            {{t admin.highAvailability.wizard.step1.nameserviceid.error}}
-          </span>
+      <div {{bindAttr class=":form-group view.showInputError:has-error :form-horizontal"}}>
+        <div class="row">
+          <div class="col-md-2">
+            <label class="control-label">{{t admin.highAvailability.wizard.step1.nameserviceid}}:</label>
+          </div>
+          <div class="col-md-3">
+            {{view Ember.TextField valueBinding="content.nameServiceId" classNames="form-control"}}
+          </div>
+          <div class="col-md-7">
+            <span {{bindAttr class=":help-block :validation-block view.showInputError::hidden"}}>
+              {{t admin.highAvailability.wizard.step1.nameserviceid.error}}
+            </span>
+          </div>
         </div>
       </div>
     </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f2ec4f4/ambari-web/test/controllers/main/host/details_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js
index 4203644..cbebcf0 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -766,8 +766,6 @@ describe('App.MainHostDetailsController', function () {
 
   describe('#showAddComponentPopup()', function () {
 
-    var message = 'Comp1';
-
     beforeEach(function () {
       sinon.stub(App.ModalPopup, 'show');
     });


Mime
View raw message