merge

1 files changed, 56 insertions, 1 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 05f4a1106..41702cbbb 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -227,8 +227,61 @@
 						</div>
 						
 						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
+								value="#{storkconfig.defaultQaa}"
+								name="storkconfig.defaultQaa"
+								key="webpages.moaconfig.stork.qaa.default"
+								labelposition="left" />
+							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
+							<table id="stork_pepslist">
+								<tr><th>Country Shortcode</th><th>PEPS URL</th>
+								<s:iterator value="storkconfig.cpepslist" status="stat">
+								  <tr><td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+								      <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
+								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
+							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4>
+							<table id="stork_attributelist">
+								<tr><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></th><th><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></th></tr>
+								<s:iterator value="storkconfig.attributes" status="stat">
+									<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td>
+										<td><s:checkbox name="storkconfig.attributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
+										<td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' />
+						</div>
+						
+						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.header", request) %></h3>
-													
+
+							<div id="moageneral_active_protocol" class="moageneral_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.allowed.header", request) %></h4>
+								<s:checkbox name="moaconfig.protocolActiveSAML1" 
+									value="%{moaconfig.protocolActiveSAML1}"
+									labelposition="left"
+									key="webpages.moaconfig.protocols.legacy.saml1"
+									cssClass="checkbox">
+								</s:checkbox>
+								<s:checkbox name="moaconfig.protocolActivePVP21" 
+									value="%{moaconfig.protocolActivePVP21}"
+									labelposition="left"
+									key="webpages.moaconfig.protocols.legacy.pvp2"
+									cssClass="checkbox">
+								</s:checkbox>
+								<s:checkbox name="moaconfig.protocolActiveOAuth" 
+									value="%{moaconfig.protocolActiveOAuth}"
+									labelposition="left"
+									key="webpages.moaconfig.protocols.oauth"
+									cssClass="checkbox">
+								</s:checkbox>
+							</div>
+	
+							<br>
+															
 							<div id="moageneral_legacy_protocol" class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.legacy.header", request) %></h4>
 								<s:checkbox name="moaconfig.legacy_saml1" 
@@ -245,6 +298,8 @@
 								</s:checkbox>
 							</div>
 							
+							<br>
+							
 							<div class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4>