Merge pull request #1253 from Stirling-Tools/configFixes

Config fixes
Stirling-Tools · May 20, 2024 · 149249c · 149249c
2 parents ea02369 + 4232f35
commit 149249c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git 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
@@ -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

diff --git 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 void ensureConfigExists() throws IOException, URISyntaxException {
                     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 @@ private static void addLine(List<String> resultLines, List<String> userLines, St
         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/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(

diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
@@ -219,10 +219,10 @@ <h5 class="card-title" th:text="#{settings.update}"></h5>
             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')}">
           </div>
           <div
-            th:replace="~{fragments/card :: card(id='book-to-pdf', cardTitle=#{home.BookToPDF.title}, cardText=#{home.BookToPDF.desc}, cardLink='book-to-pdf', toolIcon='images/book.svg', tags=#{BookToPDF.tags}, toolGroup='convert')}">
+            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')}">
           </div>
           <div
-            th:replace="~{fragments/card :: card(id='pdf-to-book', cardTitle=#{home.PDFToBook.title}, cardText=#{home.PDFToBook.desc}, cardLink='pdf-to-book', toolIcon='images/book.svg', tags=#{PDFToBook.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')}">
           </div>
           <div
             th:replace="~{fragments/card :: card(id='stamp', cardTitle=#{home.AddStampRequest.title}, cardText=#{home.AddStampRequest.desc}, cardLink='stamp', toolIcon='approval', tags=#{AddStampRequest.tags}, toolGroup='security')}">