From 83773a3597dfccbf16c8265fa3ef9019706a3461 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 12 Dec 2013 12:23:55 +0100
Subject: peps list in general config

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

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 05f4a1106..52fc79b68 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -226,6 +226,24 @@
 							</s:textarea>														
 						</div>
 						
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
+							<table>
+								<tr><th>Country Shortcode</th><th>PEPS URL</th>
+								<s:iterator value="storkconfig.cpepslist">
+								  <tr><td><s:textfield name="countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+								      <td><s:textfield name="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>
+							    <tr id="template" style="display: none;"><td><s:textfield name="countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+								      <td><s:textfield name="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>
+								
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='var target = document.getElementById("template"); var clone = target.cloneNode(true); clone.style=""; target.parentNode.appendChild(clone);' />
+						</div>
+						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.header", request) %></h3>
 													
-- 
cgit v1.2.3


From 9c46233d2fc5f81908addac6a5ec28046a1bc618 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 13 Dec 2013 08:24:53 +0100
Subject: peps list commitable

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

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 52fc79b68..686b10c12 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -231,9 +231,9 @@
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
 							<table>
 								<tr><th>Country Shortcode</th><th>PEPS URL</th>
-								<s:iterator value="storkconfig.cpepslist">
-								  <tr><td><s:textfield name="countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
-								      <td><s:textfield name="URL" value="%{URL}" cssClass="textfield_long"/></td>
+								<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>
 							    <tr id="template" style="display: none;"><td><s:textfield name="countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
-- 
cgit v1.2.3


From 9786de6a3b5886437d23d9cce06ae76ab440ff51 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 13 Dec 2013 09:13:50 +0100
Subject: new peps list entry can be created

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 686b10c12..1b87ffc57 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -229,19 +229,15 @@
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
-							<table>
+							<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>
-							    <tr id="template" style="display: none;"><td><s:textfield name="countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
-								      <td><s:textfield name="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>
-								
 							</table>
-							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='var target = document.getElementById("template"); var clone = target.cloneNode(true); clone.style=""; target.parentNode.appendChild(clone);' />
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
 						</div>
 						
 						<div class="oa_config_block">
-- 
cgit v1.2.3


From 999756bd381ec4d81db7db7bb59863ad549d69b0 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 17 Dec 2013 13:52:47 +0100
Subject: default qaa and attributes persisted and validated

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

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 1b87ffc57..df6a43e7a 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -228,6 +228,16 @@
 						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+							<s:textfield name="storkconfig.defaultAttributes"
+								value="%{storkconfig.defaultAttributes}"
+								labelposition="left"
+								key="webpages.moaconfig.stork.requestedattributes.default"
+								cssClass="textfield_long"/>
+							<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>
-- 
cgit v1.2.3


From 7c39d9e0cff15a87678bf68d6d754ee1e720ca12 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 13:48:06 +0100
Subject: attr table in global config

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index df6a43e7a..aff2028ac 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -228,11 +228,6 @@
 						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
-							<s:textfield name="storkconfig.defaultAttributes"
-								value="%{storkconfig.defaultAttributes}"
-								labelposition="left"
-								key="webpages.moaconfig.stork.requestedattributes.default"
-								cssClass="textfield_long"/>
 							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
 								value="#{storkconfig.defaultQaa}"
 								name="storkconfig.defaultQaa"
@@ -248,6 +243,14 @@
 								</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>
+								<tr><th>Attribute Name</th></tr>
+								<s:iterator value="storkconfig.attributes" var="attr" status="stat">
+									<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}]"/></td>
+										<td><input type="button" value="Delete" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
 						</div>
 						
 						<div class="oa_config_block">
-- 
cgit v1.2.3


From 3da3836bcd77a23ca00df2bdb088e63b47cc6499 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 15:07:32 +0100
Subject: mandatory field in global config

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index aff2028ac..078e5f681 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -245,9 +245,10 @@
 							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4>
 							<table>
-								<tr><th>Attribute Name</th></tr>
-								<s:iterator value="storkconfig.attributes" var="attr" status="stat">
-									<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}]"/></td>
+								<tr><th>Attribute Name</th><th>Mandatory</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="Delete" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
 							</table>
-- 
cgit v1.2.3


From c26721de9136104520fd0ce9e8aba91b480a4bb9 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 15:12:46 +0100
Subject: new attribute button

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

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 078e5f681..0f8ec5f1b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -244,7 +244,7 @@
 							</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>
+							<table id="stork_attributelist">
 								<tr><th>Attribute Name</th><th>Mandatory</th></tr>
 								<s:iterator value="storkconfig.attributes" status="stat">
 									<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td>
@@ -252,6 +252,7 @@
 										<td><input type="button" value="Delete" 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">
-- 
cgit v1.2.3


From 6ef9296d79741b455530f70262003fefd51ee85c Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 15:17:56 +0100
Subject: i18n

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

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 0f8ec5f1b..a86daf699 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -245,11 +245,11 @@
 							<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>Attribute Name</th><th>Mandatory</th></tr>
+								<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="Delete" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+										<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();' />
-- 
cgit v1.2.3