From dfd1a56545a4099ae1a38fb51d62058b0e252135 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 9 Sep 2013 15:22:52 +0200
Subject: MOA-ID 1.9.95

  --change BKU selection templates and SendAssertion Templates to responsive design. Therefore, OA parameter "useIframe" is not required anymore.
---
 id/ConfigWebTool/pom.xml                           |   6 +-
 .../main/resources/applicationResources.properties |   2 +-
 .../.settings/org.eclipse.wst.common.component     |   4 +-
 id/server/auth/pom.xml                             |   2 +-
 id/server/auth/src/main/webapp/css/index.css       | 220 +++++++++-----
 id/server/auth/src/main/webapp/index.html          | 330 +--------------------
 .../auth/src/main/webapp/template_onlineBKU.html   |   4 +-
 id/server/idserverlib/pom.xml                      |  22 +-
 .../moa/id/auth/builder/LoginFormBuilder.java      |   3 +-
 .../id/auth/builder/SendAssertionFormBuilder.java  |   3 +-
 .../moa/id/auth/servlet/MonitoringServlet.java     |   1 +
 .../protocols/pvp2x/binding/ArtifactBinding.java   |   3 +
 .../resources/templates/loginFormFull.html         | 269 +++++++++++++++++
 .../resources/templates/sendAssertionFormFull.html |  56 +---
 .../templates/sendAssertionFormIFrame.html         |  44 ---
 id/server/moa-id-commons/pom.xml                   |   4 +-
 id/server/pom.xml                                  |   2 +-
 .../.settings/org.eclipse.wst.common.component     |   4 +-
 id/server/proxy/pom.xml                            |   4 +-
 19 files changed, 456 insertions(+), 527 deletions(-)
 create mode 100644 id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
 delete mode 100644 id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 411ef55e6..85f0f05ef 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.id</groupId>
   <artifactId>ConfigurationInterface</artifactId>
-  <version>0.9</version>
+  <version>0.9.1</version>
   <packaging>war</packaging>
   <name>MOA-ID 2.0 Configuration Tool</name>
   <description>Web based Configuration Tool for MOA-ID 2.x</description>
@@ -25,12 +25,12 @@
       <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
-    		<version>1.5.2</version>
+    		<version>1.9.95-SNAPSHOT</version>
     	</dependency>
       <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-lib</artifactId>
-    		<version>1.9.90-SNAPSHOT</version>
+    		<version>1.9.95-SNAPSHOT</version>
     	</dependency>
       
       <dependency>
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index 0effc6961..b12c82b9e 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -141,7 +141,7 @@ webpages.oaconfig.general.bku.online=Online BKU
 webpages.oaconfig.general.bku.handy=Handy BKU
 webpages.oaconfig.general.bku.slversion=SecurityLayer Version
 webpages.oaconfig.general.bku.keyboxidentifier=KeyBoxIdentifier
-webpages.oaconfig.general.bku.legacy=Legacy Modus
+webpages.oaconfig.general.bku.legacy=SecurityLayerTemplates (Legacy Request)
 webpages.oaconfig.general.bku.sltemplate.first=1. SecurityLayer Template
 webpages.oaconfig.general.bku.sltemplate.second=2. SecurityLayer Template
 webpages.oaconfig.general.bku.sltemplate.third=3. SecurityLayer Template
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 9725f5b61..26d55725b 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -6,13 +6,13 @@
         <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-lib-1.9.90-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+        <dependent-module archiveName="moa-id-lib-1.9.95-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-commons-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
+        <dependent-module archiveName="moa-id-commons-1.9.95-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="context-root" value="moa-id-auth"/>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index c68236e0e..bd29cde26 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.9.90-SNAPSHOT</version>
+	<version>1.9.95-SNAPSHOT</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 2af88f24a..e57bcc99a 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -1,19 +1,158 @@
 @charset "utf-8";
 
+@media screen and (min-width: 650px) {
+
+	body {
+		margin:0;
+		padding:0;
+		color : #000;
+		background-color : #fff;
+		font-family : Verdana, Geneva, Arial, sans-serif;
+		font-size:76%;
+  	text-align: center;
+  	background-color: #6B7B8B;
+	}
+	
+  #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 {
+    /*float:left; */
+	  width:250px;
+	  margin-bottom: 25px;
+    text-align: left;
+    border: 1px solid rgb(0,0,0);
+  }
+  
+  h2#tabheader.full {
+		padding:5px;
+	  font-size:20px;
+	  color:#fff;
+	  border-bottom:2px solid #fff;
+  }
+  
+  #selectArea.full {
+	 font-size: 15px;
+	 padding-bottom: 65px;
+  }
+
+  #leftcontent.full {
+	 width: 400px;
+	 margin-top: 30px;
+  }
+
+  #main.full {
+    width: 400px;
+  }
+  
+  .setAssertionButton_full {
+  	background: #efefef;
+	  cursor: pointer;
+	  margin-top: 15px;
+    width: 100px;
+    height: 30px
+  }
+
+  #leftbutton.full  {
+	 width: 30%; 
+	 float:left; 
+	 margin-left: 40px;
+  }
+
+  #rightbutton.full {
+	 width: 30%; 
+	 float:right; 
+	 margin-right: 45px; 
+	 text-align: right;
+  }
+
+}
+
+@media screen and (max-width: 649px) {
+	
+	body {
+		margin:0;
+		padding:0;
+		color : #000;
+		background-color : #fff;
+		font-family : Verdana, Geneva, Arial, sans-serif;
+		font-size:76%;
+  	text-align: center;
+  	background-color: #FFFFFF;
+	}
+	
+  #page {
+     visibility: hidden;
+     margin-top: 0%;
+     
+  }
+  
+  #page1 {
+    visibility: hidden;
+  }
+  
+  #main {
+    visibility: hidden;
+  }
+  
+  .OA_header {
+    margin-bottom: 0px;
+    margin-top: 0px;
+    font-size: 0pt;
+    visibility: hidden;
+  }
+
+  #leftcontent {
+    visibility: visible;
+    margin-bottom: 0px;
+    text-align: left;
+    border:none;
+    width:250px;
+  }
+  
+  .setAssertionButton_full {
+     	background: #efefef;
+	    cursor: pointer;
+	    margin-top: 15px;
+      width: 70px;
+      height: 25px;
+    }
+}
+
 * {
 	margin:0;
 	padding:0;
 	border:0;
 }
 
