From 2646af19b3256acafbb8c4ed5973cc3cd328246a Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Mon, 20 May 2024 18:18:26 +0100
Subject: [PATCH 1/3] config fix and book icons
---
.../java/stirling/software/SPDF/config/ConfigInitializer.java | 2 --
src/main/resources/templates/home.html | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
index e82e8f3f..e8433588 100644
--- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
+++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
@@ -70,7 +70,6 @@ public class ConfigInitializer
if (!entry.isEmpty()) {
// Check if this comment has been uncommented in userLines
String key = entry.split(":")[0].trim();
- System.out.println("key=" + key + ", entry=" + entry );
addLine(resultLines, userLines, templateLine, key);
} else {
resultLines.add(templateLine);
@@ -104,7 +103,6 @@ public class ConfigInitializer
boolean added = false;
int templateIndentationLevel = getIndentationLevel(templateLine);
for (String settingsLine : userLines) {
- if(settingsLine.contains("oauth2") || settingsLine.contains("enabled") )
if (settingsLine.trim().startsWith(key + ":")) {
int settingsIndentationLevel = getIndentationLevel(settingsLine);
// Check if it is correct settingsLine and has the same parent as templateLine
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index 9f78c128..24e7472f 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -219,10 +219,10 @@
th:replace="~{fragments/card :: card(id='split-pdf-by-sections', cardTitle=#{home.split-by-sections.title}, cardText=#{home.split-by-sections.desc}, cardLink='split-pdf-by-sections', toolIcon='grid_on', tags=#{split-by-sections.tags}, toolGroup='advance')}">
+ th:replace="~{fragments/card :: card(id='book-to-pdf', cardTitle=#{home.BookToPDF.title}, cardText=#{home.BookToPDF.desc}, cardLink='book-to-pdf', toolIcon='book', tags=#{BookToPDF.tags}, toolGroup='convert')}">
+ th:replace="~{fragments/card :: card(id='pdf-to-book', cardTitle=#{home.PDFToBook.title}, cardText=#{home.PDFToBook.desc}, cardLink='pdf-to-book', toolIcon='book', tags=#{PDFToBook.tags}, toolGroup='convert')}">
From 6adeecac9c1f9f20161a618b722a55c2e11e84a3 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Mon, 20 May 2024 18:43:47 +0100
Subject: [PATCH 2/3] fix tool removal in navbar
---
.../resources/static/js/languageSelection.js | 31 +++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/static/js/languageSelection.js b/src/main/resources/static/js/languageSelection.js
index 7af113d0..55f0647e 100644
--- a/src/main/resources/static/js/languageSelection.js
+++ b/src/main/resources/static/js/languageSelection.js
@@ -60,23 +60,22 @@ function handleDropdownItemClick(event) {
}
document.addEventListener("DOMContentLoaded", function () {
- document.querySelectorAll(".nav-item.dropdown").forEach((element) => {
- const dropdownMenu = element.querySelector(".dropdown-menu");
- if (
- dropdownMenu.id !== "favoritesDropdown" &&
- dropdownMenu.children.length <= 2 &&
- dropdownMenu.querySelectorAll("hr.dropdown-divider").length === dropdownMenu.children.length
- ) {
- if (
- element.previousElementSibling &&
- element.previousElementSibling.classList.contains("nav-item") &&
- element.previousElementSibling.classList.contains("nav-item-separator")
- ) {
- element.previousElementSibling.remove();
- }
- element.remove();
+
+document.querySelectorAll(".col-lg-2.col-sm-6").forEach((element) => {
+ const dropdownItems = element.querySelectorAll(".dropdown-item");
+ const items = Array.from(dropdownItems).filter(item => !item.querySelector("hr.dropdown-divider"));
+
+ if (items.length <= 2) {
+ if (
+ element.previousElementSibling &&
+ element.previousElementSibling.classList.contains("col-lg-2") &&
+ element.previousElementSibling.classList.contains("nav-item-separator")
+ ) {
+ element.previousElementSibling.remove();
+ }
+ element.remove();
}
- });
+});
//Sort languages by alphabet
const list = Array.from(document.querySelector('.dropdown-menu[aria-labelledby="languageDropdown"]').children).filter(
From 4232f359c73bfaa9b5bfcbaf6a2ed86a6d7d9acc Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.>
Date: Mon, 20 May 2024 18:44:13 +0100
Subject: [PATCH 3/3] bump
---
build.gradle | 2 +-
chart/stirling-pdf/Chart.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 48aafae2..a451efd2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
import com.github.jk1.license.render.*
group = 'stirling.software'
-version = '0.24.3'
+version = '0.24.4'
//17 is lowest but we support and recommend 21
sourceCompatibility = '17'
diff --git a/chart/stirling-pdf/Chart.yaml b/chart/stirling-pdf/Chart.yaml
index 59519584..d5b6019d 100644
--- a/chart/stirling-pdf/Chart.yaml
+++ b/chart/stirling-pdf/Chart.yaml
@@ -1,5 +1,5 @@
apiVersion: v2
-appVersion: 0.24.3
+appVersion: 0.24.4
description: locally hosted web application that allows you to perform various operations
on PDF files
home: https://github.com/Stirling-Tools/Stirling-PDF