From 942a56df5948a398290323fa7f9308492ac1d998 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 5 May 2014 16:38:08 +0200
Subject: refectore online-application configuration jsp files

---
 .../webapp/jsp/snippets/OA/generalInformation.jsp  | 154 +++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp')
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
new file mode 100644
index 000000000..0c60ce45a
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
@@ -0,0 +1,154 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+
+					<div class="oa_config_block">
+					
+						<s:if test="authUser.isAdmin()">
+							<s:checkbox name="generalOA.Active" 
+								value="%{generalOA.Active}"
+								labelposition="left"
+								key="webpages.oaconfig.general.isActive"
+								cssClass="checkbox">
+							</s:checkbox>
+						</s:if>
+					
+						<s:textfield name="generalOA.identifier" 
+							value="%{generalOA.identifier}" 
+							labelposition="left"
+							key="webpages.oaconfig.general.identification"
+							cssClass="textfield_long">
+						</s:textfield>
+									
+ 						<s:textfield name="generalOA.friendlyName" 
+							value="%{generalOA.friendlyName}" 
+							labelposition="left"
+							key="webpages.oaconfig.general.friendlyname"
+							cssClass="textfield_long">
+						</s:textfield>
+
+                        <s:checkbox name="generalOA.businessService"
+                                    value="%{generalOA.businessService}"
+                                    labelposition="left"
+                                    key="webpages.oaconfig.general.isbusinessservice"
+                                    cssClass="checkbox"
+                                    onclick="oaBusinessService();"
+                                    id="OAisbusinessservice"
+                                    >
+                        </s:checkbox>
+
+
+					</div>
+					
+ 					<div id="oa_config_businessservice" class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
+						
+						<s:select list="generalOA.identificationTypeList"
+											key="webpages.oaconfig.general.business.value"
+											labelposition="left"
+											cssClass="selectfield"
+											value="%{generalOA.identificationType}"
+											name="generalOA.identificationType"
+											disabled="%{isDeaktivededBusinessService()}">
+						</s:select>
+						
+						<s:textfield name="generalOA.identificationNumber" 
+							value="%{generalOA.identificationNumber}" 
+							cssClass="textfield_middle"
+							disabled="%{isDeaktivededBusinessService()}">
+						</s:textfield>		
+					</div>
+					
+					<s:if test="!isOnlyBusinessService()">
+						<div id="oa_config_publicservice" class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
+							
+							<s:if test="authUser.isAdmin()">
+								<s:select list="generalOA.targetList"
+													key="webpages.oaconfig.general.target"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{generalOA.target}"
+													name="generalOA.target"
+													onchange="HideAdminTarget();">
+								</s:select>						
+							</s:if>
+							<s:else>
+								<s:select list="generalOA.targetList"
+													key="webpages.oaconfig.general.target"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{generalOA.target}"
+													name="generalOA.target">
+								</s:select>
+							</s:else>
+							
+							<s:checkbox name="subTargetSet" 
+								value="%{subTargetSet}"
+								labelposition="left"
+								key="webpages.oaconfig.general.target.subsector.checkbox"
+								cssClass="checkbox"
+								onclick="oaTargetSubSector();"
+								id="OAisTargetSubSector">
+							</s:checkbox>
+							
+							<s:textfield name="generalOA.target_subsector" 
+								value="%{generalOA.target_subsector}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.target.subsector"
+								cssClass="selectfield"
+								id="OAtarget_subsector">
+							</s:textfield>
+							
+							
+	 						<s:if test="authUser.isAdmin()">
+	 							<s:checkbox
+		 							name="generalOA.AdminTarget" 
+									value="%{generalOA.AdminTarget}"
+									cssClass="checkbox"
+	 								onclick="AdminTarget();"
+	 								labelposition="left"
+									key="webpages.oaconfig.general.target.admin.checkbox"
+									id="adminTarget">
+	 							</s:checkbox>
+	 							
+	 							<div id="admin_target_area">
+									<s:textfield name="generalOA.target_admin" 
+										value="%{generalOA.target_admin}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.admin"
+										cssClass="textfield_short">
+									</s:textfield>
+									<s:textfield name="generalOA.targetFriendlyName" 
+										value="%{generalOA.targetFriendlyName}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.friendlyname"
+										cssClass="textfield_long">
+									</s:textfield>
+								</div>
+	 						</s:if>
+	 						<s:else>
+	 							<s:if test="generalOA.target_admin neq null">
+	 								<s:textfield name="generalOA.target_admin" 
+										value="%{generalOA.target_admin}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.admin.disabled"
+										cssClass="textfield_short"
+										disabled="true">
+									</s:textfield>
+								</s:if>
+	<%-- 							<s:if test="generalOA.targetFriendlyName neq null">
+									<s:textfield name="generalOA.targetFriendlyName" 
+										value="%{generalOA.targetFriendlyName}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.friendlyname.disabled"
+										cssClass="textfield_long">
+									</s:textfield>
+								</s:if> --%>
+	 						</s:else>
+						</div>
+					</s:if>
+
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 66fdd9718584335322e3b1aea3e34c1dee330502 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 6 May 2014 12:32:05 +0200
Subject: split OA target configuration from general OA configuration

