ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject ambari git commit: AMBARI-19410. Improve 'Install Wizard step 0' after new guidelines.(xiwang)
Date Mon, 09 Jan 2017 18:08:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 1535bc982 -> 55747a5c2


AMBARI-19410. Improve 'Install Wizard step 0' after new guidelines.(xiwang)


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

Branch: refs/heads/trunk
Commit: 55747a5c2563c867e2a0d9418abfa2a792a92cb1
Parents: 1535bc9
Author: Xi Wang <xiwang@apache.org>
Authored: Thu Jan 5 16:56:58 2017 -0800
Committer: Xi Wang <xiwang@apache.org>
Committed: Mon Jan 9 10:07:50 2017 -0800

----------------------------------------------------------------------
 .../app/controllers/wizard/step0_controller.js  |  3 ++
 .../app/styles/theme/bootstrap-ambari.css       | 33 +++++++++++---------
 ambari-web/app/styles/wizard.less               | 10 +++---
 ambari-web/app/templates/wizard/step0.hbs       |  4 ++-
 4 files changed, 31 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/ambari-web/app/controllers/wizard/step0_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step0_controller.js b/ambari-web/app/controllers/wizard/step0_controller.js
index 1ddb4fc..270c7a4 100644
--- a/ambari-web/app/controllers/wizard/step0_controller.js
+++ b/ambari-web/app/controllers/wizard/step0_controller.js
@@ -38,6 +38,8 @@ App.WizardStep0Controller = Em.Controller.extend({
     if (clusterName == '' && this.get('hasSubmitted')) {
       this.set('clusterNameError', Em.I18n.t('installer.step0.clusterName.error.required'));
       return true;
+    } else if (clusterName == '' ) {
+      return true;
     } else if (clusterName.length > MAX_CLUSTER_NAME_LENGTH) {
       this.set('clusterNameError', Em.I18n.t('installer.step0.clusterName.error.tooLong'));
       return true;
@@ -64,6 +66,7 @@ App.WizardStep0Controller = Em.Controller.extend({
     this.set('clusterNameError', '');
   },
 
+
   /**
    * @type {boolean}
    */

http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/ambari-web/app/styles/theme/bootstrap-ambari.css
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 5a641b3..5b18417 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -527,8 +527,7 @@ h2.table-title {
   line-height: 1;
   color: #333;
   font-weight: bold;
-  font-size: 16px;
-  padding-left: 10px;
+  font-size: 18px;
   color: #666;
 }
 .wizard .wizard-body .wizard-content .step-description {
@@ -537,17 +536,20 @@ h2.table-title {
   font-style: normal;
   line-height: 1;
   color: #333;
-  font-size: 12px;
-  padding-left: 10px;
-  line-height: 1.3;
+  line-height: 1.4;
+  font-size: 14px;
   color: #999;
 }
 .wizard .wizard-body .wizard-content .panel.panel-default {
   border: none;
   box-shadow: none;
+  margin-top: 20px;
+}
+.wizard .wizard-body .wizard-content .panel.panel-default .panel-body {
+  padding: 30px 20px;
 }
 .wizard .wizard-body .wizard-nav {
-  min-height: 650px;
+  min-height: 550px;
   padding-top: 25px;
   background-color: #323544;
   float: left;
@@ -555,7 +557,7 @@ h2.table-title {
   padding-bottom: 99999px;
 }
 .wizard .wizard-body .wizard-nav .nav li {
-  padding: 10px 0;
+  padding: 0px 15px;
 }
 .wizard .wizard-body .wizard-nav .nav li a {
   height: 48px;
@@ -582,10 +584,9 @@ h2.table-title {
   font-weight: normal;
   font-style: normal;
   line-height: 1;
-  color: #333;
-  font-size: 16px;
-  color: #bbbbbb;
   margin-left: 30px;
+  font-size: 14px;
+  color: #999;
 }
 .wizard .wizard-body .wizard-nav .nav li .step-index {
   line-height: 18px;
@@ -622,8 +623,8 @@ h2.table-title {
   position: absolute;
   background-color: #1EB475;
   content: "";
-  top: 39px;
-  left: 14px;
+  top: 25px;
+  left: 29px;
 }
 .wizard .wizard-body .wizard-nav .nav li.completed:last-child:after {
   content: none;
@@ -632,8 +633,12 @@ h2.table-title {
   font-weight: bold;
 }
 .wizard .wizard-body .wizard-nav .nav li.disabled .step-marker {
-  color: #bbbbbb;
-  border-color: #bbbbbb;
+  color: #666;
+  border-color: #666;
+}
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-name,
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-description {
+  color: #666;
 }
 .wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
   background-color: #1EB475;

http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 1398f12..bc228c1 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -46,16 +46,18 @@
     }
     padding: 25px;
     background-color: #fff;
-
-    #get-started label{
-      font-weight: normal;
-    }
   }
 
   .mbm {
     margin-top: 0;
   }
 
+  #get-started {
+    .cluster-name-input {
+      padding: 4px 0px;
+    }
+  }
+
   #installOptions {
     .ssh-user, .ssh-port {
       padding-top: 5px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/ambari-web/app/templates/wizard/step0.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step0.hbs b/ambari-web/app/templates/wizard/step0.hbs
index 07c9857..0724ef1 100644
--- a/ambari-web/app/templates/wizard/step0.hbs
+++ b/ambari-web/app/templates/wizard/step0.hbs
@@ -30,7 +30,9 @@
         </label>
 
         <div>
-          {{view App.WizardStep0ViewClusterNameInput id="cluster-name" valueBinding="content.cluster.name"
placeholder="cluster name" target="controller" classNames="col-sm-3"}}
+          <div class="col-sm-3 cluster-name-input">
+            {{view App.WizardStep0ViewClusterNameInput id="cluster-name" valueBinding="content.cluster.name"
placeholder="cluster name" target="controller" classNames="form-control"}}
+          </div>
           {{#if clusterNameError}}
             <p class="help-block validation-block col-sm-9">{{clusterNameError}}</p>
           {{/if}}


Mime
View raw message