Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomTannenbaum committed Oct 2, 2024
1 parent e029aa8 commit 5b91c04
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 42 deletions.
29 changes: 18 additions & 11 deletions src/main/resources/templates/error.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html}" lang="">
<body>
<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>
</section>
</body>
</html>
<!doctype html>
<html
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html}"
lang="">
<body>
<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>
</section>
</body>
</html>
37 changes: 32 additions & 5 deletions src/main/resources/templates/fragments/exam-number-input.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,35 @@
<form action="#" th:action="@{/search}" th:object="${examNumberForm}" method="post" class="was-validated" novalidate>
<form
action="#"
th:action="@{/search}"
th:object="${examNumberForm}"
method="post"
class="was-validated"
novalidate>
<label for="examNumber">Prüfungsnummer eingeben:</label>
<span class="d-flex">
<input data-testid="exam-number-input" type="text" pattern="[0-9]{5}" name="examNumber" id="examNumber" placeholder="20202" th:value="*{examNumber}" th:maxlength="5" class="form-control" required>
<button data-testid="submit-button" type="submit" id="submit-button" class="btn btn-outline-primary">Suchen</button>
<input
data-testid="exam-number-input"
type="text"
pattern="[0-9]{5}"
name="examNumber"
id="examNumber"
placeholder="20202"
th:value="*{examNumber}"
th:maxlength="5"
class="form-control"
required />
<button
data-testid="submit-button"
type="submit"
id="submit-button"
class="btn btn-outline-primary">
Suchen
</button>
</span>
<p th:if="${#fields.hasErrors('examNumber')}" th:errors="*{examNumber}" class="text-danger">Prüfungsnummer Error</p>
</form>
<p
th:if="${#fields.hasErrors('examNumber')}"
th:errors="*{examNumber}"
class="text-danger">
Prüfungsnummer Error
</p>
</form>
24 changes: 19 additions & 5 deletions src/main/resources/templates/fragments/footer.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
<footer class="w-100 position-absolute z-1 bottom-0 bg-white">
<hr class="mt-0">
<hr class="mt-0" />
<div class="p-3 align-items-center justify-content-between d-flex">
<a data-testid="swissuniversities-link" href="https://www.swissuniversities.ch/" target="_blank">
<img data-testid="swissuniversities-logo" alt="Swissuniversities logo" height="22px" th:src="@{images/swissuniversities.png}">
<a
data-testid="swissuniversities-link"
href="https://www.swissuniversities.ch/"
target="_blank">
<img
data-testid="swissuniversities-logo"
alt="Swissuniversities logo"
height="22px"
th:src="@{images/swissuniversities.png}" />
</a>
<div class="d-flex justify-content-end gap-4">
<a data-testid="impressum-link" class="link-primary" href="https://www.unilu.ch/impressum/" target="_blank">Impressum & Datenschutz</a>
<span th:text="${'Version ' + @environment.getProperty('spring.application.version')}"></span>
<a
data-testid="impressum-link"
class="link-primary"
href="https://www.unilu.ch/impressum/"
target="_blank">
Impressum & Datenschutz
</a>
<span
th:text="${'Version ' + @environment.getProperty('spring.application.version')}"></span>
</div>
</div>
</footer>
46 changes: 25 additions & 21 deletions src/main/resources/templates/search.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html}">
<head>
<link rel="stylesheet" th:href="@{styles/search.css}" type="text/css">
</head>
<body>
<section layout:fragment="content">
<span class="display-4">Suche nach einer Prüfung...</span>
<!doctype html>
<html
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout.html}">
<head>
<link rel="stylesheet" th:href="@{styles/search.css}" type="text/css" />
</head>
<body>
<section layout:fragment="content">
<span class="display-4">Suche nach einer Prüfung...</span>

<div th:replace="~{fragments/exam-number-input}"></div>
<div class="exam-files" th:each="examFile: ${examFiles}">
<div th:replace="~{fragments/exam-file}"></div>
</div>
<div th:if="${examFiles != null && examFiles.size() >= 2}">
<a th:href="@{'/exams/download-zip/' + ${examNumberForm.getExamNumber()}}" class="btn btn-outline-primary" data-testid="zip-download-button">
Alle als ZIP herunterladen
</a>
</div>
</section>
</body>
</html>
<div th:replace="~{fragments/exam-number-input}"></div>
<div class="exam-files" th:each="examFile: ${examFiles}">
<div th:replace="~{fragments/exam-file}"></div>
</div>
<div th:if="${examFiles != null && examFiles.size() >= 2}">
<a
th:href="@{'/exams/download-zip/' + ${examNumberForm.getExamNumber()}}"
class="btn btn-outline-primary"
data-testid="zip-download-button">
Alle als ZIP herunterladen
</a>
</div>
</section>
</body>
</html>

0 comments on commit 5b91c04

Please sign in to comment.