AMBARI-285. Clean up Add Hosts page. Contributed by Yusako Sako

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1339994 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-285. Clean up Add Hosts page. (Yusako Sako via hitesh)
+
   AMBARI-284. Define service groups in nagios such that users can more easily
   enable/disable the related alerts. (vgogate via hitesh)
 

hmc/css/common.css

@@ -386,4 +386,13 @@ a.btn {
 
 .btn-large .iconic-stop:before {
     margin-top: -1px;
+}
+
+#yumMirrorSupportFormButtonWrapperId {
+	margin-bottom:20px;
+}
+
+#yumMirrorSupportFormFieldsId input[type=text] {
+	width:500px;
+	margin-bottom:20px;
 }

hmc/html/initializeCluster.php

@@ -124,32 +124,23 @@
                     </p>
                     <br/>
                     <p>
-                    <label for="clusterHostsFileId">Newline-delimited list of node hostnames</label>
+                    <label for="clusterHostsFileId">Hosts File (newline-delimited list of hostnames)</label>
                     <input type="file" name="clusterHostsFile" id="clusterHostsFileId" value="" placeholder="">
                     </p>
                     <br/>
                     <div id="yumMirrorSupportFormId">
                       <div id="yumMirrorSupportFormButtonWrapperId">
-                        <p>
-                        <label for="yumMirrorSupportFormButtonId">Use local yum mirror instead of HMC defaults?</label>
-                        <input type="checkbox" name="YumMirrorSupportFormButton" id="yumMirrorSupportFormButtonId" value="" placeholder="">
-                        </p>
+                        <label class="checkbox" for="yumMirrorSupportFormButtonId">Use local yum mirror instead of HMC defaults?
+                          <input type="checkbox" name="YumMirrorSupportFormButton" id="yumMirrorSupportFormButtonId" value="" placeholder="">
+                        </label>
                       </div>
                       <div id="yumMirrorSupportFormFieldsId" style="display:none">
-                        <p>
                         <label for="yumRepoFilePathId">YUM Repo File Path</label>
                         <input type="text" name="YumRepoFilePath" id="yumRepoFilePathId" value="" placeholder="">
-                        </p>
-                        <br/>
-                        <p>
-                        <label for="hmcArtifactsDownloadUrlId">URL from where to download Apache Artifacts</label>
+                        <label for="hmcArtifactsDownloadUrlId">Apache Artifacts Download URL</label>
                         <input type="text" name="HmcArtifactsDownloadUrl" id="hmcArtifactsDownloadUrlId" value="" placeholder="">
-                        </p>
-                        <br/>
-                        <p>
-                        <label for="hmcGplArtifactsDownloadUrlId">URL from where to download GPL Artifacts</label>
+                        <label for="hmcGplArtifactsDownloadUrlId">GPL Artifacts Download URL</label>
                         <input type="text" name="HmcGplArtifactsDownloadUrl" id="hmcGplArtifactsDownloadUrlId" value="" placeholder="">
-                        </p>
                       </div>
                     </div>
                     <div id="fileUploadWrapperDivId">

hmc/js/addNodes.js

@@ -47,7 +47,7 @@ globalYui.one('#addNodesSubmitButtonId').on('click',function (e) {
   if (userId == '') {
     errCount++;
     focusId = '#clusterDeployUserId';
-    message += 'Cluster Deploy User cannot be empty';
+    message += 'SSH Username cannot be empty';
     globalYui.one("#clusterDeployUserId").addClass('formInputError');
   } else {
     globalYui.one("#clusterDeployUserId").removeClass('formInputError');
@@ -62,7 +62,7 @@ globalYui.one('#addNodesSubmitButtonId').on('click',function (e) {
     if (message != '') {
       message += ',';
     }
-    message += 'User Identity file not specified';
+    message += 'SSH Private Key File not specified';
     globalYui.one("#clusterDeployUserIdentityFileId").addClass('formInputError');
   } else {
     globalYui.one("#clusterDeployUserIdentityFileId").removeClass('formInputError');