ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-6203 Unable to assign host in HA wizard. (atkach)
Date Thu, 19 Jun 2014 09:05:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c0fc5a5dc -> 04cc6b59d


AMBARI-6203 Unable to assign host in HA wizard. (atkach)


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

Branch: refs/heads/trunk
Commit: 04cc6b59df8c4f443739b3bd6883e3f1967839b5
Parents: c0fc5a5
Author: atkach <atkach@hortonworks.com>
Authored: Thu Jun 19 12:03:26 2014 +0300
Committer: atkach <atkach@hortonworks.com>
Committed: Thu Jun 19 12:03:26 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/styles/application.less          | 26 +++++++++-----------
 .../main/admin/highAvailability/step2.hbs       | 16 ++++++------
 2 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/04cc6b59/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 6e9ff4d..b46815d 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1336,7 +1336,19 @@ a:focus {
 .full-width-modal {
   .modal {
     .modal-body {
+      div.error{
+        color: #b94a48;
+        .help-inline{
+          color: #b94a48;
+        }
+      }
 
+      div.error input{
+        border-color: #b94a48;
+        -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+        -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+      }
       .add-cluster-1{
         width: 100%;
         height : 500px;
@@ -1350,20 +1362,6 @@ a:focus {
           width: 100%;
           height : 100%;
           float: left;
-
-          div.error{
-            color: #b94a48;
-            .help-inline{
-              color: #b94a48;
-            }
-          }
-
-          div.error input{
-            border-color: #b94a48;
-            -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-            -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-            box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          }
         }
         .add-cluster-1-3{
           width: 45%;

http://git-wip-us.apache.org/repos/asf/ambari/blob/04cc6b59/ambari-web/app/templates/main/admin/highAvailability/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability/step2.hbs b/ambari-web/app/templates/main/admin/highAvailability/step2.hbs
index 52c7300..d731e89 100644
--- a/ambari-web/app/templates/main/admin/highAvailability/step2.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability/step2.hbs
@@ -36,15 +36,17 @@
           {{display_name}}:
         </label>
         <div class="controls">
-          {{view App.SelectHostView
-            optionValuePath="content.host_name"
-            optionLabelPath="content.host_info"
-            selectedHostBinding="selectedHost"
+          {{#if view.shouldUseInputs}}
+            {{view App.InputHostView
+            componentBinding="this"
+            disabledBinding="isInstalled" }}
+          {{else}}
+            {{view App.SelectHostView
             componentBinding="this"
-            class="host-select"
-            zIdBinding="zId"
             disabledBinding="isInstalled"
-          }}
+            optionValuePath="content.host_name"
+            optionLabelPath="content.host_info" }}
+          {{/if}}
           {{#if showAddControl}}
           {{view App.AddControlView componentNameBinding="component_name"}}
           {{/if}}


Mime
View raw message