[Ogoglio-commits] SF.net SVN: ogoglio: [542] maven/trunk/ogoglio-server/src/main/resources/ siteTemplates/browserTests.js

[<tre...@us...>]

Revision: 542
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=542&view=rev
Author:   trevorolio
Date:     2007-10-22 16:58:51 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
In lieu of an all-in-one installer, tweaked the browser tests to send folks to the slick Java installer and directly to the Windows Java3D installer.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/resources/siteTemplates/browserTests.js

Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/browserTests.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/browserTests.js	2007-10-22 23:44:09 UTC (rev 541)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/browserTests.js	2007-10-22 23:58:51 UTC (rev 542)
@@ -20,7 +20,12 @@
 }
 requirementTests[requirementTests.length] = new PlatformTest("Checking that Javascript is enabled", "", "You must enable Javascript.", testJavascript);
 
+var javaErrorMessage = "<br/><br/>Please check that Java support is enabled in your browser preferences.<br/>";
+javaErrorMessage += "<br/>If your computer needs Java, use the free installer from <a href='http://java.com/en/download/'>Java.com</a>.<br/>";
 
+var java3DErrorMessage = "<br/>If your computer needs Java3D, a free installer is available <a href='/og/java3d-1_5_1-windows-i586.exe'>here</a>.";
+
+
 function testJava(testSpan){
 	try {
 		var jarURI = getServiceURI() + "/ogoglio-test-applet.jar";
@@ -44,14 +49,14 @@
 		if(!document.testApplet.hasJava3D()){
 			var j3dVersion = document.testApplet.getJava3DVersion();
 			if(j3dVersion == null){
-				requirementTests[1].failureMessage = "Unfortunately, you do not have Java3D installed.<br/>" + javaErrorMessage;
+				requirementTests[1].failureMessage = "Unfortunately, you do not have Java3D installed.<br/>" + javaErrorMessage + java3DErrorMessage;
 			} else {
-				requirementTests[1].failureMessage = "Unfortunately, this version of Java3D is not supported: " + j3dVersion + javaErrorMessage + "<br/>";
+				requirementTests[1].failureMessage = "Unfortunately, this version of Java3D is not supported: " + j3dVersion + javaErrorMessage + java3DErrorMessage + "<br/>";
 			}
 			return false;
 		}
 		if(!document.testApplet.canStartJava3D()){
-			requirementTests[1].failureMessage = "Unfortunately, you have Java3D but it can not initialize." + javaErrorMessage + "<br/>";
+			requirementTests[1].failureMessage = "Unfortunately, you have Java3D but it can not initialize." + javaErrorMessage + java3DErrorMessage + "<br/>";
 		}
 		return true;
 	} catch (error){
@@ -60,9 +65,6 @@
 	}
 	return false;
 }
-var javaErrorMessage = "<br/><br/>Please check that Java support is enabled in your browser preferences.<br/>";
-javaErrorMessage += "<br/>If your computer needs Java, use the free installer from <a href='http://java.com/en/download/'>Java.com</a>.<br/>";
-javaErrorMessage += "<br/>If your computer needs Java3D, a free installer is available <a href='java3d-1_5_1-windows-i586.exe'>here</a>.";
 requirementTests[requirementTests.length] = new PlatformTest("Checking for Java support", "Java displays the 3D views.", javaErrorMessage, testJava);
 
 var currentTestIndex = -1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.