summaryrefslogtreecommitdiff
path: root/BKUOnline/src
diff options
context:
space:
mode:
Diffstat (limited to 'BKUOnline/src')
-rw-r--r--BKUOnline/src/main/webapp/css/main.css7
-rw-r--r--BKUOnline/src/main/webapp/img/webstart.pngbin0 -> 4643 bytes
-rw-r--r--BKUOnline/src/main/webapp/index.html2
-rw-r--r--BKUOnline/src/main/webapp/js/deployJava.js23
4 files changed, 26 insertions, 6 deletions
diff --git a/BKUOnline/src/main/webapp/css/main.css b/BKUOnline/src/main/webapp/css/main.css
index 114b8da9..b6d6e906 100644
--- a/BKUOnline/src/main/webapp/css/main.css
+++ b/BKUOnline/src/main/webapp/css/main.css
@@ -24,6 +24,13 @@ h1 {
font-size: 16px;
}
+.disabled {
+ /* for IE */
+ filter:alpha(opacity=60);
+ /* CSS3 standard */
+ opacity:0.4;
+}
+
.box {
margin-top: 10px;
color: #292929;
diff --git a/BKUOnline/src/main/webapp/img/webstart.png b/BKUOnline/src/main/webapp/img/webstart.png
new file mode 100644
index 00000000..87d1cf7b
--- /dev/null
+++ b/BKUOnline/src/main/webapp/img/webstart.png
Binary files differ
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 2ec41746..fd37ce35 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -40,6 +40,7 @@
<!-- MOCCA Web Start
| (activate 'include-webstart' profile)
+ -->
<div id="animDiv" class="box">
<p>
<h1>MOCCA Web Start</h1>
@@ -52,6 +53,5 @@
<p><a href="webstart/player.jnlp">Java Cache Viewer</a> (local installation)</p>
</p>
</div>
- |-->
</body>
</html>
diff --git a/BKUOnline/src/main/webapp/js/deployJava.js b/BKUOnline/src/main/webapp/js/deployJava.js
index dbeab995..225ca80f 100644
--- a/BKUOnline/src/main/webapp/js/deployJava.js
+++ b/BKUOnline/src/main/webapp/js/deployJava.js
@@ -36,6 +36,11 @@
* (lines 95-99)
* [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP
* (lines 501-506)
+ *
+ * features:
+ * [#425] Disable WebStart Launch Button for MacOS
+ * (lines 492-504)
+ *
*/
/*
@@ -75,8 +80,7 @@ var deployJava = {
mimeType: 'application/npruntime-scriptable-plugin;DeploymentToolkit',
// location of the Java Web Start launch button graphic
- launchButtonPNG: 'http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png',
-
+ launchButtonPNG: 'img/webstart.png',
/**
* Returns an array of currently-installed JRE version strings.
@@ -485,11 +489,20 @@ var deployJava = {
'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
'}';
- document.write('<' + 'a href="' + url +
+ // [#425] Disable WebStart Launch Button for MacOS
+ if (navigator.appVersion.toLowerCase().indexOf("mac")!=-1) {
+ document.write('<' + 'a disabled="disabled"' +
+ ' onMouseOver="window.status=\'\'; ' +
+ 'return true;"><' + 'img class="disabled"' +
+ 'src="' + deployJava.launchButtonPNG + '" ' +
+ 'border="0" /><' + '/' + 'a' + '>');
+ } else {
+ document.write('<' + 'a href="' + url +
'" onMouseOver="window.status=\'\'; ' +
'return true;"><' + 'img ' +
- 'src="' + deployJava.launchButtonPNG + '" ' +
+ 'src="' + deployJava.launchButtonPNG + '" ' +
'border="0" /><' + '/' + 'a' + '>');
+ }
},
@@ -636,7 +649,7 @@ var deployJava = {
if (deployJava.debug) {
alert('userAgent -> ' + browser);
}
-
+
if ((navigator.vendor) &&
(navigator.vendor.toLowerCase().indexOf('apple') != -1) &&
(browser.indexOf('safari') != -1)) {