Skip to content

Commit

Permalink
Adjust error pages to match mockup and fix internal server error page
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomTannenbaum committed Oct 3, 2024
1 parent f2a3e85 commit ccf74bf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/templates/error.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section layout:fragment="content">
<div th:replace="~{fragments/internal-server-error}"></div>
<div th:replace="~{fragments/not-found-error}"></div>
<a data-testid="back-to-main-page" href="/return" class="link-secondary">Zurück zur Startseite</a>
<a data-testid="back-to-main-page" href="/return" class="link-primary">Zurück zur Startseite</a>
</section>
</body>
</html>
2 changes: 1 addition & 1 deletion src/main/resources/templates/fragments/header.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<header class="d-flex p-2 pb-0 align-items-center justify-content-between border-bottom border-dark mx-4 pb-3">
<header class="d-flex p-2 pb-0 align-items-center justify-content-between border-bottom border-dark mx-4 pb-3 mb-3">
<a href="/">
<img alt="image not found" class="m-4" id="logo" th:src="@{images/UNILU_Schriftzug_Standard_schwarz_DE.png}">
</a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div th:if="${session.get('errorModel') != null and session.get('errorModel').getError().equals('unknown')}">
<div th:if="${session.get('errorModel') != null and session.get('errorModel').getError().equals('500')}">
<h1>Ein unerwarteter Fehler ist aufgetreten.</h1>
<p th:text="${session.get('errorModel').getErrorMessage()}"></p>
<p>Kontaktiere
<a class="link-secondary" href="mailto: [email protected]">[email protected].</a>
<p>Bitte kontaktieren Sie
<a class="link-primary" href="mailto:[email protected]">[email protected]</a>.
</p>
</div>
7 changes: 4 additions & 3 deletions src/main/resources/templates/fragments/not-found-error.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<div th:if="${session.get('errorModel') == null or session.get('errorModel').getError() == '404'}">
<h1>Die gesuchte Seite wurde nicht gefunden.</h1>
<p>Versuche eine Prüfung zu
<a href="/search" class="link-secondary">suchen</a>
oder gehe zurück zur <a href="/" class="link-secondary">Startseite</a>.
<p>
Versuchen Sie
<a href="/search" class="link-primary">eine Prüfung zu suchen</a>
oder gehen Sie zurück zur Startseite.
</p>
</div>

0 comments on commit ccf74bf

Please sign in to comment.