aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy/conf/moa-id/htmlTemplates
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2018-01-23 14:23:39 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2018-01-23 14:23:39 +0100
commit731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb (patch)
tree52ce23ebe8191f99a187b9ff90af8cef01d63030 /id/server/data/deploy/conf/moa-id/htmlTemplates
parent869a07573fb6295174fd57aced1ba888f3015910 (diff)
downloadmoa-id-spss-731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb.tar.gz
moa-id-spss-731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb.tar.bz2
moa-id-spss-731ab39b8ef05a4e84b72fb4243d59c9f6dd48cb.zip
update mostly all GUI forms to split JavaScript and CSS from html code to support "Content Security-Policy" http headers
Diffstat (limited to 'id/server/data/deploy/conf/moa-id/htmlTemplates')
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js5
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css4
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js3
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js6
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js20
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html11
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html18
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js5
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html6
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js20
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html35
11 files changed, 78 insertions, 55 deletions
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js
new file mode 100644
index 000000000..d21a5651d
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/autocommit.js
@@ -0,0 +1,5 @@
+function autoCommmit() {
+ document.forms[0].submit();
+}
+
+document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css b/id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css
new file mode 100644
index 000000000..4bec163a9
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/basic.css
@@ -0,0 +1,4 @@
+@charset "utf-8";
+ .bgTrans {
+ background-color:transparent
+ } \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js
new file mode 100644
index 000000000..7e4d2b12f
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetected.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function () {
+ parent.setBKUAvailable(true);
+}); \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js
new file mode 100644
index 000000000..b991beb60
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/bkudetection.js
@@ -0,0 +1,6 @@
+function autoCommmit() {
+ parent.setBKUAvailable(false);
+ document.forms[0].submit();
+}
+
+document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
index 0c1f6a561..cc4714006 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
@@ -126,13 +126,12 @@ function isIE() {
}
}
}
- function onChangeChecks() {
+ function onChangeChecks() {
if (self.innerWidth < 650) {
document.getElementById("moaidform").setAttribute("target","_parent");
} else {
document.getElementById("moaidform").removeAttribute("target");
}
-
}
function checkIfBrowserSupportsJava(){
@@ -234,8 +233,21 @@ function isIE() {
console.log("Local BKU NOT available")
}
} catch(e) {console.log("Local BKU detection is not possible! Msg: "+e);}
-
- }
+
+ }
+ function setUseMandateFlag(e) {
+ /*document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);*/
+ e.setAttribute("aria-checked", e.checked);
+ }
+
+ document.addEventListener('resize', onChangeChecks);
+ document.addEventListener('DOMContentLoaded', function () {
+ document.querySelector('#mandateCheckBox').addEventListener('click', setUseMandateFlag);
+ document.querySelector('#moaidform>input[type=submit]').addEventListener('click', setMandateSelection);
+ document.querySelector('#bkuhandy>input[type=button]').addEventListener('click', bkuHandyClicked);
+ document.querySelector('#stork button[type=button]').addEventListener('click', storkClicked);
+ onChangeChecks();
+ });
/* function setSSOSelection() {
document.getElementById("useSSO").value = "false";
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index 1f365c104..5a4ca66b7 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -13,7 +13,7 @@
<title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
</head>
<!--body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();"-->
-<body onload="onChangeChecks();" onresize="onChangeChecks();">
+<body>
<div id="page">
<div id="page1" class="case selected-case" role="main">
<h2 class="OA_header" role="heading">Anmeldung an: $OAName</h2>
@@ -26,8 +26,7 @@
<div id="mandateLogin" style="$MANDATEVISIBLE">
<div>
<input tabindex="1" type="checkbox" name="Mandate"
- id="mandateCheckBox" class="verticalcenter" role="checkbox"
- onClick='document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);'$MANDATECHECKED>
+ id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED>
<label for="mandateCheckBox" class="verticalcenter">in
Vertretung anmelden</label>
<!--a href="info_mandates.html"
@@ -49,7 +48,7 @@
<input type="hidden" name="SSO" id="useSSO" />
<input type="hidden" name="ccc" id="ccc" />
<input type="hidden" name="pendingid" value="$pendingReqID" />
- <input type="submit" value=" Karte " tabindex="4" role="button" onclick="setMandateSelection();">
+ <input type="submit" value=" Karte " tabindex="4" role="button">
</form>
<iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"></iframe>
@@ -60,7 +59,7 @@
</div>
<div id="bkuhandy">
<img class="bkuimage" src="$contextPath/img/handysign.png" alt="HandyBKU" />
- <input name="bkuButtonHandy" type="button" onClick="bkuHandyClicked();" tabindex="3" role="button" value="HANDY" />
+ <input name="bkuButtonHandy" type="button" tabindex="3" role="button" value="HANDY" />
</div>
</div>
<!--div id="localBKU">
@@ -88,7 +87,7 @@
<select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
$countryList
</select>
- <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
+ <button name="bkuButton" type="button">Proceed</button>
<a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
</p>
</div>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html
index 45c183215..908582374 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/pvp_postbinding_template.html
@@ -5,8 +5,10 @@
##SAMLResponse - String - the Base64 encoded SAML Response
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<body onload="document.forms[0].submit()">
+<head>
+ <script src="$contextPath/autocommit.js"></script>
+</head>
+<body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support
@@ -14,21 +16,9 @@
</p>
</noscript>
-
<div id="alert">Your login is being processed. Thank you for
waiting.</div>
- <style type="text/css">
-<!--
-#alert {
- margin: 100px 250px;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 14px;
- font-weight: normal;
-}
--->
-</style>
-
<form action="${action}" method="post" target="_parent">
<div>
#if($RelayState) <input type="hidden" name="RelayState" value="${RelayState}"/> #end
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js
new file mode 100644
index 000000000..1bba3d5e0
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirect.js
@@ -0,0 +1,5 @@
+function autoCommmit() {
+ document.getElementById('link').click();
+}
+
+document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html
index 7b064e22a..a27a7ba10 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/redirectForm.html
@@ -1,12 +1,10 @@
<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<script type="text/javascript">
- </script>
+ <script src="$contextPath/redirect.js"></script>
</head>
-
-<body onload="document.getElementById('link').click();">
+<body>
<div id="page">
<div id="page1" class="case selected-case" role="main">
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js
new file mode 100644
index 000000000..c85837c8a
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo.js
@@ -0,0 +1,20 @@
+function sloTimeOut() {
+ document.getElementById("timeoutURL").click();
+}
+function RestartAfterDelay() {
+ var eDate = null;
+ var MilliSekZeit = 0;
+ var SysDatumJetzt = new Date();
+ var SysDatumJetztMilli = SysDatumJetzt.getTime();
+
+ do {
+ eDate = new Date();
+ MilliSekZeit = eDate.getTime();
+ } while ((MilliSekZeit-SysDatumJetztMilli) < $timeout);
+
+ sloTimeOut();
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+ setTimeout(sloTimeOut, 30000);
+}); \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
index 4d9277152..4f86f9f14 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
@@ -6,37 +6,12 @@
<link rel="stylesheet" href="$contextPath/css/buildCSS" />
#if($timeoutURL)
- <script type="text/javascript">
- function sloTimeOut() {
- window.location.href="$timeoutURL";
-
- }
- function RestartAfterDelay() {
- var eDate = null;
- var MilliSekZeit = 0;
- var SysDatumJetzt = new Date();
- var SysDatumJetztMilli = SysDatumJetzt.getTime();
-
- do {
- eDate = new Date();
- MilliSekZeit = eDate.getTime();
-
- } while ((MilliSekZeit-SysDatumJetztMilli) < $timeout);
-
- sloTimeOut();
- }
-
- </script>
+ <script src="$contextPath/slo.js"></script>
#end
<title>Single LogOut Vorgang ... </title>
</head>
-
-#if($timeoutURL)
- <body onload='setTimeout(sloTimeOut, $timeout);'>
-#else
- <body>
-#end
+<body>
<noscript>
<p>
<strong>Note:</strong> Since your browser does not support
@@ -68,6 +43,11 @@
Sie werden von allen Online-Applikationen abgemeldet. <br>
Dieser Vorgang kann einige Zeit in Anspruch nehmen.
</p>
+
+ #if($timeoutURL)
+ <a id="timeoutURL" href="$timeoutURL">Click here if it does not resume after 30 seconds</a>
+ #end
+
</div>
#end
@@ -90,5 +70,6 @@
#foreach( $el in $redirectURLs )
<iframe src=$el class="reqframe"></iframe>
#end
+
</body>
</html> \ No newline at end of file