diff --git a/scripts/installWeb.in b/scripts/installWeb.in index 9befa17ff..b75c1c436 100755 --- a/scripts/installWeb.in +++ b/scripts/installWeb.in @@ -35,6 +35,7 @@ chdir($rootdir); "HTMLINSTALL" => "/sample/apache/html/ganymede", "WEBURL" => "/ganymede", "XMLPATH" => "/ganymede-client/bin", + "RESPONSIBLEEMAIL" => "example@example.com", "DOCS" => "yes", "ANT" => "/usr/bin/ant"); @@ -43,6 +44,7 @@ chdir($rootdir); "HTMLINSTALL" => "Where should the web access files be installed?", "WEBURL" => "What URL path will resolve to the Ganymede web access directory?", "XMLPATH" => "Where will the Ganymede client binaries be installed?", + "RESPONSIBLEEMAIL" => "Who should receive email about Ganymede at your site?", "DOCS" => "Do you want the Ganymede documentation installed in this directory as well?", "ANT" => "Where is Apache Ant installed?"); @@ -135,6 +137,14 @@ foreach $step (@steps) { } } + if ($step eq "RESPONSIBLEEMAIL") { + if ($vars{$step} !~ /@/) { + print "Email address is missing an @\n"; + $vars{$step} = $old; + $success = 0; + } + } + if ($step eq "WEBURL" && $vars{"WEBURL"} !~ /^https?:\/\//) { print "*Please provide a fully qualified URL.\n"; $success = 0; @@ -188,8 +198,6 @@ copy_file("webforms/ganymede_splash.png", "$installdir/ganymede_splash.png"); # Customize and copy the client web pages install_file("webforms/index.html", "$installdir/index.html"); -install_file("webforms/client_native.html", "$installdir/client_native.html"); -install_file("webforms/console_native.html", "$installdir/console_native.html"); install_file("webforms/ganypass.pl", "$installdir/ganypass.pl"); install_file("webforms/gany_query.pl", "$installdir/gany_query.pl"); install_file("webforms/client.jnlp", "$installdir/client.jnlp"); @@ -331,6 +339,7 @@ sub install_file{ s/#SERVERHOST/$vars{"SYSTEMNAME"}/g; s/#REGISTRYPORT/$vars{"REGISTRYPORT"}/g; s/<#XMLPATH#>/$vars{"XMLPATH"}/g; + s/#RESPONSIBLEEMAIL/$vars{"RESPONSIBLEEMAIL"}/g; s/<##PERLEXE##>/$perlloc/g; s/#WEBROOT/$vars{"WEBURL"}/g; print OUTPUT $_; diff --git a/webforms/client_native.html b/webforms/client_native.html deleted file mode 100644 index ba081dbeb..000000000 --- a/webforms/client_native.html +++ /dev/null @@ -1,15 +0,0 @@ - - -Ganymede Login - #SERVERHOST - - -
- - - - -
- - diff --git a/webforms/console_native.html b/webforms/console_native.html deleted file mode 100644 index 9066c333a..000000000 --- a/webforms/console_native.html +++ /dev/null @@ -1,15 +0,0 @@ - - -Ganymede Admin Console - #SERVERHOST - - -
- - - - -
- - diff --git a/webforms/index.html b/webforms/index.html index e9da8a608..a8b6f2116 100644 --- a/webforms/index.html +++ b/webforms/index.html @@ -6,7 +6,6 @@ Ganymede Launcher on #SERVERHOST -
@@ -17,204 +16,38 @@ - - + + - - - - - - - - - +

Requires Java 6 or later with Java Web Start.

+

+

Questions or comments to: #RESPONSIBLEEMAIL

+ +
- -
- Please select - Client Type - and - Java Virtual Machine - -
- -
 
- + Ganymede Client    +
- 		- - Java Web Start
- Native - -
- + Ganymede Admin Console   
 
- - Notes

Most users should use the 'Java Web - Start' option to run the Ganymede clients. Java Web - Start allows your local system to run the Ganymede - applets outside of the context of your web browser. - Java Web Start is also capable of caching the applets - on your system, to improve subsequent startup time.

- -

If Java Web Start does not work for you, the - 'Native' option should, at least on any sort of modern - web browser. If that doesn't work, check to make sure - your system has Java 6 or better installed.

- -
+ - Links -

- - - - - - - - - - - - - - - - - -
- - Java Download: - - - - Download Java - -
- - Home: - - - - Ganymede Home Page - -
- - Author: - - - - jonabbey@arlut.utexas.edu - -
- - List: - - - - ganymede@arlut.utexas.edu - -
- -

-
-
- - -