diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/js/common.js | 12 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 51 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp | 7 |
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}" |