From 5b8818004750d9c864f9cd2c47c7b1ccaf188ac9 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 19 Jan 2016 17:14:10 +0100
Subject: update default templates for BKU-Selection, sendAssertion, and Single
 LogOut

---
 .../htmlTemplates/loginFormFull.html               |   33 +-
 .../htmlTemplates/sendAssertionFormFull.html       |    6 +-
 .../conf/moa-id/htmlTemplates/loginFormFull.html   |   33 +-
 .../htmlTemplates/sendAssertionFormFull.html       |    6 +-
 .../conf/moa-id/htmlTemplates/slo_template.html    |    6 +-
 id/server/doc/htmlTemplates/BKU-selection.html     |   27 +-
 id/server/doc/htmlTemplates/sendAssertion.html     |    6 +-
 .../resources/templates/loginFormFull.html         |   27 +-
 .../resources/templates/sendAssertionFormFull.html | 1141 +++++++++++---------
 .../resources/templates/slo_template.html          |   23 +-
 10 files changed, 702 insertions(+), 606 deletions(-)

(limited to 'id/server')

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 a29b1d7bb..95effa348 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
@@ -616,6 +616,12 @@
 			    top: 40px;
 				
 			}
+      
+      #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 5px;
+        margin-bottom: 5px;
+      }
       			                        
     </style>       
 <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
@@ -656,7 +662,6 @@
 			if (isMetro())
 				document.getElementById("metroDetected").style.display="block";
 			document.getElementById("localBKU").style.display="block";
-      document.getElementById("bkuButtonOnlineId").disabled = "true";
 /* 			if (checkMandateSSO())
 				return; */
 			
@@ -673,7 +678,6 @@
 			generateIFrame(iFrameURL);
 		}
 		function bkuHandyClicked() {
-      document.getElementById("bkuButtonHandyId").disabled = "true";
 			document.getElementById("localBKU").style.display="none";
 /* 			if (checkMandateSSO())
 				return; */
@@ -854,15 +858,13 @@
 								<img id="bkuimage" class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
 									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
 									onClick="bkuOnlineClicked();" tabindex="2" role="button"
-									value="Karte"
-                  id="bkuButtonOnlineId"/>
+									value="Karte" />
 							</div>
 							<div id="bkuhandy">
 								<img class="bkuimage" src="#CONTEXTPATH#/img/mobile-bku.png"
 									alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
 									onClick="bkuHandyClicked();" tabindex="3" role="button"
-									value="HANDY"
-                  id="bkuButtonHandyId"/>
+									value="HANDY" />
 							</div>
 						</div>
 						<div id="localBKU">
@@ -871,17 +873,18 @@
 								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
 									type="hidden" name="useMandate" id="useMandate"> <input
 									type="hidden" name="SSO" id="useSSO"> <input
-									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
-									role="button" onclick="setMandateSelection();"
-                  >
-								<!--p>
-                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
-                  </p-->								                                  
-                </form>								                                                          
+									role="button" onclick="setMandateSelection();">
+                </form>
+              </div>
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <div id="ssoSessionTransferBlock">
+                <a href="#AUTH_URL#?MOASessionID=#SESSIONID#&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div>
               
               <div id="stork" align="center" style="#STORKVISIBLE#">
@@ -904,7 +907,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--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!" />
@@ -913,7 +916,7 @@
 				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
index 1a3e683de..07d018a94 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
@@ -600,7 +600,7 @@
 					</div>
 				</div>
 		</div>
-    <div id="validation">
+    <!--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"
@@ -608,10 +608,10 @@
         </a>
         <a href="http://jigsaw.w3.org/css-validator/">
           <img   style="border:0;width:88px;height:31px"
-                 src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+                 src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
                  alt="CSS ist valide!" />
         </a>
-    </div>
+    </div-->
 	</div>
 </body>
 </html>
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 a29b1d7bb..95effa348 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -616,6 +616,12 @@
 			    top: 40px;
 				
 			}
+      
+      #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 5px;
+        margin-bottom: 5px;
+      }
       			                        
     </style>       
 <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
@@ -656,7 +662,6 @@
 			if (isMetro())
 				document.getElementById("metroDetected").style.display="block";
 			document.getElementById("localBKU").style.display="block";
-      document.getElementById("bkuButtonOnlineId").disabled = "true";
 /* 			if (checkMandateSSO())
 				return; */
 			
