Merge branch 'Stirling-Tools:main' into main

testdriverai · Oct 22, 2024 · 9f92602 · 9f92602
2 parents a7f3f65 + 532f7cd
commit 9f92602
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 48 deletions.
diff --git a/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java b/src/main/java/stirling/software/SPDF/EE/EEAppConfig.java
@@ -7,20 +7,19 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 @Lazy
+@Slf4j
 public class EEAppConfig {
 
-    private static final Logger logger = LoggerFactory.getLogger(EEAppConfig.class);
-
     @Autowired ApplicationProperties applicationProperties;
-
     @Autowired private LicenseKeyChecker licenseKeyChecker;
 
     @Bean(name = "runningEE")
     public boolean runningEnterpriseEdition() {
-        return licenseKeyChecker.getEnterpriseEnabledResult();
+    	return licenseKeyChecker.getEnterpriseEnabledResult();
     }
-}
+}
diff --git a/src/main/resources/static/js/multitool/horizontalScroll.js b/src/main/resources/static/js/multitool/horizontalScroll.js
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
@@ -360,7 +360,7 @@ <h6 class="menu-title" th:text="#{navbar.sections.advance}"></h6>
             </div>
           </li>
 
-          <li class="nav-item">
+          <li class="nav-item" th:if="${!@runningEE}">
             <a href="https://stirlingpdf.com/pricing" class="nav-link go-pro-link" target="_blank" rel="noopener noreferrer">
         <span class="go-pro-badge" th:text="#{enterpriseEdition.button}"></span>
             </a>

diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html
@@ -80,7 +80,6 @@
   <script type="module">
     import PdfContainer from './js/multitool/PdfContainer.js';
     import DragDropManager from "./js/multitool/DragDropManager.js";
-    import scrollDivHorizontally from "./js/multitool/horizontalScroll.js";
     import ImageHighlighter from "./js/multitool/ImageHighlighter.js";
     import PdfActionsManager from './js/multitool/PdfActionsManager.js';
     import FileDragManager from './js/multitool/fileInput.js';
@@ -93,7 +92,6 @@
     const fileDragManager = new FileDragManager();
 
     // Scroll the wrapper horizontally
-    scrollDivHorizontally('pages-container-wrapper');
 
     // Automatically exposes rotateAll, addFiles and exportPdf to the window for the global buttons.
     const pdfContainer = new PdfContainer(
@@ -111,4 +109,4 @@
   </script>
 </body>
 
-</html>
+</html>