From 71d94fdd4435187c13321322893cd9b1bf273402 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 8 Feb 2022 17:16:42 +0100
Subject: chore(matching): update 'other-login-method' GUI steps to use it as
 common starting-point for any other alternative matching method

---
 basicConfig/templates/other_login_method.html | 36 ++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'basicConfig/templates')

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 -->
-- 
cgit v1.2.3


From 01a4c718c21573b0d149ca182a02d9355eb61170 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 8 Feb 2022 18:03:07 +0100
Subject: feature(matching): add 'Back to previous step' button into
 'search-by-residence' GUI

---
 basicConfig/properties/messages.properties    | 1 +
 basicConfig/properties/messages_de.properties | 1 +
 basicConfig/templates/residency.html          | 6 ++++++
 3 files changed, 8 insertions(+)

(limited to 'basicConfig/templates')

diff --git a/basicConfig/properties/messages.properties b/basicConfig/properties/messages.properties
index fcb85bee..e5558c76 100644
--- a/basicConfig/properties/messages.properties
+++ b/basicConfig/properties/messages.properties
@@ -137,6 +137,7 @@ gui.residency.header.help=You can search for the address that you have been regi
   postcode, municipality or village first to start the search.
 gui.residency.header.inputinvalid=Be sure to enter a value for Municipality or Village
 gui.residency.cancel=Cancel
+gui.residency.back=Back to previous step
 gui.residency.search=Search
 gui.residency.clear=Clear
 gui.residency.proceed=Proceed
diff --git a/basicConfig/properties/messages_de.properties b/basicConfig/properties/messages_de.properties
index 613bead6..b26646aa 100644
--- a/basicConfig/properties/messages_de.properties
+++ b/basicConfig/properties/messages_de.properties
@@ -135,6 +135,7 @@ gui.residency.header.help=Hier können Sie nach einem Wohnsitze in Österreich s
   Postleitzahl, Gemeinde oder Ortschaft ein um die Suche zu starten.
 gui.residency.header.inputinvalid=Bitte geben Sie einen Wert für Gemeinde oder Ortschaft ein
 gui.residency.cancel=Abbrechen
+gui.residency.back=Zurück zum vorangegangenen Schritt
 gui.residency.search=Suche
 gui.residency.clear=Löschen
 gui.residency.proceed=Fortfahren
diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html
index 4600a26f..df3c10b7 100644
--- a/basicConfig/templates/residency.html
+++ b/basicConfig/templates/residency.html
@@ -211,6 +211,12 @@
         </form>
     </div>
 
+    <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+        <button type="submit" value="Back" th:text="#{gui.residency.back}">Back</button>
+        <input type="hidden" name="noResidence" value="true">
+        <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" value="Abbrechen/Cancel" th:text="#{gui.residency.cancel}">Cancel</button>
         <input type="hidden" name="stopAuthProcess" value="true">
-- 
cgit v1.2.3