-body {
-	margin:0;
-	padding:0;
-	color : #000;
-	background-color : #fff;
-	font-family : Verdana, Geneva, Arial, sans-serif;
-	font-size:76%;
-}
 
 /*  skiplink */
 
@@ -73,20 +212,8 @@ p#skiplinks  a:active {
 	float:right;
 }
 
-#main {
-	clear:both;
-	position:relative;
-	margin-left: 45%;
-}
-
 /* left */
 
-#leftcontent {
-	float:left;
-	width:250px;
-	margin-bottom: 25px;
-}
-
 .iframebkuselection {
 	text-align: center;
 	padding-bottom: 25px;
@@ -103,33 +230,12 @@ h2#tabheader, h2#contentheader {
 	border-bottom:2px solid #fff;
 }
 
-h2#tabheader.full {
-		padding:5px;
-	  font-size:20px;
-	  color:#fff;
-	  border-bottom:2px solid #fff;
-}
-
 #selectArea {
 	padding-top: 10px;
 	padding-bottom: 55px;
 	padding-left: 10px;
 }
 
-#selectArea.full {
-	font-size: 15px;
-	padding-bottom: 65px;
-}
-
-#leftcontent.full {
-	width: 400px;
-	margin-top: 30px;
-}
-
-#main.full {
-	margin-left: 35%;
-}
-
 .setAssertionButton {
 	background: #efefef;
 	cursor: pointer;
@@ -138,14 +244,6 @@ h2#tabheader.full {
   height: 25px;
 }
 
-.setAssertionButton_full {
-	background: #efefef;
-	cursor: pointer;
-	margin-top: 15px;
-  width: 100px;
-  height: 30px
-}
-
 #leftbutton  {
 	width: 35%; 
 	float:left; 
@@ -159,19 +257,6 @@ h2#tabheader.full {
 	text-align: right;
 }
 
-#leftbutton.full  {
-	width: 30%; 
-	float:left; 
-	margin-left: 40px;
-}
-
-#rightbutton.full {
-	width: 30%; 
-	float:right; 
-	margin-right: 45px; 
-	text-align: right;
-}
-
 #stork {
     margin-bottom: 10px;
     margin-top: 5px;
@@ -273,7 +358,8 @@ input {
 }
 
 iframe {
-	width:220px;
+	width:250px;
+	height: 180px
 }
 
 /* right */
@@ -347,14 +433,6 @@ p {
 	color: white;
 }
 
