incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1347159 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/css/common.css hmc/css/common3.css hmc/html/initializeCluster.php hmc/js/configureCluster.js hmc/php/conf/MessageResources-en.inc
Date Wed, 06 Jun 2012 21:56:58 GMT
Author: vikram
Date: Wed Jun  6 21:56:58 2012
New Revision: 1347159

URL: http://svn.apache.org/viewvc?rev=1347159&view=rev
Log:
AMBARI-279. On the mount points page show info on what the mount points are being used for
(Contributed by Yusaku)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/css/common.css
    incubator/ambari/branches/ambari-186/hmc/css/common3.css
    incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php
    incubator/ambari/branches/ambari-186/hmc/js/configureCluster.js
    incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347159&r1=1347158&r2=1347159&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun  6 21:56:58 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-279. On the mount points page show info on what the mount points are being used
for (Yusaku via Vikram)
+
   AMBARI-387. Fine tune node assignment and propagate ZK host assignments to the frontend.
(Mahadev via Vikram)
 
   AMBARI-381. Restarting Templeton should not run PIG smoke tests (Hitesh via Vikram)

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=1347159&r1=1347158&r2=1347159&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/css/common.css (original)
+++ incubator/ambari/branches/ambari-186/hmc/css/common.css Wed Jun  6 21:56:58 2012
@@ -450,7 +450,7 @@ div.separator {
 	width:auto;
 	float:left;
 }
-.hostToMasterServices, .hostToServices {
+.hostToMasterServices, .hostToServices, #configureClusterMountPointsDisplayDivId .formElement
{
     background-color: #F7F7F5;
     border: 2px solid rgba(0, 0, 0, 0.25);
     border-radius: 4px 4px 4px 4px;

Modified: incubator/ambari/branches/ambari-186/hmc/css/common3.css
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/css/common3.css?rev=1347159&r1=1347158&r2=1347159&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/css/common3.css (original)
+++ incubator/ambari/branches/ambari-186/hmc/css/common3.css Wed Jun  6 21:56:58 2012
@@ -385,8 +385,7 @@ span.installationWizardStageNumber {
 #configureClusterInputContainerDivId {
   float:left;
   width:400px;
-  margin-left:40px;
-  margin-right:20px;
+  margin:20px 0 0 40px;
 }
 
 #configureClusterDisplayDivId {
@@ -396,6 +395,25 @@ span.installationWizardStageNumber {
   margin-left:10px;
 }
 
+#configureClusterCoreDivId #previewLinkId {
+  color:#0088CC;
+  font-size:13px; 
+}
+
+#configureClusterMountPointsDisplayDivId {
+  margin:20px; 
+}
+
+#configureClusterMountPointsDisplayDivId label {
+  font-weight:bold;
+  font-size:14px;
+}
+
+#configureClusterMountPointsDisplayDivId .formElement {
+  margin-top:20px;
+  width:auto;
+}
+
 .formInputError, input[type="text"].formInputError {
   border-color: #F53907;
   /*background-color: #F17879;*/

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=1347159&r1=1347158&r2=1347159&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/initializeCluster.php Wed Jun  6 21:56:58
2012
@@ -224,8 +224,8 @@
                           </div>
                           <!-- Additional <div>s for other categories of cluster
configuration go here -->
                         </fieldset>
-                    </div>
-                    <!-- <input type="button" id="configureClusterSubmitButtonId" value="Submit"
class="submitButton"> -->
+                    </div>                    
+                    <a id="previewLinkId" href="javascript:void 0"><?php echo $RES['initWizard.configureCluster.preview.label']
?></a>
                   </form>
                   <a href="javascript:void 0" class="btn btn-large" id="configureClusterSubmitButtonId"><?php
echo $RES['initWizard.configureCluster.submit.label'] ?></a>
                 </div>
@@ -323,7 +323,7 @@
                 '../js/configureServicesUtils.js',
                 '../js/configureServices.js',
                 '../js/reviewAndDeploy.js',
-                '../js/deployProgress.js'                
+                '../js/deployProgress.js'                        
               ];
             </script>
 

