summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-07-15 08:08:49 +0000
committermcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-07-15 08:08:49 +0000
commitf75a0d8169fb4d684efdaebe7aceeb217bbe9462 (patch)
tree1c8d8d07e1877adea2ed6ba2021aba3dcd020b82
parentab58b0ad77f49661d8f6eded211276019ae24823 (diff)
downloadmocca-f75a0d8169fb4d684efdaebe7aceeb217bbe9462.tar.gz
mocca-f75a0d8169fb4d684efdaebe7aceeb217bbe9462.tar.bz2
mocca-f75a0d8169fb4d684efdaebe7aceeb217bbe9462.zip
Fixed issue with iframe detection in MOCCA Online applet.jsp.
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@775 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUOnline/src/main/webapp/applet.jsp12
1 files changed, 9 insertions, 3 deletions
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index ee1cca2a..aa0c3423 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -112,6 +112,10 @@
text-decoration: none;
border-style: none;
}
+ #buttons {
+ padding: 0;
+ margin: 0;
+ }
#message {
margin: 0;
padding: 0.25em 0 0.25em 0;
@@ -122,7 +126,7 @@
padding: 0.25em 0.5em 0.25em 0.5em;
}
</style>
- <script type="text/javascript" src="http://www.java.com/js/deployJava.js"></script>
+ <script type="text/javascript" src="https://www.java.com/js/deployJava.js"></script>
<script type="text/javascript">
var iframe = (top.location.href != window.location.href);
var fontSize = 100;
@@ -168,8 +172,10 @@
</head>
<body>
<div id="container">
- <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 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>
+ </div>
<a href="<c:out value="${helpUrl}"/>" onclick="this.href = document.moccaapplet.getHelpURL(); return true;" 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>