Merge branch 'feature/matching_ernp_client' into 'feature/matching_base'

refactor(ernp): update openAPI specification from BM.I to use...

See merge request egiz/eidas_at_proxy!16

1 files changed, 32 insertions, 4 deletions

diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html
index 8f846f84..4fc061c0 100644
--- a/basicConfig/templates/other_login_method.html
+++ b/basicConfig/templates/other_login_method.html
@@ -49,29 +49,57 @@
         <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
     </div>
 
+	<div id="matchingError"
+			  th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
+		<p  th:if="${advancedMatchingFailedReason != null}"
+			th:text="#{${advancedMatchingFailedReason}}">Detailed</p>
+		<p  th:unless="${advancedMatchingFailedReason != null}"
+			th:text="#{module.eidasauth.matching.29}">Generell</p>
+					  
+			  
+			  
+    </div>
+
+
     <h1 th:text="#{gui.otherlogin.header.selection}"> Select an alternative login method </h1>
 
     <div id="otherlogin" class="block">
         <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
             <button type="submit" role="button" value="Handy-Signatur / Mobile Signature"
-                    th:text="#{gui.otherlogin.hs}">A
+                    th:text="#{gui.otherlogin.button.hs}">A
             </button>
             <input type="hidden" name="loginSelection" value="MOBILE_PHONE_SIGNATURE_LOGIN">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
         </form>
         <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Andere eIDAS ID" th:text="#{gui.otherlogin.eidas}">B
+            <button type="submit" role="button" value="Andere eIDAS ID" 
+                    th:text="#{gui.otherlogin.button.eidas}">B
             </button>
             <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
         </form>
         <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Keine weitere HS / eIDAS"
-                    th:text="#{gui.otherlogin.none}">C
+            <button type="submit" role="button" value="Keine weitere HS / eIDAS" 
+            	    th:text="#{gui.otherlogin.button.none}">C
             </button>
             <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
         </form>
+        
+		<div id="insertErnp"
+			  th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
+			
+			<p th:text="#{gui.otherlogin.inserternp.infotext}"></p>
+			
+        	<form 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
+            	</button>
+            	<input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
+            	<input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+        	</form>
+        </div>
+        
     </div>
 
     <!-- Abbrechen Button -->