Merge remote-tracking branch 'origin/main' into test

src/main/resources/templates/convert/pdf-to-img.html

@@ -26,14 +26,13 @@
                                     <option value="gif">GIF</option>
                                     <option value="tiff">TIFF</option>
                                     <option value="bmp">BMP</option>
-                                    <option value="wbmp">WBMP</option>
                                 </select>
                             </div>
                             <div class="mb-3">
                                 <label th:text="#{pdfToImage.singleOrMultiple}"></label> 
                                 <select class="form-control" name="singleOrMultiple">
-                                    <option value="single" th:text="#{pdfToImage.single}"></option>
                                     <option value="multiple" th:text="#{pdfToImage.multi}"></option>
+                                    <option value="single" th:text="#{pdfToImage.single}"></option>
                                 </select>
                             </div>
                             <div class="mb-3">

src/main/resources/templates/fragments/common.html

@@ -36,6 +36,9 @@
 <script src="js/thirdParty/bootstrap.min.js"></script>
 <link rel="stylesheet" href="css/bootstrap.min.css">
 
+<!-- Bootstrap Icons -->
+<link rel="stylesheet" href="css/bootstrap-icons.min.css">
+
 <!-- PDF.js -->
 <script src="pdfjs/pdf.js"></script>
 

src/main/resources/templates/fragments/languages.html

@@ -1,8 +1,8 @@
 <th:block th:fragment="langs">
-<a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="bg_BG">
+         <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="bg_BG">
              <img src="images/flags/bg.svg" alt="icon" width="20" height="15"> Български
          </a>
-<a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ar_AR">
+         <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ar_AR">
              <img src="images/flags/sa.svg" alt="icon" width="20" height="15"> العربية
          </a>
          <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ca_CA">
@@ -20,10 +20,10 @@
          <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="en_US">
              <img src="images/flags/us.svg" alt="icon" width="20" height="15"> English (US)
          </a>
-        <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="eu_ES">
+         <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="eu_ES">
              <img src="images/flags/eu.svg" alt="icon" width="20" height="15"> Euskara
          </a>
-		  <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="es_ES">
+         <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="es_ES">
              <img src="images/flags/es.svg" alt="icon" width="20" height="15"> Español
          </a>
          <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="fr_FR">
@@ -49,7 +49,7 @@
          </a>
          <a class="dropdown-item lang_dropdown-item" href="" data-language-code="tr_TR">
             <img src="images/flags/tr.svg" alt="icon" width="20" height="15"> Türkçe
-        </a>
+         </a>
          <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ru_RU">
              <img src="images/flags/ru.svg" alt="icon" width="20" height="15"> Русский
          </a>
@@ -59,7 +59,10 @@
          <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="ja_JP">
              <img src="images/flags/jp.svg" alt="icon" width="20" height="15"> 日本語
          </a>
-        <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="el_GR">
-            <img src="images/flags/gr.svg" alt="icon" width="20" height="15"> Ελληνικά
-        </a>
+         <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="el_GR">
+             <img src="images/flags/gr.svg" alt="icon" width="20" height="15"> Ελληνικά
+         </a>
+	 <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="hu_HU">
+             <img src="images/flags/hu.svg" alt="icon" width="20" height="15"> Hungarian
+         </a>
 </th:block>

src/main/resources/templates/fragments/navbar.html

@@ -107,7 +107,7 @@
                     </li>
 
                     <li class="nav-item nav-item-separator"></li>
-                    <li class="nav-item dropdown" th:classappend="${currentPage}=='sign' OR ${currentPage}=='repair' OR ${currentPage}=='compare' OR ${currentPage}=='show-javascript' OR ${currentPage}=='flatten' OR ${currentPage}=='remove-blanks' OR ${currentPage}=='extract-image-scans' OR ${currentPage}=='change-metadata' OR ${currentPage}=='add-image' OR ${currentPage}=='ocr-pdf' OR ${currentPage}=='change-permissions' OR ${currentPage}=='extract-images' OR ${currentPage}=='compress-pdf' OR ${currentPage}=='add-page-numbers' OR ${currentPage}=='auto-rename' OR ${currentPage}=='get-info-on-pdf' ? 'active' : ''">
+                    <li class="nav-item dropdown" th:classappend="${currentPage}=='sign' OR ${currentPage}=='repair' OR ${currentPage}=='compare' OR ${currentPage}=='show-javascript' OR ${currentPage}=='flatten' OR ${currentPage}=='remove-blanks' OR ${currentPage}=='remove-annotations' OR ${currentPage}=='extract-image-scans' OR ${currentPage}=='change-metadata' OR ${currentPage}=='add-image' OR ${currentPage}=='ocr-pdf' OR ${currentPage}=='change-permissions' OR ${currentPage}=='extract-images' OR ${currentPage}=='compress-pdf' OR ${currentPage}=='add-page-numbers' OR ${currentPage}=='auto-rename' OR ${currentPage}=='get-info-on-pdf' ? 'active' : ''">
                         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <img class="icon" src="images/card-list.svg" alt="icon" style="width: 16px; height: 16px; vertical-align: middle;">
                             <span class="icon-text"  th:text="#{navbar.other}"></span>
