chore(matching): re-oreder process steps in GUI releated matching

1 files changed, 76 insertions, 44 deletions

diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html
index 2165add2..6806dc05 100644
--- a/basicConfig/templates/other_login_method.html
+++ b/basicConfig/templates/other_login_method.html
@@ -49,73 +49,105 @@
         <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>
+    <div th:if="${createNewErnpEntry != null} and ${createNewErnpEntry}">
 
+      <div class="mainDescription">
+        <h3 th:text="#{gui.otherlogin.inserternp.header.selection}"> Generate new ERnP entry</h3>
 
-    <h3 th:text="#{gui.otherlogin.header.selection}"> Select an alternative login method </h3>
+        <p th:text="#{gui.otherlogin.inserternp.first}"> Insert ERnP first block </p>
+        <p th:text="#{gui.otherlogin.inserternp.second}"> Insert ERnP second block </p>
+        <p>
+          <span th:text="#{gui.otherlogin.inserternp.third.prefix}"> Insert ERnP third block / part 1 </span>
+          <span>bdquo;<a href="mailto:BMI-IKT-eIDAS-Betrieb@bmi.gv.at"> BMI-IKT-eIDAS-Betrieb@bmi.gv.at </a></span>
+          <span th:text="#{gui.otherlogin.inserternp.third.postfix}"> Insert ERnP third block / part 3 </span>
+        </p>
+      </div>
 
-    <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.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.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}}">
+      <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.none}">C
+                  th:text="#{gui.otherlogin.button.inserternp}">D
             </button>
-            <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
+            <input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
         </form>
+      </div>
+
+      <div  id="stopMatching" class="block">
+        <!-- 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="pendingid" value="$pendingid" th:attr="value=${pendingid}">
+        </form>
+      </div>
 
-        <div  id="insertErnp" class="block"
-              th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
+    </div>
+
+    <div th:unless="${createNewErnpEntry!= null} and ${createNewErnpEntry}">
 
-          <br>
+      <div class="mainDescription">
+        <h3 th:text="#{gui.otherlogin.header.selection}"> No person data found</h3>
 
-          <p th:text="#{gui.otherlogin.inserternp.infotext}"></p>
+        <p th:text="#{gui.otherlogin.info.first}"> Info text after MDS search with one or more results</p>
+        <p th:text="#{gui.otherlogin.info.second}"> Prefix for option list</p>
+        <ul>
+          <li th:text="#{gui.otherlogin.info.list.1}"> ID Austria or alterantive eIDAS Login </li>
+          <li th:text="#{gui.otherlogin.info.list.2}"> Search with Address </li>
+        </ul>
+      </div>
 
-          <br>
+      <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>
 
-        	<form class="block" 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 id="otherlogin" class="block">
+        <div id="selectOtherMethodArea" class="block">
+          <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+              <button class="primaryButton" type="submit" role="button" value="Handy-Signatur / Mobile Signature"
+                      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 class="primaryButton" 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 class="primaryButton" 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>
 
         <div  id="stopMatching" class="block">
           <!-- Abbrechen Button -->
-          <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+          <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="pendingid" value="$pendingid" th:attr="value=${pendingid}">
           </form>
         </div>
+      </div>
+
     </div>
-</div>
-<footer>
+  </div>
+  <footer>
     <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
     <div></div>
-</footer>
+  </footer>
 </body>
 </html>