aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp/jsp/snippets
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-10-17 15:04:49 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-10-17 15:04:49 +0200
commit92834aed9d97772a0d37330b9c60aee18374c759 (patch)
tree30adff7052c6eca919aed447a9640522b2c94c3d /id/ConfigWebTool/src/main/webapp/jsp/snippets
parent698a0066e84dee07f0f8de8aa408d9744f755660 (diff)
parent7c5d84f1f4054d2c85207364d5d996c4ec6fe1f8 (diff)
downloadmoa-id-spss-92834aed9d97772a0d37330b9c60aee18374c759.tar.gz
moa-id-spss-92834aed9d97772a0d37330b9c60aee18374c759.tar.bz2
moa-id-spss-92834aed9d97772a0d37330b9c60aee18374c759.zip
Merge branch 'eIDAS_node_implementation' into development_preview
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/jsp/snippets')
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp16
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp12
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp11
3 files changed, 30 insertions, 9 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index ff2b091c6..59661091b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -7,14 +7,7 @@
<s:if test="authUser.isAdmin()">
<div class="oa_config_block">
<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
-
- <s:textfield name="authOA.bkuOnlineURL"
- value="%{authOA.bkuOnlineURL}"
- labelposition="left"
- key="webpages.oaconfig.general.bku.online"
- cssClass="textfield_long">
- </s:textfield>
-
+
<s:textfield name="authOA.bkuHandyURL"
value="%{authOA.bkuHandyURL}"
labelposition="left"
@@ -28,6 +21,13 @@
key="webpages.oaconfig.general.bku.local"
cssClass="textfield_long">
</s:textfield>
+
+ <s:textfield name="authOA.bkuOnlineURL"
+ value="%{authOA.bkuOnlineURL}"
+ labelposition="left"
+ key="webpages.oaconfig.general.bku.online"
+ cssClass="textfield_long">
+ </s:textfield>
<s:radio list="authOA.keyBoxIdentifierList"
name="authOA.keyBoxIdentifier"
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
index 008a8b521..6dbed0047 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
@@ -160,7 +160,7 @@
</div>
- <div class="oa_protocol_area">
+ <div class="oa_protocol_area">
<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
<s:iterator value="%{formOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
<div class="floatClass">
@@ -202,6 +202,16 @@
</s:if>
</div>
+ <div class="oa_protocol_area">
+ <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.elgamandates.header", request) %></h4>
+ <s:textfield name="formOA.mandateServiceSelectionTemplate"
+ value="%{formOA.mandateServiceSelectionTemplate}"
+ labelposition="left"
+ key="webpages.oaconfig.general.templates.elgamandates.url"
+ cssClass="textfield_long">
+ </s:textfield>
+ </div>
+
</s:if>
</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
index 7e40fc60b..693ef8073 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
@@ -23,6 +23,17 @@
<div id="pvp2_certificate_upload">
<s:file name="pvp2OA.fileUpload" key="webpages.oaconfig.pvp2.certifcate" cssClass="textfield_long"></s:file>
</div>
+
+ <div class="oa_protocol_area">
+ <h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.templates.saml2.postbinding.header", request) %></h4>
+ <s:textfield name="formOA.saml2PostBindingTemplate"
+ value="%{formOA.saml2PostBindingTemplate}"
+ labelposition="left"
+ key="webpages.oaconfig.general.templates.saml2.postbinding.url"
+ cssClass="textfield_long">
+ </s:textfield>
+ </div>
+
</div>
</html> \ No newline at end of file