* fixed #311 User Selfservice is broken

* Issue #312 User2UserMessage Chat is broken
* Issue #313 Change Password - update HTML Layout to current Bootstrap Version
* Issue #314 Set Default Language - update HTML Layout to current Bootstrap Version
* Issue #315 Add Context - update HTML Layout to current Bootstrap Version
* Issue #316 Add Context - add Back Button
* Issue #317 switch Context is broken
* Issue #318 Broken: http://localhost:8080/taskstate/task/1153/changeorderto/1051

Author: thomaswoehlke

src/main/resources/messages_de.properties

@@ -227,7 +227,7 @@ user.selfservice.profile.changeContexts=Kontexte ändern
 user.selfservice.profile.changeLanguage=Sprache einstellen
 button.back=<i class="fas fa-angle-double-left"></i>&nbsp;zur&uuml;ck
 user.selfservice.name.button=Benutzernamen speichern
-user.resetPasswordConfirmed.oldUserPassword=Bestehendes Passwort
+user.resetPasswordConfirmed.oldUserPassword=Altes Passwort
 user.selfservice.language.button=Setze Sprache
 enum.language.de=Deutsch
 enum.language.en=Englisch

src/main/resources/templates/user/selfservice/context/add.html

@@ -48,6 +48,9 @@ <h1>
                 </div>
             </td>
             <td>
+                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                    <span th:utext="#{button.back}">back</span>
+                </a>
                 <button id="createNewProject" type="submit" class="btn btn-primary">
                     <i class="fas fa-save"></i>
                     <span th:utext="#{user.selfservice.contexts.add.button}">Add Area</span>

src/main/resources/templates/user/selfservice/context/all.html

@@ -87,10 +87,9 @@ <h1>
             </form>
         </div>
         <br/>
-        <a th:href="@{/user/selfservice/profile}">
+        <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
             <span th:utext="#{button.back}">back</span>
         </a>
-
     </div>
 
 </body>

src/main/resources/templates/user/selfservice/context/edit.html

@@ -26,28 +26,31 @@ <h1>
         <div>
             <form id="formId" th:action="@{/user/selfservice/context/edit/{id}(id=${contextId})}" th:object="${editContext}" method="post">
                 <td>
-                    <div class="form-group form-control-lg">
+                    <div class="form-group">
                         <label th:for="${#ids.next('nameEn')}" class="control-label">
                             <span th:utext="#{enum.language.en}">Englisch</span>
                         </label>
-                        <input type="text" th:field="*{nameEn}" class="form-control" />
+                        <input type="text" th:field="*{nameEn}" class="form-control form-control-lg" />
                         <div>
                             <div th:each="err : ${#fields.errors('nameEn')}" th:text="${err}" class="alert alert-danger" />
                         </div>
                     </div>
                 </td>
                 <td>
-                    <div class="form-group form-control-lg">
+                    <div class="form-group">
                         <label th:for="${#ids.next('nameDe')}" class="control-label">
                             <span th:utext="#{enum.language.de}">Deutsch</span>
                         </label>
-                        <input type="text" th:field="*{nameDe}" class="form-control" />
+                        <input type="text" th:field="*{nameDe}" class="form-control form-control-lg" />
                         <div>
                             <div th:each="err : ${#fields.errors('nameDe')}" th:text="${err}" class="alert alert-danger" />
                         </div>
                     </div>
                 </td>
                 <td>
+                    <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                        <span th:utext="#{button.back}">back</span>
+                    </a>
                     <button id="editContextButton" type="submit" class="btn btn-primary">
                         <i class="fas fa-save"></i>
                         <span th:utext="#{user.selfservice.contexts.edit.button}">Edit Area</span>

src/main/resources/templates/user/selfservice/language.html

@@ -24,11 +24,11 @@ <h1>
 
     <div th:fragment="mytwcontent">
         <form id="formId" th:action="@{/user/selfservice/language}" th:object="${userChangeLanguageForm}" method="post">
-            <div class="form-group form-control-lg">
+            <div class="form-group">
                 <label th:for="${#ids.next('defaultLanguage')}" class="control-label">
                     <span th:text="#{user.selfservice.language.defaultLanguage}">Language</span>
                 </label>
-                <select th:field="*{defaultLanguage}" class="form-control">
+                <select th:field="*{defaultLanguage}" class="form-control form-control-lg">
                     <option th:each="language : ${languages}"
                             th:value="${language.value}"
                             th:text="${#messages.msg(language.code)}">language.code</option>
@@ -38,13 +38,13 @@ <h1>
                     </div>
                 </div>
             </div>
