From 5304a281d530abbe2aa57dc2583bc72d7988c949 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 14:57:42 +0100
Subject: config gui for vidp mockups

---
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 4e8dfc259..18d703eae 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -340,6 +340,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">
@@ -447,6 +454,29 @@
 								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>
+							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
+							<table id="stork_aplist">
+								<tr><th>AP Plugin</th><th>URL</th>
+								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
+								  <tr><td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" cssClass="textfield"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></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>
 
 
-- 
cgit v1.2.3


From ea9d46e1fb39ad31d9bfe6226442b71b8bb11539 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 15:09:55 +0100
Subject: available attribute provider dropdown selection

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 18d703eae..5fce15f5c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -469,7 +469,7 @@
 							<table id="stork_aplist">
 								<tr><th>AP Plugin</th><th>URL</th>
 								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
-								  <tr><td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" cssClass="textfield"/></td>
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
 								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></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>
-- 
cgit v1.2.3


From 44b1f27b00306cac728f6921befd0c1eddb97f81 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 16:23:43 +0100
Subject: drafted config saving

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 5fce15f5c..e783d753d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -469,7 +469,7 @@
 							<table id="stork_aplist">
 								<tr><th>AP Plugin</th><th>URL</th>
 								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
-								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin" value="%{plugin}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
 								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></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>
-- 
cgit v1.2.3


From 6da6e88d2026d2777b54cfba759b4e63f5a391f9 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 28 Feb 2014 08:21:43 +0100
Subject: fixed config visible vidp config block glitch

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 7887d9d62..696723b9b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -505,7 +505,7 @@
 						</div>
 						
 											
-						<div id="oa_vidp_area" class="oa_protocol_area">
+						<div id="oa_vidp_area" class="oa_protocol_area hidden">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
 	
 							<p><s:checkbox name="storkOA.vidpEnabled" 
-- 
cgit v1.2.3


From 9e830fb8f4aa758f0855ab422d398fa8bb0db32d Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 28 Feb 2014 09:09:43 +0100
Subject: fixed name validation error in config

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 696723b9b..1f42bf092 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -518,7 +518,7 @@
 							<table id="stork_aplist">
 								<tr><th>AP Plugin</th><th>URL</th>
 								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
-								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin" value="%{plugin}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+								  <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><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>
-- 
cgit v1.2.3


From f57dbf19485e1da5f9a60d65b0c4cc8ce6e4cd9c Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 08:35:19 +0100
Subject: config gui fixes

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 1f42bf092..76c347445 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -505,7 +505,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" 
-- 
cgit v1.2.3


From 1ba3c2042e0c4da08af39db6172ff1206dfece36 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 10:22:46 +0100
Subject: ap plugins can be configured to listen to certain attributes

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 76c347445..5ee1188ae 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -516,10 +516,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>
-- 
cgit v1.2.3


From 58c8a91c173ce699b8014e4f81fa195bfa37d246 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 19:28:25 +0100
Subject: land selection change

---
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 43 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 1f42bf092..cf8626ae3 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -59,16 +59,28 @@
 							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:checkbox name="generalOA.storkService"
+                                    value="%{generalOA.storkService}"
+                                    labelposition="left"
+                                    key="webpages.oaconfig.general.isstorkservice"
+                                    cssClass="checkbox"
+                                    onclick="oaStorkService();"
+                                    id="OAisstorkservice"
+                                    disabled="%{isOnlyStorkService()}">
+                        </s:checkbox>
+
 					</div>
 					
  					<div id="oa_config_businessservice" class="oa_config_block">
@@ -89,6 +101,17 @@
 							disabled="%{isDeaktivededBusinessService()}">
 						</s:textfield>		
 					</div>
+
+                    <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 test="!isOnlyBusinessService()">
 						<div id="oa_config_publicservice" class="oa_config_block">
-- 
cgit v1.2.3


From 4ade7db6124eec07aebf087721d3d478f92bdaad Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 12 Mar 2014 09:59:19 +0100
Subject: added consent-checkbox to config ui

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 78ad500ef..6749b5131 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -537,6 +537,12 @@
 								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>
-- 
cgit v1.2.3