layout cleanup

This commit is contained in:
Jottyfan
2022-11-14 15:16:10 +01:00
parent 55ff76c29b
commit abeba4935c
18 changed files with 795 additions and 722 deletions

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html th:fragment="layout (title, libs, header, content)" xmlns:th="http://www.thymeleaf.org">
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
<head>
<title th:replace="${title}">Camp Organizer Business</title>
<title>Camp Organizer 2</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link th:rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/bootstrap/5.2.0/css/bootstrap.min.css} " />
<link th:rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/font-awesome/5.15.4/css/all.css} " />
@ -16,18 +16,30 @@
<script th:src="@{/js/dataTables.de.js}"></script>
<script th:src="@{/js/mytoggle.js}"></script>
<script th:src="@{/js/myAjax.js}"></script>
<meta th:replace="${libs}"></meta>
<th:block layout:fragment="libs"></th:block>
</head>
<body>
<div class="myheadline">
<div class="topright">
<span th:if="${not #strings.isEmpty(currentUser)}"><a th:href="@{/logout}" class="btn btn-outline-secondary menufont"><b th:inline="text">[[${currentUser}]]</b> ausloggen</a>
</span> <span th:if="${#strings.isEmpty(currentUser)}"> <a th:href="@{/dashboard}" class="btn btn-outline-secondary menufont">einloggen</a>
</span>
<nav class="navbar navbar-expand-lg bg-light">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul layout:fragment="header"></ul>
<ul class="nav navbar-nav ms-auto right-dist">
<li>
<span th:if="${not #strings.isEmpty(currentUser)}">
<a th:href="@{/logout}" class="btn btn-outline-secondary menufont"><b th:inline="text">[[${currentUser}]]</b> ausloggen</a>
</span>
<span th:if="${#strings.isEmpty(currentUser)}">
<a th:href="@{/dashboard}" class="btn btn-outline-secondary menufont">einloggen</a>
</span>
</li>
</ul>
</div>
</div>
<span th:replace="${header}">Layout header</span>
</div>
<div th:replace="${content}">Layout content</div>
</nav>
<div layout:fragment="content">Layout content</div>
<div class="versionclip">
<a href="https://gitlab.com/jottyfan/camporganizer2/-/issues" class="versionlink" target="_blank" th:text="${'Version ' + @manifestBean.getVersion()}"></a>
</div>