+            <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                <span th:utext="#{button.back}">back</span>
+            </a>
             <button id="saveLanguageButton" type="submit" class="btn btn-primary">
                 <i class="fas fa-save"></i>
                 <span th:utext="#{user.selfservice.language.button}">Save Language</span>
             </button>
-            <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
-                <span th:utext="#{button.back}">back</span>
-            </a>
         </form>
     </div>
 

src/main/resources/templates/user/selfservice/name.html

@@ -26,23 +26,23 @@ <h1>
     <div th:fragment="mytwcontent">
         <div>
             <form id="formId" th:action="@{/user/selfservice/name}" th:object="${username}" method="post">
-                <div class="form-group form-control-lg">
+                <div class="form-group">
                     <label th:for="${#ids.next('userFullname')}" class="control-label">
                         <span th:utext="#{user.registerConfirmed.userFullname}">Full Name</span>
                     </label>
-                    <input type="text" th:field="*{userFullname}" class="form-control" />
+                    <input type="text" th:field="*{userFullname}" class="form-control form-control-lg" />
                     <div>
                         <div th:each="err : ${#fields.errors('userFullname')}" th:text="${err}" class="alert alert-danger">
                         </div>
                     </div>
                 </div>
+                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                    <span th:utext="#{button.back}">back</span>
+                </a>
                 <button id="save-username" type="submit" class="btn btn-primary">
                     <i class="fas fa-save"></i>
                     <span th:utext="#{user.selfservice.name.button}">Save Username</span>
                 </button>
-                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
-                    <span th:utext="#{button.back}">back</span>
-                </a>
             </form>
         </div>
     </div>

src/main/resources/templates/user/selfservice/password.html

@@ -13,52 +13,52 @@
         <h1>
             <i class="fas fa-edit"></i>
             <span th:utext="#{user.selfservice.profile.changePassword}">Change Password</span>
-            <small>
-                <span th:utext="#{user.selfservice.forUser}">for User:</span>
-                <strong>
-                    <span sec:authentication="name"></span>
-                </strong>
-            </small>
         </h1>
+        <h2>
+            <span th:utext="#{user.selfservice.forUser}">for User:</span>
+            <strong>
+                <span sec:authentication="name"></span>
+            </strong>
+        </h2>
     </div>
 
     <div th:fragment="mytwcontent">
         <div>
             <form id="formId" th:action="@{/user/selfservice/password}" th:object="${userChangePasswordForm}" method="post">
-                <div class="form-group form-control-lg">
+                <div class="form-group">
                     <label th:for="${#ids.next('oldUserPassword')}" class="control-label">
                         <span th:utext="#{user.resetPasswordConfirmed.oldUserPassword}">Current Password</span>
                     </label>
-                    <input type="password" th:field="*{oldUserPassword}" class="form-control" />
+                    <input type="password" th:field="*{oldUserPassword}" class="form-control form-control-lg" />
                     <div>
                         <div th:each="err : ${#fields.errors('oldUserPassword')}" th:text="${err}" class="alert alert-danger" />
                     </div>
                 </div>
-                <div class="form-group form-control-lg">
+                <div class="form-group">
                     <label th:for="${#ids.next('userPassword')}" class="control-label">
                         <span th:utext="#{user.resetPasswordConfirmed.password}">Password</span>
                     </label>
-                    <input type="password" th:field="*{userPassword}" class="form-control" />
+                    <input type="password" th:field="*{userPassword}" class="form-control form-control-lg" />
                     <div>
                         <div th:each="err : ${#fields.errors('userPassword')}" th:text="${err}" class="alert alert-danger" />
                     </div>
                 </div>
-                <div class="form-group form-control-lg">
+                <div class="form-group">
                     <label th:for="${#ids.next('userPasswordConfirmation')}" class="control-label">
                         <span th:utext="#{user.resetPasswordConfirmed.passwordAgain}">Password again</span>
                     </label>
-                    <input type="password" th:field="*{userPasswordConfirmation}" class="form-control" />
+                    <input type="password" th:field="*{userPasswordConfirmation}" class="form-control form-control-lg" />
                     <div>
                         <div th:each="err : ${#fields.errors('userPasswordConfirmation')}" th:text="${err}" class="alert alert-danger" />
                     </div>
                 </div>
+                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
+                    <span th:utext="#{button.back}">back</span>
+                </a>
                 <button id="saveNewPassword" type="submit" class="btn btn-primary">
                     <i class="fas fa-save"></i>
                     <span th:utext="#{user.resetPasswordConfirmed.button}">Save New Password</span>
                 </button>
-                <a th:href="@{/user/selfservice/profile}" class="btn btn-secondary" role="button">
-                    <span th:utext="#{button.back}">back</span>
-                </a>
             </form>
         </div>
     </div>