aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-06 12:32:05 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-06 12:32:05 +0200
commit66fdd9718584335322e3b1aea3e34c1dee330502 (patch)
tree6f7701ff770e85c8d2b81eab60fc1d66d8a335ff /id/ConfigWebTool/src/main/webapp
parent761e3c17f3679ed4bbc3402c8552d7e2a1e77d1b (diff)
downloadmoa-id-spss-66fdd9718584335322e3b1aea3e34c1dee330502.tar.gz
moa-id-spss-66fdd9718584335322e3b1aea3e34c1dee330502.tar.bz2
moa-id-spss-66fdd9718584335322e3b1aea3e34c1dee330502.zip
split OA target configuration from general OA configuration
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp6
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp129
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp115
3 files changed, 129 insertions, 121 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 21f8e12f5..e797d05fe 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -36,6 +36,8 @@
<s:include value="snippets/OA/generalInformation.jsp"></s:include>
+ <s:include value="snippets/OA/targetConfiguration.jsp"></s:include>
+
<s:include value="snippets/OA/authentication.jsp"></s:include>
<s:include value="snippets/OA/sso.jsp"></s:include>
@@ -78,7 +80,9 @@
<s:include value="snippets/OA/saml1.jsp"></s:include>
- <s:include value="snippets/OA/pvp2.jsp"></s:include>
+ <s:include value="snippets/OA/pvp2.jsp">
+ <s:param name="headBlock">hidden</s:param>
+ </s:include>
<s:include value="snippets/OA/openIDConnect.jsp"></s:include>
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
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
new file mode 100644
index 000000000..261966a86
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -0,0 +1,115 @@
+<%@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 id="oa_config_businessservice" class="oa_config_block">
+ <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
+
+ <s:select list="targetConfig.identificationTypeList"
+ key="webpages.oaconfig.general.business.value"
+ labelposition="left"
+ cssClass="selectfield"
+ value="%{targetConfig.identificationType}"
+ name="targetConfig.identificationType"
+ disabled="%{isDeaktivededBusinessService()}">
+ </s:select>
+
+ <s:textfield name="targetConfig.identificationNumber"
+ value="%{targetConfig.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="targetConfig.targetList"
+ key="webpages.oaconfig.general.target"
+ labelposition="left"
+ cssClass="selectfield"
+ value="%{targetConfig.target}"
+ name="targetConfig.target"
+ onchange="HideAdminTarget();">
+ </s:select>
+ </s:if>
+ <s:else>
+ <s:select list="targetConfig.targetList"
+ key="webpages.oaconfig.general.target"
+ labelposition="left"
+ cssClass="selectfield"
+ value="%{targetConfig.target}"
+ name="targetConfig.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="targetConfig.target_subsector"
+ value="%{targetConfig.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="targetConfig.AdminTarget"
+ value="%{targetConfig.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="targetConfig.target_admin"
+ value="%{targetConfig.target_admin}"
+ labelposition="left"
+ key="webpages.oaconfig.general.target.admin"
+ cssClass="textfield_short">
+ </s:textfield>
+ <s:textfield name="targetConfig.targetFriendlyName"
+ value="%{targetConfig.targetFriendlyName}"
+ labelposition="left"
+ key="webpages.oaconfig.general.target.friendlyname"
+ cssClass="textfield_long">
+ </s:textfield>
+ </div>
+ </s:if>
+ <s:else>
+ <s:if test="targetConfig.target_admin neq null">
+ <s:textfield name="targetConfig.target_admin"
+ value="%{targetConfig.target_admin}"
+ labelposition="left"
+ key="webpages.oaconfig.general.target.admin.disabled"
+ cssClass="textfield_short"
+ disabled="true">
+ </s:textfield>
+ </s:if>
+ <%-- <s:if test="targetConfig.targetFriendlyName neq null">
+ <s:textfield name="targetConfig.targetFriendlyName"
+ value="%{targetConfig.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