incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject svn commit: r1339994 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/css/common.css hmc/html/initializeCluster.php hmc/js/addNodes.js
Date Fri, 18 May 2012 06:21:52 GMT
Author: hitesh
Date: Fri May 18 06:21:52 2012
New Revision: 1339994

URL: http://svn.apache.org/viewvc?rev=1339994&view=rev
Log:
AMBARI-285. Clean up Add Hosts page. Contributed by Yusako Sako

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/css/common.css
    incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
    incubator/ambari/branches/ambari-186/hmc/js/addNodes.js

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339994&r1=1339993&r2=1339994&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 18 06:21:52 2012
@@ -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)
 

Modified: incubator/ambari/branches/ambari-186/hmc/css/common.css
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/css/common.css?rev=1339994&r1=1339993&r2=1339994&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/css/common.css (original)
+++ incubator/ambari/branches/ambari-186/hmc/css/common.css Fri May 18 06:21:52 2012
@@ -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;
 }
\ No newline at end of file

Modified: incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php?rev=1339994&r1=1339993&r2=1339994&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php Fri May 18 06:21:52
2012
@@ -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">

Modified: incubator/ambari/branches/ambari-186/hmc/js/addNodes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/addNodes.js?rev=1339994&r1=1339993&r2=1339994&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/addNodes.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/addNodes.js Fri May 18 06:21:52 2012
@@ -47,7 +47,7 @@ globalYui.one('#addNodesSubmitButtonId')
   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')
     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');



Mime
View raw message