aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-09-04 07:18:39 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-09-04 07:18:39 +0200
commit8854b5c2c1e342b891271a04face4f4479653d46 (patch)
tree5dd6054fad6827dc50eeaf95dd629467458d2a12 /id/ConfigWebTool/src/main/webapp
parent7c6ecaa8adb365a6c670cb86bb68be94136dc6a0 (diff)
downloadmoa-id-spss-8854b5c2c1e342b891271a04face4f4479653d46.tar.gz
moa-id-spss-8854b5c2c1e342b891271a04face4f4479653d46.tar.bz2
moa-id-spss-8854b5c2c1e342b891271a04face4f4479653d46.zip
Configuration Tool Update and Bugfix
-- Username/Password login update -- EditUser, insert second password textfield -- OAConfig: insert OA specific SecurityLayer Templates -- OAConfig: SecurityLayer Version only for admin
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/js/common.js12
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp51
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp7
3 files changed, 56 insertions, 14 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 5271a4006..249cb37fa 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -52,8 +52,20 @@ function userOA(userid){
$('#selectUserForm_OAID').val(userid);
$('#selectUserForm').submit();
}
+function oaLegacyService() {
+ if ($('#OAislegacy').attr('checked') == 'checked') {
+
+ $('#oa_config_sltemplates').css('display', "block");
+
+ } else {
+
+ $('#oa_config_sltemplates').css('display', "none");
+
+ }
+}
function oaOnLoad() {
oaBusinessService();
oaSSOService();
+ oaLegacyService();
return true;
} \ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 4d9642130..60f253222 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -121,20 +121,14 @@
cssClass="textfield_long">
</s:textfield>
- <s:textfield name="generalOA.slVersion"
- value="%{generalOA.slVersion}"
- labelposition="left"
- key="webpages.oaconfig.general.bku.slversion"
- cssClass="textfield_long">
- </s:textfield>
-
-<%-- <s:textfield name="generalOA.keyBoxIdentifier"
- value="%{generalOA.keyBoxIdentifier}"
- labelposition="left"
- key="webpages.oaconfig.general.bku.keyboxidentifier"
- cssClass="textfield_long">
- </s:textfield> --%>
-
+ <s:if test="authUser.isAdmin()">
+ <s:textfield name="generalOA.slVersion"
+ value="%{generalOA.slVersion}"
+ labelposition="left"
+ key="webpages.oaconfig.general.bku.slversion"
+ cssClass="textfield_long">
+ </s:textfield>
+ </s:if>
<s:radio list="generalOA.keyBoxIdentifierList"
name="generalOA.keyBoxIdentifier"
value="%{generalOA.keyBoxIdentifier}"
@@ -142,6 +136,35 @@
key="webpages.oaconfig.general.bku.keyboxidentifier"
cssClass="radio">
</s:radio>
+ <s:checkbox name="generalOA.legacy"
+ value="%{generalOA.legacy}"
+ labelposition="left"
+ key="webpages.oaconfig.general.bku.legacy"
+ cssClass="checkbox"
+ onclick="oaLegacyService();"
+ id="OAislegacy">
+ </s:checkbox>
+ <div id="oa_config_sltemplates">
+ <s:textfield name="generalOA.SLTemplateURL1"
+ value="%{generalOA.SLTemplateURL1}"
+ labelposition="left"
+ key="webpages.oaconfig.general.bku.sltemplate.first"
+ cssClass="textfield_long">
+ </s:textfield>
+ <s:textfield name="generalOA.SLTemplateURL2"
+ value="%{generalOA.SLTemplateURL2}"
+ labelposition="left"
+ key="webpages.oaconfig.general.bku.sltemplate.second"
+ cssClass="textfield_long">
+ </s:textfield>
+ <s:textfield name="generalOA.SLTemplateURL3"
+ value="%{generalOA.SLTemplateURL3}"
+ labelposition="left"
+ key="webpages.oaconfig.general.bku.sltemplate.third"
+ cssClass="textfield_long">
+ </s:textfield>
+ </div>
+
</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
index a332fb425..067bcd57d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
@@ -93,6 +93,13 @@
cssClass="textfield_long"
maxlength="16">
</s:password>
+
+ <s:password name="user.password_second"
+ labelposition="left"
+ key="webpages.edituser.password_second"
+ cssClass="textfield_long"
+ maxlength="16">
+ </s:password>
<s:textfield name="user.bpk"
value="%{user.bpk}"