diff options
author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-02-25 08:56:03 +0100 |
---|---|---|
committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-02-25 08:56:03 +0100 |
commit | f2a3b2a78eab55af0f4ad09a160d3fffcd98a187 (patch) | |
tree | 19e7b1ba0b9f47b20205741508c26f84da46e54a /id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | |
parent | e220daf9bc0eac36c3e20406865f99f4760a30d3 (diff) | |
parent | f1d374bb66f3b48f2a14a8d550c4125c04dde7a8 (diff) | |
download | moa-id-spss-f2a3b2a78eab55af0f4ad09a160d3fffcd98a187.tar.gz moa-id-spss-f2a3b2a78eab55af0f4ad09a160d3fffcd98a187.tar.bz2 moa-id-spss-f2a3b2a78eab55af0f4ad09a160d3fffcd98a187.zip |
merge tlenz into ap
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp')
-rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp index 41702cbbb..de5e4841b 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" @@ -301,14 +309,27 @@ <br> <div class="moageneral_protocol_area"> + <h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.saml1.header", request) %></h4> + + <s:textfield name="moaconfig.saml1SourceID " + value="%{moaconfig.saml1SourceID}" + labelposition="left" + key="webpages.moaconfig.protocols.saml1.sourceID" + cssClass="textfield_long"> + </s:textfield> + </div> + + <br> + + <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" @@ -386,6 +407,7 @@ <s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file> </div> </s:iterator> + <s:if test="moaconfig.fileUploadFileName.size() == 0"> <div id="pvp2_certificate_upload"> <s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file> |