From 9661e940923d81ab4078a600ec1089ee36cf215c Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Sat, 14 Sep 2024 23:20:29 +0100
Subject: [PATCH] Css changes (#1899)

* #1841

Signed-off-by: a <a>

* #1841 for watermark

Signed-off-by: a <a>

* #1869 and ensure naming

Signed-off-by: a <a>

---------

Signed-off-by: a <a>
Co-authored-by: a <a>
---
 .../resources/templates/misc/adjust-contrast.html    | 12 ++++++++++--
 src/main/resources/templates/misc/stamp.html         |  7 +++++++
 .../resources/templates/security/add-watermark.html  |  6 ++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/misc/adjust-contrast.html b/src/main/resources/templates/misc/adjust-contrast.html
index f54ac108..d10ea8e6 100644
--- a/src/main/resources/templates/misc/adjust-contrast.html
+++ b/src/main/resources/templates/misc/adjust-contrast.html
@@ -21,7 +21,9 @@
         <div class="container">
           <div class="row justify-content-center">
             <div class="col-md-12 bg-card">
+              <form>
               <div class="row justify-content-center">
+
                 <div class="col-md-3">
                   <div id="sliders-container" style="display:none;">
                     <h4><span th:text="#{adjustContrast.contrast}"></span> <span id="contrast-val">100</span>%</h4>
@@ -48,7 +50,9 @@
                   <button id="download-button" class="btn btn-primary" th:text="#{adjustContrast.download}"></button>
                   </div>
                 </div>
+
               </div>
+              </form>
 
               <script>
                 var canvas = document.getElementById('contrast-pdf-canvas');
@@ -219,7 +223,7 @@
                 function adjustBrightnessForPixel(pixel, brightness) {
                   return Math.max(0, Math.min(255, pixel * brightness));
                 }
-
+                let inputFileName = '';
                 async function downloadPDF() {
                   for (var i = 0; i < allPages.length; i++) {
                     await renderPageAndAdjustImageProperties(allPages[i]);
@@ -248,7 +252,10 @@
                   // Create download link
                   const downloadLink = document.createElement('a');
                   downloadLink.href = URL.createObjectURL(blob);
-                  downloadLink.download = "download.pdf";
+                  let newFileName = inputFileName ? inputFileName.replace('.pdf', '') : 'download';
+                  newFileName += '_adjusted_color.pdf';
+
+                  downloadLink.download = newFileName;
                   downloadLink.click();
 
                   // After download, reset the viewer and clear stored data
@@ -264,6 +271,7 @@
                 // Event listeners
                 document.getElementById('fileInput-input').addEventListener('change', function(e) {
                   if (e.target.files.length > 0) {
+                    inputFileName = e.target.files[0].name;
                     renderPDFAndSaveOriginalImageData(e.target.files[0]);
                   }
                 });
diff --git a/src/main/resources/templates/misc/stamp.html b/src/main/resources/templates/misc/stamp.html
index 90ce8601..d2512830 100644
--- a/src/main/resources/templates/misc/stamp.html
+++ b/src/main/resources/templates/misc/stamp.html
@@ -172,16 +172,23 @@
         });
 
         function toggleFileOption() {
+          const stampImage = document.getElementById('stampImage');
           const stampType = document.getElementById('stampType').value;
           const stampTextGroup = document.getElementById('stampTextGroup');
           const stampImageGroup = document.getElementById('stampImageGroup');
           const alphabetGroup = document.getElementById('alphabetGroup');
 
           if (stampType === 'text') {
+            if (stampImage.hasAttribute('required')) {
+              stampImage.removeAttribute('required');
+            }
             stampTextGroup.style.display = 'block';
             stampImageGroup.style.display = 'none';
             alphabetGroup.style.display = 'block';
           } else if (stampType === 'image') {
+            if (!stampImage.hasAttribute('required')) {
+              stampImage.setAttribute('required', '');
+            }
             stampTextGroup.style.display = 'none';
             stampImageGroup.style.display = 'block';
             alphabetGroup.style.display = 'none';
diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html
index d6614e85..a9cdebc4 100644
--- a/src/main/resources/templates/security/add-watermark.html
+++ b/src/main/resources/templates/security/add-watermark.html
@@ -123,12 +123,18 @@
                   const watermarkImage = document.getElementById('watermarkImage');
 
                   if (watermarkType === 'text') {
+                    if (watermarkImage.hasAttribute('required')) {
+                      watermarkImage.removeAttribute('required');
+                    }
                     watermarkTextGroup.style.display = 'block';
                     watermarkText.required = true;
                     watermarkImageGroup.style.display = 'none';
                     watermarkImage.required = false;
                     alphabetGroup.style.display = 'block';
                   } else if (watermarkType === 'image') {
+                    if (watermarkImage.hasAttribute('required')) {
+                      watermarkImage.removeAttribute('required');
+                    }
                     watermarkTextGroup.style.display = 'none';
                     watermarkText.required = false;
                     watermarkImageGroup.style.display = 'block';