Merge pull request #275 from Selvasundaram/17d5b1421de9af6779961e944658ba384d59405d

Modified to show links of only identified OS if CPU architecture is not identified.

1 files changed, 45 insertions, 6 deletions

diff --git a/src/com.gluster.storage.management.gateway/WebContent/index.html b/src/com.gluster.storage.management.gateway/WebContent/index.html
index 9b7e28cd..5947cf11 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/index.html
+++ b/src/com.gluster.storage.management.gateway/WebContent/index.html
@@ -68,17 +68,32 @@
 		var element = document.getElementById('loading');
 		element.style.display = "none";
 
-		// show the links for various os-arch combinations
-		element = document.getElementById('always_on');
-		element.style.display = "block";
-
 		if ( os == "unknown" ) {
 			var element = document.getElementById('unknown_os');
 			element.style.display = "block";
+
+			// show the links for various os-arch combinations
+			element = document.getElementById('all_links');
+			element.style.display = "block";
+		}
+		
+		if ( os != "unknown" && arch == "unknown" ) {
+			var element = document.getElementById('unknown_arch');
+			element.style.display = "block";
 		}
 
 		if ( os == "macosx" && arch == "unknown" ) {
-			var element = document.getElementById('unknown_arch');
+			var element = document.getElementById('macosx');
+			element.style.display = "block";
+		}
+
+		if ( os == "win32" && arch == "unknown" ) {
+			var element = document.getElementById('win32');
+			element.style.display = "block";
+		}
+
+		if ( os == "linux" && arch == "unknown" ) {
+			var element = document.getElementById('linux');
 			element.style.display = "block";
 		}
 
@@ -86,6 +101,11 @@
 			// os-ws-arch detected. redirect to appropriate jnlp
 			var element = document.getElementById('all_ok');
 			element.style.display = "block";
+
+			// show the links for various os-arch combinations
+			element = document.getElementById('all_links');
+			element.style.display = "block";
+
 			url = os + "." + ws + "." + arch + "/gluster-management-console.jnlp";
 			document.location.href = url;
 		}
@@ -107,13 +127,32 @@
 	<DIV ID="unknown_arch" style="display: none">
 		Could not identify your CPU architecture. Please click on the appropriate link below to invoke Gluster Management Console!
 	</DIV><br>
-	<DIV ID="always_on" style="display: none">
+	<DIV ID="win32" style="display: none">
+		<table style="width: 479px; ">
+			<tr><td style="width: 100px;">Windows</td><td style="width: 60px;"><a href="win32.win32.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="win32.win32.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr>
+		</table>
+	</DIV>
+	
+	<DIV ID="linux" style="display: none">
+		<table style="width: 479px; ">
+			<tr><td style="width: 100px;">Linux</td><td style="width: 60px;"><a href="linux.gtk.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="linux.gtk.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr>
+		</table>
+	</DIV>
+
+	<DIV ID="macosx" style="display: none">
+		<table style="width: 479px; ">
+			<tr><td style="width: 100px;">Mac OS X</td><td style="width: 60px;"><a href="macosx.cocoa.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="macosx.cocoa.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr>
+		</table>
+	</DIV>	
+	
+	<DIV ID="all_links" style="display: none">
 		<table style="width: 479px; ">
 			<tr><td style="width: 100px;">Linux</td><td style="width: 60px;"><a href="linux.gtk.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="linux.gtk.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr>
 			<tr><td style="width: 100px;">Mac OS X</td><td style="width: 60px;"><a href="macosx.cocoa.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="macosx.cocoa.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr>
 			<tr><td style="width: 100px;">Windows</td><td style="width: 60px;"><a href="win32.win32.x86/gluster-management-console.jnlp">32 bit</a></td><td style="width: 60px;"><a href="win32.win32.x86_64/gluster-management-console.jnlp">64 bit</a></td></tr>
 		</table>
 	</DIV>
+	
 </body>
 
 </html>