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

---
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 55 ++++++++++++----------
 1 file changed, 31 insertions(+), 24 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 cc4220d0e..feab86593 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -46,12 +46,14 @@
 		
 					<s:include value="snippets/OA/authentication.jsp"></s:include>
 		
-					<s:include value="snippets/OA/bPKDecryption.jsp"></s:include>
+					<s:if test="authOA.isMoaidMode()">
+						<s:include value="snippets/OA/bPKDecryption.jsp"></s:include>
 					
-					<s:include value="snippets/OA/sso.jsp"></s:include>
+						<s:include value="snippets/OA/sso.jsp"></s:include>
 					
-					<s:include value="snippets/OA/stork.jsp"></s:include>
-							
+						<s:include value="snippets/OA/stork.jsp"></s:include>						
+					</s:if>
+						
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3>
 						
@@ -64,35 +66,40 @@
 								</button>
 							</s:if>
 							
-							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %>
-						  </button>
-							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_hidden">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.hidden", request) %>
-						  </button>
-						  
-						  <button type="button" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_show">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.show", request) %>
-						  </button>
-							<button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
-						  </button>
-							
+							<s:if test="authOA.isMoaidMode()">
+								<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %>
+							  	</button>
+								<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.hidden", request) %>
+							  	</button>
+							  
+							  	<button type="button" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.show", request) %>
+							  	</button>
+								<button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
+							  	</button>
+							</s:if>
 
 							<s:include value="snippets/OA/saml1.jsp"></s:include>
 
-							<s:include value="snippets/OA/pvp2.jsp">
-								<s:param name="hideBlock">hidden</s:param>
-							</s:include>							
+							<s:if test="authOA.isMoaidMode()">
+								<s:include value="snippets/OA/pvp2.jsp">
+									<s:param name="hideBlock">hidden</s:param>
+								</s:include>							
 						
-							<s:include value="snippets/OA/openIDConnect.jsp"></s:include>				
+								<s:include value="snippets/OA/openIDConnect.jsp"></s:include>
+							</s:if>				
 								  						
 							
 					</div>
 
-					<s:include value="snippets/OA/formCustomization.jsp"></s:include>
+					<s:if test="authOA.isMoaidMode()">
+						<s:include value="snippets/OA/formCustomization.jsp"></s:include>
 
-					<s:include value="snippets/OA/revisionslog.jsp"></s:include>
+						<s:include value="snippets/OA/revisionslog.jsp"></s:include>
+					</s:if>
 										
 					<s:hidden name="formID" 
 							value="%{formID}"></s:hidden>
-- 
cgit v1.2.3