update some more parts to support Content-Security-Policy Header in http

9 files changed, 39 insertions, 37 deletions

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 691166911..6b33335d3 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
@@ -674,4 +674,14 @@
       }
       #processContent {
         margin-top: 25px;
+      }
+      #eIDASButton {
+         color:#FFF;
+      }
+      #eIDASSelection {
+        width: 120px; 
+        margin-right: 5px;        
+      }
+      .unvisible {
+        display: none;
       }
\ 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 cc4714006..2076cbbc8 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
@@ -22,10 +22,11 @@ function isIE() {
 				return false;
 			return !isActivexEnabled() && isFullscreen();
 		}
-		window.onload=function() {
+/* only required if BKU selection template uses the old local BKU selection form*/
+/*		window.onload=function() {
 			document.getElementById("localBKU").style.display="block";
 			return;
-		}
+		}*/
     function bkuLocalClicked() {
        setMandateSelection();
     }
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 5a4ca66b7..fe9bc2166 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -23,7 +23,7 @@
 						<h2 id="tabheader" class="dunkel" role="heading">$HEADER_TEXT</h2>
 					</div>
 					<div id="bkulogin" class="hell" role="form">
-						<div id="mandateLogin" style="$MANDATEVISIBLE">
+						<div id="mandateLogin" class="$MANDATEVISIBLE">
 							<div>
 								<input tabindex="1" type="checkbox" name="Mandate"
 									id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED>
@@ -81,18 +81,18 @@
                 <a href="$contextPath$submitEndpoint?pendingid=$pendingReqID&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div-->
               
-              <div id="stork" align="center" style="$STORKVISIBLE">
+              <div id="stork" align="center" class="$STORKVISIBLE">
                 <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
                 <p>
-                  <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
+                  <select id="eIDASSelection" name="cccSelection" id="cccSelection" size="1">
                     $countryList
                   </select>
-                  <button name="bkuButton" type="button">Proceed</button>
-                  <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
+                  <button id="eIDASButton" name="bkuButton" type="button">Proceed</button>
+                  <!--a href="info_stork.html" target="_blank" class="infobutton">i</a-->
                 </p>
               </div>
 
-						<div id="metroDetected" style="display: none">
+						<div id="metroDetected" class="unvisible">
 							<p>Anscheinend verwenden Sie Internet Explorer im
 								Metro-Modus. Wählen Sie bitte "Auf dem Desktop anzeigen" aus den
 								Optionen um die Karten-Anmeldung starten zu können.</p>
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 4f86f9f14..7483b6aac 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
@@ -54,16 +54,6 @@
 				</div>
 			</div>
 		</div>
-		<!--div id="validation">
-			<a href="http://validator.w3.org/check?uri="> <img
-				style="border: 0; width: 88px; height: 31px"
-				src="$contextPath/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
-			</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
-				style="border: 0; width: 88px; height: 31px"
-				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-				alt="CSS ist valide!" />
-			</a>
-		</div-->
 	</div>
 
 
diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java
index 71093a4d3..66bfd9c3e 100644
--- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java
+++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java
@@ -52,7 +52,7 @@ public class FormBuildUtils {
 
 	private static String PARAM_STORKVISIBLE = "STORKVISIBLE";
 
-	private static final String TEMPLATEVISIBLE = " display: none";
+	private static final String TEMPLATEVISIBLE = " unvisible";
 	private static final String TEMPLATEDISABLED =  "disabled=\"true\"";
 	private static final String TEMPLATECHECKED = "checked=\"true\"";
 	private static final String TEMPLATE_ARIACHECKED = "aria-checked=";
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css b/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
index 691166911..6b33335d3 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
@@ -674,4 +674,14 @@
       }
       #processContent {
         margin-top: 25px;
+      }
+      #eIDASButton {
+         color:#FFF;
+      }
+      #eIDASSelection {
+        width: 120px; 
+        margin-right: 5px;        
+      }
+      .unvisible {
+        display: none;
       }
\ No newline at end of file
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js
index cc4714006..2076cbbc8 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/javascript_tempalte.js
@@ -22,10 +22,11 @@ function isIE() {
 				return false;
 			return !isActivexEnabled() && isFullscreen();
 		}
-		window.onload=function() {
+/* only required if BKU selection template uses the old local BKU selection form*/
+/*		window.onload=function() {
 			document.getElementById("localBKU").style.display="block";
 			return;
-		}
+		}*/
     function bkuLocalClicked() {
        setMandateSelection();
     }
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html
index 5a4ca66b7..fe9bc2166 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/loginFormFull.html
@@ -23,7 +23,7 @@
 						<h2 id="tabheader" class="dunkel" role="heading">$HEADER_TEXT</h2>
 					</div>
 					<div id="bkulogin" class="hell" role="form">
-						<div id="mandateLogin" style="$MANDATEVISIBLE">
+						<div id="mandateLogin" class="$MANDATEVISIBLE">
 							<div>
 								<input tabindex="1" type="checkbox" name="Mandate"
 									id="mandateCheckBox" class="verticalcenter" role="checkbox" $MANDATECHECKED>
@@ -81,18 +81,18 @@
                 <a href="$contextPath$submitEndpoint?pendingid=$pendingReqID&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div-->
               
-              <div id="stork" align="center" style="$STORKVISIBLE">
+              <div id="stork" align="center" class="$STORKVISIBLE">
                 <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
                 <p>
-                  <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
+                  <select id="eIDASSelection" name="cccSelection" id="cccSelection" size="1">
                     $countryList
                   </select>
-                  <button name="bkuButton" type="button">Proceed</button>
-                  <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
+                  <button id="eIDASButton" name="bkuButton" type="button">Proceed</button>
+                  <!--a href="info_stork.html" target="_blank" class="infobutton">i</a-->
                 </p>
               </div>
 
-						<div id="metroDetected" style="display: none">
+						<div id="metroDetected" class="unvisible">
 							<p>Anscheinend verwenden Sie Internet Explorer im
 								Metro-Modus. Wählen Sie bitte "Auf dem Desktop anzeigen" aus den
 								Optionen um die Karten-Anmeldung starten zu können.</p>
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html
index 4f86f9f14..7483b6aac 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/slo_template.html
@@ -54,16 +54,6 @@
 				</div>
 			</div>
 		</div>
-		<!--div id="validation">
-			<a href="http://validator.w3.org/check?uri="> <img
-				style="border: 0; width: 88px; height: 31px"
-				src="$contextPath/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
-			</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
-				style="border: 0; width: 88px; height: 31px"
-				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
-				alt="CSS ist valide!" />
-			</a>
-		</div-->
 	</div>