From a1ad23920ad8ea2f70806e7c2693a62704125ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Henke?= <joerg.henke@uni-greifswald.de>
Date: Thu, 3 Oct 2024 10:03:26 +0200
Subject: [PATCH] repaired datatables extension

---
 .classpath                                 |  7 -------
 build.gradle                               | 11 +++++++----
 src/main/resources/static/css/style.css    |  2 +-
 src/main/resources/templates/template.html | 19 +++++++++++--------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.classpath b/.classpath
index 607b789..f3bdce0 100644
--- a/.classpath
+++ b/.classpath
@@ -12,13 +12,6 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="src/test/java">
-		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
diff --git a/build.gradle b/build.gradle
index 75aeee9..36bdd43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-	id 'org.springframework.boot' version '3.3.2'
+	id 'org.springframework.boot' version '3.3.4'
 	id "io.spring.dependency-management" version "1.1.6"
 	id 'war'
 	id 'eclipse'
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'de.jottyfan.bico'
-version = '0.1.3'
+version = '0.1.4'
 
 description = """BibleClassOrganizer"""
 
@@ -49,7 +49,7 @@ war {
 dependencies {
   implementation 'de.jottyfan:bicolib:4'
 
-  implementation 'org.mnode.ical4j:ical4j:4.0.3'
+  implementation 'org.mnode.ical4j:ical4j:4.0.4'
 
 	implementation 'org.springframework.boot:spring-boot-starter-jooq'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
@@ -63,7 +63,10 @@ dependencies {
   implementation 'org.webjars:bootstrap:5.3.3'
   implementation 'org.webjars.npm:bootstrap-icons:1.11.3'
 	implementation 'org.webjars:jquery:3.7.1'
-  implementation 'org.webjars:datatables:2.1.0'
+  implementation 'org.webjars.npm:datatables.net:2.1.7'
+  implementation 'org.webjars.npm:datatables.net-buttons:3.1.1'
+  implementation 'org.webjars.npm:datatables.net-responsive:3.0.1'
+  implementation 'org.webjars.npm:datatables.net-bs5:2.1.7'
 
   implementation 'org.springframework.boot:spring-boot-devtools'
 
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 3e29c32..ce1c47c 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -28,7 +28,7 @@ body {
 }
 
 .rightaligned {
-	right: 5px;
+	right: 20px;
 	position: absolute;
 }
 
diff --git a/src/main/resources/templates/template.html b/src/main/resources/templates/template.html
index 2766cd1..95a5ec6 100644
--- a/src/main/resources/templates/template.html
+++ b/src/main/resources/templates/template.html
@@ -4,14 +4,17 @@
 <title>Bible Class Organizer</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link th:rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/bootstrap/5.3.3/css/bootstrap.min.css}" />
-<link th:rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.css}" />
-<link th:rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/datatables/2.1.0/css/jquery.dataTables.min.css}" />
-<link th:rel="stylesheet" type="text/css" media="all" th:href="@{/css/style.css}" />
-<script th:src="@{/webjars/bootstrap/5.3.3/js/bootstrap.bundle.min.js}"></script>
-<script th:src="@{/webjars/jquery/3.7.1/jquery.min.js}"></script>
-<script th:src="@{/webjars/datatables/2.1.0/js/jquery.dataTables.min.js}"></script>
-<script th:src="@{/js/dataTables.de.js}"></script>
+<link rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/bootstrap/5.3.3/css/bootstrap.min.css}" />
+<link rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.css}" />
+<link rel="stylesheet" type="text/css" media="all" th:href="@{/webjars/datatables.net-bs5/2.1.7/css/dataTables.bootstrap5.min.css}"/>
+<link rel="stylesheet" type="text/css" media="all" th:href="@{/css/style.css}" />
+<script type="application/javascript" th:src="@{/webjars/bootstrap/5.3.3/js/bootstrap.bundle.min.js}"></script>
+<script type="application/javascript" th:src="@{/webjars/jquery/3.7.1/jquery.min.js}"></script>
+<script type="application/javascript" th:src="@{/webjars/datatables.net/2.1.7/js/dataTables.min.js}"></script>
+<script type="application/javascript" th:src="@{/js/dataTables.de.js}"></script>
+<script type="application/javascript" th:src="@{/webjars/datatables.net-bs5/2.1.7/js/dataTables.bootstrap5.min.js}"></script>
+<script type="application/javascript" th:src="@{/webjars/datatables.net-responsive/3.0.1/js/dataTables.responsive.min.js}"></script>
+<script type="application/javascript" th:src="@{/webjars/datatables.net-buttons/3.1.1/js/dataTables.buttons.min.js}"></script>
 <script th:src="@{/js/stylehelp.js}"></script>
 </head>
 <body>