incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1347141 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/js/addNodesProgress.js hmc/js/deployProgress.js
Date Wed, 06 Jun 2012 21:29:02 GMT
Author: vikram
Date: Wed Jun  6 21:29:01 2012
New Revision: 1347141

URL: http://svn.apache.org/viewvc?rev=1347141&view=rev
Log:
AMBARI-380. Clean up messages for Add Nodes and Deploy progress result (Contributed by Yusaku)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/js/addNodesProgress.js
    incubator/ambari/branches/ambari-186/hmc/js/deployProgress.js

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347141&r1=1347140&r2=1347141&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun  6 21:29:01 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-380. Clean up messages for Add Nodes and Deploy progress result (Yusaku via Vikram)
+
   AMBARI-379. Remove puppet start stub on uninstall. (Mahadev via Vikram)
 
   AMBARI-378. Getting a 404 after clicking on reinstall when the install fails (Yusaku via
Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/js/addNodesProgress.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/addNodesProgress.js?rev=1347141&r1=1347140&r2=1347141&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/addNodesProgress.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/addNodesProgress.js Wed Jun  6 21:29:01 2012
@@ -207,19 +207,18 @@ function renderProgress (discoverProgres
         if (overallFail == true) {
           installationStatusDivContent = 
           '<p>' +
-            'We found a few rebellious nodes! Take a look at the ' +
+            'An error was encountered with some of the nodes.  ' +
             '<a href="javascript:void(null)" id=errorInfoLinkId>' +
-            'Error Logs' +
-            '</a>' +
-            '?' +   
+            'Take a look at the logs to see what happened.' +
+            '</a>' 
           '</p>';
           installationStatusDivCssClass = 'statusError';
         } else {
           installationStatusDivContent =             
           '<p>' +
-            'All done with discovering nodes. ' +
+            'Finished node discovery and preparation. ' +
             '<a href="javascript:void(null)" id=successInfoLinkId>' +
-              'Great!' +
+              'Proceed to Select Services' +
             '</a>' +
           '</p>';
           installationStatusDivCssClass = 'statusOk';
@@ -242,7 +241,7 @@ function renderProgress (discoverProgres
             /* Create the panel that'll display our error info. */
             var errorInfoPanel = 
               createInformationalPanel( '#informationalPanelContainerDivId',
-                'Logs for the nodes\' initialization process.' );
+                'Node Discovery and Preparation Logs' );
 
               globalYui.one("#errorInfoLinkId").on( "click", function(err) {
                 var bodyContent = "";
@@ -273,10 +272,10 @@ function renderProgress (discoverProgres
                 //  globalYui.JSON.stringify( e.response.meta.stateInfo, null, 4) + '</pre>'
);
                 errorInfoPanel.show();
                 var linkInfo = '<a href="javascript:void(null)"' +
-                  'id=errorBackNavLinkId>Back</a>';
+                  'id="errorBackNavLinkId">Back to Add Nodes</a>';
                 if (totalFailure == false) {
                   linkInfo += ' <a href=' + 
-                  '"javascript:void(null)" id=errorFwdNavLinkId>Continue</a>';
+                  '"javascript:void(null)" id="errorFwdNavLinkId" style="margin-left:20px">Ignore
and Continue</a>';
                 }
 
                   //REZYYY globalYui.one("#progressErrorInfoNavigateDivId").setContent(linkInfo);

Modified: incubator/ambari/branches/ambari-186/hmc/js/deployProgress.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/deployProgress.js?rev=1347141&r1=1347140&r2=1347141&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/deployProgress.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/deployProgress.js Wed Jun  6 21:29:01 2012
@@ -83,28 +83,27 @@ function renderDeployProgress (deployPro
       && deployProgressInfo.nagiosGangliaCoHosted) {
     hmcRestartMsg = '<strong>Note:</strong> We detected that you need to restart
HMC as'
         + ' Nagios/Ganglia are co-hosted on this server. <br/>Please restart'
-        + ' HMC using \"service hmc restart\" and then head ';
+        + ' HMC using \"service hmc restart\".  After that is done, ';
   } else {
-    hmcRestartMsg = 'May we be so bold as to suggest heading ';
+    hmcRestartMsg = 'Please ';
   }
 
-  hmcRestartMsg += 'on over to the ' +
-      '<a href="javascript:void(null)" id=clustersListLinkId>' +
-        'Cluster information' +
-      '</a>' +
-      ' page?';
+  hmcRestartMsg += 
+      '<a href="javascript:void(null)" id="clustersListLinkId">' +
+        'click here to start managing your cluster.' +
+      '</a>';
 
   var deployProgressStatusMessage = {
 
     success:
       '<p style=\"text-align:center\">' +
-        'All done with the deploy! <br/>' + hmcRestartMsg +
+        'Your cluster is ready! <br/>' + hmcRestartMsg +
       '</p>',
     failure:
       '<p>' +
-        'We made a boo-boo! Take a look at the ' +
-          '<a href="javascript:void(null)" id=showDeployTxnLogsLinkId>Deploy Logs</a>'
+
-        '?' +
+        'Failed to finish setting up the cluster. ' +
+          '<a href="javascript:void(null)" id="showDeployTxnLogsLinkId">Take a look
at the deploy logs</a>' +
+        ' to find out what might have gone wrong.' +
       '</p>'
   };
 
@@ -113,7 +112,7 @@ function renderDeployProgress (deployPro
     success: function( txnProgressWidget ) {
 
       globalYui.one("#clustersListLinkId").on( "click", function(e) {
-        window.open( generateClustersListUrl(txnProgressWidget.txnProgressContext.clusterName)
);
+        document.location.href = generateClustersListUrl(txnProgressWidget.txnProgressContext.clusterName);
       });
     },
 
@@ -176,24 +175,15 @@ function renderDeployProgress (deployPro
         errorInfoPanel.show();
 
         if( firstTimeShowingErrorInfoPanel ) {
-
           globalYui.one('#txnProgressStatusActionsDivId').setContent(  
-            '<a href="javascript:void(null)" id=restartInstallationWizardLinkId>' +

-              'Restart The Installation Wizard' +
-            '</a>' + 
-            '&nbsp; &nbsp; &nbsp;' + 
-            '<a href="javascript:void(null)" id=clustersListLinkId>' + 
-              'Go Manage The Cluster\'s Services' +
-            '</a>' );
-
+              '<a href="javascript:void(null)" id=restartInstallationWizardLinkId>'
+ 
+                'Reinstall Cluster' +
+              '</a>'
+          );          
           globalYui.one("#restartInstallationWizardLinkId").on( "click", function(e) {
-            window.open( window.location.href );
-          });
-
-          globalYui.one("#clustersListLinkId").on( "click", function(e) {
-            window.open( generateClustersListUrl(txnProgressWidget.txnProgressContext.clusterName)
);
+            document.location.href = 'reinstall.php';
           });
-
+          
           firstTimeShowingErrorInfoPanel = false;
         }
       });



Mime
View raw message