Merge branch 'bs_3_fr' into moa2_0_tlenz_bs_3

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java

2 files changed, 13 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 7e42eaf30..a14a287db 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -61,21 +61,21 @@ 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') == "block") {
-		$('#oa_vidp_area').css('display', "none");
-		$('#button_vidp_show').css('display', "block");
-		$('#button_vidp_hidden').css('display', "none");
-	} else {
+	if ($('#oa_vidp_area').css('display') == "none" || $('#OAuseVidp').is(':checked')) {
 		$('#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() {
@@ -218,9 +218,12 @@ function oaOnLoad() {
     oaStorkService();
 	oaSSOService();
 	oaLegacyService();
+	oaStork();
 	AdminTarget();
 	oaTargetSubSector();
 	
+	oaVIDP();
+	
 	$(".colorfield").each(
 		function() {
 			$(this).ColorPicker({
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index cf8626ae3..78ad500ef 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -528,7 +528,7 @@
 						</div>
 						
 											
-						<div id="oa_vidp_area" class="oa_protocol_area hidden">
+						<div id="oa_vidp_area" class="oa_protocol_area">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
 	
 							<p><s:checkbox name="storkOA.vidpEnabled" 
@@ -539,10 +539,11 @@
 								id="OAuseVidp" /></p>
 							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
 							<table id="stork_aplist">
-								<tr><th>AP Plugin</th><th>URL</th>
+								<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"/></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>