aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2018-07-16 18:26:01 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2018-07-16 18:26:01 +0200
commit4ae32fabc822b3c8ed51d380969f7db682d1bfae (patch)
treec818d7e158309dcfc21fbfc6e6d6e3ac91c35783 /id/server/data/deploy
parenta3c1d2e65898d693ce242b7400effbacb5ae308f (diff)
downloadmoa-id-spss-MOA-ID-3.4.0.tar.gz
moa-id-spss-MOA-ID-3.4.0.tar.bz2
moa-id-spss-MOA-ID-3.4.0.zip
some GUI and handbook updatesMOA-ID-3.4.0
Diffstat (limited to 'id/server/data/deploy')
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html14
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css86
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js23
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html14
-rw-r--r--id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml3
5 files changed, 67 insertions, 73 deletions
diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
index 62f954ada..4e548e58c 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
@@ -48,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="5" role="button" onclick="setMandateSelection();" />
+ <input type="submit" value=" Karte " tabindex="5" 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>
@@ -64,15 +64,14 @@
<div id="bkueulogin" class="$eIDASVisible">
- <img class="bkuimage" src="$contextPath/img/eIDAS_small.png" alt="EULogin" />
- <form method="get" id="moaidform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
+ <img id="eIDASImage" class="bkuimage" src="$contextPath/img/eIDAS_small.png" alt="EULogin" />
+ <form method="get" id="moaideIDASform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
<input type="hidden" name="useeIDAS" value="true" />
<input type="hidden" name="useMandate" id="useMandate" />
<input type="hidden" name="pendingid" value="$pendingReqID" />
- <input name="bkuButtonEULogin" onclick="setMandateSelection();" type="submit" role="button" value="EULogin" />
+ <input id="buttonEULogin" name="bkuButtonEULogin" type="submit" role="button" value="EULogin" />
</form>
</div>
-
<!--div id="localBKU">
<form method="get" id="moaidform" action="$contextPath$submitEndpoint"
class="verticalcenter" target="_parent">
@@ -91,7 +90,10 @@
<!--div id="ssoSessionTransferBlock">
<a href="$contextPath$submitEndpoint?pendingid=$pendingReqID&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
</div-->
-
+
+
+
+
<!--
<div id="stork" align="center" class="$STORKVISIBLE">
<h2 id="tabheader" class="dunkel">Home Country Selection</h2>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
index fab541751..40e8eae7a 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
@@ -30,11 +30,25 @@
width: 100%;
text-align: center;
}
+
+ h2#tabheader{
+ font-size: 1.0em;
+ padding-left: 2%;
+ padding-right: 2%;
+ position: relative;
+ }
+
#bkulogin {
min-width: 200px;
min-height: 155px;
margin-bottom: 5%;
}
+ #mandateLogin {
+ padding-bottom: 1%;
+ padding-top: 2%;
+ position: relative;
+ text-align: left;
+ }
.unvisible {
visibility: hidden;
@@ -118,11 +132,13 @@
}
.bkuimage {
- width: 60%;
+ width: 55%;
}
input {
+ width:auto;
cursor: pointer;
+
}
#localBKU input {
@@ -149,12 +165,7 @@
clear: both;
}
- #mandateLogin {
- padding-bottom: 2%;
- padding-top: 2%;
- position: relative;
- text-align: left;
- }
+
.verticalcenter {
vertical-align: middle;
@@ -182,7 +193,6 @@
}
#selectArea {
- float:left;
width:90%;
padding-left: 4%
}
@@ -210,12 +220,6 @@
background-color: $HEADER_BACKGROUNDCOLOR;
color: $HEADER_COLOR;
}
- h2#tabheader{
- font-size: 2.0em;
- padding-left: 2%;
- padding-right: 2%;
- position: relative;
- }
@media screen and (min-width: 650px) {
@@ -236,16 +240,13 @@
#bkuselectionarea input[type=button],#bkuselectionarea input[type=submit]{
font-size: 0.85em;
+ width:65%
}
#mandateLogin {
font-size: 0.85em;
}
- #bku_header h2 {
- font-size: 0.8em;
- }
-
#alert_area {
width: 500px;
padding-left: 80px;
@@ -255,20 +256,7 @@
font-size: 15px;
padding-bottom: 65px;
}
-
- #bku_header {
- height: 5%;
- padding-bottom: 2%;
- padding-top: 2%;
- }
-
- h2#tabheader{
- font-size: 1.1em;
- padding-left: 2%;
- padding-right: 2%;
- position: relative;
- }
-
+
#stork h2 {
font-size: 1.0em;
margin-bottom: 2%;
@@ -281,12 +269,7 @@
width: 100px;
height: 30px
}
-
- button {
- height: 25px;
- width: 75px;
- margin-bottom: 4%;
- }
+
#validation {
position: absolute;
@@ -338,7 +321,12 @@
display: none;
visibility: hidden;
}
-
+
+
+ h2#tabheader{
+ font-size: 1.5em;
+ position: relative;
+ }
.mandate{
font-size: 1.0em;
}
@@ -351,8 +339,7 @@
margin-bottom: 2%;
}
.bkuimage {
-
-
+ width: 40%;
}
#bkukarte {
@@ -366,20 +353,7 @@
#bkueulogin {
box-sizing: border-box;
}
-
- #bku_header {
- height: 10%;
- min-height: 1.2em;
- margin-top: 1%;
- }
-
- h2#tabheader{
- padding-left: 2%;
- padding-right: 2%;
- font-size: 1.5em;
- position: relative;
- }
-
+
.setAssertionButton_full {
background: #efefef;
cursor: pointer;
@@ -389,6 +363,6 @@
}
input[type=button],input[type=submit] {
- width: 70%;
+ width:65%;
}
} \ 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 313f14b4a..15b82614c 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
@@ -84,9 +84,9 @@ function isIE() {
/* setSSOSelection(); */
var ccc = "AT";
- var countrySelection = document.getElementById("eIDASSelection");
+ var countrySelection = document.getElementById("cccSelection");
if (countrySelection != null) {
- ccc = document.getElementById("eIDASSelection").value;
+ ccc = document.getElementById("cccSelection").value;
}
var iFrameURL = "$contextPath$submitEndpoint" + "?";
iFrameURL += "&pendingid=" + "$pendingReqID";
@@ -238,7 +238,22 @@ function isIE() {
}
function setUseMandateFlag(e) {
/*document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);*/
- e.setAttribute("aria-checked", e.checked);
+ e.target.setAttribute("aria-checked", e.target.checked);
+ if (e.target.checked) {
+ var image = document.getElementById("eIDASImage");
+ var srcatt = image.getAttribute("src");
+ var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
+ srcatt = srcatt.replace(last,'eIDAS_small_deactivated.png');
+ image.setAttribute("src",srcatt);
+ document.getElementById("buttonEULogin").disabled=true;
+ } else {
+ var image = document.getElementById("eIDASImage");
+ var srcatt = image.getAttribute("src");
+ var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
+ srcatt = srcatt.replace(last,'eIDAS_small.png');
+ image.setAttribute("src",srcatt);
+ document.getElementById("buttonEULogin").disabled=false
+ }
}
document.addEventListener('resize', onChangeChecks);
@@ -246,7 +261,7 @@ function isIE() {
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);
+ document.querySelector('#moaideIDASform>input[type=submit]').addEventListener('click', setMandateSelection);
onChangeChecks();
});
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 62f954ada..4e548e58c 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -48,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="5" role="button" onclick="setMandateSelection();" />
+ <input type="submit" value=" Karte " tabindex="5" 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>
@@ -64,15 +64,14 @@
<div id="bkueulogin" class="$eIDASVisible">
- <img class="bkuimage" src="$contextPath/img/eIDAS_small.png" alt="EULogin" />
- <form method="get" id="moaidform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
+ <img id="eIDASImage" class="bkuimage" src="$contextPath/img/eIDAS_small.png" alt="EULogin" />
+ <form method="get" id="moaideIDASform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
<input type="hidden" name="useeIDAS" value="true" />
<input type="hidden" name="useMandate" id="useMandate" />
<input type="hidden" name="pendingid" value="$pendingReqID" />
- <input name="bkuButtonEULogin" onclick="setMandateSelection();" type="submit" role="button" value="EULogin" />
+ <input id="buttonEULogin" name="bkuButtonEULogin" type="submit" role="button" value="EULogin" />
</form>
</div>
-
<!--div id="localBKU">
<form method="get" id="moaidform" action="$contextPath$submitEndpoint"
class="verticalcenter" target="_parent">
@@ -91,7 +90,10 @@
<!--div id="ssoSessionTransferBlock">
<a href="$contextPath$submitEndpoint?pendingid=$pendingReqID&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
</div-->
-
+
+
+
+
<!--
<div id="stork" align="center" class="$STORKVISIBLE">
<h2 id="tabheader" class="dunkel">Home Country Selection</h2>
diff --git a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
index 85d801245..9dede486d 100644
--- a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
@@ -64,7 +64,8 @@
<cfg:Id>PVP_metadata</cfg:Id>
<cfg:TrustAnchorsLocation>trustProfiles/PVP_metadata</cfg:TrustAnchorsLocation>
</cfg:TrustProfile>
- <cfg:Id>centralnode_metadata</cfg:Id>
+ <cfg:TrustProfile>
+ <cfg:Id>centralnode_metadata</cfg:Id>
<cfg:TrustAnchorsLocation>trustProfiles/centralnode_metadata</cfg:TrustAnchorsLocation>
</cfg:TrustProfile>
</cfg:PathValidation>