From 2c82d41a98e2617088cdcf3db72b40d9747ae292 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 26 Sep 2013 08:05:52 +0200
Subject: Features: -- Add additional parameters to customize BKUSelectionForm
 and SendAssertionForm -- change Target configuration -- insert some logging

Bugfixes:
-- Nullpointerexceptions in combination of an old userdatabase entry and a actual configuration tool version
---
 .../resources/templates/loginFormFull.html         | 35 +++++++---------------
 .../resources/templates/sendAssertionFormFull.html |  6 ++--
 2 files changed, 14 insertions(+), 27 deletions(-)

(limited to 'id/server/idserverlib/src/main/resources')

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 c6b98dc85..55290d05e 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -176,43 +176,30 @@
 						<h2 id="tabheader" class="dunkel">
 							Login mit Bürgerkarte
 						</h2>
-						<div id="bkulogin" class="hell">
+						<div id="bkulogin" class="hell" #BACKGROUNDCOLOR#>
 
-							<div id="mandateLogin" style="margin-top: 10px; margin-bottom: 10px">
+							<div id="mandateLogin" style="margin-bottom: 10px;#MANDATEVISIBLE#">
 								<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>
+											style="vertical-align: middle; margin-right: 5px;"
+											id="mandateCheckBox" #MANDATECHECKED#></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">
+							<div id="bkukarte">
 								<button name="bkuButton" type="button" onClick="bkuOnlineClicked();">KARTE</button>
 							</div>
 	
-							<div id="bkuhandy" class="hell">
+							<div id="bkuhandy">
 								<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">
+			
+    					<div id="localBKU">
 								<hr>
 								<form method="get" id="moaidform" action="#AUTH_URL#">
 									<input type="hidden" name="bkuURI" value="#LOCAL#">
@@ -229,7 +216,7 @@
 								</p>
 							</div>
     
-							<div id="stork" class="hell" align="center">
+<!--							<div id="stork" align="center">
 								<div id="leftcontent" style="margin-bottom:10px">
 									<h2 id="tabheader" class="dunkel">
 										Home Country Selection
@@ -253,9 +240,9 @@
 									<a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>								
 								</p>
 							</div>
-						</div>
+						</div>  -->
 
-						<div id="metroDetected" style="display:none" class="hell">
+						<div id="metroDetected" style="display:none">
 							<p>
 								Anscheinend verwenden Sie Internet Explorer im Metro-Modus. Wählen Sie bitte "Auf dem Desktop anzeigen" aus den Optionen um die Karten-Anmeldung starten zu können.
 							</p>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
index f977b1d2e..1e5f4229c 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html
@@ -20,13 +20,13 @@
 							  
 						</h2>
 					
-						<div id="selectArea" class="hell full">
+						<div id="selectArea" class="hell full" #BACKGROUNDCOLOR#>
 							<b>Anmeldung an:</b>
 							<p>#OAName#</p>
 						
 
 <!-- 						<div class="hell"> -->
-							<div id="leftbutton" class="hell full">
+							<div id="leftbutton" class="full">
 									<form method="post" id="moaidform_yes" action="#URL#">
 										<input type="hidden" name="value" value="true">
 										<input type="hidden" name="mod" value="#MODUL#">
@@ -35,7 +35,7 @@
 										<input type="submit" size="400" value="Ja" class="setAssertionButton_full">
 									</form>
 							</div>
-							<div id="rightbutton" class="hell full">
+							<div id="rightbutton" class="full">
 										<form method="post" id="moaidform_no" action="#URL#">
 										<input type="hidden" name="value" value="false">
 										<input type="hidden" name="mod" value="#MODUL#">
-- 
cgit v1.2.3