From d34f9161257e803e13618749a7b78df333b0f937 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 9 Jan 2020 10:23:46 +0100
Subject: reactivate foreign-bPKs and additional bPKs in MOA-ID mode

---
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index dc093fc36..ef62ef0e6 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -113,7 +113,7 @@
 					</s:if>
 					
 										
-					<div id="oa_config_foreignbPKArea" class="oa_config_block">
+					<div id="oa_config_EID_proxy_mode" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
 						
 						<s:checkbox name="targetConfig.eidDemoActive" 
@@ -121,10 +121,12 @@
 								labelposition="left"
 								key="webpages.oaconfig.general.neweid.activate"
 								cssClass="checkbox">
-						</s:checkbox>
-						
-						<s:if test="authOA.isMoaidMode()">
-							<!-- 
+						</s:checkbox>						
+					</div>	
+					
+					<div id="oa_config_foreignbPKArea" class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
+						<s:if test="authOA.isMoaidMode()"> 
 							<s:textarea name="targetConfig.foreignbPKTargets" 
 										value="%{targetConfig.foreignbPKTargets}" 
 										labelposition="left"
@@ -144,7 +146,6 @@
 										requiredLabel="true"
 										style="height:120px;">								
 							</s:textarea>
-							 -->
 						</s:if>
 					
 					</div>
-- 
cgit v1.2.3


From 117054bfda66d9537cd8dcaf4851e950cde75765 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 15 Jan 2020 14:20:30 +0100
Subject: fix wrong header in configuration tool

---
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index ef62ef0e6..6bccd7d48 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -125,7 +125,7 @@
 					</div>	
 					
 					<div id="oa_config_foreignbPKArea" class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.foreign.header", request) %></h3>
 						<s:if test="authOA.isMoaidMode()"> 
 							<s:textarea name="targetConfig.foreignbPKTargets" 
 										value="%{targetConfig.foreignbPKTargets}" 
-- 
cgit v1.2.3


From 830e1912e44e666c6853c9fedefcb032637bd0d9 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 19 Feb 2020 13:46:10 +0100
Subject: separate between E-ID Proxy-Mode and Demo-Mode

---
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index 6bccd7d48..1f7adea01 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -116,12 +116,19 @@
 					<div id="oa_config_EID_proxy_mode" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
 						
+						<s:checkbox name="targetConfig.eidProxyActive" 
+								value="%{targetConfig.eidProxyActive}"
+								labelposition="left"
+								key="webpages.oaconfig.general.neweid.proxy.activate"
+								cssClass="checkbox">
+						</s:checkbox>		
+						
 						<s:checkbox name="targetConfig.eidDemoActive" 
 								value="%{targetConfig.eidDemoActive}"
 								labelposition="left"
-								key="webpages.oaconfig.general.neweid.activate"
+								key="webpages.oaconfig.general.neweid.demo.activate"
 								cssClass="checkbox">
-						</s:checkbox>						
+						</s:checkbox>					
 					</div>	
 					
 					<div id="oa_config_foreignbPKArea" class="oa_config_block">
-- 
cgit v1.2.3