merge

1 files changed, 77 insertions, 12 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index e182fd805..d5396d06e 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -59,16 +59,29 @@
 							key="webpages.oaconfig.general.friendlyname"
 							cssClass="textfield_long">
 						</s:textfield>
-												
-						<s:checkbox name="generalOA.businessService" 
-							value="%{generalOA.businessService}"
-							labelposition="left"
-							key="webpages.oaconfig.general.isbusinessservice"
-							cssClass="checkbox"
-							onclick="oaBusinessService();"
-							id="OAisbusinessservice"
-							disabled="%{isOnlyBusinessService()}">
-						</s:checkbox>
+
+                        <s:checkbox name="generalOA.businessService"
+                                    value="%{generalOA.businessService}"
+                                    labelposition="left"
+                                    key="webpages.oaconfig.general.isbusinessservice"
+                                    cssClass="checkbox"
+                                    onclick="oaBusinessService();"
+                                    id="OAisbusinessservice"
+                                    >
+                        </s:checkbox>
+
+						<s:if test="authUser.isAdmin()">
+                        <s:checkbox name="generalOA.storkService"
+                                    value="%{generalOA.storkService}"
+                                    labelposition="left"
+                                    key="webpages.oaconfig.general.isstorkservice"
+                                    cssClass="checkbox"
+                                    onclick="oaStorkService();"
+                                    id="OAisstorkservice"
+                                    disabled="%{isOnlyStorkService()}">
+                        </s:checkbox>
+            </s:if>
+
 					</div>
 					
  					<div id="oa_config_businessservice" class="oa_config_block">
@@ -89,6 +102,19 @@
 							disabled="%{isDeaktivededBusinessService()}">
 						</s:textfield>		
 					</div>
+
+					<s:if test="authUser.isAdmin()">
+                    <div id="oa_config_storkservice" class="oa_config_block">
+                        <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.stork.header", request) %></h3>
+                        <s:textfield name="generalOA.storkSPTargetCountry"
+                                     labelposition="left"
+                                     key="webpages.oaconfig.general.stork.countrycode"
+                                     value="%{generalOA.storkSPTargetCountry}"
+                                     cssClass="textfield_middle"
+                                     disabled="%{isDeactivatedStorkService()}">
+                        </s:textfield>
+                    </div>
+          </s:if>
 					
 					<s:if test="!isOnlyBusinessService()">
 						<div id="oa_config_publicservice" class="oa_config_block">
@@ -362,9 +388,11 @@
 								name="storkOA.qaa"
 								key="webpages.moaconfig.stork.qaa"
 								labelposition="left" />
-							<h4>Attributes</h4>
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.header", request) %></h4>
 							<table>
-								<tr><th>verwendet</th><th>Attributname</th><th>mandatory</th></tr>
+								<tr><th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.used", request) %></th>
+								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.name", request) %></th>
+								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.mandatory", request) %></th></tr>
 								<s:iterator value="storkOA.helperAttributes" status="stat">
 									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /></td>
 										<td><s:property value="%{name}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
@@ -384,6 +412,13 @@
 								<button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden">
 									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %>
 								</button>
+								
+								<button  type="button" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.show", request) %>
+								</button>
+								<button type="button" style="display:none" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.hidden", request) %>
+								</button>
 							</s:if>
 							
 							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
@@ -496,6 +531,36 @@
 								cssClass="textfield_long">
 							</s:textfield>
 						</div>
+						
+											
+						<div id="oa_vidp_area" class="oa_protocol_area">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
+	
+							<p><s:checkbox name="storkOA.vidpEnabled" 
+								value="%{storkOA.vidpEnabled}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.enabled"
+								cssClass="checkbox"
+								id="OAuseVidp" /></p>
+							<p><s:checkbox name="storkOA.requireConsent" 
+								value="%{storkOA.requireConsent}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.requireconsent"
+								cssClass="checkbox"
+								id="OArequireConsent" /></p>
+							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
+							<table id="stork_aplist">
+								<tr><th>AP Plugin</th><th>URL</th><th>Attribute (CSV)</th></tr>
+								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].name" value="%{name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield_mail"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].attributes" value="%{attributes}" cssClass="textfield_mail"/></td>
+								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.new", request) %>" onclick='newAp();' />
+								
+						</div>
 					</div>