@@ -673,7 +678,6 @@
 			generateIFrame(iFrameURL);
 		}
 		function bkuHandyClicked() {
-      document.getElementById("bkuButtonHandyId").disabled = "true";
 			document.getElementById("localBKU").style.display="none";
 /* 			if (checkMandateSSO())
 				return; */
@@ -854,15 +858,13 @@
 								<img id="bkuimage" class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
 									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
 									onClick="bkuOnlineClicked();" tabindex="2" role="button"
-									value="Karte"
-                  id="bkuButtonOnlineId"/>
+									value="Karte" />
 							</div>
 							<div id="bkuhandy">
 								<img class="bkuimage" src="#CONTEXTPATH#/img/mobile-bku.png"
 									alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
 									onClick="bkuHandyClicked();" tabindex="3" role="button"
-									value="HANDY"
-                  id="bkuButtonHandyId"/>
+									value="HANDY" />
 							</div>
 						</div>
 						<div id="localBKU">
@@ -871,17 +873,18 @@
 								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
 									type="hidden" name="useMandate" id="useMandate"> <input
 									type="hidden" name="SSO" id="useSSO"> <input
-									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
-									role="button" onclick="setMandateSelection();"
-                  >
-								<!--p>
-                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
-                  </p-->								                                  
-                </form>								                                                          
+									role="button" onclick="setMandateSelection();">
+                </form>
+              </div>
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <div id="ssoSessionTransferBlock">
+                <a href="#AUTH_URL#?MOASessionID=#SESSIONID#&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div>
               
               <div id="stork" align="center" style="#STORKVISIBLE#">
@@ -904,7 +907,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--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!" />
@@ -913,7 +916,7 @@
 				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
index 1a3e683de..07d018a94 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
@@ -600,7 +600,7 @@
 					</div>
 				</div>
 		</div>
-    <div id="validation">
+    <!--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"
@@ -608,10 +608,10 @@
         </a>
         <a href="http://jigsaw.w3.org/css-validator/">
           <img   style="border:0;width:88px;height:31px"
-                 src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+                 src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
                  alt="CSS ist valide!" />
         </a>
-    </div>
+    </div-->
 	</div>
 </body>
 </html>
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 9a621998c..a9d73e0d3 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
@@ -444,16 +444,16 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--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="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 
 
diff --git a/id/server/doc/htmlTemplates/BKU-selection.html b/id/server/doc/htmlTemplates/BKU-selection.html
index 123a23837..95effa348 100644
--- a/id/server/doc/htmlTemplates/BKU-selection.html
+++ b/id/server/doc/htmlTemplates/BKU-selection.html
@@ -616,6 +616,12 @@
 			    top: 40px;
 				
 			}
+      
+      #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 5px;
+        margin-bottom: 5px;
+      }
       			                        
     </style>       
 <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
