incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1356360 - in /incubator/ambari/trunk: CHANGES.txt hmc/js/assignMasters.js hmc/js/clustersList.js hmc/js/deployProgress.js hmc/js/utils.js hmc/php/conf/MessageResources-en.inc
Date Mon, 02 Jul 2012 17:11:59 GMT
Author: vikram
Date: Mon Jul  2 17:11:57 2012
New Revision: 1356360

URL: http://svn.apache.org/viewvc?rev=1356360&view=rev
Log:
AMBARI-588. Externalize the manager service name and point the Help link to a valid URL (Contributed
by yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/hmc/js/assignMasters.js
    incubator/ambari/trunk/hmc/js/clustersList.js
    incubator/ambari/trunk/hmc/js/deployProgress.js
    incubator/ambari/trunk/hmc/js/utils.js
    incubator/ambari/trunk/hmc/php/conf/MessageResources-en.inc

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1356360&r1=1356359&r2=1356360&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Jul  2 17:11:57 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 1.0.0 - unreleased
 
+  AMBARI-588. Externalize the manager service name and point the Help link to a valid URL
(yusaku via vikram)
+
   AMBARI-587. Rat tool changes with exclude file. (vikram)
 
   AMBARI-583. UI allows io_sort_spill_percent value to be set to over 1.0

Modified: incubator/ambari/trunk/hmc/js/assignMasters.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/js/assignMasters.js?rev=1356360&r1=1356359&r2=1356360&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/js/assignMasters.js (original)
+++ incubator/ambari/trunk/hmc/js/assignMasters.js Mon Jul  2 17:11:57 2012
@@ -28,16 +28,16 @@ function AssignMasters() {
   function renderHostsToMasterServices(hostsToMasterServices) {
   	var markup = '';
   	for (var host in hostsToMasterServices) {
-  		  var hostInfo = getNodeInfo(host);
-  		  markup += '<div class="hostToMasterServices"><h3>' + host + '<span class="hostInfo">'
+ getTotalMemForDisplay(hostInfo.totalMem) + ', ' + hostInfo.cpuCount + ' cores</span></h3><ul>';
-  		  for (var j in hostsToMasterServices[host]) {
-  			  markup += '<li>' + hostsToMasterServices[host][j] + '</li>';
-  		  }
-  		  // add HMC Server
-  		  if (host == this.managerHostName) {
-          markup += '<li>HMC Server</li>';	    
-  		  }
-        markup += '</ul><div style="clear:both"></div></div>';
+      var hostInfo = getNodeInfo(host);
+      markup += '<div class="hostToMasterServices"><h3>' + host + '<span class="hostInfo">'
+ getTotalMemForDisplay(hostInfo.totalMem) + ', ' + hostInfo.cpuCount + ' cores</span></h3><ul>';
+      for (var j in hostsToMasterServices[host]) {
+        markup += '<li>' + hostsToMasterServices[host][j] + '</li>';
+      }
+      // add manager server
+      if (host == this.managerHostName) {
+        markup += '<li>' + App.Props.managerServiceName + ' Server</li>';   
 
+      }
+      markup += '</ul><div style="clear:both"></div></div>';
   	}
   	$('#hostsToMasterServices').html(markup);
   }

Modified: incubator/ambari/trunk/hmc/js/clustersList.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/js/clustersList.js?rev=1356360&r1=1356359&r2=1356360&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/js/clustersList.js (original)
+++ incubator/ambari/trunk/hmc/js/clustersList.js Mon Jul  2 17:11:57 2012
@@ -69,7 +69,7 @@ function ClustersList() { 
     for (var hostName in hostMap) {
       markup += '<div class="hostToServices clearfix"><h3>' + hostName + '</h3>'
+ '<ul>';
       if (hostName == managerHostName) {
-        markup += '<li class="master">HMC Server</li>';
+        markup += '<li class="master">' + App.Props.managerServiceName + ' Server</li>';
       }
       for (var service in hostMap[hostName]) {
         markup += '<li class="' + ((hostMap[hostName][service].isMaster) ? 'master' :
'client') + '">' + hostMap[hostName][service].serviceName + '</li>';

Modified: incubator/ambari/trunk/hmc/js/deployProgress.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/js/deployProgress.js?rev=1356360&r1=1356359&r2=1356360&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/js/deployProgress.js (original)
+++ incubator/ambari/trunk/hmc/js/deployProgress.js Mon Jul  2 17:11:57 2012
@@ -58,9 +58,9 @@ function renderDeployProgress (deployPro
   var hmcRestartMsg = '';
   if (deployProgressInfo.nagiosGangliaCoHosted != null
       && deployProgressInfo.nagiosGangliaCoHosted) {
-    hmcRestartMsg = '<span style="color:red"><strong>Note:</strong> You
need to restart HMC as'
-        + ' Nagios/Ganglia are co-hosted on this server.<br>Please restart'
-        + ' HMC using \"service ambari restart\".</span><br>After that is done,
';
+    hmcRestartMsg = '<span style="color:red"><strong>Note:</strong> You
need to restart ' + App.Props.managerServiceName + ' as'
+        + ' Nagios/Ganglia are co-hosted on this server.<br>Please restart '
+        + App.Props.managerServiceName + ' using \"service ' + App.Props.managerServiceName.toLowerCase()
+ ' restart\".</span><br>After that is done, ';
   } else {
     hmcRestartMsg = 'Please ';
   }

Modified: incubator/ambari/trunk/hmc/js/utils.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/js/utils.js?rev=1356360&r1=1356359&r2=1356360&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/js/utils.js (original)
+++ incubator/ambari/trunk/hmc/js/utils.js Mon Jul  2 17:11:57 2012
@@ -413,3 +413,9 @@ function generateHMCUrl( uriPath ) {
 
   return url;
 }
+
+var App = App || {
+  Props: {
+    managerServiceName: 'Ambari'
+  }
+};

Modified: incubator/ambari/trunk/hmc/php/conf/MessageResources-en.inc
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/conf/MessageResources-en.inc?rev=1356360&r1=1356359&r2=1356360&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/php/conf/MessageResources-en.inc (original)
+++ incubator/ambari/trunk/hmc/php/conf/MessageResources-en.inc Mon Jul  2 17:11:57 2012
@@ -2,7 +2,7 @@
 $RES['app.name']="Ambari";
 $RES['page.title']="Ambari";
 $RES['page.footer.body']="";
-$RES['topnav.help.link']="";
+$RES['topnav.help.link']="http://incubator.apache.org/ambari/install.html";
 $RES['welcome.header']="Welcome to Ambari!";
 $RES['welcome.body']="";
 $RES['welcome.note']="Before you proceed, make sure you have performed all the pre-installation
steps.";



Mime
View raw message