* add OA specific BKU selection template

* add OA specific send-assertion template
* add OA specific applet height and width configuration
* add PVP2.x reload checkbox in PVP2.x OA configuration

* add new elements to MOA-ID configuration

2 files changed, 70 insertions, 5 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 2e0e5ea2a..1bb429afa 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -399,6 +399,7 @@
 									<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
 								</div>
 							</s:iterator>
+							
 							<s:if test="moaconfig.fileUploadFileName.size() == 0">
 									<div id="pvp2_certificate_upload">
 									<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 4e8dfc259..fadf528d1 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -240,6 +240,49 @@
 									cssClass="textfield_long">
 								</s:textfield>
 							</div>
+							
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
+								<s:iterator value="%{generalOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
+									<div class="floatClass">
+										<s:label key="webpages.oaconfig.general.bku.bkuselection.filename" value="%{fileNameBKU}"/>
+										<s:checkbox key="webpages.oaconfig.general.bku.delete"
+																labelposition="left"														
+																cssClass="checkbox"
+																name="generalOA.deleteBKUTemplate"></s:checkbox>
+									</div>
+									<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:iterator>
+								<s:if test="generalOA.bkuSelectionFileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>
+							</div>
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.sendassertion.header", request) %></h4>
+								<s:iterator value="%{generalOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
+									<div class="floatClass">
+										<s:label 	key="webpages.oaconfig.general.bku.sendassertion.filename" 
+															value="%{fileNameBKU}"/>
+										<s:checkbox key="webpages.oaconfig.general.bku.delete"
+																labelposition="left"														
+																cssClass="checkbox"
+																name="generalOA.deleteSendAssertionTemplate"></s:checkbox>
+									</div>
+									<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:iterator>
+								<s:if test="generalOA.sendAssertionFileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>
+							</div>
+							
 						</div>
 					</s:if>
 					
@@ -271,7 +314,7 @@
 					</div>
 
 					<div class="oa_config_block">
-						<p><strong><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></strong></p>
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></h3>
 						
 						<s:checkbox name="ssoOA.useSSO" 
 							value="%{ssoOA.useSSO}"
@@ -356,7 +399,7 @@
 								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
 						  </button>
 						  						
-						<div id="oa_saml1_area" class="oa_protocol_area">
+						<div id="oa_saml1_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.saml1.header", request) %></h4>
 							
 							<s:if test="authUser.isAdmin()">
@@ -416,9 +459,14 @@
 							
 						</div>
 						
-						<div id="oa_pvp2_area" class="oa_protocol_area">
+						<div id="oa_pvp2_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4>
 						
+							<s:checkbox 	key="webpages.oaconfig.pvp2.reload"
+														labelposition="left"														
+														cssClass="checkbox"
+														name="pvp2OA.reLoad"></s:checkbox>
+						
 						  <s:textfield name="pvp2OA.metaDataURL" 
 								value="%{pvp2OA.metaDataURL}" 
 								labelposition="left"
@@ -433,7 +481,7 @@
 							</div>
 						</div>
 						
-						<div id="oa_oauth20_area" class="oa_protocol_area">
+						<div id="oa_oauth20_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.oauth20.header", request) %></h4>
 						
 							<s:label key="webpages.oaconfig.oauth20.clientId" value="%{oauth20OA.clientId}"/>
@@ -483,7 +531,7 @@
 								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.hidden", request) %>
 						  </button>
 						  						
-							<div id="formcustom_area" class="oa_protocol_area">
+							<div id="formcustom_area" class="oa_protocol_area hidden">
 								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
 																
 								<div id="formCustomValues">													
@@ -562,6 +610,22 @@
 														name="formOA.appletRedirectTarget">
 									</s:select>
 									
+									<s:textfield name="formOA.applet_height" 
+										value="%{formOA.applet_height}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.applet.height"
+										cssClass="textfield_middle"
+										id="HEADER_HEIGHT">
+									</s:textfield>
+									
+									<s:textfield name="formOA.applet_width" 
+										value="%{formOA.applet_width}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.applet.width"
+										cssClass="textfield_middle"
+										id="HEADER_WIDTH">
+									</s:textfield>
+									
 									<s:select list="formOA.fontTypeList"
 														key="webpages.oaconfig.general.BKUSelection.fonttype.list"
 														labelposition="left"