-- Customizable BKUSelection Form and SendAssertion Form

-- OA specific Checkbox to disable SAML1

1 files changed, 107 insertions, 25 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 6bca21435..f7a722893 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -286,12 +286,15 @@
 
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3>
-							<button  type="button" class="oa_buttons" onclick="oaSAML1();" id="button_smal1_show">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.show", request) %>
-							</button>
-							<button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %>
-							</button>
+						
+							<s:if test="authUser.isAdmin() || saml1OA.isActive()">
+								<button  type="button" class="oa_buttons" onclick="oaSAML1();" id="button_smal1_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.show", request) %>
+								</button>
+								<button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %>
+								</button>
+							</s:if>
 							
 							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
 								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %>
@@ -302,6 +305,15 @@
 						  						
 						<div id="oa_saml1_area" class="oa_protocol_area">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.saml1.header", request) %></h4>
+							
+							<s:if test="authUser.isAdmin()">
+								<s:checkbox name="saml1OA.Active" 
+									value="%{saml1OA.Active}"
+									labelposition="left"
+									key="webpages.oaconfig.saml1.isActice"
+									cssClass="checkbox">
+								</s:checkbox>
+							</s:if>
 							<s:checkbox name="saml1OA.provideStammZahl" 
 								value="%{saml1OA.provideStammZahl}"
 								labelposition="left"
@@ -395,26 +407,96 @@
 								cssClass="textfield_large">
 							</s:textarea>
 							
-							<s:textfield name="generalOA.bkuSelectionBackGroundColor" 
-								value="%{generalOA.bkuSelectionBackGroundColor}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
-								cssClass="textfield_middle">
-							</s:textfield>
 							
-							<s:checkbox name="generalOA.showMandateLoginButton" 
-								value="%{generalOA.showMandateLoginButton}"
-								labelposition="left"
-								key="webpages.oaconfig.general.BKUSelection.isMandateLoginCheckboxVisible"
-								cssClass="checkbox">
-							</s:checkbox>
-						
-							<s:checkbox name="generalOA.onlyMandateAllowed" 
-								value="%{generalOA.onlyMandateAllowed}"
-								labelposition="left"
-								key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
-								cssClass="checkbox">
-							</s:checkbox>
+							<button type="button" class="oa_buttons" onclick="oaFormCustom();" id="formcustom_button_show">
+								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.show", request) %>
+						  </button>
+							<button type="button" class="oa_buttons" onclick="oaFormCustom();" id="formcustom_button_hidden">
+								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.hidden", request) %>
+						  </button>
+						  						
+							<div id="formcustom_area" class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
+													
+								<s:checkbox name="formOA.showMandateLoginButton" 
+									value="%{formOA.showMandateLoginButton}"
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.isMandateLoginCheckboxVisible"
+									cssClass="checkbox">
+								</s:checkbox>						
+								<s:checkbox name="formOA.onlyMandateAllowed" 
+									value="%{formOA.onlyMandateAllowed}"
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
+									cssClass="checkbox">
+								</s:checkbox>
+								
+								<s:textfield name="formOA.backGroundColor" 
+									value="%{formOA.backGroundColor}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
+									cssClass="textfield_middle">
+								</s:textfield>								
+								<s:textfield name="formOA.frontColor" 
+									value="%{formOA.frontColor}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.frontcolor"
+									cssClass="textfield_middle">
+								</s:textfield>
+								
+								<s:textfield name="formOA.header_BackGroundColor" 
+									value="%{formOA.header_BackGroundColor}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.header.backgroundcolor"
+									cssClass="textfield_middle">
+								</s:textfield>
+								<s:textfield name="formOA.header_FrontColor" 
+									value="%{formOA.header_FrontColor}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.header.frontcolor"
+									cssClass="textfield_middle">
+								</s:textfield>
+								<s:textfield name="formOA.header_text" 
+									value="%{formOA.header_text}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.header.text"
+									cssClass="textfield_middle">
+								</s:textfield>
+								
+								<s:textfield name="formOA.button_BackGroundColor" 
+									value="%{formOA.button_BackGroundColor}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.header.button.background"
+									cssClass="textfield_middle">
+								</s:textfield>
+								<s:textfield name="formOA.button_BackGroundColorFocus" 
+									value="%{formOA.button_BackGroundColorFocus}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.header.button.background.focus"
+									cssClass="textfield_middle">
+								</s:textfield>
+								<s:textfield name="formOA.button_FrontColor" 
+									value="%{formOA.button_FrontColor}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.header.button.front"
+									cssClass="textfield_middle">
+								</s:textfield>
+								
+								<s:select list="formOA.appletRedirectTargetList"
+													key="webpages.oaconfig.general.BKUSelection.redirectTarget"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{formOA.appletRedirectTarget}"
+													name="formOA.appletRedirectTarget">
+								</s:select>
+								<s:textfield name="formOA.fontType" 
+									value="%{formOA.fontType}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.fonttype"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+							</div>
 						</s:if>
 							
 					</div>