-.OA_header {
-	  background-color: white;
-    font-size: 20pt;
-    margin-bottom: 25px;
-    margin-left: 25%;
-    margin-top: 25px;
-}
-
 .main_header {
    color: black;
     font-size: 32pt;
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 83b4ee418..eee3cd69a 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -3,340 +3,12 @@
     <head>
         <!-- [OPTIONAL] Aendern Sie hier den Titel der Seite -->
         <title>
-           MOA-Template zur B&uuml;rgerkartenauswahl (Musterseite)
+           MOA-ID 2.0 Mainpage
         </title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta http-equiv="Content-Style-Type" content="text/css">
-        <link rel="stylesheet" type="text/css" href="css/index.css">
-        <script type="text/javascript">
-			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
-            // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
-			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";			
-			
-			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
-            // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
-			var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
-			
-			
-			window.onload=function() {
-				
-				document.getElementById("localBKU").style.display="none";
-				return;
-        	}
 
-	        function bkuOnlineClicked() {
-				<!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
-				document.getElementById("localBKU").style.display="block"; 
-				
-				document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;
-				document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;
-				
-				document.getElementById("useMandate").value = "false";
-				var checkbox = document.getElementById("mandateCheckBox")
-				if (checkbox !=  null) {
-					if (document.getElementById("mandateCheckBox").checked) {
-						document.getElementById("useMandate").value = "true";
-					}
-				}
-									
-		        var el = document.getElementById("bkulogin");
-        		var parent = el.parentNode;
-
-				var iFrameURL = "iframeOnlineBKU.html" + "?";
-				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;				
-
-				var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", iFrameURL);
-		        iframe.setAttribute("width", "220");
-		        iframe.setAttribute("height", "165");
-		        iframe.setAttribute("frameborder", "0");
-		        iframe.setAttribute("scrolling", "no");
-		        iframe.setAttribute("title", "Login");
-
-		        parent.replaceChild(iframe, el);
-        	}
-        	        
-        	function bkuHandyClicked() {
-	        	document.getElementById("localBKU").style.display="none";
-
-	        	document.getElementById("useMandate").value = "false";
-				var checkbox = document.getElementById("mandateCheckBox")
-				if (checkbox !=  null) {
-					if (document.getElementById("mandateCheckBox").checked) {
-						document.getElementById("useMandate").value = "true";
-					}
-				}
-				
-	            var el = document.getElementById("bkulogin");
-	    	    var parent = el.parentNode;
-
-				var iFrameURL = "iframeHandyBKU.html" + "?";
-				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
-
-	    	    var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", iFrameURL);
-	    	    iframe.setAttribute("width", "220");
-	        	iframe.setAttribute("height", "159");
-		        iframe.setAttribute("frameborder", "0");
-	        	iframe.setAttribute("scrolling", "no");
-	    	    iframe.setAttribute("title", "Login");
-	
-			    parent.replaceChild(iframe, el);
-			}
-	
-        	function storkClicked() {				
-				document.getElementById("localBKU").style.display="block"; 
-				
-				document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;
-				document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;
-				
-				document.getElementById("useMandate").value = "false";
-				var checkbox = document.getElementById("mandateCheckBox")
-				if (checkbox !=  null) {
-					if (document.getElementById("mandateCheckBox").checked) {
-						document.getElementById("useMandate").value = "true";
-					}
-				}
-
-				var ccc = "AT";
-				var countrySelection = document.getElementById("cccSelection");
-				
-				if (countrySelection !=  null) {
-					ccc = document.getElementById("cccSelection").value;
-				}
-					
-		        var el = document.getElementById("bkulogin");
-        		var parent = el.parentNode;
-
-				var iFrameURL = "iframeOnlineBKU.html" + "?";
-				iFrameURL += "use=" + document.getElementById("useMandate").value + "&";
-				iFrameURL += "ccc=" + ccc;
-
-				var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", iFrameURL);
-		        iframe.setAttribute("width", "220");
-		        iframe.setAttribute("height", "165");
-		        iframe.setAttribute("frameborder", "0");
-		        iframe.setAttribute("scrolling", "no");
-		        iframe.setAttribute("title", "Login");
-
-		        parent.replaceChild(iframe, el);
-        	}
-			
-        </script>
     </head>
     <body>
-        <div id="wrapper">
-            <p id="skiplinks">
-                <a href="#content">Zum Inhalt springen</a>            
-			</p>
-			<div id="banner">
-                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
-                <div id="bannerleft">
-                    <h1>MOA-Template zur B&uuml;rgerkartenauswahl (Musterseite)</h1>
-              </div>                
-                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
-              <div id="bannerright">
-                    <img src="img/logo.jpg" alt="Logo">                
-                 </div>
-            </div>
-			<div id="main">
-                <div id="leftcontent">
-                    <h2 id="tabheader" class="dunkel">
-                        Login mit B&uuml;rgerkarte                    
-                    </h2>
-                    <div id="bkulogin" class="hell">
-                 	   <!-- No-Script Variante, wenn im Browser JavaScript deaktiviert ist -->
-	                    <!-- Defaulteinstellung: No-Script Variante mit Anmeldung via lokaler BKU oder Handysignatur ohne Vollmacht -->
-    	                <noscript>
-        	                Kein JavaScript aktiviert!
-                        
-							<!-- [OPTIONAL] kommentieren sie folgende entsprechenden Blöcke aus, wenn Sie keine No-Script Variante anbieten möchten oder nur bestimmte BKU/Vollmachten Varianten anzeigen möchten -->
-                        
-                	        <!-- Block "KARTE": Anmeldung mit lokaler BKU *ohne* Vollmacht (No-Script Variante) -->
-                    	    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->			         
-                        	<!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false -->
-			                <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">					
-    	                    	<div id="bkukarte" class="hell">
-        	                		<button name="bkuButton" type="button">KARTE</button>
-	        	                </div>
-                	        </a>                	        
-                	        
-                        
-                    	    <!-- Block "KARTE+Vollmacht": Anmeldung mit lokaler BKU *mit* Vollmacht (No-Script Variante) -->
-                        	<!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
-		                    <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true -->
-		                    <!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">					
-        	                	<div id="bkukarte" class="hell">
-            	            		<button name="bkuButton" type="button">KARTE+<br>Vollmacht</button>
-	            	            </div>
-                    	    </a> -->
-
-                        
-							<!-- Block "HANDY": Anmeldung mit Handysignatur *ohne* Vollmacht (No-Script Variante) -->
-		                    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
-   		                    <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false -->
-							<a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">
-								<div id="bkuhandy" class="hell">
-		                          	<button name="bkuButton" type="button">HANDY</button>
-								</div>
-							</a>
-                        
-	                        <!-- Block "HANDY+Vollnacht": Anmeldung mit Handysignatur *mit* Vollmacht (No-Script Variante) -->
-		                    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->
-   	    	                <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true -->
-							<!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">
-								<div id="bkuhandy" class="hell">
-		                          	<button name="bkuButton" type="button">HANDY</button>
-								</div>
-	                        </a> -->
-
-
-	                    	<!-- Block "Ausländische Identitäten bzw. STORK": Länderauswahl für Anmeldung ausländischer Identitäten über STORK oder lokale BKU(No-Script Variante) -->
-		                    <!-- [MUSS] Geben Sie im Feld "action" die URL zum Aufruf von MOA-ID an (inkl. Template-URL und bkuURI) -->
-   	    	                <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request -->							
-							<div id="leftcontent" style="margin-bottom:10px">
-		                    	<h2 id="tabheader" class="dunkel">
-    		                    	Home Country Selection                    
-	        		            </h2>
-    	            	    </div>
-        	                <div id="stork" class="hell" align="center"> 
-                           		<p>
-            	                	<form name="storkForm" method="POST" action="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request">
-       	    	                		<select name="CCC" size="1" style="width:120px">
-           		                			<option value="BE">België/Belgique</option>
-											<option value="EE">Eesti</option>
-											<option value="ES">España</option>
-											<option value="IS">Ísland</option>																						
-											<option value="IT">Italia</option>
-											<option value="LI">Liechtenstein</option>
-											<option value="LT">Lithuania</option>
-											<option value="PT">Portugal</option>
-											<option value="SI">Slovenija</option>
-											<option value="FI">Suomi</option>
-											<option value="SE">Sverige</option>													  
-    		                        	</select>
-    		                        	<input type="submit" name="storkButton" value="Send" alt="Send" class="button"/>            		                	
-                	                    <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
-									</form>
-                                </p>
-							</div>
-							
-                   		</noscript>
-                    <script>
-                    	<!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie folgende fünf Zeilen aus -->
-						document.write("<div id=\"mandate\">");
-                    		document.write("<input tabindex=\"1\" type=\"checkbox\" name=\"Mandate\" style=\"vertical-align: middle; margin-right: 5px;\" id=\"mandateCheckBox\">");
-								document.write("<label>in Vertretung anmelden</label>");
-                      	document.write(" <a href=\"info_mandates.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");
-                    	document.write("</div> ");
-                    
-                    	<!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie folgende drei Zeilen aus aus -->
-                        document.write("<div id=\"bkukarte\" class=\"hell\">");     
-                            document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuOnlineClicked();\" tabindex=\"2\">KARTE</button>");
-                        document.write("</div>");
-						
-						<!-- [OPTIONAL] Um die Handysignatur auszublenden, kommentieren sie folgende drei Zeilen aus aus -->
-                        document.write("<div id=\"bkuhandy\" class=\"hell\">");
-                            document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuHandyClicked();\" tabindex=\"3\">HANDY</button>");
-                        document.write("</div>");
-                        
-                       
-						
-                        <!-- [OPTIONAL] Um die Anmeldung von ausländischen Identitäten auszublenden, kommentieren Sie folgende Zeilen aus -->
-						document.write("<div id=\"leftcontent\" style=\"margin-bottom:10px\">");
-							document.write("<h2 id=\"tabheader\" class=\"dunkel\">");
-								document.write("Home Country Selection");
-							document.write("</h2>");
-						document.write("</div>");
-						document.write("<div id=\"stork\" class=\"hell\" align=\"center\">");
-							document.write("<p>");								
-		   	    	            	document.write("<select name=\"cccSelection\" id=\"cccSelection\" size=\"1\" style=\"width: 120px; margin-right: 5px;\" >");
-        	   		                	document.write("<option value=\"BE\">België/Belgique</option>");    
-				                        document.write("<option value=\"EE\">Eesti</option>");
-    	        	                  	document.write("<option value=\"ES\">España</option>");
-    	        	                  	document.write("<option value=\"IS\">Ísland</option>");    
-				                        document.write("<option value=\"IT\">Italia</option>");
-    	        	                  	document.write("<option value=\"LI\">Liechtenstein</option>");
-    	        	                  	document.write("<option value=\"LT\">Lithuania</option>");    
-				                        document.write("<option value=\"PT\">Portugal</option>");
-    	        	                  	document.write("<option value=\"SI\">Slovenija</option>");
-    	        	                  	document.write("<option value=\"FI\">Suomi</option>");    
-				                        document.write("<option value=\"SE\">Sverige</option>");				                                	        	                  
-	   	            	            document.write("</select>");
-	   	            	         	document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"storkClicked();\">Send</button>");
-									document.write(" <a href=\"info_stork.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");								
-							document.write("</p>");
-						document.write("</div>");
-						
-                    </script>
-                    </div>
-
-                    
-                    
-s
-                    <div id="localBKU" style="display:none" class="hell">
-                        <hr>
-                        <form method="post" id="moaidform">
-                            <input type="hidden" name="show" value="false"> 
-                            <input type="hidden" name="Template" id="Template">
-                            <input type="hidden" name="bkuURI" value="https://127.0.0.1:3496/https-security-layer-request">
-                            <input type="hidden" name="useMandate" id="useMandate">
-                            <input type="hidden" name="CCC" id="ccc">  
-                            <input type="submit" size="400" value="Lokale BKU" class="sendButton">
-                        </form>
-                        <p>
-                            <small>Alternativ k&ouml;nnen Sie eine lokal installierte BKU verwenden.</small>                        
-                        </p>
-                    </div>
-                    
-                    <div id="tab" class="hell">
-                        <a href="info_bk.html" class="link_nav">Informationen zur B&uuml;rgerkarte</a>                    
-                    </div>
-                    
-                    <div id="navlist" class="hell">
-                        <ul>
-                            <li>
-                                <a href="http://www.buergerkarte.at" target="_blank">B&uuml;rgerkarte.at</a>                            
-                            </li>
-                            <li>
-                                <a href="http://www.digitales.oesterreich.gv.at/" target="_blank">Digitales &Ouml;sterreich</a>                            
-                            </li>
-                            <li>
-                                <a href="http://www.a-sit.at/" target="_blank">A-SIT</a>                            
-                            </li>
-                            <li>
-                                <a href="http://www.a-trust.at/" target="_blank">A-Trust</a>                            
-                            </li>
-                            <li>
-                                <a href="http://www.egiz.gv.at/" target="_blank">EGIZ</a>                            
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-
-                <div id="rightcontent">
-                    <p>
-                        <a href="http://www.buergerkarte.at/aktivieren.de.php" target="_blank"><img src="img/bk_aktivieren.jpg" border="0" alt="B6uuml;rgerkarte aktivieren" width="210"></a>                    
-                    </p>                   
-                </div>
-
-                <div id="centercontent">
-
-                    <h2 id="contentheader" class="dunkel">
-                        Hinweise zum MOA-Template
-                    </h2>
-
-                    <div id="content" class="hell">
-                        <p>
-                        	Eine Anleitung zur Nutzung des MOA-Template finden Sie hier: <a href="BKAuswahl-MOA-Template-Howto.pdf" target="_blank">BKAuswahl-MOA-Template-Howto.pdf (PDF, 190B)</a>.
-                        So m&uuml;ssen vor einem Login noch die Parameter für den MOA-ID Aufruf angegeben werden.</p>                        	
-                        <p>
-                        	Diese Musterseite erf&uuml;llt die Richtlinie f&uuml;r barrierefreie Webinhalte 2.0 (WCAG 2.0 des W3C) Stufe AA. Das Pr&uuml;fprotokoll hierzu finden Sie hier: <a href="WCAG-Pruefprotokoll.pdf" target="_blank">Pruefprotokoll.pdf (PDF, 705kB)</a>.
-                        </p>
-   	            	</div>
-                </div>
-            </div>
-    	</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index dceae1a75..7e3fbc99c 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -19,8 +19,8 @@
 			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
 		
 			<!-- Angabe der Parameter fuer die Online-BKU -->
