merge

4 files changed, 146 insertions, 20 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index e3d2763c2..4f497faaa 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -183,6 +183,11 @@ body {
    margin-left: 10px;
 }
 
+.oa_protocol_area >h5 {
+	clear: both;
+  margin-left: 10px;
+  padding-top: 10px;
+}
 
 .oa_config_block {
 	padding-left: 15px;
@@ -218,6 +223,12 @@ body {
 		padding-top: 25px;
 }
 
+.oa_config_block h4 {
+		clear: both;
+		padding-top: 20px;
+		margin-bottom: 10px;
+}
+
 #loadOA_webpages_oaconfig_pvp2_certifcate_info{
 	width: 100%;
 }
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 384e40509..d31a65d87 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -22,17 +22,33 @@
  *******************************************************************************/
 function oaBusinessService() {
 	if ($('#OAisbusinessservice').attr('checked') == 'checked') {
-		
-		$('#oa_config_businessservice').css('display', "block");
+        $('#OAisstorkservice').attr('checked',false);
+        $('#oa_config_storkservice').css('display', "none");
+        $('#oa_config_businessservice').css('display', "block");
 		$('#oa_config_publicservice').css('display', "none");
 		
 	} else {
-		
-		$('#oa_config_businessservice').css('display', "none");
+        $('#oa_config_storkservice').css('display', "none");
+        $('#oa_config_businessservice').css('display', "none");
 		$('#oa_config_publicservice').css('display', "block");
 		
 	}		
 }
+function oaStorkService() {
+    if ($('#OAisstorkservice').attr('checked') == 'checked') {
+        $('#OAisbusinessservice').attr('checked',false);
+        $('#oa_config_storkservice').css('display', "block");
+        $('#oa_config_businessservice').css('display', "none");
+        $('#oa_config_publicservice').css('display', "none");
+
+    } else {
+        $('#oa_config_storkservice').css('display', "none");
+        $('#oa_config_businessservice').css('display', "none");
+        $('#oa_config_publicservice').css('display', "block");
+
+    }
+}
+
 function oaSSOService() {
 	if ($('#OAuseSSO').attr('checked') == 'checked') {
 		
@@ -45,12 +61,23 @@ function oaSSOService() {
 	}
 }
 function oaStork() {
-	if ($('#OAuseSTORKLogon').attr('checked') == 'checked') {
+	if ($('#OAuseSTORKLogon').is(':checked')) {
 		$('#stork_block').css('display', "block");
 	} else {
 		$('#stork_block').css('display', "none");
 	}
 }
+function oaVIDP() {
+	if ($('#oa_vidp_area').css('display') == "none") {
+		$('#oa_vidp_area').css('display', "block");
+		$('#button_vidp_show').css('display', "none");
+		$('#button_vidp_hidden').css('display', "block");
+	} else {
+		$('#oa_vidp_area').css('display', "none");
+		$('#button_vidp_show').css('display', "block");
+		$('#button_vidp_hidden').css('display', "none");
+	}
+}
 function oaSAML1() {
 	if ($('#oa_saml1_area').css('display') == "block") {
 		$('#oa_saml1_area').css('display', "none");
@@ -187,12 +214,16 @@ function userOnLoad() {
 	return true;
 }
 function oaOnLoad() {
+    oaStorkService();
 	oaBusinessService();
 	oaSSOService();
 	oaLegacyService();
+	oaStork();
 	AdminTarget();
 	oaTargetSubSector();
 	
+	oaVIDP();
+	
 	$(".colorfield").each(
 		function() {
 			$(this).ColorPicker({
@@ -210,7 +241,12 @@ function oaOnLoad() {
 function newPeps() {
 	var target = $(document.getElementById("stork_pepslist").getElementsByTagName("tr")).last()[0];
 	var clone = target.cloneNode(true);
-	var lastindex = parseInt(clone.innerHTML.match(/name="storkconfig.cpepslist\[(\d)/)[1]);
+	try {
+        var lastindex = parseInt(clone.innerHTML.match(/name="storkconfig.cpepslist\[(\d)/)[1]);
+    } catch (err) {
+
+        var lastindex = 1;
+    }
 	var nextindex = lastindex + 1;
 	clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.cpepslist\[\d/g, 'name="storkconfig.cpepslist[' + nextindex);
 	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
@@ -224,4 +260,13 @@ function newStorkAttribute() {
 	clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.attributes\[\d/g, 'name="storkconfig.attributes[' + nextindex);
 	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
 	target.parentNode.appendChild(clone);
+}
+function newAp() {
+	var target = $(document.getElementById("stork_aplist").getElementsByTagName("tr")).last()[0];
+	var clone = target.cloneNode(true);
+	var lastindex = parseInt(clone.innerHTML.match(/name="storkOA.attributeProviderPlugins\[(\d)/)[1]);
+	var nextindex = lastindex + 1;
+	clone.innerHTML = clone.innerHTML.replace(/name="storkOA.attributeProviderPlugins\[\d/g, 'name="storkOA.attributeProviderPlugins[' + nextindex);
+	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
+	target.parentNode.appendChild(clone);
 }
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 9f89f9a9d..945d4b0b5 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -248,14 +248,19 @@
 								key="webpages.moaconfig.stork.qaa.default"
 								labelposition="left" />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
-							<table id="stork_pepslist">
+                            <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>
+                                <s:if test="%{storkconfig.cpepslist == null}">
+                                    <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_short"/></td>
+                                        <td><s:textfield name="storkconfig.cpepslist[0].URL" value="http://" 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:if>
+                            </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">
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>