From 3c81d3fef06204f2259b6c0377c8a2a00974c614 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 20 Sep 2017 12:15:20 +0200
Subject: make SAML2 http POST-Binding template and mandate-service
 selection-template configurable for every online application

---
 .../webapp/jsp/snippets/OA/formCustomization.jsp    | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
index 008a8b521..424fdfacc 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
@@ -160,7 +160,7 @@
 																
 							</div>
 							
-														<div class="oa_protocol_area">
+							<div class="oa_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
 								<s:iterator value="%{formOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
 									<div class="floatClass">
@@ -202,6 +202,25 @@
 								</s:if>
 							</div>
 							
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.elgamandates.header", request) %></h4>
+								<s:textfield name="formOA.mandateServiceSelectionTemplate" 
+		 												 value="%{formOA.mandateServiceSelectionTemplate}" 
+								 						 labelposition="left"
+								 						 key="webpages.oaconfig.general.templates.elgamandates.url"
+								 						 cssClass="textfield_long">
+								</s:textfield>
+							</div>
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.saml2.postbinding.header", request) %></h4>
+								<s:textfield name="formOA.saml2PostBindingTemplate" 
+		 												 value="%{formOA.saml2PostBindingTemplate}" 
+								 						 labelposition="left"
+								 						 key="webpages.oaconfig.general.templates.saml2.postbinding.url"
+								 						 cssClass="textfield_long">
+								</s:textfield>
+							</div>
+							
 						</s:if>
 							
 					</div>
-- 
cgit v1.2.3


From d4e3d5a75ae1922f576a9f28b6bf2267f4bd9ce6 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 20 Sep 2017 14:07:55 +0200
Subject: move some elements in OA configuration GUI

---
 .../src/main/webapp/jsp/snippets/OA/formCustomization.jsp     |  9 ---------
 id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp     | 11 +++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
index 424fdfacc..6dbed0047 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
@@ -211,15 +211,6 @@
 								 						 cssClass="textfield_long">
 								</s:textfield>
 							</div>
-							<div class="oa_protocol_area">
-								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.saml2.postbinding.header", request) %></h4>
-								<s:textfield name="formOA.saml2PostBindingTemplate" 
-		 												 value="%{formOA.saml2PostBindingTemplate}" 
-								 						 labelposition="left"
-								 						 key="webpages.oaconfig.general.templates.saml2.postbinding.url"
-								 						 cssClass="textfield_long">
-								</s:textfield>
-							</div>
 							
 						</s:if>
 							
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
index 7e40fc60b..693ef8073 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
@@ -23,6 +23,17 @@
 							<div id="pvp2_certificate_upload">
 								<s:file name="pvp2OA.fileUpload" key="webpages.oaconfig.pvp2.certifcate" cssClass="textfield_long"></s:file>
 							</div>
+							
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.saml2.postbinding.header", request) %></h4>
+								<s:textfield name="formOA.saml2PostBindingTemplate" 
+		 												 value="%{formOA.saml2PostBindingTemplate}" 
+								 						 labelposition="left"
+								 						 key="webpages.oaconfig.general.templates.saml2.postbinding.url"
+								 						 cssClass="textfield_long">
+								</s:textfield>
+							</div>
+							
 						</div>
 				
 </html>
\ No newline at end of file
-- 
cgit v1.2.3


From 2736109c0928c0c1edb787d54e91bf67bbaad849 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 3 Oct 2017 16:20:11 +0200
Subject: remove mobileBKU and add an additional third BKU

---
 .../src/main/webapp/jsp/editMOAConfig.jsp          | 31 +++++++++++-----------
 .../main/webapp/jsp/snippets/OA/authentication.jsp | 16 +++++------
 2 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 6892535a1..79c66f37c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -73,13 +73,6 @@
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3>
 							
-							<s:textfield name="moaconfig.defaultBKUOnline" 
-								value="%{moaconfig.defaultBKUOnline}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.online"
-								cssClass="textfield_long">
-							</s:textfield>
-	
 							<s:textfield name="moaconfig.defaultBKUHandy" 
 								value="%{moaconfig.defaultBKUHandy}" 
 								labelposition="left"
@@ -93,18 +86,18 @@
 								key="webpages.oaconfig.general.bku.local"
 								cssClass="textfield_long">
 							</s:textfield>
-						</div>
-						
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.slrequesttemplates.header", request) %></h3>
 							
-							<s:textfield name="moaconfig.SLRequestTemplateOnline" 
-								value="%{moaconfig.SLRequestTemplateOnline}" 
+							<s:textfield name="moaconfig.defaultBKUOnline" 
+								value="%{moaconfig.defaultBKUOnline}" 
 								labelposition="left"
-								key="webpages.moaconfig.slrequesttemplates.online"
+								key="webpages.oaconfig.general.bku.online"
 								cssClass="textfield_long">
 							</s:textfield>
-	
+						</div>
+						
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.slrequesttemplates.header", request) %></h3>
+								
 							<s:textfield name="moaconfig.SLRequestTemplateHandy" 
 								value="%{moaconfig.SLRequestTemplateHandy}" 
 								labelposition="left"
@@ -118,6 +111,14 @@
 								key="webpages.moaconfig.slrequesttemplates.local"
 								cssClass="textfield_long">
 							</s:textfield>
+							
+							<s:textfield name="moaconfig.SLRequestTemplateOnline" 
+								value="%{moaconfig.SLRequestTemplateOnline}" 
+								labelposition="left"
+								key="webpages.moaconfig.slrequesttemplates.online"
+								cssClass="textfield_long">
+							</s:textfield>
+							
 						</div>			
 
 						<div class="oa_config_block">
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index ff2b091c6..59661091b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -7,14 +7,7 @@
 					<s:if test="authUser.isAdmin()">
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
-							
-							<s:textfield name="authOA.bkuOnlineURL" 
-								value="%{authOA.bkuOnlineURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.online"
-								cssClass="textfield_long">
-							</s:textfield>
-	
+						
 							<s:textfield name="authOA.bkuHandyURL" 
 								value="%{authOA.bkuHandyURL}" 
 								labelposition="left"
@@ -28,6 +21,13 @@
 								key="webpages.oaconfig.general.bku.local"
 								cssClass="textfield_long">
 							</s:textfield>
+						
+							<s:textfield name="authOA.bkuOnlineURL" 
+								value="%{authOA.bkuOnlineURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.online"
+								cssClass="textfield_long">
+							</s:textfield>
 							
 							<s:radio list="authOA.keyBoxIdentifierList"
 								name="authOA.keyBoxIdentifier"
-- 
cgit v1.2.3