From 66859cd53d4181350525e91c4d35071932675ca7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 29 May 2019 14:04:44 +0200
Subject: refactoring from MOA-ID 3.4.x to MOA E-ID Proxy 4.0.x

---
 .../main/webapp/jsp/snippets/OA/authentication.jsp | 24 +++++++++----
 .../webapp/jsp/snippets/OA/targetConfiguration.jsp | 40 ++++++++++++----------
 .../src/main/webapp/jsp/snippets/main_menu.jsp     | 12 ++++---
 3 files changed, 46 insertions(+), 30 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets')
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index d2668e264..7a54df554 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -3,8 +3,8 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
-
-					<s:if test="authUser.isAdmin()">
+				<s:if test="authOA.isMoaidMode()">
+					<s:if test="authUser.isAdmin()">					
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
 						
@@ -167,16 +167,26 @@
 					</div>						
 				
 					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.szrgw.header", request) %></h3>
-						
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.szrgw.header", request) %></h3>						
 						<s:select list="authOA.szrgwServicesList"
 											key="webpages.oaconfig.general.szrgw.selected"
 											labelposition="left"
 											cssClass="selectfield_long"
 											value="%{authOA.szrgwServiceSelected}"
 											name="authOA.szrgwServiceSelected">
-						</s:select>
-						
-					</div>	
+						</s:select>						
+					</div>
+				</s:if>
+					
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.eid.header", request) %></h3>						
+						<s:select list="authOA.eidServicesList"
+											key="webpages.oaconfig.general.eid.selected"
+											labelposition="left"
+											cssClass="selectfield_long"
+											value="%{authOA.eidServiceSelected}"
+											name="authOA.eidServiceSelected">
+						</s:select>						
+					</div>		
 				
 </html>
\ No newline at end of file
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 367dc445d..2436b1051 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -123,25 +123,27 @@
 								cssClass="checkbox">
 						</s:checkbox>
 						
-						<s:textarea name="targetConfig.foreignbPKTargets" 
-									value="%{targetConfig.foreignbPKTargets}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.foreign.sectors"
-									cssClass="textfield_long"
-									rows="6"								
-									requiredLabel="true"
-									style="height:120px;">								
-						</s:textarea>
-						
-						<s:textarea name="targetConfig.additionalbPKTargets" 
-									value="%{targetConfig.additionalbPKTargets}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.additionalbpks.sectors"
-									cssClass="textfield_long"
-									rows="6"								
-									requiredLabel="true"
-									style="height:120px;">								
-						</s:textarea>
+						<s:if test="authOA.isMoaidMode()">
+							<s:textarea name="targetConfig.foreignbPKTargets" 
+										value="%{targetConfig.foreignbPKTargets}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.foreign.sectors"
+										cssClass="textfield_long"
+										rows="6"								
+										requiredLabel="true"
+										style="height:120px;">								
+							</s:textarea>
+							
+							<s:textarea name="targetConfig.additionalbPKTargets" 
+										value="%{targetConfig.additionalbPKTargets}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.additionalbpks.sectors"
+										cssClass="textfield_long"
+										rows="6"								
+										requiredLabel="true"
+										style="height:120px;">								
+							</s:textarea>
+						</s:if>
 					
 					</div>
 					
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
index 95d6de912..f4c377d9c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -18,10 +18,14 @@
 			</div>
 			
 			<s:if test="authUser.isAdmin()">
-				<div class="menu_element">
-						<s:url action="listallinterfederationidps" var="interfederationConfig" namespace="/secure"/>
-						<a href="<s:property value="#interfederationConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.interfederation", request) %></a>
-				</div>			
+				
+				<s:if test="authOA.isMoaidMode()">
+					<div class="menu_element">
+							<s:url action="listallinterfederationidps" var="interfederationConfig" namespace="/secure"/>
+							<a href="<s:property value="#interfederationConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.interfederation", request) %></a>
+					</div>
+				</s:if>			
+				
 				<div class="menu_element">
 						<s:url action="loadGeneralConfig" var="generalConfig" namespace="/secure"/>
 						<a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a>
-- 
cgit v1.2.3

