ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject [1/2] ambari git commit: AMBARI-18861. Remove redundant css (part 1) (onechiporenko)
Date Fri, 11 Nov 2016 12:14:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5dea886ef -> 2d948db31


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/wizard/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step2.hbs b/ambari-web/app/templates/wizard/step2.hbs
index 55ebd79..4912851 100644
--- a/ambari-web/app/templates/wizard/step2.hbs
+++ b/ambari-web/app/templates/wizard/step2.hbs
@@ -36,13 +36,14 @@
           </p>
 
           <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-7">
               {{view Ember.TextArea id="host-names" class="form-control" valueBinding="content.installOptions.hostNames"
rows="5"
               placeholder="host names"}}
             </div>
-            <div class="clearfix"></div>
             {{#if hostsError}}
-              <p class="help-block validation-block col-md-8">{{hostsError}}</p>
+              <div class="col-md-5">
+                <p class="help-block validation-block">{{hostsError}}</p>
+              </div>
             {{/if}}
           </div>
         </div>
@@ -77,66 +78,76 @@
                   {{view App.SshKeyFileUploader disabledBinding="view.sshKeyState"}}
                 </div>
               {{/if}}
+
+              {{! ssh key }}
               <div {{bindAttr class="sshKeyError:has-error :form-group :row"}}>
-                <div class="col-md-6">
+                <div class="col-md-7">
                   {{view Ember.TextArea class="form-control" rows="3" id="sshKey"
                   placeholder="ssh private key" disabledBinding="view.sshKeyState" valueBinding="content.installOptions.sshKey"}}
                 </div>
-                <div class="clearfix"></div>
                 {{#if sshKeyError}}
-                  <span class="help-block validation-block col-md-8">{{sshKeyError}}</span>
+                  <div class="col-md-5">
+                    <span class="help-block validation-block">{{sshKeyError}}</span>
+                  </div>
                 {{/if}}
               </div>
-              <div class="row">
-                <span rel="tooltip" {{translateAttr title="installer.step2.sshUser.toolTip"}}
class="ssh-user col-md-4">
-                  {{t installer.step2.sshUser}}
-                </span>
+              {{! ssh key end }}
 
-                <div {{bindAttr class="sshUserError:has-error :form-group :col-md-8"}}>
-                  <div class="row">
-                    <div class="col-md-4">
-                      {{view view.textFieldView valueBinding="content.installOptions.sshUser"
isEnabledBinding="content.installOptions.useSsh" classNames="form-control"}}
-                    </div>
-                    {{#if sshUserError}}
-                      <span class="help-block validation-block col-md-8 help-inline">{{sshUserError}}</span>
-                    {{/if}}
-                  </div>
+              {{! ssh user }}
+              <div {{bindAttr class="sshUserError:has-error :row"}}>
+                <div class="col-md-4">
+                  <label rel="tooltip" {{translateAttr title="installer.step2.sshUser.toolTip"}}
class="ssh-user">
+                    {{t installer.step2.sshUser}}
+                  </label>
+                </div>
+                <div {{bindAttr class="sshUserError:has-error :form-group :col-md-3"}}>
+                  {{view view.textFieldView valueBinding="content.installOptions.sshUser"
isEnabledBinding="content.installOptions.useSsh" classNames="form-control pull-right"}}
                 </div>
+                {{#if sshUserError}}
+                  <div class="col-md-5">
+                    <span class="help-block validation-block help-inline">{{sshUserError}}</span>
+                  </div>
+                {{/if}}
               </div>
-               <div class="row">
-                    <span rel="tooltip" {{translateAttr title="installer.step2.sshPort.toolTip"}}
class="ssh-port col-md-4">
-                        {{t installer.step2.sshPort}}
-                    </span>
+              {{! ssh user end }}
 
-                    <div {{bindAttr class="sshPortError:has-error :form-group :col-md-8"}}>
-                        <div class="row">
-                          <div class="col-md-4">
-                            {{view view.textFieldView valueBinding="content.installOptions.sshPort"
isEnabledBinding="content.installOptions.useSsh" classNames="form-control"}}
-                          </div>
-                          {{#if sshPortError}}
-                              <span class="help-block validation-block col-md-8 help-inline">{{sshPortError}}</span>
-                          {{/if}}
-                        </div>
-                    </div>
+              {{! ssh port }}
+               <div {{bindAttr class="sshPortError:has-error :row"}}>
+                 <div class="col-md-4">
+                   <label rel="tooltip" {{translateAttr title="installer.step2.sshPort.toolTip"}}
class="ssh-port">
+                    {{t installer.step2.sshPort}}
+                   </label>
+                 </div>
+                 <div class="form-group col-md-3">
+                   {{view view.textFieldView valueBinding="content.installOptions.sshPort"
isEnabledBinding="content.installOptions.useSsh" classNames="form-control"}}
+                 </div>
+                 {{#if sshPortError}}
+                   <div class="col-md-5">
+                     <span class="help-block validation-block help-inline">{{sshPortError}}</span>
+                   </div>
+                 {{/if}}
                </div>
-              {{#if App.supports.customizeAgentUserAccount}}
-                <div class="row">
-                  <span rel="tooltip" {{translateAttr title="installer.step2.agentUser.toolTip"}}
class="ssh-user col-md-4">
-                    {{t installer.step2.agentUser}}
-                  </span>
+              {{! ssh port end }}
 
-                  <div {{bindAttr class="agentUserError:has-error :form-group :col-md-8"}}>
-                    <div class="row">
-                      <div class="col-md-4">
-                        {{view view.textFieldView valueBinding="content.installOptions.agentUser"
isEnabledBinding="content.installOptions.useSsh" classNames="form-control"}}
-                      </div>
-                      {{#if agentUserError}}
-                        <span class="help-block validation-block col-md-8 help-inline">{{agentUserError}}</span>
-                      {{/if}}
-                    </div>
+              {{! ambari agent user }}
+              {{#if App.supports.customizeAgentUserAccount}}
+                <div {{bindAttr class="agentUserError:has-error :row"}}>
+                  <div class="col-md-4">
+                    <label rel="tooltip" {{translateAttr title="installer.step2.agentUser.toolTip"}}
class="ssh-user">
+                      {{t installer.step2.agentUser}}
+                    </label>
+                  </div>
+                  <div {{bindAttr class="agentUserError:has-error :form-group :col-md-3"}}>
+                    {{view view.textFieldView valueBinding="content.installOptions.agentUser"
isEnabledBinding="content.installOptions.useSsh" classNames="form-control"}}
                   </div>
+                  {{#if agentUserError}}
+                    <div class="col-md-5">
+                      <span class="help-block validation-block help-inline">{{agentUserError}}</span>
+                    </div>
+                  {{/if}}
                 </div>
               {{/if}}
+              {{! ambari agent user end }}
 
             </div>
           {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/wizard/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3.hbs b/ambari-web/app/templates/wizard/step3.hbs
index d804d29..07cf7f2 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -144,6 +144,7 @@
     </div>
   </div>
 </div>
+</div>
 <div class="wizard-footer col-md-12">
   <div class="btn-area">
     <button type="button" class="btn btn-default pull-left installer-back-btn" {{bindAttr
disabled="isBackButtonDisabled"}} {{action back}}>
@@ -159,4 +160,4 @@
       {{t common.next}} &rarr;
     </button>
   </div>
-</div>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/views/main/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js
index f15e48a..bb27388 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -24,7 +24,7 @@ var App = require('app');
  */
 App.MainMenuView = Em.CollectionView.extend({
   tagName: 'ul',
-  classNames: ['nav', 'top-nav-menu', 'navbar-nav'],
+  classNames: ['nav', 'top-nav-menu', 'navbar-nav', 'navbar-right'],
 
   views: function () {
     return App.router.get('mainViewsController.ambariViews');


Mime
View raw message