---
 .../webapp/jsp/snippets/OA/generalInformation.jsp  | 129 ++-------------------
 1 file changed, 9 insertions(+), 120 deletions(-)

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

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
index 0c60ce45a..ade5bb185 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
@@ -29,126 +29,15 @@
 							cssClass="textfield_long">
 						</s:textfield>
 
-                        <s:checkbox name="generalOA.businessService"
-                                    value="%{generalOA.businessService}"
-                                    labelposition="left"
-                                    key="webpages.oaconfig.general.isbusinessservice"
-                                    cssClass="checkbox"
-                                    onclick="oaBusinessService();"
-                                    id="OAisbusinessservice"
-                                    >
-                        </s:checkbox>
+          	<s:checkbox 	name="generalOA.businessService"
+                          value="%{generalOA.businessService}"
+                          labelposition="left"
+                          key="webpages.oaconfig.general.isbusinessservice"
+                          cssClass="checkbox"
+                          onclick="oaBusinessService();"
+                          id="OAisbusinessservice"
+                          >
+            </s:checkbox>
 
-
-					</div>
-					
- 					<div id="oa_config_businessservice" class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
-						
-						<s:select list="generalOA.identificationTypeList"
-											key="webpages.oaconfig.general.business.value"
-											labelposition="left"
-											cssClass="selectfield"
-											value="%{generalOA.identificationType}"
-											name="generalOA.identificationType"
-											disabled="%{isDeaktivededBusinessService()}">
-						</s:select>
-						
-						<s:textfield name="generalOA.identificationNumber" 
-							value="%{generalOA.identificationNumber}" 
-							cssClass="textfield_middle"
-							disabled="%{isDeaktivededBusinessService()}">
-						</s:textfield>		
 					</div>
-					
-					<s:if test="!isOnlyBusinessService()">
-						<div id="oa_config_publicservice" class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
-							
-							<s:if test="authUser.isAdmin()">
-								<s:select list="generalOA.targetList"
-													key="webpages.oaconfig.general.target"
-													labelposition="left"
-													cssClass="selectfield"
-													value="%{generalOA.target}"
-													name="generalOA.target"
-													onchange="HideAdminTarget();">
-								</s:select>						
-							</s:if>
-							<s:else>
-								<s:select list="generalOA.targetList"
-													key="webpages.oaconfig.general.target"
-													labelposition="left"
-													cssClass="selectfield"
-													value="%{generalOA.target}"
-													name="generalOA.target">
-								</s:select>
-							</s:else>
-							
-							<s:checkbox name="subTargetSet" 
-								value="%{subTargetSet}"
-								labelposition="left"
-								key="webpages.oaconfig.general.target.subsector.checkbox"
-								cssClass="checkbox"
-								onclick="oaTargetSubSector();"
-								id="OAisTargetSubSector">
-							</s:checkbox>
-							
-							<s:textfield name="generalOA.target_subsector" 
-								value="%{generalOA.target_subsector}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.target.subsector"
-								cssClass="selectfield"
-								id="OAtarget_subsector">
-							</s:textfield>
-							
-							
-	 						<s:if test="authUser.isAdmin()">
-	 							<s:checkbox
-		 							name="generalOA.AdminTarget" 
-									value="%{generalOA.AdminTarget}"
-									cssClass="checkbox"
-	 								onclick="AdminTarget();"
-	 								labelposition="left"
-									key="webpages.oaconfig.general.target.admin.checkbox"
-									id="adminTarget">
-	 							</s:checkbox>
-	 							
-	 							<div id="admin_target_area">
-									<s:textfield name="generalOA.target_admin" 
-										value="%{generalOA.target_admin}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.admin"
-										cssClass="textfield_short">
-									</s:textfield>
-									<s:textfield name="generalOA.targetFriendlyName" 
-										value="%{generalOA.targetFriendlyName}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.friendlyname"
-										cssClass="textfield_long">
-									</s:textfield>
-								</div>
-	 						</s:if>
-	 						<s:else>
-	 							<s:if test="generalOA.target_admin neq null">
-	 								<s:textfield name="generalOA.target_admin" 
-										value="%{generalOA.target_admin}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.admin.disabled"
-										cssClass="textfield_short"
-										disabled="true">
-									</s:textfield>
-								</s:if>
-	<%-- 							<s:if test="generalOA.targetFriendlyName neq null">
-									<s:textfield name="generalOA.targetFriendlyName" 
-										value="%{generalOA.targetFriendlyName}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.friendlyname.disabled"
-										cssClass="textfield_long">
-									</s:textfield>
-								</s:if> --%>
-	 						</s:else>
-						</div>
-					</s:if>
-
 </html>
\ No newline at end of file
-- 
cgit v1.2.3

