From ab7c7b6a64edca60b78a89b18a1972ad5e38586e Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 1 Apr 2011 08:03:14 +0000
Subject: =?UTF-8?q?-=20Update=20Parameter=C3=BCberpr=C3=BCfung=20-=20Updat?=
 =?UTF-8?q?e=20MOA-Template=20zur=20B=C3=BCrgerkartenauswahl=20-=20=C3=84n?=
 =?UTF-8?q?derung=20der=20Konfiguration=20f=C3=BCr:=20=09-=20Angabe=20eine?=
 =?UTF-8?q?r=20Liste=20von=20vertrauensw=C3=BCrdigen=20BKUs=20(aufgrund=20?=
 =?UTF-8?q?Parameterpr=C3=BCfung)=20-=20Fixed=20Bug=20#552=20(http://egovl?=
 =?UTF-8?q?abs.gv.at/tracker/index.php=3Ffunc=3Ddetail&aid=3D552&group=5Fi?=
 =?UTF-8?q?d=3D6&atid=3D105)=20-=20Fixed=20Bug=20#551=20(http://egovlabs.g?=
 =?UTF-8?q?v.at/tracker/index.php=3Ffunc=3Ddetail&aid=3D551&group=5Fid=3D6?=
 =?UTF-8?q?&atid=3D105)=20-=20Fixed=20Bug=20#550=20(http://egovlabs.gv.at/?=
 =?UTF-8?q?tracker/index.php=3Ffunc=3Ddetail&aid=3D550&group=5Fid=3D6&atid?=
 =?UTF-8?q?=3D105)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1198 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../main/webapp/BKAuswahl-MOA-Template-Howto.pdf   | Bin 190907 -> 175414 bytes
 id/server/auth/src/main/webapp/css/index.css       |  32 +++++++--
 id/server/auth/src/main/webapp/iframeHandyBKU.html |  41 ++++++++---
 .../auth/src/main/webapp/iframeOnlineBKU.html      |  48 ++++++++++---
 id/server/auth/src/main/webapp/index.html          |  78 ++++++++++++++++++---
 .../auth/src/main/webapp/template_handyBKU.html    |   4 +-
 .../auth/src/main/webapp/template_onlineBKU.html   |   4 +-
 7 files changed, 168 insertions(+), 39 deletions(-)

(limited to 'id/server/auth/src/main')

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
index 021e15b94..b68d247cb 100644
Binary files a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf and b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf differ
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 3dea4d7ff..39b715a6e 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -82,7 +82,7 @@ p#skiplinks  a:active {
 
 #leftcontent {
 	float:left;
-	width:210px;		
+	width:220px;		
 }
 
 h2#tabheader, h2#contentheader {
@@ -94,7 +94,7 @@ h2#tabheader, h2#contentheader {
 
 #bkulogin {
 	overflow:hidden;	
-	width:210px;
+	width:220px;
 }
 
 #bkukarte {
@@ -113,6 +113,12 @@ h2#tabheader, h2#contentheader {
 	width:40%;
 }
 
+#mandate{
+	text-align:center;
+	padding : 5px 5px 5px 5px;
+}
+
+
 button {
 	background: #efefef;
 	border:1px solid #000;
@@ -161,19 +167,19 @@ button {
 }
 
 iframe {
-	width:210px;
+	width:220px;
 }
 
 /* right */
 
 #rightcontent {
 	float:right;
-	width:210px;
+	width:220px;
 }
 
 #centercontent {
 	width:auto;
-	margin: 0 220px;
+	margin: 0 230px;
 }
 
 /* center */
@@ -202,6 +208,22 @@ p {
 }
 
 