-			<input type="hidden" name="appletWidth" value="220">
-			<input type="hidden" name="appletHeight" value="140">
+			<input type="hidden" name="appletWidth" value="250">
+			<input type="hidden" name="appletHeight" value="160">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
 	      <input type="hidden" name="appletBackgroundColor" value="#DDDDDD">
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 69e1c8c18..37663c08b 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-lib</artifactId>
 	<packaging>jar</packaging>
-	<version>1.9.90-SNAPSHOT</version>
+	<version>1.9.95-SNAPSHOT</version>
 	<name>MOA ID API</name>
 
 	<properties>
@@ -17,6 +17,16 @@
 	</properties>
 
 	<dependencies>
+	  <dependency>
+    		<groupId>MOA.id</groupId>
+    		<artifactId>stork-saml-engine</artifactId>
+    		<version>1.5.2</version>
+    </dependency>
+    <dependency>
+    		<groupId>MOA.id.server</groupId>
+    		<artifactId>moa-id-commons</artifactId>
+    		<version>${project.version}</version>
+    </dependency>
 		<dependency>
 			<groupId>MOA</groupId>
 			<artifactId>moa-common</artifactId>
@@ -147,16 +157,6 @@
 	      <artifactId>commons-lang</artifactId>
 	      <version>2.6</version>
     	</dependency>
