finetuning

This commit is contained in:
Jörg Henke
2026-01-20 14:37:13 +01:00
parent 9568e77f52
commit c408e4d693
8 changed files with 79 additions and 16 deletions

View File

@@ -6,7 +6,8 @@
<title>Timetrack</title>
<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/5.3.8/css/bootstrap.min.css}" />
<link rel="stylesheet" type="text/css" th:href="@{/webjars/datatables/2.3.5/css/dataTables.dataTables.min.css}" />
<link rel="stylesheet" type="text/css" th:href="@{/webjars/datatables/2.3.6/css/dataTables.dataTables.min.css}" />
<link rel="stylesheet" type="text/css" th:href="@{/webjars/datatables/2.3.6/css/dataTables.bootstrap5.min.css}" />
<link rel="stylesheet" type="text/css" th:href="@{/webjars/font-awesome/7.1.0/css/all.min.css}" />
<link rel="stylesheet" type="text/css" th:href="@{/css/style.css}">
<link rel="stylesheet" type="text/css" th:href="@{/public/dynamicstyle.css}">
@@ -15,7 +16,9 @@
<script type="text/javascript" th:src="@{/webjars/jquery/3.7.1/jquery.min.js}"></script>
<script type="text/javascript" th:src="@{/webjars/bootstrap/5.3.8/js/bootstrap.bundle.min.js}"></script>
<script type="text/javascript" th:src="@{/webjars/datatables/2.3.5/js/dataTables.dataTables.min.js}"></script>
<script type="text/javascript" th:src="@{/webjars/datatables/2.3.6/js/dataTables.min.js}"></script>
<script type="text/javascript" th:src="@{/webjars/datatables/2.3.6/js/dataTables.dataTables.min.js}"></script>
<script type="text/javascript" th:src="@{/webjars/datatables/2.3.6/js/dataTables.bootstrap5.min.js}"></script>
<script type="text/javascript" th:src="@{/webjars/fullcalendar/6.1.19/index.global.min.js}"></script>
<script type="text/javascript" th:src="@{/js/helper.js}"></script>
<script type="text/javascript" th:src="@{/js/clock.js}"></script>

View File

@@ -7,7 +7,7 @@
<font layout:fragment="title">Projekt</font>
<ul layout:fragment="menu">
<li class="nav-item" sec:authorize="hasRole('timetrack_user')">
<a class="nav-link btn btn-secondary btn-white-text" th:href="@{/projectmanagement}">zur Projektübersicht</a>
<a class="btn btn-outline-secondary" th:href="@{/projectmanagement}">zur Projektübersicht</a>
</li>
</ul>
<main layout:fragment="content">
@@ -39,7 +39,7 @@
</div>
</div>
<div class="card-footer">
<table class="table table-striped">
<table name="table" class="table table-striped">
<thead>
<tr>
<th>Name</th>
@@ -49,13 +49,23 @@
</thead>
<tbody>
<tr th:each="p : ${workpackages}">
<td><input type="checkbox" th:checked="${p.isIn(linked)}" /> <a th:href="@{/projectmanagement/workpackage/{w}/apps(w=${p.pkWorkpackage})}" th:text="${p.name}"></a></td>
<td><input type="checkbox" th:checked="${p.isIn(linked)}" /> <a th:href="@{/projectmanagement/workpackage/{w}/apps(w=${p.pkWorkpackage})}" th:text="${p.name}" th:title="${p.projectName}"></a></td>
<td th:text="${p.description}"></td>
<td><a th:href="@{/projectmanagement/workpackage/{w}/app/{a}/toggle(w=${p.pkWorkpackage},a=${app.pkApp})}" class="btn btn-outline-secondary">
<span th:if="${p.isIn(linked)}">rausschmeißen</span> <span th:unless="${p.isIn(linked)}">zuweisen</span>
</a></td>
</tr>
</table>
<script type="text/javascript">
$(document).ready(function() {
var localeUrl = '[[@{/js/dataTables/de.json}]]';
$("#table").DataTable({
"language" : {
"url" : localeUrl
}
});
});
</script>
</div>
</div>
</main>

View File

@@ -7,8 +7,8 @@
<font layout:fragment="title">Projekte</font>
<ul layout:fragment="menu">
<li class="nav-item" sec:authorize="hasRole('timetrack_user')">
<a class="btn btn-outline-success" th:href="@{/projectmanagement/project/add}">Neues Projekt anlegen</a>
<a class="btn btn-outline-secondary" th:href="@{/projectmanagement/download}">Export</a>
<a class="btn btn-outline-secondary" th:href="@{/projectmanagement/apps}">alle Apps</a>
</li>
</ul>
<main layout:fragment="content">
@@ -32,10 +32,11 @@
</div>
<div class="col-sm-12 col-md-3 col-lg-2 dashboardcard">
<div class="card">
<div class="card-header">Alles</div>
<div class="card-body">
<a th:href="@{/projectmanagement/apps}">alle apps auflisten</a>
<div class="card-header">
<a class="btn btn-outline-secondary" th:href="@{/projectmanagement/project/add}">Projekt anlegen</a>
</div>
<div class="card-body"></div>
<div class="card-footer"></div>
</div>
</div>
</div>

View File

@@ -7,7 +7,7 @@
<font layout:fragment="title">Projekt</font>
<ul layout:fragment="menu">
<li class="nav-item" sec:authorize="hasRole('timetrack_user')">
<a class="nav-link btn btn-secondary btn-white-text" th:href="@{/projectmanagement}">abbrechen</a>
<a class="btn btn-outline-secondary" th:href="@{/projectmanagement}">abbrechen</a>
</li>
</ul>
<main layout:fragment="content">
@@ -30,7 +30,7 @@
</div>
<div class="col-2">Geldgeber</div>
<div class="col-10">
<select th:field="*{fkFunder}" class="select-field">
<select th:field="*{fkFunder}" class="form-select">
<option value="" label="--- bitte wählen ---" />
<option th:each="f : ${funders}" th:label="${f.name}" th:value="${f.pkFunder}" />
</select>

View File

@@ -7,7 +7,7 @@
<font layout:fragment="title">Workpackage</font>
<ul layout:fragment="menu">
<li class="nav-item" sec:authorize="hasRole('timetrack_user')">
<a class="nav-link btn btn-secondary btn-white-text" th:href="@{/projectmanagement}">abbrechen</a>
<a class="btn btn-outline-secondary" th:href="@{/projectmanagement}">abbrechen</a>
</li>
</ul>
<main layout:fragment="content">