From 6cdccdd2482480f02b0442f9e059ef87914c81c7 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Thu, 9 Feb 2023 22:05:51 +0000 Subject: [PATCH] formats! --- .../stirling/software/SPDF/config/Beans.java | 32 +-- .../SPDF/controller/PdfController.java | 3 - .../RearrangePagesPDFController.java | 18 +- .../converters/ConvertImgPDFController.java | 25 +- .../security/MetadataController.java | 18 +- .../software/SPDF/utils/PdfUtils.java | 95 +++---- src/main/resources/messages_en_GB.properties | 4 +- src/main/resources/messages_en_US.properties | 2 +- src/main/resources/messages_fr_FR.properties | 2 +- src/main/resources/templates/add-image.html | 68 +++-- .../resources/templates/compress-pdf.html | 54 ++-- .../templates/convert/img-to-pdf.html | 51 ++-- .../templates/convert/pdf-to-img.html | 99 ++++---- .../resources/templates/fragments/card.html | 8 +- .../resources/templates/fragments/common.html | 72 +++--- .../resources/templates/fragments/navbar.html | 8 +- src/main/resources/templates/home.html | 93 +++---- src/main/resources/templates/merge-pdfs.html | 232 +++++++++--------- .../resources/templates/pdf-organizer.html | 52 ++-- .../resources/templates/remove-pages.html | 50 ++-- src/main/resources/templates/rotate-pdf.html | 139 +++++------ .../templates/security/add-password.html | 152 ++++++------ .../templates/security/add-watermark.html | 88 +++---- .../templates/security/change-metadata.html | 153 ++++++------ .../security/change-permissions.html | 132 +++++----- .../templates/security/remove-password.html | 59 +++-- src/main/resources/templates/split-pdfs.html | 67 +++-- 27 files changed, 873 insertions(+), 903 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/Beans.java b/src/main/java/stirling/software/SPDF/config/Beans.java index 72a41b6ac..f821bb070 100644 --- a/src/main/java/stirling/software/SPDF/config/Beans.java +++ b/src/main/java/stirling/software/SPDF/config/Beans.java @@ -13,23 +13,23 @@ import java.util.Locale; @Configuration public class Beans implements WebMvcConfigurer { - @Bean - public LocaleResolver localeResolver() { - SessionLocaleResolver slr = new SessionLocaleResolver(); - slr.setDefaultLocale(Locale.US); - return slr; - } + @Bean + public LocaleResolver localeResolver() { + SessionLocaleResolver slr = new SessionLocaleResolver(); + slr.setDefaultLocale(Locale.US); + return slr; + } - @Bean - public LocaleChangeInterceptor localeChangeInterceptor() { - LocaleChangeInterceptor lci = new LocaleChangeInterceptor(); - lci.setParamName("lang"); - return lci; - } + @Bean + public LocaleChangeInterceptor localeChangeInterceptor() { + LocaleChangeInterceptor lci = new LocaleChangeInterceptor(); + lci.setParamName("lang"); + return lci; + } - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(localeChangeInterceptor()); - } + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(localeChangeInterceptor()); + } } diff --git a/src/main/java/stirling/software/SPDF/controller/PdfController.java b/src/main/java/stirling/software/SPDF/controller/PdfController.java index cff7df24a..3973c603f 100644 --- a/src/main/java/stirling/software/SPDF/controller/PdfController.java +++ b/src/main/java/stirling/software/SPDF/controller/PdfController.java @@ -31,13 +31,10 @@ public class PdfController { return "redirect:/"; } - @GetMapping("/") public String home(Model model) { model.addAttribute("currentPage", "home"); return "home"; } - - } \ No newline at end of file diff --git a/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java b/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java index b655ab69b..90fbf118c 100644 --- a/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java +++ b/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java @@ -42,19 +42,19 @@ public class RearrangePagesPDFController { @PostMapping("/remove-pages") public ResponseEntity deletePages(@RequestParam("fileInput") MultipartFile pdfFile, @RequestParam("pagesToDelete") String pagesToDelete) throws IOException { - + PDDocument document = PDDocument.load(pdfFile.getBytes()); - + // Split the page order string into an array of page numbers or range of numbers String[] pageOrderArr = pagesToDelete.split(","); - + List pagesToRemove = pageOrderToString(pageOrderArr, document.getNumberOfPages()); - + for (int i = pagesToRemove.size() - 1; i >= 0; i--) { - int pageIndex = pagesToRemove.get(i); - document.removePage(pageIndex); - } - + int pageIndex = pagesToRemove.get(i); + document.removePage(pageIndex); + } + return PdfUtils.pdfDocToWebResponse(document, pdfFile.getName() + "_removed_pages.pdf"); } @@ -100,7 +100,7 @@ public class RearrangePagesPDFController { int totalPages = document.getNumberOfPages(); List newPageOrder = pageOrderToString(pageOrderArr, totalPages); - + // Create a new list to hold the pages in the new order List newPages = new ArrayList<>(); for (int i = 0; i < newPageOrder.size(); i++) { diff --git a/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java b/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java index 765085a46..b34c24ed3 100644 --- a/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java +++ b/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java @@ -49,12 +49,14 @@ public class ConvertImgPDFController { @PostMapping("/pdf-to-img") public ResponseEntity convertToImage(@RequestParam("fileInput") MultipartFile file, - @RequestParam("imageFormat") String imageFormat, - @RequestParam("singleOrMultiple") String singleOrMultiple, - @RequestParam("colorType") String colorType) throws IOException { + @RequestParam("imageFormat") String imageFormat, @RequestParam("singleOrMultiple") String singleOrMultiple, + @RequestParam("colorType") String colorType, @RequestParam("dpi") String dpi, + @RequestParam("contrast") String contrast, @RequestParam("brightness") String brightness) + throws IOException { + byte[] pdfBytes = file.getBytes(); ImageType colorTypeResult = ImageType.RGB; - if("greyscale".equals(colorType)) { + if ("greyscale".equals(colorType)) { colorTypeResult = ImageType.GRAY; } else if ("blackwhite".equals(colorType)) { colorTypeResult = ImageType.BINARY; @@ -63,7 +65,9 @@ public class ConvertImgPDFController { boolean singleImage = singleOrMultiple.equals("single"); byte[] result = null; try { - result = PdfUtils.convertFromPdf(pdfBytes, imageFormat.toLowerCase(), colorTypeResult, singleImage); + result = PdfUtils.convertFromPdf(pdfBytes, imageFormat.toLowerCase(), colorTypeResult, singleImage, + Integer.valueOf(dpi), Integer.valueOf(contrast), Integer.valueOf(brightness)); // DPI, contrast, + // brightness } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -71,17 +75,20 @@ public class ConvertImgPDFController { // TODO Auto-generated catch block e.printStackTrace(); } - if(singleImage) { + if (singleImage) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.parseMediaType(getMediaType(imageFormat))); headers.setCacheControl("must-revalidate, post-check=0, pre-check=0"); - ResponseEntity response = new ResponseEntity<>(new ByteArrayResource(result), headers, HttpStatus.OK); + ResponseEntity response = new ResponseEntity<>(new ByteArrayResource(result), headers, + HttpStatus.OK); return response; } else { ByteArrayResource resource = new ByteArrayResource(result); // return the Resource in the response - return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=converted_documents.zip") - .contentType(MediaType.APPLICATION_OCTET_STREAM).contentLength(resource.contentLength()).body(resource); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=converted_documents.zip") + .contentType(MediaType.APPLICATION_OCTET_STREAM).contentLength(resource.contentLength()) + .body(resource); } } diff --git a/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java b/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java index 52358564d..a4bf9535c 100644 --- a/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java +++ b/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java @@ -38,20 +38,17 @@ public class MetadataController { model.addAttribute("currentPage", "change-metadata"); return "security/change-metadata"; } + @PostMapping("/update-metadata") - public ResponseEntity metadata( - @RequestParam Map allRequestParams) throws IOException { - + public ResponseEntity metadata(@RequestParam Map allRequestParams) throws IOException { + System.out.println("1 allRequestParams.size() = " + allRequestParams.size()); - for(Entry entry : allRequestParams.entrySet()) { - System.out.println("1 key=" + entry.getKey() + ", value=" + entry.getValue()); - } + for (Entry entry : allRequestParams.entrySet()) { + System.out.println("1 key=" + entry.getKey() + ", value=" + entry.getValue()); + } return null; } - - - - + // @PostMapping("/update-metadata") // public ResponseEntity addWatermark(@RequestParam("fileInput") MultipartFile pdfFile, // @RequestParam Map allRequestParams,HttpServletRequest request, ModelMap model) throws IOException { @@ -88,7 +85,6 @@ public class MetadataController { // return PdfUtils.pdfDocToWebResponse(document, pdfFile.getName() + "_metadata.pdf"); // } - // // Loop over all pages and remove annotations // for (PDPage page : document.getPages()) { // page.getAnnotations().clear(); diff --git a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java index 1b2de70c9..495c6986d 100644 --- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java +++ b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java @@ -2,6 +2,7 @@ package stirling.software.SPDF.utils; import java.awt.Graphics; import java.awt.image.BufferedImage; +import java.awt.image.RescaleOp; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -80,55 +81,61 @@ public class PdfUtils { } } - public static byte[] convertFromPdf(byte[] inputStream, String imageType, ImageType colorType, boolean singleImage) throws IOException, Exception { - try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputStream))) { - PDFRenderer pdfRenderer = new PDFRenderer(document); - int pageCount = document.getNumberOfPages(); - List images = new ArrayList<>(); - // Create images of all pages - for (int i = 0; i < pageCount; i++) { - images.add(pdfRenderer.renderImageWithDPI(i, 300, colorType)); - } + public static byte[] convertFromPdf(byte[] inputStream, String imageType, ImageType colorType, boolean singleImage, + int DPI, int contrast, int brightness) throws IOException, Exception { + try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputStream))) { + PDFRenderer pdfRenderer = new PDFRenderer(document); + int pageCount = document.getNumberOfPages(); + List images = new ArrayList<>(); - if (singleImage) { - // Combine all images into a single big image - BufferedImage combined = new BufferedImage(images.get(0).getWidth() , - images.get(0).getHeight()* pageCount, BufferedImage.TYPE_INT_RGB); - Graphics g = combined.getGraphics(); - for (int i = 0; i < images.size(); i++) { - g.drawImage(images.get(i), 0, i * images.get(0).getHeight(), null); - } - images = Arrays.asList(combined); - } + // Create images of all pages + for (int i = 0; i < pageCount; i++) { + BufferedImage image = pdfRenderer.renderImageWithDPI(i, 300, colorType); + float scale = contrast + 1f; + float offset = brightness; + RescaleOp rescaleOp = new RescaleOp(scale, offset, null); + BufferedImage dest = rescaleOp.filter(image, null); + images.add(dest); + } + if (singleImage) { + // Combine all images into a single big image + BufferedImage combined = new BufferedImage(images.get(0).getWidth(), + images.get(0).getHeight() * pageCount, BufferedImage.TYPE_INT_RGB); + Graphics g = combined.getGraphics(); + for (int i = 0; i < images.size(); i++) { + g.drawImage(images.get(i), 0, i * images.get(0).getHeight(), null); + } + images = Arrays.asList(combined); + } - // Create a ByteArrayOutputStream to save the image(s) to - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - if (singleImage) { - // Write the image to the output stream - ImageIO.write(images.get(0), "PNG", baos); + // Create a ByteArrayOutputStream to save the image(s) to + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + if (singleImage) { + // Write the image to the output stream + ImageIO.write(images.get(0), "PNG", baos); - // Log that the image was successfully written to the byte array - logger.info("Image successfully written to byte array"); - } else { - // Zip the images and return as byte array - try (ZipOutputStream zos = new ZipOutputStream(baos)) { - for (int i = 0; i < images.size(); i++) { - BufferedImage image = images.get(i); - try (ByteArrayOutputStream baosImage = new ByteArrayOutputStream()) { - ImageIO.write(image, "PNG", baosImage); + // Log that the image was successfully written to the byte array + logger.info("Image successfully written to byte array"); + } else { + // Zip the images and return as byte array + try (ZipOutputStream zos = new ZipOutputStream(baos)) { + for (int i = 0; i < images.size(); i++) { + BufferedImage image = images.get(i); + try (ByteArrayOutputStream baosImage = new ByteArrayOutputStream()) { + ImageIO.write(image, "PNG", baosImage); - // Add the image to the zip file - zos.putNextEntry(new ZipEntry(String.format("page_%d.%s", i + 1, "png"))); - zos.write(baosImage.toByteArray()); - } - } - // Log that the images were successfully written to the byte array - logger.info("Images successfully written to byte array as a zip"); - } - } - return baos.toByteArray(); - } catch (IOException e) { + // Add the image to the zip file + zos.putNextEntry(new ZipEntry(String.format("page_%d.%s", i + 1, "png"))); + zos.write(baosImage.toByteArray()); + } + } + // Log that the images were successfully written to the byte array + logger.info("Images successfully written to byte array as a zip"); + } + } + return baos.toByteArray(); + } catch (IOException e) { // Log an error message if there is an issue converting the PDF to an image logger.error("Error converting PDF to image", e); throw e; diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index afd3bdb06..2862f69ac 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -8,7 +8,7 @@ imgPrompt=Choose Image genericSubmit=Submit processTimeWarning=Warning: This process can take up to a minute depending on file-size pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) : -goToPage=go +goToPage=Go ############# # HOME-PAGE # ############# @@ -131,6 +131,8 @@ pdfToImage.colorType=Colour type pdfToImage.color=Colour pdfToImage.grey=Greyscale pdfToImage.blackwhite=Black and White (May lose data!) +pdfToImage.contrast=Contrast Value: +pdfToImage.brightness=Brightness Value: pdfToImage.submit=Convert #addPassword diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index f285a1e07..9554aa47a 100644 --- a/src/main/resources/messages_en_US.properties +++ b/src/main/resources/messages_en_US.properties @@ -11,7 +11,7 @@ imgPrompt=Choose Image genericSubmit=Submit processTimeWarning=Warning: This process can take up to a minute depending on file-size pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) : -goToPage=go +goToPage=Go ############# # HOME-PAGE # ############# diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index 6ab046bda..498fa2279 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/src/main/resources/messages_fr_FR.properties @@ -15,7 +15,7 @@ imgPrompt=Choisir une image genericSubmit=Soumettre processTimeWarning=Attention : ce processus peut prendre jusqu'à une minute en fonction de la taille du fichier pageOrderPrompt=Ordre des pages (Entrez une liste de numéros de page séparés par des virgules) : -goToPage=aller +goToPage=Aller ############# # HOME-PAGE # ############# diff --git a/src/main/resources/templates/add-image.html b/src/main/resources/templates/add-image.html index 31d170a77..6a54fc998 100644 --- a/src/main/resources/templates/add-image.html +++ b/src/main/resources/templates/add-image.html @@ -6,45 +6,35 @@ -
-
-
-
-
-
-
-
-

- - - -
- -
-
- -
-
- -
-
- -
- -
- - -
-
-
-
-
-
+
+
+
+

+
+
+
+

+
+
+
+ + +
+
+ +
+
+ +
+ +
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/compress-pdf.html b/src/main/resources/templates/compress-pdf.html index 6b17672d7..2d746412a 100644 --- a/src/main/resources/templates/compress-pdf.html +++ b/src/main/resources/templates/compress-pdf.html @@ -5,36 +5,32 @@ -
-
-
-
-
-
-
-
-

-
-

-
-
- -
+ +
+
+
+

+
+
+
+

+ +

+
+
+ + +
+ + + - - - - -
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html index 7f833e320..83d70b308 100644 --- a/src/main/resources/templates/convert/img-to-pdf.html +++ b/src/main/resources/templates/convert/img-to-pdf.html @@ -4,35 +4,32 @@ -
-
-
-
-
-
-
-
-

+ +
+
+
+

+
+
+
+

-
-
- -
-
-
- + +
+ + +
+

+ -
- -
-
-
+ + +
+
+
-
-
-
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html index 5bfa543af..4a122f33d 100644 --- a/src/main/resources/templates/convert/pdf-to-img.html +++ b/src/main/resources/templates/convert/pdf-to-img.html @@ -4,51 +4,64 @@ -
-
-
+ +
+
+
-
-
-
-
-
-

-

-
-
-
- -
-
- - -
-
- - -
- -
- +

+
+
+
+

+

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
-
+
+ + +
-
-
-
+
+ + +
+ + + + +
+
+
+ +
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/fragments/card.html b/src/main/resources/templates/fragments/card.html index 6fc41cfdf..620068cb8 100644 --- a/src/main/resources/templates/fragments/card.html +++ b/src/main/resources/templates/fragments/card.html @@ -1,5 +1,5 @@ -
-
-

- +
+
+

+
\ No newline at end of file diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index c7d4bcedd..5e546a23d 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -1,29 +1,29 @@ - - - - - + + + + + - - + + - - - - - + + + + + - - - + + + - - - + + + - - - - + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 75820fcd0..3b4b24772 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -65,11 +65,11 @@
    • - + - - + +
  • English (US) English (UK) العربية - German + Deutsch Français
    • diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index 18eef0fd6..c67be6444 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -5,62 +5,63 @@ -
    -
    -
    - -
    -
    -

    Stirling PDF

    -

    -
    -
    +
    +
    +
    + +
    +
    +

    Stirling PDF

    +

    +
    +
    - -
    -
    -
    -
    + +
    +
    +
    +
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/src/main/resources/templates/merge-pdfs.html b/src/main/resources/templates/merge-pdfs.html index 0c55beaba..87fbc241b 100644 --- a/src/main/resources/templates/merge-pdfs.html +++ b/src/main/resources/templates/merge-pdfs.html @@ -4,130 +4,124 @@ -
    -
    -
    -
    -
    -
    -
    -
    -

    -
    -
    - -
    - -
    -
    -
    -
      -
      -
      - -
      -
      + +
      +
      +
      +

      +
      +
      +
      +

      +
      +
      + +
      + + +
      +
      +
      +
        +
        +
        + +
        +
        + - - - - -
        -
        -
        -
        -
        -
        + }); + +
        +
        +
        +
        +
        +
        \ No newline at end of file diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html index 93c9a8a54..f738c2992 100644 --- a/src/main/resources/templates/pdf-organizer.html +++ b/src/main/resources/templates/pdf-organizer.html @@ -4,33 +4,31 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        - -
        -
        -
        - -
        - -
        - + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        -
        -
        -
        -
        +
        +
        +
        + + +
        + +
        + + +
        +
        +
        +
        +
        +
        \ No newline at end of file diff --git a/src/main/resources/templates/remove-pages.html b/src/main/resources/templates/remove-pages.html index 9e7c79dca..df75c0fad 100644 --- a/src/main/resources/templates/remove-pages.html +++ b/src/main/resources/templates/remove-pages.html @@ -4,33 +4,31 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        -
        - -
        - -
        - +
        +
        +
        + + +
        + +
        + -
        -
        -
        -
        -
        -
        +
        +
        +
        +
        +
        +
        \ No newline at end of file diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html index 8cf600270..ed4e3a67c 100644 --- a/src/main/resources/templates/rotate-pdf.html +++ b/src/main/resources/templates/rotate-pdf.html @@ -5,51 +5,51 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        - + +
        + -
        + -
        -
        -
        -
        -
        -
        +
        +
        +
        +
        +
        +
        - - +.previewContainer { + aspect-ratio: 1; + width: 100%; + border: 1px solid rgba(0, 0, 0, .125); + border-radius: 0.25rem; + margin: 1rem 0; + padding: 15px; + display: block; + overflow: hidden; + position: relative; +} + +.buttonContainer { + display: flex; + justify-content: space-around; +} + \ No newline at end of file diff --git a/src/main/resources/templates/security/add-password.html b/src/main/resources/templates/security/add-password.html index 85e3ebaf5..a215881ea 100644 --- a/src/main/resources/templates/security/add-password.html +++ b/src/main/resources/templates/security/add-password.html @@ -3,90 +3,78 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        - -
        -
        -
        - -
        -
        - -
        -
        - -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        + +
        + +
        +
        +
        + +
        +
        + +
        +
        + +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        -
        -
        -
        - -
        +
        +
        +
        + +
        -
        -
        -
        -
        -
        -
        -
        + +
        +
        +
        +
        +
        +
        diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html index 42d92a33f..cb9b5fedb 100644 --- a/src/main/resources/templates/security/add-watermark.html +++ b/src/main/resources/templates/security/add-watermark.html @@ -3,50 +3,50 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        - -
        -
        -
        - - -
        -
        - - -
        -
        - - -
        -
        - - -
        -
        - - -
        -
        - -
        -
        -
        -
        -
        -
        -
        -
        +
        +
        + +
        +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + +
        +
        +
        +
        +
        +
        +
        +
        diff --git a/src/main/resources/templates/security/change-metadata.html b/src/main/resources/templates/security/change-metadata.html index c61d04728..f85f4952b 100644 --- a/src/main/resources/templates/security/change-metadata.html +++ b/src/main/resources/templates/security/change-metadata.html @@ -3,85 +3,84 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        + +
        +

        Please select the variables you wish to change

        - -

        Please select the variables you wish to change

        +
        + + +
        -
        - - -
        +
        + + +
        -
        - - -
        - -
        - - -
        +
        + + +
        -
        - - -
        +
        + + +
        -
        - - -
        +
        + + +
        -
        - - -
        +
        + + +
        -
        - - -
        +
        + + +
        -
        - - -
        +
        + + +
        -
        - - -
        - -
        - - -
        - -
        - - -
        - -
        - -

        - - -
        - -
        -
        -
        -
        -
        -
        + + +
        +
        +
        +
        +
        +
        diff --git a/src/main/resources/templates/security/change-permissions.html b/src/main/resources/templates/security/change-permissions.html index 9d5972522..4affb9409 100644 --- a/src/main/resources/templates/security/change-permissions.html +++ b/src/main/resources/templates/security/change-permissions.html @@ -4,78 +4,68 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        -

        -
        -
        - -
        -
        -
        - -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        -
        - -
        + +
        +
        +
        +

        +
        +
        +
        +

        +

        + +
        + +
        +
        +
        + +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        -
        -
        -
        - -
        +
        +
        +
        + +
        - -
        -
        -
        -
        -
        -
        + +
        +
        +
        +
        +
        +
        diff --git a/src/main/resources/templates/security/remove-password.html b/src/main/resources/templates/security/remove-password.html index c896907c3..1a135819e 100644 --- a/src/main/resources/templates/security/remove-password.html +++ b/src/main/resources/templates/security/remove-password.html @@ -3,36 +3,35 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        + +
        +
        +
        +

        +
        +
        +
        +

        -
        -
        - -
        -
        -
        - -
        -
        -
        - -
        -
        -
        -
        -
        -
        -
        -
        +
        +
        + +
        +
        +
        + + +
        +
        +
        + +
        +
        +
        +
        +
        +
        +
        +
        diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html index 516332a26..d0a2672e3 100644 --- a/src/main/resources/templates/split-pdfs.html +++ b/src/main/resources/templates/split-pdfs.html @@ -6,42 +6,39 @@ -
        -
        -
        -
        -
        -
        -
        -
        -

        -

        -

        -

        -

        -

        -

        -

        -

        +
        +
        +
        +

        +
        +
        +
        +

        +

        +

        +

        +

        +

        +

        +

        +

        -
        -
        + +
        -
        - -
        -
        - -
        - -
        -
        -
        -
        -
        -
        +
        + + +
        +
        + + + +
        +
        +
        +
        +
        +
        \ No newline at end of file