From 4ccab7e5eb0843a490ab8292514e1d654f801ba6 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 10 Dec 2013 16:17:40 +0100
Subject: stork OA config frontend

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 12 ++++++++++++
 1 file changed, 12 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 97f0d01c2..aef6aff24 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -302,6 +302,18 @@
 						</div>
 					</div>
 
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+
+						<s:checkbox name="storkOA.useStorkLogon" 
+							value="%{storkOA.useStorkLogon}"
+							labelposition="left"
+							key="webpages.oaconfig.stork.usestork"
+							cssClass="checkbox"
+							id="OAuseSTORKLogon">
+						</s:checkbox>
+					</div>
+
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3>
 						
-- 
cgit v1.2.3


From f10baaa115823b8e0d2e6a736559467335a096df Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 10 Dec 2013 18:59:10 +0100
Subject: stork OA config persisted

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 4 ++--
 1 file changed, 2 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 aef6aff24..3234c6a86 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -305,8 +305,8 @@
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
 
-						<s:checkbox name="storkOA.useStorkLogon" 
-							value="%{storkOA.useStorkLogon}"
+						<s:checkbox name="storkOA.storkLogonEnabled" 
+							value="%{storkOA.storkLogonEnabled}"
 							labelposition="left"
 							key="webpages.oaconfig.stork.usestork"
 							cssClass="checkbox"
-- 
cgit v1.2.3


From 1bb655bbb372f069e907c6ddcc40a43ca1f36e09 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 19 Dec 2013 11:01:44 +0100
Subject: OA qaa and attributes gui

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 16 ++++++++++++++--
 1 file changed, 14 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 3234c6a86..d12a47b9e 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -310,8 +310,20 @@
 							labelposition="left"
 							key="webpages.oaconfig.stork.usestork"
 							cssClass="checkbox"
-							id="OAuseSTORKLogon">
-						</s:checkbox>
+							onclick="oaStork();"
+							id="OAuseSTORKLogon" />
+						<div id="stork_block">
+							<s:textfield name="storkOA.attributes"
+								value="%{storkOA.attributes}"
+								labelposition="left"
+								key="webpages.moaconfig.stork.requestedattributes"
+								cssClass="textfield_long"/>
+							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
+								value="#{storkOA.qaa}"
+								name="storkOA.qaa"
+								key="webpages.moaconfig.stork.qaa"
+								labelposition="left" />
+						</div>
 					</div>
 
 					<div class="oa_config_block">
-- 
cgit v1.2.3


From fb6e40832df5182ae1ebd7555583caed174e8776 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 17:25:38 +0100
Subject: oa attr configuration revisited

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 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 d12a47b9e..57728845c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -313,16 +313,21 @@
 							onclick="oaStork();"
 							id="OAuseSTORKLogon" />
 						<div id="stork_block">
-							<s:textfield name="storkOA.attributes"
-								value="%{storkOA.attributes}"
-								labelposition="left"
-								key="webpages.moaconfig.stork.requestedattributes"
-								cssClass="textfield_long"/>
 							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
 								value="#{storkOA.qaa}"
 								name="storkOA.qaa"
 								key="webpages.moaconfig.stork.qaa"
 								labelposition="left" />
+							<h4>Attributes</h4>
+							<table>
+								<tr><th>verwendet</th><th>Attributname</th><th>mandatory</th></tr>
+								<s:iterator value="storkOA.helperAttributes" status="stat">
+									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
+										<td><s:property value="%{name}" /></td>
+										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
+										<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>
 						</div>
 					</div>
 
-- 
cgit v1.2.3


From 21c26bc3ead6ca414179268056bfc11006c5efe3 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 17:34:03 +0100
Subject: global mandatory attr cannot be deselected for OA

---
 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 57728845c..413298724 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -322,7 +322,7 @@
 							<table>
 								<tr><th>verwendet</th><th>Attributname</th><th>mandatory</th></tr>
 								<s:iterator value="storkOA.helperAttributes" status="stat">
-									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
+									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
 										<td><s:property value="%{name}" /></td>
 										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
 										<td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
-- 
cgit v1.2.3


From 7fb3ae0e4922ec76e998937b771df244574be394 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 14 Jan 2014 13:45:24 +0100
Subject: refactored stork-related database structure

---
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 7 +++----
 1 file changed, 3 insertions(+), 4 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 413298724..b58b997ec 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -322,10 +322,9 @@
 							<table>
 								<tr><th>verwendet</th><th>Attributname</th><th>mandatory</th></tr>
 								<s:iterator value="storkOA.helperAttributes" status="stat">
-									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
-										<td><s:property value="%{name}" /></td>
-										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
-										<td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+									<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>
+										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td></tr>
 								</s:iterator>
 							</table>
 						</div>
-- 
cgit v1.2.3