+#mandateLogin {
+	vertical-align: middle;
+}
+
+.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;
+}
+
 /* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
 .hell {
 	background-color : #DDDDDD;	
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 24a2d80f9..06639c7e5 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -7,22 +7,47 @@
     	<meta http-equiv="PRAGMA" content="NO-CACHE">
     	<script type="text/javascript">
 			window.onload=function() {
+				var Template = get_url_param("Template", "startAuth");
+				var startAuth = get_url_param("startAuth", "useMandate");
+				var useMandate = get_url_param("useMandate", "");
+			
+				document.moaidform.useMandate.value = useMandate;
+				document.moaidform.action = startAuth;
+				document.moaidform.Template.value = Template;
+				
       			document.moaidform.submit();
       			return;
       		}
+			
+			function get_url_param(name, follower) {
+
+				var url = window.location.href;
+				var i = url.indexOf(name);
+				url = url.substring(i + name.length+1, url.length);				
+				if (follower.length != 0) {
+					i = url.indexOf(follower);
+					url = url.substring(0, i-1);
+				}
+			
+				
+				// alert (name + ": " + url);
+				
+				return url;
+				
+			}
 		</script>
 	</head>
 	<body>
 		Bitte warten...
+
+		<form method="POST" name="moaidform">
+			<input type="hidden" name="Template">
+            <input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">		
+            <input type="hidden" name="useMandate">
+    	</form>		
 		
-		<!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
-		<!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at" -->
-		<FORM  name="moaidform" action="[MOA_ID_STARTAUTHENTICATION]" method="post">
-    	<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy BKU an -->
-			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
-			<input type="hidden" name="Template" value="[URL_TO_HANDYBKU_TEMPLATE]">
-			<input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">
-		</FORM>
+        
+        
 		
 		<hr>
 	</body>
diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index e92420e7a..b0f6b8bb0 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -7,23 +7,49 @@
     	<meta http-equiv="PRAGMA" content="NO-CACHE">
 	    <script type="text/javascript">
 			window.onload=function() {
-    		  	document.moaidform.submit();
+				
+				var bkuURI = get_url_param("bkuURI", "Template");
+				var Template = get_url_param("Template", "startAuth");
+				var startAuth = get_url_param("startAuth", "useMandate");
+				var useMandate = get_url_param("useMandate", "");
+			
+				document.moaidform.useMandate.value = useMandate;
+				document.moaidform.action = startAuth;
+				document.moaidform.Template.value = Template;
+				document.moaidform.bkuURI.value = bkuURI;
+
+				document.moaidform.submit();
+				
       			return;
       		}
+
+			function get_url_param(name, follower) {
+
+				var url = window.location.href;
+				var i = url.indexOf(name);
+				url = url.substring(i + name.length+1, url.length);				
+				if (follower.length != 0) {
+					i = url.indexOf(follower);
+					url = url.substring(0, i-1);
+				}
+			
+				
+				// alert (name + ": " + url);
+				
+				return url;
+				
+			}
+			
+
 		</script>
 	</head>
 	<body>
 		Bitte warten...
-		
-        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
-		<!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at" -->
-		<form method="POST" name="moaidform" id="moa" action="[MOA_ID_STARTAUTHENTICATION]">
-			<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an -->
-			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_onlineBKU.html"-->
-			<input type="hidden" name="Template" value="[URL_TO_ONLINEBKU_TEMPLATE]">
-            <!-- [MUSS] Geben Sie hier die URL zur Online BKU an -->
-			<!-- z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"-->
-            <input type="hidden" name="bkuURI" value="[URL_TO_ONLINEBKU]">
+        
+		<form method="POST" name="moaidform">
+			<input type="hidden" name="Template">
+            <input type="hidden" name="bkuURI">		
+            <input type="hidden" name="useMandate">
     	</form>
 	
 		<hr>
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index a49d8c6bc..0e12035e9 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -9,22 +9,64 @@
         <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]";
+			
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
+			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
+			var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+			
+			// [MUSS] Geben Sie hier die URL zur Online BKU an
+			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
+			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
+			
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
+			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_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"; 
+				
+				// set values for local BKU
+				document.getElementById("form_local_bku").action = MOA_ID_STARTAUTHENTICATION;
+				document.getElementById("input_localBKU_template").value = URL_TO_LOKALBKU_TEMPLATE;
+				if (document.getElementById("mandateCheckBox").checked) {
+					document.getElementById("useMandate").value = "true";
+				}
+				else {
+					document.getElementById("useMandate").value = "false";
+				}
 
+				// set values for online BKU
 		        var el = document.getElementById("bkulogin");
         		var parent = el.parentNode;
 				
+				var checkBox = document.getElementById("mandateCheckBox");				
+				var iFrameURL = "iframeOnlineBKU.html" + "?";
+				iFrameURL += "bkuURI=" + URL_TO_ONLINEBKU + "&";
+				iFrameURL += "Template=" + URL_TO_ONLINEBKU_TEMPLATE + "&";
+				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
+				iFrameURL += "useMandate=" + checkBox.checked ;
+			
 		 		var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", "iframeOnlineBKU.html");
-		        iframe.setAttribute("width", "210");
-		        iframe.setAttribute("height", "155");
+		        iframe.setAttribute("src", iFrameURL);
+		        iframe.setAttribute("width", "220");  
+		        iframe.setAttribute("height", "165");
 		        iframe.setAttribute("frameborder", "0");
 		        iframe.setAttribute("scrolling", "no");
 		        iframe.setAttribute("title", "Login");
@@ -36,13 +78,21 @@
         	function bkuHandyClicked() {
 	        	document.getElementById("localBKU").style.display="none";
     	    	
+				// set values for Handy Signatur
 		        var el = document.getElementById("bkulogin");
 	    	    var parent = el.parentNode;
+
+				var checkBox = document.getElementById("mandateCheckBox");				
+				var iFrameURL = "iframeHandyBKU.html" + "?";
+				iFrameURL += "Template=" + URL_TO_HANDYSIGNATUR_TEMPLATE + "&";
+				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
+				iFrameURL += "useMandate=" + checkBox.checked ;
+
 		         
 	        	var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", "iframeHandyBKU.html");
-	    	    iframe.setAttribute("width", "210");
-	        	iframe.setAttribute("height", "149");
+		        iframe.setAttribute("src", iFrameURL);
+	    	    iframe.setAttribute("width", "220"); 
+	        	iframe.setAttribute("height", "159");
 		        iframe.setAttribute("frameborder", "0");
 	        	iframe.setAttribute("scrolling", "no");
 	    	    iframe.setAttribute("title", "Login");
@@ -86,19 +136,25 @@
                         <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>
+                        </div>
                     </div>
+                    
+					
+
+
 
                     <div id="localBKU" style="display:none" class="hell">
                         <hr>
-                        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
-                        <!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at"-->
-                        <form method="post" action="[MOA_ID_STARTAUTHENTICATION]">
+                        <form id="form_local_bku" method="post">
                             <input type="hidden" name="show" value="false"> 
 							<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an -->
                             <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_localBKU.html"-->
-                            <input type="hidden" name="Template" value="[URL_TO_LOKALBKU_TEMPLATE]">
+                            <input type="hidden" name="Template" id="input_localBKU_template" >
                             <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request"> 
-                            <input type="submit" size="400" value="Lokale BKU">
+                            <input type="hidden" name="useMandate" id="useMandate">
+                            <input type="submit" size="400" value="Lokale BKU">                            
                         </form>
                         <p>
                             <small>Alternativ k&ouml;nnen Sie eine lokal installierte BKU verwenden.</small>                        
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
index 4ae6c2231..6ccd295b2 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -18,8 +18,8 @@
 			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
 			
 			<!-- Angabe der Parameter für die Handy-BKU -->
-			<input type="hidden" name="appletWidth" value="210">
-			<input type="hidden" name="appletHeight" value="149">
+			<input type="hidden" name="appletWidth" value="220">
+			<input type="hidden" name="appletHeight" value="159">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->
 			<input type="hidden" name="backgroundColor" value="#DDDDDD"> 
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index 28207e9e2..1bb2ac236 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -18,8 +18,8 @@
 			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
 		
 			<!-- Angabe der Parameter fuer die Online-BKU -->
-			<input type="hidden" name="appletWidth" value="210">
-			<input type="hidden" name="appletHeight" value="130">
+			<input type="hidden" name="appletWidth" value="220">
+			<input type="hidden" name="appletHeight" value="140">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
 	      <input type="hidden" name="appletBackgroundColor" value="#DDDDDD">
-- 
cgit v1.2.3