Modified: incubator/ambari/branches/ambari-186/hmc/js/configureCluster.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/configureCluster.js?rev=1347159&r1=1347158&r2=1347159&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/configureCluster.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/configureCluster.js Wed Jun  6 21:56:58 2012
@@ -112,7 +112,7 @@ function renderEffectiveClusterConfig (g
           '<li>' + dirsArray[dirs] + '</li>';
         } 
 
-        clusterConfigDisplayMarkup += '</ul>' + '</div><br/>';
+        clusterConfigDisplayMarkup += '</ul>' + '<div style="clear:both"></div></div>';
         globalYui.log("HTML GENERATED: " + clusterConfigDisplayMarkup);
     }
   }
@@ -203,6 +203,22 @@ function renderConfigureCluster (cluster
         var nextScreenRenderFunction = renderOptionsPage;
         submitDataAndProgressToNextScreen(url, requestData, submitButton, thisScreenId, nextScreenId,
nextScreenRenderFunction);
      });
+    
+    globalYui.one('#previewLinkId').on('click', function(e) {
+      previewPanel = createInformationalPanel('#informationalPanelContainerDivId', 'Preview
Directories to be used by Hadoop');
+      previewPanel.set('centered', true);
+      previewPanel.set('bodyContent', globalYui.one('#configureClusterDisplayDivId').getContent());
+      var okButton = {
+          value: 'OK',
+          action: function (e) {
+            e.preventDefault();
+            destroyInformationalPanel(previewPanel);
+          },
+          section: 'footer'
+        };
+      previewPanel.addButton(okButton);
+      previewPanel.show();
+    });
 
     /* event on mountPoints to be checked. */
     globalYui.one('#configureClusterMountPointsInputDivId').delegate(

Modified: incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc?rev=1347159&r1=1347158&r2=1347159&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/conf/MessageResources-en.inc Wed Jun  6 21:56:58
2012
@@ -25,14 +25,15 @@ $RES['initWizard.selectServices.pageSumm
 $RES['initWizard.selectServices.submit.label']="Select Services";
 $RES['initWizard.assignMasters.pageSummary.header']="Assign Master Services to Hosts";
 $RES['initWizard.assignMasters.pageSummary.body']="We have come up with recommendations on
where the master services should be hosted.  Modify as you see fit.";
-$RES['initWizard.assignMasters.submit.label']="Submit";
+$RES['initWizard.assignMasters.submit.label']="Next";
 $RES['initWizard.configureCluster.pageSummary.header']="Specify Mount Points";
 $RES['initWizard.configureCluster.pageSummary.body']="We found the following mount points
on your nodes. Please confirm/modify the mount points to use for your nodes.";
 $RES['initWizard.configureCluster.customMountPoints.label']="Custom mount points";
-$RES['initWizard.configureCluster.submit.label']="Submit";
+$RES['initWizard.configureCluster.preview.label']="Preview directories to be used";
+$RES['initWizard.configureCluster.submit.label']="Next";
 $RES['initWizard.configureClusterAdvanced.pageSummary.header']="Customize Settings";
 $RES['initWizard.configureClusterAdvanced.pageSummary.body']="We have come up with reasonable
default settings.  Customize as you see fit.";
-$RES['initWizard.configureClusterAdvanced.submit.label']="Submit";
+$RES['initWizard.configureClusterAdvanced.submit.label']="Next";
 $RES['initWizard.reviewAndDeploy.pageSummary.header']="Review and Deploy";
 $RES['initWizard.reviewAndDeploy.pageSummary.body']="<p>We are ready to deploy!  Please
review your settings below.</p><p>If you wish to make any changes, you can click
on any of the installation stages above.  Note that if you do go back to a stage, you will
have to go through all the subsequent stages again.</p>";
 $RES['initWizard.reviewAndDeploy.submit.label']='Deploy';



Mime
View raw message