AMBARI-588. Externalize the manager service name and point the Help l…

…ink to a valid URL (Contributed by yusaku) git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1356360 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 2, 2012 · 7530cca · 7530cca
1 parent 92c68da
commit 7530cca
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -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

diff --git a/hmc/js/assignMasters.js b/hmc/js/assignMasters.js
@@ -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);
   }

diff --git a/hmc/js/clustersList.js b/hmc/js/clustersList.js
@@ -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>';

diff --git a/hmc/js/deployProgress.js b/hmc/js/deployProgress.js
@@ -58,9 +58,9 @@ function renderDeployProgress (deployProgressInfo) {
   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 ';
   }

diff --git a/hmc/js/utils.js b/hmc/js/utils.js
@@ -413,3 +413,9 @@ function generateHMCUrl( uriPath ) {
 
   return url;
 }
+
+var App = App || {
+  Props: {
+    managerServiceName: 'Ambari'
+  }
+};
diff --git a/hmc/php/conf/MessageResources-en.inc b/hmc/php/conf/MessageResources-en.inc
@@ -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.";