forked from Hexlet/hexlet-correction
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Add footer to website templates"
This reverts commit f839d29.
- Loading branch information
Showing
17 changed files
with
883 additions
and
925 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,58 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en" xmlns:th="http://www.thymeleaf.org"> | ||
| <head th:replace="~{fragments/header :: head}"></head> | ||
| <body style="padding-top: 4.5rem" class="d-flex flex-column min-vh-100"> | ||
| <nav th:replace="~{fragments/panels :: mainNavbarTop}"></nav> | ||
| <main class="mb-5 container" th:object="${accInfo}"> | ||
| <div class="card mb-3"> | ||
| <div class="card-body"> | ||
| <h5 class="card-title mb-1" th:text="#{acc-info.card-title.general}"></h5> | ||
| <div class="row mb-1"> | ||
| <div class="col" th:text="#{firstname}"></div> | ||
| <div class="col" th:text="*{firstName}"></div> | ||
| </div> | ||
| <div class="row mb-1"> | ||
| <div class="col" th:text="#{lastname}"></div> | ||
| <div class="col" th:text="*{lastName}"></div> | ||
| </div> | ||
| <div class="row mb-1"> | ||
| <div class="col" th:text="#{username}"></div> | ||
| <div class="col" th:text="*{username}"></div> | ||
| </div> | ||
| <div class="row mb-3"> | ||
| <div class="col" th:text="#{email}"></div> | ||
| <div class="col" th:text="*{email}"></div> | ||
| </div> | ||
| <a class="btn btn-primary" th:href="@{/account/update}" th:text="#{btn.edit}"></a> | ||
| <body style="padding-top: 4.5rem"> | ||
| <nav th:replace="~{fragments/panels :: mainNavbarTop}"></nav> | ||
| <main class="container" th:object="${accInfo}"> | ||
| <div class="card mb-3"> | ||
| <div class="card-body"> | ||
| <h5 class="card-title mb-1" th:text="#{acc-info.card-title.general}"></h5> | ||
| <div class="row mb-1"> | ||
| <div class="col" th:text="#{firstname}"></div> | ||
| <div class="col" th:text="*{firstName}"></div> | ||
| </div> | ||
| </div> | ||
| <div class="card mb-5"> | ||
| <div class="card-body"> | ||
| <h5 class="card-title mb-3" th:text="#{password}"></h5> | ||
| <a class="btn btn-primary" th:href="@{/account/password}" th:text="#{btn.edit}"></a> | ||
| <div class="row mb-1"> | ||
| <div class="col" th:text="#{lastname}"></div> | ||
| <div class="col" th:text="*{lastName}"></div> | ||
| </div> | ||
| <div class="row mb-1"> | ||
| <div class="col" th:text="#{username}"></div> | ||
| <div class="col" th:text="*{username}"></div> | ||
| </div> | ||
| <div class="row mb-3"> | ||
| <div class="col" th:text="#{email}"></div> | ||
| <div class="col" th:text="*{email}"></div> | ||
| </div> | ||
| <a class="btn btn-primary" th:href="@{/account/update}" th:text="#{btn.edit}"></a> | ||
| </div> | ||
| </div> | ||
| <div class="card mb-3"> | ||
| <div class="card-body"> | ||
| <h5 class="card-title mb-3" th:text="#{password}"></h5> | ||
| <a class="btn btn-primary" th:href="@{/account/password}" th:text="#{btn.edit}"></a> | ||
| </div> | ||
| <h5 class="card-title mb-1" th:text="#{acc-info.card-title.workspaces}"></h5> | ||
| <table class="table table-bordered table-hover"> | ||
| <thead> | ||
| <tr> | ||
| <th class="col-1" th:text="#{acc-info.wks.name}"></th> | ||
| <th class="col-1" th:text="#{acc-info.wks.url}"></th> | ||
| <th class="col-1" th:text="#{acc-info.wks.descr}"></th> | ||
| <th class="col-1" th:text="#{username}"></th> | ||
| <th class="col-1" th:text="#{acc-info.wks.role}"></th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr th:each="workspaceRoleInfo : ${workspaceRoleInfoList}" th:object="${workspaceRoleInfo}"> | ||
| <td th:text="*{workspaceName}"></td> | ||
| <td th:text="*{workspaceUrl}"></td> | ||
| <td th:text="*{workspaceDescription}"></td> | ||
| <td th:text="*{username}"></td> | ||
| <td th:text="*{role}"></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </main> | ||
| <footer th:replace="~{fragments/footer :: footer}"></footer> | ||
| </div> | ||
| <h5 class="card-title mb-1" th:text="#{acc-info.card-title.workspaces}"></h5> | ||
| <table class="table table-bordered table-hover mt-3"> | ||
| <thead> | ||
| <tr> | ||
| <th class="col-1" th:text="#{acc-info.wks.name}"></th> | ||
| <th class="col-1" th:text="#{acc-info.wks.url}"></th> | ||
| <th class="col-1" th:text="#{acc-info.wks.descr}"></th> | ||
| <th class="col-1" th:text="#{username}"></th> | ||
| <th class="col-1" th:text="#{acc-info.wks.role}"></th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr th:each="workspaceRoleInfo : ${workspaceRoleInfoList}" th:object="${workspaceRoleInfo}"> | ||
| <td th:text="*{workspaceName}"></td> | ||
| <td th:text="*{workspaceUrl}"></td> | ||
| <td th:text="*{workspaceDescription}"></td> | ||
| <td th:text="*{username}"></td> | ||
| <td th:text="*{role}"></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </main> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,41 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en" xmlns:th="http://www.thymeleaf.org"> | ||
| <head th:replace="~{fragments/header :: head}"></head> | ||
| <body style="padding-top: 4.5rem" class="d-flex flex-column min-vh-100"> | ||
| <nav th:replace="~{fragments/panels :: mainNavbarTop}"></nav> | ||
| <main class="container"> | ||
| <div class="row"> | ||
| <div class="col"> | ||
| <form th:action="@{/account/password}" th:method="put" th:object="${updatePassword}"> | ||
| <div class="form-floating mb-3"> | ||
| <input class="form-control" id="inputOldPassword" placeholder="p" | ||
| th:classappend="${!#fields.hasErrors('oldPassword') && formModified ? 'is-valid' : ''}" | ||
| th:errorclass="is-invalid" th:field="*{oldPassword}" type="password"> | ||
| <label for="inputOldPassword" th:text="#{password.current}"></label> | ||
| <div class="invalid-feedback" th:each="err : ${#fields.errors('oldPassword')}" th:text="${err}"></div> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <input class="form-control" id="inputNewPassword" placeholder="p" | ||
| th:classappend="${!#fields.hasErrors('newPassword') && formModified ? 'is-valid' : ''}" | ||
| th:errorclass="is-invalid" th:field="*{newPassword}" type="password"> | ||
| <label for="inputNewPassword" th:text="#{password.new}"></label> | ||
| <div class="invalid-feedback" th:each="err : ${#fields.errors('newPassword')}" th:text="${err}"></div> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <input class="form-control" id="inputConfirmPassword" placeholder="p" | ||
| th:classappend="${!#fields.hasErrors('confirmNewPassword') && formModified ? 'is-valid' : ''}" | ||
| th:errorclass="is-invalid" th:field="*{confirmNewPassword}" type="password"> | ||
| <label for="inputConfirmPassword" th:text="#{password.confirm}"></label> | ||
| <div class="invalid-feedback" th:each="err : ${#fields.errors('confirmNewPassword')}" th:text="${err}"></div> | ||
| </div> | ||
| <div th:if="${#fields.hasGlobalErrors()}"> | ||
| <div class="alert alert-danger" th:each="err : ${#fields.globalErrors()}" th:text="${err}"></div> | ||
| </div> | ||
| <button class="btn btn-primary" type="submit" th:text="#{btn.save}"></button> | ||
| <a class="btn btn-secondary" th:href="@{/account}" th:text="#{btn.close}"></a> | ||
| </form> | ||
| </div> | ||
| <body style="padding-top: 4.5rem"> | ||
| <nav th:replace="~{fragments/panels :: mainNavbarTop}"></nav> | ||
| <main class="container"> | ||
| <div class="row"> | ||
| <div class="col"> | ||
| <form th:action="@{/account/password}" th:method="put" th:object="${updatePassword}"> | ||
| <div class="form-floating mb-3"> | ||
| <input class="form-control" id="inputOldPassword" placeholder="p" | ||
| th:classappend="${!#fields.hasErrors('oldPassword') && formModified ? 'is-valid' : ''}" | ||
| th:errorclass="is-invalid" th:field="*{oldPassword}" type="password"> | ||
| <label for="inputOldPassword" th:text="#{password.current}"></label> | ||
| <div class="invalid-feedback" th:each="err : ${#fields.errors('oldPassword')}" th:text="${err}"></div> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <input class="form-control" id="inputNewPassword" placeholder="p" | ||
| th:classappend="${!#fields.hasErrors('newPassword') && formModified ? 'is-valid' : ''}" | ||
| th:errorclass="is-invalid" th:field="*{newPassword}" type="password"> | ||
| <label for="inputNewPassword" th:text="#{password.new}"></label> | ||
| <div class="invalid-feedback" th:each="err : ${#fields.errors('newPassword')}" th:text="${err}"></div> | ||
| </div> | ||
| <div class="form-floating mb-3"> | ||
| <input class="form-control" id="inputConfirmPassword" placeholder="p" | ||
| th:classappend="${!#fields.hasErrors('confirmNewPassword') && formModified ? 'is-valid' : ''}" | ||
| th:errorclass="is-invalid" th:field="*{confirmNewPassword}" type="password"> | ||
| <label for="inputConfirmPassword" th:text="#{password.confirm}"></label> | ||
| <div class="invalid-feedback" th:each="err : ${#fields.errors('confirmNewPassword')}" th:text="${err}"></div> | ||
| </div> | ||
| <div th:if="${#fields.hasGlobalErrors()}"> | ||
| <div class="alert alert-danger" th:each="err : ${#fields.globalErrors()}" th:text="${err}"></div> | ||
| </div> | ||
| <button class="btn btn-primary" type="submit" th:text="#{btn.save}"></button> | ||
| <a class="btn btn-secondary" th:href="@{/account}" th:text="#{btn.close}"></a> | ||
| </form> | ||
| </div> | ||
| </main> | ||
| <footer th:replace="~{fragments/footer :: footer}"></footer> | ||
| </div> | ||
| </main> | ||
| </body> | ||
| </html> |
Oops, something went wrong.