work

Author: thomaswoehlke

src/main/resources/templates/layout/navbartop.html

@@ -20,6 +20,7 @@
           </a>
 
           <div id="mynavbar" class="collapse navbar-collapse">
+
             <ul class="navbar-nav me-auto mb-2 mb-lg-0" sec:authorize="isAuthenticated()">
               <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" id="contextMenu" role="button"
@@ -54,27 +55,10 @@
                 </a>
               </li>
             </ul>
-            <ul class="navbar-nav me-auto mb-2 mb-lg-0" sec:authorize="isAnonymous()">
-              <li class="nav-item">
-                <a class="nav-link" th:href="@{/user/register/}">
-                  <i class="fas fa-user"></i>
-                  <span th:text="#{layout.page.register}">Register as New User</span>
-                </a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" th:href="@{/user/login/}">
-                  <i class="fas fa-sign-in-alt"></i>
-                  <span th:text="#{layout.page.login}">Login</span>
-                </a>
-              </li>
-              <li class="nav-item">
-                <a class="nav-link" th:href="@{/user/resetPassword/}">
-                  <i class="fas fa-question-circle"></i>
-                  <span th:text="#{layout.page.passwordForgotten}">Password forgotten?</span>
-                </a>
-              </li>
-            </ul>
-            <ul class="navbar-nav mr-auto">
+
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0" sec:authorize="isAnonymous()"></ul>
+
+            <ul class="navbar-nav me-2">
               <li class="nav-item dropdown">
                 <a id="languageMenu" class="nav-link dropdown-toggle"
                    role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">

src/main/resources/templates/user/login/loginForm.html

@@ -47,16 +47,20 @@ <h2><span th:utext="#{user.loginForm.h2}">Your Todo-List for Getting Things Done
             </button>
           </div>
           <div class="col align-middle m-2 p-1">
-            <i class="fas fa-user"></i>
-            <a id="registerButton" th:href="@{/user/register/}" class="align-middle">
-              <span th:utext="#{user.loginForm.register}" class="align-middle">register as new user</span>
-            </a>
+            <div class="btn btn-outline-secondary btn-block">
+              <i class="fas fa-user"></i>
+              <a id="registerButton" th:href="@{/user/register/}">
+                <s11 th:utext="#{user.loginForm.register}" class="align-middle">register as new user</s11>
+              </a>
+            </div>
           </div>
           <div class="col align-middle m-2 p-1">
-            <i class="fas fa-question-circle"></i>
-            <a id="passwordResetButton" th:href="@{/user/resetPassword}" class="align-middle">
-              <span th:utext="#{user.loginForm.passwordReset}" class="align-middle">Password forgotten?</span>
-            </a>
+            <div class="btn btn-outline-secondary btn-block">
+              <i class="fas fa-question-circle"></i>
+              <a id="passwordResetButton" th:href="@{/user/resetPassword}" class="align-middle">
+                <span th:utext="#{user.loginForm.passwordReset}">Password forgotten?</span>
+              </a>
+            </div>
           </div>
         </div>
       </div>