summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kellner <tobias.kellner@iaik.tugraz.at>2015-04-23 11:39:45 +0200
committerTobias Kellner <tobias.kellner@iaik.tugraz.at>2015-04-23 11:39:45 +0200
commitfd94c6186260ede93b5e5980032f67eb02cf2d5c (patch)
tree6e06baa234893f4bcb89b6ad13a399390d7d2ada
parentcbd719a487362c2641e73889f5727981249e2d5f (diff)
downloadmocca-fd94c6186260ede93b5e5980032f67eb02cf2d5c.tar.gz
mocca-fd94c6186260ede93b5e5980032f67eb02cf2d5c.tar.bz2
mocca-fd94c6186260ede93b5e5980032f67eb02cf2d5c.zip
Display different applet error message for Chrome users
-rw-r--r--BKUOnline/src/main/resources/web.properties1
-rw-r--r--BKUOnline/src/main/resources/web_de.properties1
-rw-r--r--BKUOnline/src/main/webapp/applet.jsp15
3 files changed, 12 insertions, 5 deletions
diff --git a/BKUOnline/src/main/resources/web.properties b/BKUOnline/src/main/resources/web.properties
index 88da6556..3beeeaed 100644
--- a/BKUOnline/src/main/resources/web.properties
+++ b/BKUOnline/src/main/resources/web.properties
@@ -21,6 +21,7 @@
title=MOCCA
javaPluginRequired=Java&trade; plug-in, version 6 update 4 or higher is required. Reload this page after installation.
+noJavaChrome=Chrome doesn't support the Java&trade; plug-in anymore, please use a different browser for this application.
installJava=Install Java&trade;
incTextSize=increase text size
decTextSize=decrease text size
diff --git a/BKUOnline/src/main/resources/web_de.properties b/BKUOnline/src/main/resources/web_de.properties
index 8bd9dc52..a26c1313 100644
--- a/BKUOnline/src/main/resources/web_de.properties
+++ b/BKUOnline/src/main/resources/web_de.properties
@@ -21,6 +21,7 @@
title=MOCCA
javaPluginRequired=Java&trade; Plug-In, Version 6 Update 4 oder höher wird benötigt. Nach der Installation diese Seite neu laden.
+noJavaChrome=Chrome unterstützt das Java&trade; Plug-In nicht mehr, bitte verwenden Sie einen anderen Browser um diese Anwendung auszuführen.
installJava=Java&trade; installieren
incTextSize=Text vergrößern
decTextSize=Text verkleinern
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index c0e3ef49..60486ae6 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -185,21 +185,26 @@
<body>
<div id="container">
<div id="buttons">
- <a href="#" id="focus" onclick="resize(1.2); return false;" style="float: left;"><img alt="<fmt:message key="incTextSize"/>" src="img/inc.png" id="incButton" class="button"></a>
- <a href="#" onclick="resize(1/1.2); return false;" style="float: left;"><img alt="<fmt:message key="decTextSize"/>" src="img/dec.png" id="decButton" class="button"></a>
+ <a href="#" id="focus" onclick="resize(1.2); return false;" style="float: left;"><img alt="<fmt:message key="incTextSize"/>" src="img/inc.png" id="incButton" class="button"></a>
+ <a href="#" onclick="resize(1/1.2); return false;" style="float: left;"><img alt="<fmt:message key="decTextSize"/>" src="img/dec.png" id="decButton" class="button"></a>
</div>
- <a href="<c:out value="${helpUrl}"/>" onclick="this.href = document.moccaapplet.getHelpURL(); return true;" onblur="focusToApplet()" target="_new" style="float: right;"><img alt="<fmt:message key="help"/>" src="img/help.png" id="helpButton" class="button"></a>
- <div id="message" style="display: none;">
+ <a href="<c:out value="${helpUrl}"/>" onclick="this.href = document.moccaapplet.getHelpURL(); return true;" onblur="focusToApplet()" target="_new" style="float: right;"><img alt="<fmt:message key="help"/>" src="img/help.png" id="helpButton" class="button"></a>
+ <div id="message" style="display: none;">
<p><fmt:message key="javaPluginRequired"/></p>
<p style="text-align: right;">
<a style="width: 90%; font-size: 100%" href="http://www.java.com" onclick="deployJava.installLatestJRE(); return false;"><fmt:message key="installJava"/></a>
</p>
+ </div><div id="message_chrome" style="display: none;">
+ <p><fmt:message key="noJavaChrome"/></p>
</div><script type="text/javascript">
if (iframe) {
document.getElementById("buttons").style.visibility = "hidden";
}
if (!deployJava.versionCheck('<c:out value="${minJavaVersion}+"/>')) {
- document.getElementById("message").style.display = "block";
+ if (window.chrome)
+ document.getElementById("message_chrome").style.display = "block";
+ else
+ document.getElementById("message").style.display = "block";
} else {
var attributes = {
codebase :'<c:out value="${codebase}"/>',