@@ -740,7 +746,7 @@
 			}
 		}
 		function onChangeChecks() {
-      if (top.innerWidth < 650) {
+      if (self.innerWidth < 650) {
          document.getElementById("moaidform").setAttribute("target","_parent");
       } else {
          document.getElementById("moaidform").removeAttribute("target");
@@ -867,17 +873,18 @@
 								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
 									type="hidden" name="useMandate" id="useMandate"> <input
 									type="hidden" name="SSO" id="useSSO"> <input
-									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
-									role="button" onclick="setMandateSelection();"
-                  >
-								<!--p>
-                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
-                  </p-->								                                  
-                </form>								                                                          
+									role="button" onclick="setMandateSelection();">
+                </form>
+              </div>
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <div id="ssoSessionTransferBlock">
+                <a href="#AUTH_URL#?MOASessionID=#SESSIONID#&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div>
               
               <div id="stork" align="center" style="#STORKVISIBLE#">
@@ -900,7 +907,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--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!" />
@@ -909,7 +916,7 @@
 				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/doc/htmlTemplates/sendAssertion.html b/id/server/doc/htmlTemplates/sendAssertion.html
index 1a3e683de..07d018a94 100644
--- a/id/server/doc/htmlTemplates/sendAssertion.html
+++ b/id/server/doc/htmlTemplates/sendAssertion.html
@@ -600,7 +600,7 @@
 					</div>
 				</div>
 		</div>
-    <div id="validation">
+    <!--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"
@@ -608,10 +608,10 @@
         </a>
         <a href="http://jigsaw.w3.org/css-validator/">
           <img   style="border:0;width:88px;height:31px"
-                 src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+                 src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
                  alt="CSS ist valide!" />
         </a>
-    </div>
+    </div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index 123a23837..95effa348 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -616,6 +616,12 @@
 			    top: 40px;
 				
 			}
+      
+      #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 5px;
+        margin-bottom: 5px;
+      }
       			                        
     </style>       
 <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
@@ -740,7 +746,7 @@
 			}
 		}
 		function onChangeChecks() {
-      if (top.innerWidth < 650) {
+      if (self.innerWidth < 650) {
          document.getElementById("moaidform").setAttribute("target","_parent");
       } else {
          document.getElementById("moaidform").removeAttribute("target");
@@ -867,17 +873,18 @@
 								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
 									type="hidden" name="useMandate" id="useMandate"> <input
 									type="hidden" name="SSO" id="useSSO"> <input
-									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
-									role="button" onclick="setMandateSelection();"
-                  >
-								<!--p>
-                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
-                  </p-->								                                  
-                </form>								                                                          
+									role="button" onclick="setMandateSelection();">
+                </form>
+              </div>
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <div id="ssoSessionTransferBlock">
+                <a href="#AUTH_URL#?MOASessionID=#SESSIONID#&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div>
               
               <div id="stork" align="center" style="#STORKVISIBLE#">
@@ -900,7 +907,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--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!" />
@@ -909,7 +916,7 @@
 				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
index 033a574b9..07d018a94 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
@@ -1,554 +1,617 @@
-<!DOCTYPE html>
+<!DOCTYPE html> 
 <html>
 <head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<!-- MOA-ID 2.x BKUSelection Layout CSS -->
-<style type="text/css">
-@media screen and (min-width: 650px) {
-	body {
-		margin: 0;
-		padding: 0;
-		color: #000;
-		background-color: #fff;
-		text-align: center;
-		background-color: #6B7B8B;
-	}
-	#localBKU p {
-		font-size: 0.7em;
-	}
-	#localBKU input {
-		font-size: 0.7em;
-		border-radius: 5px;
-	}
-	#bkuselectionarea button {
-		font-size: 0.85em;
-		border-radius: 7px;
-		margin-bottom: 25px;
-	}
-	#mandateLogin {
-		font-size: 0.85em;
-	}
-	#bku_header h2 {
-		font-size: 0.8em;
-	}
-	#page {
-		display: block;
-		border: 2px solid rgb(0, 0, 0);
-		width: 650px;
-		height: 440px;
-		margin: 0 auto;
-		margin-top: 5%;
-		position: relative;
-		border-radius: 25px;
-		background: rgb(255, 255, 255);
-	}
-	#page1 {
-		text-align: center;
-	}
-	#main {
-		/*	clear:both; */
-		position: relative;
-		margin: 0 auto;
-		width: 250px;
-		text-align: center;
-	}
-	.OA_header {
-		/*	  background-color: white;*/
-		font-size: 20pt;
-		margin-bottom: 25px;
-		margin-top: 25px;
-	}
-	#leftcontent {
-		width: 300px;
-		margin-top: 30px;
-		padding-bottom: 15px;
-		margin-bottom: 25px;
-		text-align: left;
-		border: 1px solid rgb(0, 0, 0);
-	}
-	#selectArea {
-		font-size: 15px;
-		padding-bottom: 65px;
-	}
-	#selectArea h3 {
-		margin-bottom: 25px;
-	}
-	#bku_header {
-		height: 5%;
-		padding-bottom: 3px;
-		padding-top: 3px;
-	}
-	#bkulogin {
-		overflow: hidden;
-		min-width: 190px;
-		min-height: 180px;
-		/*height: 260px;*/
-	}
-	h2#tabheader {
-		font-size: 1.1em;
-		padding-left: 2%;
-		padding-right: 2%;
-		position: relative;
-	}
-	.setAssertionButton_full {
-		margin-top: 15px;
-		width: 100px;
-		height: 30px;
-		font-size: 1.3em;
-		min-height: 1.3em;
-		/*          border-radius: 10px;*/
-	}
-	#leftbutton {
-		width: 30%;
-		float: left;
-		margin-left: 40px;
-	}
-	#rightbutton {
-		width: 30%;
-		float: right;
-		margin-right: 45px;
-		text-align: right;
-	}
-	button {
-		height: 25px;
-		width: 90px;
-		margin-bottom: 10px;
-	}
-	#validation {
-		position: absolute;
-		bottom: 0px;
-		margin-left: 270px;
-		padding-bottom: 10px;
-	}
-}
-
-@media screen and (max-width: 205px) {
-	#localBKU p {
-		font-size: 0.6em;
-	}
-	#localBKU input {
-		font-size: 0.7em;
-		min-width: 70px;
-		min-height: 1.2em;
-		border-radius: 5px;
-	}
-	#bkuselectionarea button,.setAssertionButton_full {
-		font-size: 0.8em;
-		min-width: 65px;
-		min-height: 1.3em;
-		/*        border-radius: 5px;         */
-		margin-bottom: 2%
-	}
-	#mandateLogin {
-		font-size: 0.65em;
-	}
-	#bku_header h2,#selectArea h3 {
-		font-size: 0.8em;
-		margin-top: -0.4em;
-	}
-}
-
-@media screen and (max-width: 249px) and (min-width: 206px) {
-	#localBKU p {
-		font-size: 0.7em;
-	}
-	#localBKU input {
-		font-size: 0.85em;
-		min-width: 80px;
-		min-height: 0.95em;
-		border-radius: 6px;
-	}
-	#bkuselectionarea button,.setAssertionButton_full {
-		font-size: 0.85em;
-		min-width: 70px;
-		min-height: 0.95em;
-		/*        border-radius: 6px;        */
-		margin-bottom: 2%
-	}
-	#mandateLogin {
-		font-size: 0.75em;
-	}
-	#bku_header h2,#selectArea h3 {
-		font-size: 0.9em;
-		margin-top: -0.45em;
-	}
-}
-
-@media screen and (max-width: 299px) and (min-width: 250px) {
-	#localBKU p {
-		font-size: 0.9em;
-	}
-	#localBKU input {
-		font-size: 0.9em;
-		min-width: 100px;
-		border-radius: 6px;
-	}
-	#bkuselectionarea button,.setAssertionButton_full {
-		font-size: 1.0em;
-		min-height: 1.05em;
-		/*         border-radius: 7px;          */
-		margin-bottom: 5%;
-	}
-	#mandateLogin {
-		font-size: 1em;
-	}
-	#bku_header h2,#selectArea h3 {
-		font-size: 1.0em;
-		margin-top: -0.50em;
-	}
-}
-
-@media screen and (max-width: 399px) and (min-width: 300px) {
-	#localBKU p {
-		font-size: 0.9em;
-	}
-	#localBKU input {
-		font-size: 0.9em;
-		min-width: 100px;
-		border-radius: 6px;
-	}
-	#bkuselectionarea button,.setAssertionButton_full {
-		font-size: 1.1em;
-		min-height: 1.2em;
-		/*        border-radius: 8px;     */
-		margin-bottom: 5%;
-	}
-	#mandateLogin {
-		font-size: 1em;
-	}
-	#bku_header h2,#selectArea h3 {
-		font-size: 1.1em;
-		margin-top: -0.55em;
-	}
-}
-
-@media screen and (max-width: 649px) and (min-width: 400px) {
-	#localBKU p {
-		font-size: 0.9em;
-	}
-	#localBKU input {
-		font-size: 0.9em;
-		min-width: 100px;
-		border-radius: 6px;
-	}
-	#bkuselectionarea button,.setAssertionButton_full {
-		font-size: 1.3em;
-		min-height: 1.3em;
-		/*          border-radius: 10px;  */
-		margin-bottom: 5%;
-	}
-	#mandateLogin {
-		font-size: 1.2em;
-	}
-	#bku_header h2,#selectArea h3 {
-		font-size: 1.3em;
-		margin-top: -0.65em;
-	}
-}
-
-@media screen and (max-width: 649px) {
-	body {
-		margin: 0;
-		padding: 0;
-		color: #000;
-		text-align: center;
-		font-size: 100%;
-		background-color: #MAIN_BACKGOUNDCOLOR#;
-	}
-	#page {
-		visibility: hidden;
-		margin-top: 0%;
-	}
-	#page1 {
-		visibility: hidden;
-	}
-	#main {
-		visibility: hidden;
-	}
-	#validation {
-		visibility: hidden;
-		display: none;
-	}
-	.OA_header {
-		margin-bottom: 0px;
-		margin-top: 0px;
-		font-size: 0pt;
-		visibility: hidden;
-	}
-	#leftcontent {
-		visibility: visible;
-		margin-bottom: 0px;
-		text-align: left;
-		border: none;
-		min-width: 190px;
-		/*          min-height: 190px;  */
-		vertical-align: middle;
-	}
-	#bku_header {
-		height: 10%;
-		min-height: 1.2em;
-		margin-top: 1%;
-	}
-	h2#tabheader {
-		padding-left: 2%;
-		padding-right: 2%;
-		padding-top: 1%;
-		position: relative;
-		top: 50%;
-	}
-	#bkulogin {
-		min-width: 190px;
-		min-height: 150px;
-	}
-	.setAssertionButton_full {
-		margin-top: 15px;
-		width: 70%;
-		height: 11%;
-		min-width: 60px;
-		min-height: 25px;
-	}
-	#selectArea h3 {
-		margin-top: 2%;
-	}
-	button {
-		height: 11%;
-		width: 70%;
-	}
-}
-
-* {
-	margin: 0;
-	padding: 0;
-	/*				border: 0;  */
-	font-family: #FONTTYPE #;
-}
-
-#selectArea {
-	padding-top: 10px;
-	padding-bottom: 55px;
-	padding-left: 10px;
-}
-
-.setAssertionButton {
-	background: #efefef;
-	cursor: pointer;
-	margin-top: 15px;
-	width: 70px;
-	height: 25px;
-}
-
-#leftbutton {
-	width: 35%;
-	float: left;
-	margin-left: 15px;
-}
-
-#rightbutton {
-	width: 35%;
-	float: right;
-	margin-right: 25px;
-	text-align: right;
-}
-
-#stork {
-	margin-bottom: 10px;
-	margin-top: 5px;
-}
-
-#mandateLogin {
-	padding-bottom: 2%;
-	padding-top: 2%;
-	height: 10%;
-	position: relative;
-	text-align: center;
-}
-
-.verticalcenter {
-	vertical-align: middle;
-}
-
-#mandateLogin>div {
-	clear: both;
-	margin-top: -1%;
-	position: relative;
-	top: 50%;
-}
-
-#bkuselectionarea {
-	position: relative;
-	display: block;
-}
-
-#localBKU {
-	padding-left: 5%;
-	padding-right: 2%;
-	padding-bottom: 2%;
-	position: relative;
-	clear: both;
-}
-
-#bkukarte {
-	float: left;
-	text-align: center;
-	width: 40%;
-	min-height: 70px;
-	padding-left: 5%;
-	padding-top: 2%;
-}
-
-#bkuhandy {
-	float: right;
-	text-align: center;
-	width: 40%;
-	min-height: 90px;
-	padding-right: 5%;
-	padding-top: 2%;
-}
-
-.bkuimage {
-	width: 90%;
-	height: auto;
-}
-
-#mandate {
-	text-align: center;
-	padding: 5px 5px 5px 5px;
-}
-
-button,.sendButton {
-	/*				background: #BUTTON_BACKGROUNDCOLOR#;
+	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
+    <style type="text/css">
+			@media screen and (min-width: 650px) {
+			
+				body {
+					margin:0;
+					padding:0;
+					color : #000;
+					background-color : #fff;
+			  	text-align: center;
+			  	background-color: #6B7B8B;
+				}
+				
+        #localBKU p {
+          font-size: 0.7em;
+        } 
+        
+        #localBKU input{
+          font-size: 0.7em;
+          border-radius: 5px;
+        }
+        
+         #bkuselectionarea button {
+          font-size: 0.85em;
+          border-radius: 7px;
+          margin-bottom: 25px;
+         }
+        
+        #mandateLogin {
+          font-size: 0.85em;
+        }
+        
+        #bku_header h2 {
+          font-size: 0.8em;
+        } 
+        
+        
+			  #page {
+			    display: block;
+			    border: 2px solid rgb(0,0,0);
+			    width: 650px;
+			    height: 440px;
+			    margin: 0 auto;
+			    margin-top: 5%;
+			    position: relative;
+			    border-radius: 25px;
+			    background: rgb(255,255,255);
+			  }
+			  
+			  #page1 {
+			    text-align: center;
+			  }
+			  
+			  #main {
+			    /*	clear:both; */
+				  position:relative;
+			    margin: 0 auto;
+			    width: 250px;
+			    text-align: center;
+			  }
+			  
+			  .OA_header {
+			/*	  background-color: white;*/
+			    font-size: 20pt;
+			    margin-bottom: 25px;
+			    margin-top: 25px;
+			  }
+			
+			  #leftcontent {
+        	width: 300px;
+				  margin-top: 30px;
+          padding-bottom: 15px;
+				  margin-bottom: 25px;
+			    text-align: left;
+			    border: 1px solid rgb(0,0,0);
+			  }
+			  			  
+			  #selectArea {
+				 font-size: 15px;
+				 padding-bottom: 65px;
+			  }
+			 
+        #selectArea h3 {
+          margin-bottom: 25px;
+        }
+      
+        #bku_header {
+          height: 5%;
+          padding-bottom: 3px;
+          padding-top: 3px;
+        }
+      
+        #bkulogin {
+				  overflow:hidden;	
+          min-width: 190px;
+          min-height: 180px;
+          /*height: 260px;*/	
+			  }
+      
+        h2#tabheader{
+				  font-size: 1.1em; 
+          padding-left: 2%;
+          padding-right: 2%;
+          position: relative;
+			  }
+      			  
+			  .setAssertionButton_full {
+				  margin-top: 15px;
+			    width: 100px;
+			    height: 30px;
+          font-size: 1.3em;
+          min-height: 1.3em;
+/*          border-radius: 10px;*/
+			  }
+			
+			  #leftbutton  {
+				 width: 30%; 
+				 float:left; 
+				 margin-left: 40px;
+			  }
+			
+			  #rightbutton {
+				 width: 30%; 
+				 float:right; 
+				 margin-right: 45px; 
+				 text-align: right;
+			  }
+        
+        button {
+          height: 25px;
+          width: 90px;
+          margin-bottom: 10px;
+        }
+        
+       #validation {
+        position: absolute;
+        bottom: 0px;
+        margin-left: 270px;
+        padding-bottom: 10px;
+      }
+			
+			}
+
+      @media screen and (max-width: 205px) {
+        #localBKU p {
+          font-size: 0.6em;
+        } 
+        
+        #localBKU input {
+          font-size: 0.7em;
+          min-width: 70px;
+          min-height: 1.2em;
+          border-radius: 5px;
+        }
+        
+        #bkuselectionarea button, .setAssertionButton_full {
+          font-size: 0.8em;
+          min-width: 65px;
+          min-height: 1.3em;
+  /*        border-radius: 5px;         */
+          margin-bottom: 2%
+        }
+        
+        #mandateLogin {
+          font-size: 0.65em;
+        }
+        
+        #bku_header h2, #selectArea h3 {
+          font-size: 0.8em;
+          margin-top: -0.4em;
+        } 
+      }
+
+      @media screen and (max-width: 249px) and (min-width: 206px) {
+        #localBKU p {
+          font-size: 0.7em;
+        } 
+        
+        #localBKU input {
+          font-size: 0.85em;
+          min-width: 80px;
+          min-height: 0.95em;
+          border-radius: 6px;
+        }
+        
+        #bkuselectionarea button, .setAssertionButton_full {
+          font-size: 0.85em;
+          min-width: 70px;
+          min-height: 0.95em;
+  /*        border-radius: 6px;        */
+          margin-bottom: 2%
+        }
+        
+        #mandateLogin {
+          font-size: 0.75em;
+        }
+        
+        #bku_header h2, #selectArea h3 {
+          font-size: 0.9em;
+          margin-top: -0.45em;
+        } 
+      }
+
+      @media screen and (max-width: 299px) and (min-width: 250px) {
+        #localBKU p {
+          font-size: 0.9em;
+        } 
+        
+        #localBKU input {
+          font-size: 0.9em;
+          min-width: 100px;
+          border-radius: 6px;
+        }
+        
+        #bkuselectionarea button, .setAssertionButton_full {
+          font-size: 1.0em;
+          min-height: 1.05em;
+ /*         border-radius: 7px;          */
+          margin-bottom: 5%;
+        }
+        
+        #mandateLogin {
+          font-size: 1em;
+        }
+        
+        #bku_header h2, #selectArea h3 {
+          font-size: 1.0em;
+          margin-top: -0.50em;
+        } 
+      }
+
+      @media screen and (max-width: 399px) and (min-width: 300px) {
+        #localBKU p {
+          font-size: 0.9em;
+        } 
+        
+        #localBKU input {
+          font-size: 0.9em;
+          min-width: 100px;
+          border-radius: 6px;
+        }
+        
+        #bkuselectionarea button, .setAssertionButton_full {
+          font-size: 1.1em;
+          min-height: 1.2em;
+  /*        border-radius: 8px;     */
+          margin-bottom: 5%;
+        }
+        
+        #mandateLogin {
+          font-size: 1em;
+        }
+        
+        #bku_header h2, #selectArea h3 {
+          font-size: 1.1em;
+          margin-top: -0.55em;
+        } 
+      }
+      
+      @media screen and (max-width: 649px) and (min-width: 400px) {
+        #localBKU p {
+          font-size: 0.9em;
+        } 
+        
+        #localBKU input {
+          font-size: 0.9em;
+          min-width: 100px;
+          border-radius: 6px;
+        }
+        
+        #bkuselectionarea button, .setAssertionButton_full {
+          font-size: 1.3em;
+          min-height: 1.3em;
+/*          border-radius: 10px;  */
+          margin-bottom: 5%;
+        }
+        
+        #mandateLogin {
+          font-size: 1.2em;
+        }
+        
+        #bku_header h2, #selectArea h3 {
+          font-size: 1.3em;
+          margin-top: -0.65em;
+        } 
+      }
+
+
+			
+			@media screen and (max-width: 649px) {
+				
+        body {
+					margin:0;
+					padding:0;
+					color : #000;
+			  	text-align: center;
+          font-size: 100%;
+			  	background-color: #MAIN_BACKGOUNDCOLOR#;
+				}
+        				
+			  #page {
+			     visibility: hidden;
+			     margin-top: 0%;
+			  }
+			  
+			  #page1 {
+			    visibility: hidden;
+			  }
+			  
+			  #main {
+			    visibility: hidden;
+			  }
+        
+        #validation {
+          visibility: hidden;
+          display: none;
+        }
+			  
+			  .OA_header {
+			    margin-bottom: 0px;
+			    margin-top: 0px;
+			    font-size: 0pt;
+			    visibility: hidden;
+			  }
+			
+			  #leftcontent {
+			    visibility: visible;
+			    margin-bottom: 0px;
+			    text-align: left;
+			    border:none;
+          min-width: 190px;
+/*          min-height: 190px;  */
+          vertical-align: middle;
+          
+			  }
+			  
+        #bku_header {
+          height: 10%;
+          min-height: 1.2em;
+          margin-top: 1%;
+        }
+        
+        h2#tabheader{
+          padding-left: 2%;
+          padding-right: 2%;
+          padding-top: 1%;
+          position: relative;
+          top: 50%;
+			  }
+        
+       	#bkulogin {	
+          min-width: 190px;
+          min-height: 150px;	
+			 }
+        
+			 .setAssertionButton_full {
+				    margin-top: 15px;
+			      width: 70%;
+			      height: 11%;
+            min-width: 60px;
+            min-height: 25px;
+			 }
+       
+       #selectArea h3 {
+          margin-top: 2%;
+       }
+       
+        button {
+          height: 11%;
+          width: 70%;
+        }
+			}
+			      
+			* {
+				margin: 0;
+				padding: 0;
+/*				border: 0;  */
+        font-family: #FONTTYPE#;
+			}
+							      			
+			#selectArea {
+				padding-top: 10px;
+				padding-bottom: 55px;
+				padding-left: 10px;
+			}
+			
+			.setAssertionButton {
+				background: #efefef;
+				cursor: pointer;
+				margin-top: 15px;
+			  width: 70px;
+			  height: 25px;
+			}
+			
+			#leftbutton  {
+				width: 35%; 
+				float:left; 
+				margin-left: 15px;
+			}
+			
+			#rightbutton {
+				width: 35%; 
+				float:right; 
+				margin-right: 25px; 
+				text-align: right;
+			}
+			
+			#stork {
+			    margin-bottom: 10px;
+			    margin-top: 5px;
+			}
+			
+      #mandateLogin {
+        padding-bottom: 2%;
+        padding-top: 2%;
+        height: 10%;
+        position: relative;
+        text-align: center;
+			}
+      
+      .verticalcenter {
+        vertical-align: middle;
+      }
+      
+      #mandateLogin > div {
+        clear: both;
+        margin-top: -1%;
+        position: relative;
+        top: 50%;
+      }
+      
+      #bkuselectionarea {
+          position: relative;
+          display: block;
+      }
+      
+      #localBKU {
+        padding-left: 5%;
+        padding-right: 2%;
+        padding-bottom: 2%;
+        position: relative;
+        clear: both;        
+			}
+          			
+			#bkukarte {
+				float:left;
+				text-align:center;
+				width:40%;
+        min-height: 70px;
+        padding-left: 5%;
+        padding-top: 2%;
+			}
+			
+			#bkuhandy {
+				float:right;
+				text-align:center;
+				width:40%;
+        min-height: 90px;
+        padding-right: 5%;
+        padding-top: 2%;
+			}
+			
+      .bkuimage {
+        width: 90%;
+        height: auto;
+      }
+      
+			#mandate{
+				text-align:center;
+				padding : 5px 5px 5px 5px;
+			}
+			
+			button, .sendButton {
+/*				background: #BUTTON_BACKGROUNDCOLOR#;
         color: #BUTTON_COLOR#;  */
-	cursor: pointer;
-
-	/*				border:1px solid #000;
+        cursor: pointer;
+        
+/*				border:1px solid #000;
         box-shadow: 3px 3px 3px #222222; */
-}
-
-button:hover,button:focus,button:active,.sendButton:hover,.sendButton:focus,.sendButton:active,#mandateCheckBox:hover,#mandateCheckBox:focus,#mandateCheckBox:active
-	{
-	/*				background: #BUTTON_BACKGROUNDCOLOR_FOCUS#;
-        color: #BUTTON_COLOR#;  */
-	cursor: pointer;
-
-	/*				border:1px solid #000;
+			}
+			
+      button:hover, button:focus, button:active, 
+      .sendButton:hover , .sendButton:focus, .sendButton:active,
+      #mandateCheckBox:hover, #mandateCheckBox:focus, #mandateCheckBox:active {
+/*				background: #BUTTON_BACKGROUNDCOLOR_FOCUS#;
+        color: #BUTTON_COLOR#;  */        
+        cursor: pointer;
+        
+/*				border:1px solid #000;
         box-shadow: -1px -1px 3px #222222;  */
-}
-
-#installJava,#BrowserNOK {
-	clear: both;
-	font-size: 0.8em;
-	padding: 4px;
-}
-
-.selectText {
-	
-}
-
-.selectTextHeader {
-	
-}
-
-#leftcontent a {
-	text-decoration: none;
-	color: #000;
-	/*	display:block;*/
-	padding: 4px;
-}
-
-#leftcontent a:hover,#leftcontent a:focus,#leftcontent a:active {
-	text-decoration: underline;
-	color: #000;
-}
-
-.infobutton {
-	background-color: #005a00;
-	color: white;
-	font-family: serif;
-	text-decoration: none;
-	padding-top: 2px;
-	padding-right: 4px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	font-weight: bold;
-}
-
-.hell {
-	background-color: #MAIN_BACKGOUNDCOLOR#;
-	color: #MAIN_COLOR#;
-}
-
-.dunkel {
-	background-color: #HEADER_BACKGROUNDCOLOR#;
-	color: #HEADER_COLOR#;
-}
-
-.main_header {
-	color: black;
-	font-size: 32pt;
-	position: absolute;
-	right: 10%;
-	top: 40px;
-}
-</style>
-
-
-<title>Anmeldung an Online-Applikation</title>
+			}
+      			
+			#installJava, #BrowserNOK {
+				clear:both;
+				font-size:0.8em;
+				padding:4px;
+			}
+						
+			.selectText{
+			
+			}
+			
+			.selectTextHeader{
+			
+			}
+						
+			#leftcontent a {
+				text-decoration:none; 
+				color: #000;
+			/*	display:block;*/
+				padding:4px;	
+			}
+			
+			#leftcontent a:hover, #leftcontent a:focus, #leftcontent a:active {
+				text-decoration:underline;
+				color: #000;	
+			}
+						
+			.infobutton {
+				background-color: #005a00;
+				color: white;
+				font-family: serif;
+				text-decoration: none;
+				padding-top: 2px;
+				padding-right: 4px;
+				padding-bottom: 2px;
+				padding-left: 4px;
+				font-weight: bold;
+			}
+			
+			.hell {
+				background-color : #MAIN_BACKGOUNDCOLOR#;
+        color: #MAIN_COLOR#;	
+			}
+			
+			.dunkel {
+				background-color: #HEADER_BACKGROUNDCOLOR#;
+        color: #HEADER_COLOR#;
+			}
+			      
+			.main_header {
+			   color: black;
+			    font-size: 32pt;
+			    position: absolute;
+			    right: 10%;
+			    top: 40px;
+				
+			}
+      			                        
+    </style>
+    
+    
+    <title>Anmeldung an Online-Applikation</title>   
 </head>
 
 
 <body>
