From a58a60836fadf9e0f482b9d781292a8b93c54b52 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 27 Mar 2014 15:57:09 +0100
Subject: move textbox VIDP country code

---
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index ebdacc7a7..94f4a9d21 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -102,19 +102,6 @@
 							disabled="%{isDeaktivededBusinessService()}">
 						</s:textfield>		
 					</div>
-
-					<s:if test="authUser.isAdmin()">
-                    <div id="oa_config_storkservice" class="oa_config_block">
-                        <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.stork.header", request) %></h3>
-                        <s:textfield name="generalOA.storkSPTargetCountry"
-                                     labelposition="left"
-                                     key="webpages.oaconfig.general.stork.countrycode"
-                                     value="%{generalOA.storkSPTargetCountry}"
-                                     cssClass="textfield_middle"
-                                     disabled="%{isDeactivatedStorkService()}">
-                        </s:textfield>
-                    </div>
-          </s:if>
 					
 					<s:if test="!isOnlyBusinessService()">
 						<div id="oa_config_publicservice" class="oa_config_block">
@@ -544,6 +531,18 @@
 								key="webpages.oaconfig.vidp.enabled"
 								cssClass="checkbox"
 								id="OAuseVidp" /></p>
+								
+              <div id="oa_config_storkservice" class="oa_config_block">
+<%--                         <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.stork.header", request) %></h3> --%>
+                        <s:textfield name="generalOA.storkSPTargetCountry"
+                                     labelposition="left"
+                                     key="webpages.oaconfig.general.stork.countrycode"
+                                     value="%{generalOA.storkSPTargetCountry}"
+                                     cssClass="textfield_middle"
+                                     disabled="%{isDeactivatedStorkService()}">
+                        </s:textfield>
+                    </div>
+								
 							<p><s:checkbox name="storkOA.requireConsent" 
 								value="%{storkOA.requireConsent}"
 								labelposition="left"
-- 
cgit v1.2.3