diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-24 13:57:41 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-24 13:57:41 +0100 |
| commit | 764cbf7de6caa0064719645afdfde2807c272203 (patch) | |
| tree | 555814a276b917fa6e2af00a5fa52733520fc346 /id/ConfigWebTool/src/main/webapp | |
| parent | b7c4c3bbe1e0ad4f4a4789e087f78222ebda58a9 (diff) | |
| parent | f1d374bb66f3b48f2a14a8d550c4125c04dde7a8 (diff) | |
| download | moa-id-spss-764cbf7de6caa0064719645afdfde2807c272203.tar.gz moa-id-spss-764cbf7de6caa0064719645afdfde2807c272203.tar.bz2 moa-id-spss-764cbf7de6caa0064719645afdfde2807c272203.zip | |
Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 16 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 5 |
2 files changed, 15 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index 604080d21..bdafdd40a 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp @@ -33,6 +33,14 @@ <s:if test="authUser.isAdmin()"> <s:form namespace="/secure" method="POST" enctype="multipart/form-data"> + + <s:textfield name="moaconfig.publicURLPrefix" + value="%{moaconfig.publicURLPrefix}" + labelposition="left" + key="webpages.oaconfig.general.publicURLPreFix" + cssClass="textfield_long"> + </s:textfield> + <div class="oa_config_block"> <h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3> @@ -200,12 +208,12 @@ <div class="oa_config_block" > <h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sso.header", request) %></h3> - <s:textfield name="moaconfig.ssoPublicUrl" +<%-- <s:textfield name="moaconfig.ssoPublicUrl" value="%{moaconfig.ssoPublicUrl}" labelposition="left" key="webpages.moaconfig.sso.PublicUrl" cssClass="textfield_long"> - </s:textfield> + </s:textfield> --%> <s:textfield name="moaconfig.ssoFriendlyName" value="%{moaconfig.ssoFriendlyName}" labelposition="left" @@ -321,12 +329,12 @@ <div class="moageneral_protocol_area"> <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4> - <s:textfield name="moaconfig.pvp2PublicUrlPrefix " +<%-- <s:textfield name="moaconfig.pvp2PublicUrlPrefix " value="%{moaconfig.pvp2PublicUrlPrefix}" labelposition="left" key="webpages.moaconfig.protocols.pvp2.PublicUrlPrefix" cssClass="textfield_long"> - </s:textfield> + </s:textfield> --%> <s:textfield name="moaconfig.pvp2IssuerName" value="%{moaconfig.pvp2IssuerName}" labelposition="left" diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index fadf528d1..e182fd805 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -336,12 +336,13 @@ </s:checkbox> </s:if> - <s:textfield name="ssoOA.singleLogOutURL" +<%--TODO: insert if SLO is implemented!!!--%> +<%-- <s:textfield name="ssoOA.singleLogOutURL" value="%{ssoOA.singleLogOutURL}" labelposition="left" key="webpages.oaconfig.sso.singlelogouturl" cssClass="textfield_long"> - </s:textfield> + </s:textfield> --%> </div> </div> |