aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp/jsp
diff options
context:
space:
mode:
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp')
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp30
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp79
2 files changed, 98 insertions, 11 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>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index e783d753d..7887d9d62 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -240,6 +240,49 @@
cssClass="textfield_long">
</s:textfield>
</div>
+
+ <div class="oa_protocol_area">
+ <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
+ <s:iterator value="%{generalOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
+ <div class="floatClass">
+ <s:label key="webpages.oaconfig.general.bku.bkuselection.filename" value="%{fileNameBKU}"/>
+ <s:checkbox key="webpages.oaconfig.general.bku.delete"
+ labelposition="left"
+ cssClass="checkbox"
+ name="generalOA.deleteBKUTemplate"></s:checkbox>
+ </div>
+ <div id="pvp2_certificate_upload">
+ <s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+ </div>
+ </s:iterator>
+ <s:if test="generalOA.bkuSelectionFileUploadFileName.size() == 0">
+ <div id="pvp2_certificate_upload">
+ <s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+ </div>
+ </s:if>
+ </div>
+ <div class="oa_protocol_area">
+ <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.sendassertion.header", request) %></h4>
+ <s:iterator value="%{generalOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
+ <div class="floatClass">
+ <s:label key="webpages.oaconfig.general.bku.sendassertion.filename"
+ value="%{fileNameBKU}"/>
+ <s:checkbox key="webpages.oaconfig.general.bku.delete"
+ labelposition="left"
+ cssClass="checkbox"
+ name="generalOA.deleteSendAssertionTemplate"></s:checkbox>
+ </div>
+ <div id="pvp2_certificate_upload">
+ <s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+ </div>
+ </s:iterator>
+ <s:if test="generalOA.sendAssertionFileUploadFileName.size() == 0">
+ <div id="pvp2_certificate_upload">
+ <s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+ </div>
+ </s:if>
+ </div>
+
</div>
</s:if>
@@ -271,7 +314,7 @@
</div>
<div class="oa_config_block">
- <p><strong><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></strong></p>
+ <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></h3>
<s:checkbox name="ssoOA.useSSO"
value="%{ssoOA.useSSO}"
@@ -293,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>
@@ -363,7 +407,7 @@
<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
</button>
- <div id="oa_saml1_area" class="oa_protocol_area">
+ <div id="oa_saml1_area" class="oa_protocol_area hidden">
<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.saml1.header", request) %></h4>
<s:if test="authUser.isAdmin()">
@@ -423,9 +467,14 @@
</div>
- <div id="oa_pvp2_area" class="oa_protocol_area">
+ <div id="oa_pvp2_area" class="oa_protocol_area hidden">
<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4>
+ <s:checkbox key="webpages.oaconfig.pvp2.reload"
+ labelposition="left"
+ cssClass="checkbox"
+ name="pvp2OA.reLoad"></s:checkbox>
+
<s:textfield name="pvp2OA.metaDataURL"
value="%{pvp2OA.metaDataURL}"
labelposition="left"
@@ -440,7 +489,7 @@
</div>
</div>
- <div id="oa_oauth20_area" class="oa_protocol_area">
+ <div id="oa_oauth20_area" class="oa_protocol_area hidden">
<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.oauth20.header", request) %></h4>
<s:label key="webpages.oaconfig.oauth20.clientId" value="%{oauth20OA.clientId}"/>
@@ -513,7 +562,7 @@
<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.hidden", request) %>
</button>
- <div id="formcustom_area" class="oa_protocol_area">
+ <div id="formcustom_area" class="oa_protocol_area hidden">
<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
<div id="formCustomValues">
@@ -592,6 +641,22 @@
name="formOA.appletRedirectTarget">
</s:select>
+ <s:textfield name="formOA.applet_height"
+ value="%{formOA.applet_height}"
+ labelposition="left"
+ key="webpages.oaconfig.general.BKUSelection.header.applet.height"
+ cssClass="textfield_middle"
+ id="HEADER_HEIGHT">
+ </s:textfield>
+
+ <s:textfield name="formOA.applet_width"
+ value="%{formOA.applet_width}"
+ labelposition="left"
+ key="webpages.oaconfig.general.BKUSelection.header.applet.width"
+ cssClass="textfield_middle"
+ id="HEADER_WIDTH">
+ </s:textfield>
+
<s:select list="formOA.fontTypeList"
key="webpages.oaconfig.general.BKUSelection.fonttype.list"
labelposition="left"