-	<div id="page">
-
-		<div id="page1" class="case selected-case" role="main">
-
-			<!-- 					<h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
-
-			<div id="main">
-				<div id="leftcontent" class="hell">
-					<div id="bku_header" class="dunkel">
-						<h2 id="tabheader" class="dunkel" role="heading">
-							Anmeldeinformationen:</h2>
-					</div>
-
-					<div id="selectArea" class="hell" role="application">
-						<h3>Anmeldung an: #OAName#</h3>
-
-						<!-- 						<div class="hell"> -->
-						<div id="leftbutton">
-							<form method="post" id="moaidform_yes" action="#URL#">
-								<input type="hidden" name="value" value="true"> <input
-									type="hidden" name="mod" value="#MODUL#"> <input
-									type="hidden" name="action" value="#ACTION#"> <input
-									type="hidden" name="identifier" value="#ID#"> <input
-									type="submit" value="Ja"
-									class="setAssertionButton_full sendButton" role="button">
-							</form>
-						</div>
-						<div id="rightbutton">
-							<form method="post" id="moaidform_no" action="#URL#">
-								<input type="hidden" name="value" value="false"> <input
-									type="hidden" name="mod" value="#MODUL#"> <input
-									type="hidden" name="action" value="#ACTION#"> <input
-									type="hidden" name="identifier" value="#ID#"> <input
-									type="submit" value="Nein"
-									class="setAssertionButton_full sendButton" role="button">
-							</form>
-						</div>
-
+		<div id="page">
+
+			<div id="page1" class="case selected-case" role="main">
+
+<!-- 					<h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
+
+					<div id="main">
+					<div id="leftcontent" class="hell">
+            <div id="bku_header" class="dunkel">
+						  <h2 id="tabheader" class="dunkel" role="heading">
+							 Anmeldeinformationen:							  
+						  </h2>
+            </div>
+					
+						<div id="selectArea" class="hell" role="application">
+							<h3>Anmeldung an: #OAName#</h3>
+					
+<!-- 						<div class="hell"> -->
+							<div id="leftbutton">
+									<form method="post" id="moaidform_yes" action="#URL#">
+										<input type="hidden" name="value" value="true">
+										<input type="hidden" name="mod" value="#MODUL#">
+								    <input type="hidden" name="action" value="#ACTION#">
+                    <input type="hidden" name="identifier" value="#ID#">
+										<input type="submit" value="Ja" class="setAssertionButton_full sendButton" role="button">
+									</form>
+							</div>
+							<div id="rightbutton">
+										<form method="post" id="moaidform_no" action="#URL#">
+										<input type="hidden" name="value" value="false">
+										<input type="hidden" name="mod" value="#MODUL#">
+								    <input type="hidden" name="action" value="#ACTION#">
+                    <input type="hidden" name="identifier" value="#ID#">
+										<input type="submit" value="Nein" class="setAssertionButton_full sendButton" role="button">
+									</form>
+							</div>
+						
+						</div>												
 					</div>
 				</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="https://jigsaw.w3.org/css-validator/images/vcss-blue"
-				alt="CSS ist valide!" />
-			</a>
 		</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>
 </body>
 </html>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html
index 8976b2bd6..a9d73e0d3 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html
@@ -380,7 +380,21 @@
 			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>
 	#end
@@ -430,22 +444,21 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--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="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 
 
   #foreach( $el in $redirectURLs )
 	   <iframe src=$el class="reqframe"></iframe>
   #end
-  
 </body>
 </html>
\ No newline at end of file
-- 
cgit v1.2.3