aboutsummaryrefslogtreecommitdiff
path: root/basicConfig
diff options
context:
space:
mode:
authorThomas <>2022-08-02 14:00:57 +0200
committerThomas <>2022-08-02 14:00:57 +0200
commitf381c610acdecb06a8561389a4d1598738559948 (patch)
tree4e752580f0cfdf6963951c41335001188a27dff1 /basicConfig
parente0c0b219588322a0f0e7a891369b43ab6c853d71 (diff)
parent48f19dc45cec670fe62399d09fb34732fb4eeedc (diff)
downloadNational_eIDAS_Gateway-f381c610acdecb06a8561389a4d1598738559948.tar.gz
National_eIDAS_Gateway-f381c610acdecb06a8561389a4d1598738559948.tar.bz2
National_eIDAS_Gateway-f381c610acdecb06a8561389a4d1598738559948.zip
Merge branch 'nightlybuild' into feature/ms_proxy_service
# Conflicts: # ms_specific_proxyservice/src/test/resources/config/logback_config.xml
Diffstat (limited to 'basicConfig')
-rw-r--r--basicConfig/ms-connector/templates/other_login_method.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/basicConfig/ms-connector/templates/other_login_method.html b/basicConfig/ms-connector/templates/other_login_method.html
index d392a553..30bae604 100644
--- a/basicConfig/ms-connector/templates/other_login_method.html
+++ b/basicConfig/ms-connector/templates/other_login_method.html
@@ -66,7 +66,7 @@
<div id="insertErnp" class="block">
<form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
<button type="submit" role="button" value="Keine weitere HS / eIDAS"
- th:text="#{gui.otherlogin.button.inserternp}">D
+ th:text="#{gui.otherlogin.button.inserternp}">
</button>
<input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
<input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
@@ -77,7 +77,7 @@
<!-- Abbrechen Button -->
<form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
<button type="submit" value="Abbrechen/Cancel" th:text="#{gui.otherlogin.cancel}"></button>
- <input type="hidden" name="stopAuthProcess" value="true">
+ <input type="hidden" name="loginSelection" value="STOP_MATCHING_PROCESS">
<input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
</form>
</div>