chore(UX): a few small GUI improvements

6 files changed, 73 insertions, 44 deletions

diff --git a/basicConfig/properties/messages.properties b/basicConfig/properties/messages.properties
index e5558c76..f768c00e 100644
--- a/basicConfig/properties/messages.properties
+++ b/basicConfig/properties/messages.properties
@@ -102,8 +102,16 @@ gui.countryselection.country.se.logo.alt=Sweden-eID
 gui.countryselection.country.uk=United Kingdom
 gui.countryselection.country.uk.logo.alt=United Kingdom-eID
 
+gui.countryselection.country.ie=Ireland
+gui.countryselection.country.ie.logo.alt=Ireland-eID
+gui.countryselection.country.sw=Sweden
+gui.countryselection.country.sw.logo.alt=Sweden-eID
+
 gui.countryselection.country.testcountry=TestCountry
 gui.countryselection.country.testcountry.logo.alt=Testcountry-eID
+gui.countryselection.country.eu.validation=EC Validation-Service
+gui.countryselection.country.eu.logo.alt=EC Validation-Service
+
 
 gui.countryselection.mode.prod=Production
 gui.countryselection.mode.qs=QS
@@ -149,4 +157,4 @@ gui.residency.input.postleitzahl=Postcode
 gui.residency.input.municipality=Municipality
 gui.residency.input.village=Village
 gui.residency.input.street=Street
-gui.residency.input.number=Number
\ No newline at end of file
+gui.residency.input.number=Number
diff --git a/basicConfig/properties/messages_de.properties b/basicConfig/properties/messages_de.properties
index 2e715011..780916d0 100644
--- a/basicConfig/properties/messages_de.properties
+++ b/basicConfig/properties/messages_de.properties
@@ -101,8 +101,15 @@ gui.countryselection.country.se.logo.alt=Schwedische-eID
 gui.countryselection.country.uk=Großbritanien
 gui.countryselection.country.uk.logo.alt=Britische-eID
 
+gui.countryselection.country.ie=Irland
+gui.countryselection.country.ie.logo.alt=Irische-eID
+gui.countryselection.country.sw=Schweden
+gui.countryselection.country.sw.logo.alt=Schwedische-eID
+
 gui.countryselection.country.testcountry=Testland
 gui.countryselection.country.testcountry.logo.alt=Testland-eID
+gui.countryselection.country.eu.validation=EC Validierungsservice
+gui.countryselection.country.eu.logo.alt=EC Validierungsservice
 
 gui.countryselection.mode.prod=Produktion
 gui.countryselection.mode.qs=Qualitätsicherung
diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html
index 0b58c452..d8c3de56 100644
--- a/basicConfig/templates/error_message.html
+++ b/basicConfig/templates/error_message.html
@@ -35,8 +35,6 @@
         <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
     </div>
     <div id="page1" class="case selected-case" role="main">
-      <h2 class="OA_header" role="heading">Authentication error arise</h2>
-
       <div class="hell" role="application" >
             <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
 
diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html
index 9dd00379..2165add2 100644
--- a/basicConfig/templates/other_login_method.html
+++ b/basicConfig/templates/other_login_method.html
@@ -49,19 +49,18 @@
         <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 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>
+    <h3 th:text="#{gui.otherlogin.header.selection}"> Select an alternative login method </h3>
 
     <div id="otherlogin" class="block">
         <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
@@ -72,47 +71,47 @@
             <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" 
+            <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" 
+            <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" class="block"
               th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
-			
+
           <br>
-			
+
           <p th:text="#{gui.otherlogin.inserternp.infotext}"></p>
-			
+
           <br>
-			
+
         	<form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            	<button type="submit" role="button" value="Keine weitere HS / eIDAS" 
+            	<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 -->
-    <form class="block" 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="pendingid" value="$pendingid" th:attr="value=${pendingid}">
-    </form>
 
+        <div  id="stopMatching" class="block">
+          <!-- Abbrechen Button -->
+          <form class="block" 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="pendingid" value="$pendingid" th:attr="value=${pendingid}">
+          </form>
+        </div>
+    </div>
 </div>
 <footer>
     <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html
index c94721c0..f8516945 100644
--- a/basicConfig/templates/residency.html
+++ b/basicConfig/templates/residency.html
@@ -43,7 +43,7 @@
             }
             $.ajax({
                 type: "POST",
-                url: [(${wizardEndpoint})],
+                url: "[(${wizardEndpoint})]",
                 data: $("#inputForm").serialize()
             }).done(function (data, textStatus, jqXHR) {
                 if (data["resultCount"] === 1) {
@@ -88,6 +88,7 @@
         }
 
         function clearInput() {
+            $("#inputForm #inputPostleitzahl").val("");
             $("#inputForm #inputMunicipality").val("");
             $("#inputForm #inputVillage").val("");
             $("#inputForm #inputStreet").val("");
@@ -116,11 +117,12 @@
         button {
             padding: 0.5em;
             margin: 0.5em;
-            width: 8em;
+            width: 12em;
         }
 
         .block {
-            width: 100%;
+            width: 80%;
+            justify-content: left;
         }
 
         #tableResult td, #tableResult th {
@@ -205,23 +207,30 @@
                 <button type="button" id="buttonClear" onclick="clearInput()" th:text="#{gui.residency.clear}">
                     Clear
                 </button>
-                <button type="button" id="buttonProceed" th:text="#{gui.residency.proceed}">Proceed</button>
+
+                <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+                    <button type="submit" id="buttonProceed" value="Proceed" th:text="#{gui.residency.proceed}">Proceed</button>
+                    <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
+                </form>
             </div>
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
         </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>
+    <div id="backOrReturn" class="block">
+      <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">
+          <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">
-        <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
-    </form>
+    </div>
 
     <div>
         <img id="loading" src="../webcontent/img/ajax-loader.gif"
diff --git a/basicConfig/webcontent/css/css_country.css b/basicConfig/webcontent/css/css_country.css
index 7a22bdfd..34b0e928 100644
--- a/basicConfig/webcontent/css/css_country.css
+++ b/basicConfig/webcontent/css/css_country.css
@@ -17,6 +17,14 @@ body {
     align-items: center;
 }
 
+#matchingError {
+    border: 2px solid rgb(162, 44, 28);
+    padding: 1em;
+    width: 80%;
+    margin-top: 2em;
+    margin-bottom: 2em;
+}
+
 .block {
     display: flex;
     flex-direction: row;