-    	<dependency>
-    		<groupId>MOA.id</groupId>
-    		<artifactId>stork-saml-engine</artifactId>
-    		<version>1.5.2</version>
-    	</dependency>
-    	<dependency>
-    		<groupId>MOA.id.server</groupId>
-    		<artifactId>moa-id-commons</artifactId>
-    		<version>1.5.2</version>
-    	</dependency>
 	</dependencies>
 
 	<build>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
index a80fcfa25..ee5afa5dc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/LoginFormBuilder.java
@@ -20,7 +20,8 @@ public class LoginFormBuilder {
 
 	private static final String HTMLTEMPLATESDIR = "htmlTemplates/";
 	private static final String HTMLTEMPLATEFULL = "loginFormFull.html";
-	private static final String HTMLTEMPLATEIFRAME = "loginFormIFrame.html";
+	private static final String HTMLTEMPLATEIFRAME = "loginFormFull.html";
+	//private static final String HTMLTEMPLATEIFRAME = "loginFormIFrame.html";
 	
 	private static String AUTH_URL = "#AUTH_URL#";
 	private static String MODUL = "#MODUL#";
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java
index 956593237..59cbbe25e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/SendAssertionFormBuilder.java
@@ -20,7 +20,8 @@ public class SendAssertionFormBuilder {
 	
 	private static final String HTMLTEMPLATESDIR = "htmlTemplates/";
 	private static final String HTMLTEMPLATEFULL = "sendAssertionFormFull.html";
-	private static final String HTMLTEMPLATEIFRAME = "sendAssertionFormIFrame.html";
+	private static final String HTMLTEMPLATEIFRAME = "sendAssertionFormFull.html";
+	//private static final String HTMLTEMPLATEIFRAME = "sendAssertionFormIFrame.html";
 	
 	private static String URL = "#URL#";
 	private static String MODUL = "#MODUL#";
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java
index 4ba282dc1..4cd471db0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java
@@ -38,6 +38,7 @@ public class MonitoringServlet extends AuthServlet {
 					
 				} else {
 					resp.setStatus(HttpServletResponse.SC_OK);
+					resp.setContentType("text/html;charset=UTF-8");
 					Logger.info("Monitoring Servlet finished without errors");
 				}
 					
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
index 1d51d91f1..baea32f28 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
@@ -73,6 +73,9 @@ public class ArtifactBinding implements IDecoder, IEncoder {
 		} catch (CredentialsNotAvailableException e) {
 			e.printStackTrace();
 			throw new SecurityException(e);
+			
+		} catch (Exception e) {
+			throw new SecurityException(e);
 		}
 	}
 
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
new file mode 100644
index 000000000..c6b98dc85
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -0,0 +1,269 @@
+<html>
+<head>
+	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+	<meta content="text/css" http-equiv="Content-Style-Type">
+	<link rel="stylesheet" type="text/css" href="#CONTEXTPATH#/css/index.css">
+  
+	<script type="text/javascript">
+		function isIE() {
+			return (/MSIE (\d+\.\d+);/.test(navigator.userAgent));
+		}
+
+		function isFullscreen() {
+			try {
+				return ((top.innerWidth == screen.width) && (top.innerHeight == screen.height));
+			} catch (e) {
+				return false;
+			}
+		}
+
+		function isActivexEnabled() {
+			var supported = null;
+			try {
+				supported = !!new ActiveXObject("htmlfile");
+			} catch (e) {
+				supported = false;
+			}
+			return supported;
+		}
+
+		function isMetro() {
+			if (!isIE())
+				return false;
+			return !isActivexEnabled() && isFullscreen();
+		}
+
+		window.onload=function() {
+			document.getElementById("localBKU").style.display="block";
+			return;
+		}
+
+		function bkuOnlineClicked() {
+			if (isMetro())
+				document.getElementById("metroDetected").style.display="block";
+			document.getElementById("localBKU").style.display="block";
+
+/* 			if (checkMandateSSO())
+				return; */
+			
+			setMandateSelection();
+/* 			setSSOSelection(); */
+						
+			var iFrameURL = "#AUTH_URL#" + "?";
+			iFrameURL += "bkuURI=" + "#ONLINE#";
+			iFrameURL += "&useMandate=" + document.getElementById("useMandate").value;
+/* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
+			iFrameURL += "&MODUL=" + "#MODUL#";
+			iFrameURL += "&ACTION=" + "#ACTION#";
+			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+
+			generateIFrame(iFrameURL);
+		}
+
+		function bkuHandyClicked() {
+			document.getElementById("localBKU").style.display="none";
+
+/* 			if (checkMandateSSO())
+				return; */
+			
+			setMandateSelection();
+/* 			setSSOSelection(); */
+			
+			var iFrameURL = "#AUTH_URL#" + "?";
+			iFrameURL += "bkuURI=" + "#HANDY#";
+			iFrameURL += "&useMandate=" + document.getElementById("useMandate").value;
+/* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
+			iFrameURL += "&MODUL=" + "#MODUL#";
+			iFrameURL += "&ACTION=" + "#ACTION#";
+			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+
+			generateIFrame(iFrameURL);
+		}
+
+		function storkClicked() {
+			document.getElementById("localBKU").style.display="none"; 
+
+/* 			if (checkMandateSSO())
+				return; */
+			
+			setMandateSelection();
+/* 			setSSOSelection(); */
+			
+			var ccc = "AT";
+			var countrySelection = document.getElementById("cccSelection");
+
+			if (countrySelection !=  null) {
+				ccc = document.getElementById("cccSelection").value;
+			}
+
+			var iFrameURL = "#AUTH_URL#" + "?";
+			iFrameURL += "bkuURI=" + "#ONLINE#";
+			iFrameURL += "&useMandate=" + document.getElementById("useMandate").value;
+			iFrameURL += "&CCC=" + ccc;
+/* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
+			iFrameURL += "&MODUL=" + "#MODUL#";
+			iFrameURL += "&ACTION=" + "#ACTION#";
+			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+
+			generateIFrame(iFrameURL);
+		}
+
+		function generateIFrame(iFrameURL) {
+			var el = document.getElementById("bkulogin");
+			var parent = el.parentNode;
+
+			var iframe = document.createElement("iframe");
+			iframe.setAttribute("src", iFrameURL);
+			iframe.setAttribute("width", "220");
+			iframe.setAttribute("height", "165");
+			iframe.setAttribute("frameborder", "0");
+			iframe.setAttribute("scrolling", "no");
+			iframe.setAttribute("title", "Login");
+
+			parent.replaceChild(iframe, el);
+		}
+
+		function setMandateSelection() {
+			document.getElementById("moaidform").action = "#AUTH_URL#";
+
+			document.getElementById("useMandate").value = "false";
+			var checkbox = document.getElementById("mandateCheckBox");
+			if (checkbox !=  null) {
+				if (document.getElementById("mandateCheckBox").checked) {
+					document.getElementById("useMandate").value = "true";
+				}
+			}
+		}
+		
+/* 		function setSSOSelection() {
+			document.getElementById("useSSO").value = "false";
+			var checkbox = document.getElementById("SSOCheckBox");
+			if (checkbox !=  null) {
+				if (document.getElementById("SSOCheckBox").checked) {
+					document.getElementById("useSSO").value = "true";
+				}
+			}
+		} */
+		
+/* 		function checkMandateSSO() {
+			var sso = document.getElementById("SSOCheckBox");
+			var mandate = document.getElementById("mandateCheckBox");
+			
+			
+			if (sso.checked && mandate.checked) {
+				alert("Anmeldung in Vertretung in kombination mit Single Sign-On wird aktuell noch nicht unterstützt!")
+				mandate.checked = false;
+				sso.checked = false;
+				return true;
+			} else {
+				return false;
+			}
+		} */
+	</script>
+</head>
+
+
+<body>
+
+		<div id="page">
+    
+			<div id="page1" class="case selected-case">
+
+					<h2 class="OA_header">Anmeldung an: #OAName#</h2>
+
+					<div id="main">
+					<div id="leftcontent">
+						<h2 id="tabheader" class="dunkel">
+							Login mit Bürgerkarte
+						</h2>
+						<div id="bkulogin" class="hell">
+
+							<div id="mandateLogin" style="margin-top: 10px; margin-bottom: 10px">
+								<table style="margin-left: auto; margin-right: auto;">
+									<tr>
+										<td><input tabindex="1" type="checkbox" name="Mandate"
+											style="vertical-align: middle; margin-right: 5px"
+											id="mandateCheckBox"></td>
+										<td><label for="mandateCheckBox">in Vertretung anmelden</label></td>
+										<td><a href="info_mandates.html" target="_blank"
+											class="infobutton" style="margin-left: 5px" tabindex="5">i</a></td>
+									</tr>
+<!-- 									<tr>
+										<td><input tabindex="1" type="checkbox" name="SSO"
+											style="vertical-align: middle; margin-right: 5px"
+											id="SSOCheckBox"></td>
+										<td><label for="SSOCheckBox">Single Sign-On</label></td>
+										<td></td>
+									</tr> -->
+								</table>
+							</div>
+	
+							<div id="bkukarte" class="hell">
+								<button name="bkuButton" type="button" onClick="bkuOnlineClicked();">KARTE</button>
+							</div>
+	
+							<div id="bkuhandy" class="hell">
+								<button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
+							</div>
+	
+	<!-- 						<div id="mandate">
+								<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox">
+								<label>in Vertretung anmelden</label>
+								<a href="info_mandates.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
+							</div> -->
+		
+    					<div id="localBKU" class="hell">
+								<hr>
+								<form method="get" id="moaidform" action="#AUTH_URL#">
+									<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" name="MODUL" value="#MODUL#">
+									<input type="hidden" name="ACTION" value="#ACTION#">
+									<input type="hidden" name="MOASessionID" value="#SESSIONID#">
+									<input type="submit" size="400" value="lokale BKU" class="sendButton" style="margin-top: 5px;">
+								</form>
+								<p style="margin-bottom: 0px; margin-top: 3px;">
+									<small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>
+								</p>
+							</div>
+    
+							<div id="stork" class="hell" align="center">
+								<div id="leftcontent" style="margin-bottom:10px">
+									<h2 id="tabheader" class="dunkel">
+										Home Country Selection
+									</h2>
+								</div>
+								<p>
+									<select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
+										<option value="BE">Belgi&euml;/Belgique</option>
+										<option value="EE">Eesti</option>
+										<option value="ES">Espa&ntilde;a</option>
+										<option value="IS">&Iacute;sland</option>
+										<option value="IT">Italia</option>
+										<option value="LI">Liechtenstein</option>
+										<option value="LT">Lithuania</option>
+										<option value="PT">Portugal</option>
+										<option value="SI">Slovenija</option>
+										<option value="FI">Suomi</option>
+										<option value="SE">Sverige</option>
+									</select>
+									<button name="bkuButton" type="button" onClick="storkClicked();">Send</button>
+									<a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>								
+								</p>
+							</div>
+						</div>
+
+						<div id="metroDetected" style="display:none" class="hell">
+							<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>
+						</div>
+            
+					</div>
+				</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 f4377ace4..f977b1d2e 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
@@ -3,47 +3,13 @@
 	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
 	<meta content="text/css" http-equiv="Content-Style-Type">
 	<link rel="stylesheet" type="text/css" href="#CONTEXTPATH#/css/index.css">
-	<link type="text/css" rel="stylesheet" href="#CONTEXTPATH#/css/2.0/stammzahl.css">
-	<link type="text/css" rel="stylesheet" href="#CONTEXTPATH#/css/2.0/stylesnew.css">
-	<link type="text/css" rel="stylesheet" href="#CONTEXTPATH#/css/2.0/stylesinput.css">
-
 </head>
 
 
 <body>
-	<div class="pageWidth">
-
-		<div id="pagebase">
 		<div id="page">
 
-		<div id="header" class="header clearfix">
-			<h1 class="main_header">MOA-ID 2.0 - Login Preview</h1>
-
-<!-- 			<ul id="servicenav">
-				<li><a href="http://www.dsk.gv.at">Datenschutzkommission<span class="hidden">.</span></a></li>
-			    <li><a href="http://www.stammzahlenregister.gv.at/site/5109/default.aspx">Stammzahlenregister<span class="hidden">.</span></a></li>
-			    <li><a href="http://www.dsk.gv.at/DesktopDefault.aspx?alias=dvr">Datenverarbeitungsregister<span class="hidden">.</span></a></li>
-			    <li><a href="http://www.dsk.gv.at/DesktopDefault.aspx?alias=dsken" lang="en" class="last-item">English<span class="hidden">.</span></a></li>	
-			</ul> -->
-
-			<div id="mainnavjump"></div>
-			<p id="homelink"><img src="#CONTEXTPATH#/img/2.0/logo.png" style="width: 250px" alt="EGIZ"></p>
-			<ul id="mainnav" class="clearfix">
-<!-- 				<li><a href="http://www2.egiz.gv.at">Home<span class="hidden">.</span></a></li> -->
-<!-- 				<li><a href="http://www.stammzahlenregister.gv.at/site/5970/default.aspx">bPK<span class="hidden">.</span></a></li>
-				<li><a href="http://www.stammzahlenregister.gv.at/site/5981/default.aspx">Ergänzungsregister<span class="hidden">.</span></a></li>
-				<li class="selected"><a href="http://www.stammzahlenregister.gv.at/site/5983/default.aspx" class="current">Vollmachten<span class="hidden"> (gew&auml;hlt)</span><span class="hidden">.</span></a></li>
-				<li><a href="http://www.stammzahlenregister.gv.at/site/6001/default.aspx">Veröffentlichungen<span class="hidden">.</span></a></li> -->
-			</ul>
-
-		</div>
-
-
-		<br class="clearAll">
-
-		<div id="viewcontrol" class="switch">
 			<div id="page1" class="case selected-case">
-				<div style="margin-left: 0px;">
 
 <!-- 					<h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
 
@@ -65,7 +31,7 @@
 										<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="hidden" name="identifier" value="#ID#">
 										<input type="submit" size="400" value="Ja" class="setAssertionButton_full">
 									</form>
 							</div>
@@ -74,7 +40,7 @@
 										<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="hidden" name="identifier" value="#ID#">
 										<input type="submit" size="400" value="Nein" class="setAssertionButton_full">
 									</form>
 							</div>
@@ -82,24 +48,6 @@
 						</div>												
 					</div>
 				</div>
-			</div>
-		</div>
-
-		<br style="clear: both">
-		<div id="footer" class="clearfix">
-
-<!-- 			<h2 class="hidden">&Uuml;ber die Website der Stammzahlenregisterbeh&ouml;rde</h2>
-			<ul>
-				<li><a href="http://www.stammzahlenregister.gv.at/site/5115/Default.aspx" class="first-item">Impressum<span class="hidden">.</span></a></li>
-				<li><a href="http://www.stammzahlenregister.gv.at/site/6004/Default.aspx" lang="en">Sitemap<span class="hidden">.</span></a></li>
-		
-				<li><a href="http://www.stammzahlenregister.gv.at/site/5122/Default.aspx">Kontakt<span class="hidden">.</span></a></li>
-				<li><a href="http://www.stammzahlenregister.gv.at/site/6005/Default.aspx">Hilfe<span class="hidden">.</span></a></li>
-			</ul> -->
-		</div>
-
-
-		</div>
 		</div>
 	</div>
 </body>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html
deleted file mode 100644
index a30bbfa9a..000000000
--- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormIFrame.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-	<meta content="text/css" http-equiv="Content-Style-Type">
-	<link rel="stylesheet" type="text/css" href="#CONTEXTPATH#/css/index.css">
-</head>
-
-
-<body>
-					<div id="leftcontent">
-						<h2 id="tabheader" class="dunkel">
-							Anmeldeinformationen:
-							  
-						</h2>
-					
-						<div id="selectArea" class="hell">
-							<b>Anmeldung an:</b>
-							<p>#OAName#</p>
-						
-
-<!-- 						<div class="hell"> -->
-							<div id="leftbutton" class="hell">
-									<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" size="400" value="Ja" class="setAssertionButton">
-									</form>
-							</div>
-							<div id="rightbutton" class="hell">
-										<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" size="400" value="Nein" class="setAssertionButton">
-									</form>
-							</div>
-						
-						</div>												
-					</div>
-</body>
-</html>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index f04de3ad8..4bf57d743 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -3,11 +3,12 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>1.5.2</version>
+    <version>1.9.95-SNAPSHOT</version>
   </parent>
   <artifactId>moa-id-commons</artifactId>
   <name>moa-id-commons</name>
   <groupId>MOA.id.server</groupId>
+  <version>1.9.95-SNAPSHOT</version>
   
   <dependencies>
 		<dependency>
@@ -179,5 +180,4 @@
 			</plugin>
 		</plugins>
 	</build>
-  	<version>1.5.2</version>
 </project>
\ No newline at end of file
diff --git a/id/server/pom.xml b/id/server/pom.xml
index 777715c3b..b3d467294 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -11,7 +11,7 @@
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.2</version>
+    <version>1.9.95-SNAPSHOT</version>
     <name>MOA ID Server</name>
 
     <modules>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index 4fc6832e5..ed42e9405 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -6,13 +6,13 @@
         <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-lib-1.9.90-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+        <dependent-module archiveName="moa-id-lib-1.9.95-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-commons-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
+        <dependent-module archiveName="moa-id-commons-1.9.95-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="context-root" value="moa-id-proxy"/>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 3cf7a3316..fad47450b 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.9.90-SNAPSHOT</version>
+	<version>1.9.95-SNAPSHOT</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
-			<version>1.9.90-SNAPSHOT</version>
+			<version>1.9.95-SNAPSHOT</version>
 			<!--version>${project.version}</version-->
 		</dependency>
 		<!-- transitive dependencies we don't want to include into the war -->
-- 
cgit v1.2.3