@@ -125,6 +125,7 @@
                             <div th:replace="~{fragments/navbarEntry :: navbarEntry ('flatten', 'images/flatten.svg', 'home.flatten.title', 'home.flatten.desc', 'flatten.tags')}"></div>
                             <div th:replace="~{fragments/navbarEntry :: navbarEntry ('repair', 'images/wrench.svg', 'home.repair.title', 'home.repair.desc', 'repair.tags')}"></div>
                             <div th:replace="~{fragments/navbarEntry :: navbarEntry ('remove-blanks', 'images/blank-file.svg', 'home.removeBlanks.title', 'home.removeBlanks.desc', 'removeBlanks.tags')}"></div>
+                            <div th:replace="~{fragments/navbarEntry :: navbarEntry ('remove-annotations', 'images/no-chat.svg', 'home.removeAnnotations.title', 'home.removeAnnotations.desc', 'removeAnnotations.tags')}"></div>
                             <div th:replace="~{fragments/navbarEntry :: navbarEntry ('compare', 'images/scales.svg', 'home.compare.title', 'home.compare.desc', 'compare.tags')}"></div>
                             <div th:replace="~{fragments/navbarEntry :: navbarEntry ('add-page-numbers', 'images/add-page-numbers.svg', 'home.add-page-numbers.title', 'home.add-page-numbers.desc', 'add-page-numbers.tags')}"></div>
                             <div th:replace="~{fragments/navbarEntry :: navbarEntry ('auto-rename', 'images/fonts.svg', 'home.auto-rename.title', 'home.auto-rename.desc', 'auto-rename.tags')}"></div>

src/main/resources/templates/home.html

@@ -73,6 +73,7 @@
 
                 <div th:replace="~{fragments/card :: card(id='repair', cardTitle=#{home.repair.title}, cardText=#{home.repair.desc}, cardLink='repair', svgPath='images/wrench.svg')}"></div>
                 <div th:replace="~{fragments/card :: card(id='remove-blanks', cardTitle=#{home.removeBlanks.title}, cardText=#{home.removeBlanks.desc}, cardLink='remove-blanks', svgPath='images/blank-file.svg')}"></div>
+                <div th:replace="~{fragments/card :: card(id='remove-annotations', cardTitle=#{home.removeAnnotations.title}, cardText=#{home.removeAnnotations.desc}, cardLink='remove-annotations', svgPath='images/no-chat.svg')}"></div>
                 <div th:replace="~{fragments/card :: card(id='compare', cardTitle=#{home.compare.title}, cardText=#{home.compare.desc}, cardLink='compare', svgPath='images/scales.svg')}"></div>
 
                 <div th:replace="~{fragments/card :: card(id='cert-sign', cardTitle=#{home.certSign.title}, cardText=#{home.certSign.desc}, cardLink='cert-sign', svgPath='images/award.svg')}"></div>

src/main/resources/templates/misc/remove-annotations.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
+<th:block th:insert="~{fragments/common :: head(title=#{removeAnnotations.title})}"></th:block>
+
+<body>
+    <div id="page-container">
+        <div id="content-wrap">
+            <div th:insert="~{fragments/navbar.html :: navbar}"></div>
+            <br> <br>
+            <div class="container">
+                <div class="row justify-content-center">
+                    <div class="col-md-6">
+                        <h2 th:text="#{removeAnnotations.header}"></h2>
+                        <form id="pdfForm" class="mb-3">
+                            <div class="custom-file">
+                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf', remoteCall='false')}"></div>
+                            </div>
+                            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{removeAnnotations.submit}"></button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div th:insert="~{fragments/footer.html :: footer}"></div>
+    </div>
+    <script src="js/local-pdf-input-download.js"></script>
+    <script>
+    document.getElementById('pdfForm').addEventListener('submit', async (e) => {
+        e.preventDefault();
+
+        const { PDFDocument } = PDFLib;
+
+        const processFile = async (file) => {
+            const origFileUrl = URL.createObjectURL(file);
+            const formPdfBytes = await fetch(origFileUrl).then(res => res.arrayBuffer());
+            const pdfDoc = await PDFDocument.load(formPdfBytes, { ignoreEncryption: true });
+
+            const pages = pdfDoc.getPages();
+
+            for (let i = 0; i < pages.length; ++i) {
+                const page = pages[i];
+                const annotations = page.node.Annots();
+                if (!annotations) continue;
+                const ctx = annotations.context;
+
+                for (let j = 0; j < annotations.size(); ++j) {
+                    const annotation = annotations.get(j);
+                    ctx.delete(annotation);
+                }
+            }
+
+            const pdfBytes = await pdfDoc.save();
+            const pdfBlob = new Blob([pdfBytes], { type: 'application/pdf' });
+            const fileName = (file.name ? file.name.replace('.pdf', '') : 'pdf') + '_removed_annotations.pdf';
+
+            return { processedData: pdfBlob, fileName };
+        };
+
+        await downloadFilesWithCallback(processFile);
+    });
+    </script>
+</body>
+
+</html>