From f43fe15193ce257245221472e34336cdf4983cf8 Mon Sep 17 00:00:00 2001 From: Ludy Date: Sat, 15 Jun 2024 23:07:09 +0200 Subject: [PATCH] further bug fixes when using context path (#1475) Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- src/main/resources/templates/account.html | 4 +- .../resources/templates/auto-split-pdf.html | 6 +- .../templates/convert/book-to-pdf.html | 2 +- .../templates/convert/file-to-pdf.html | 2 +- .../templates/convert/html-to-pdf.html | 2 +- .../templates/convert/img-to-pdf.html | 2 +- .../templates/convert/markdown-to-pdf.html | 2 +- .../templates/convert/pdf-to-book.html | 2 +- .../templates/convert/pdf-to-csv.html | 2 +- .../templates/convert/pdf-to-html.html | 2 +- .../templates/convert/pdf-to-img.html | 2 +- .../templates/convert/pdf-to-pdfa.html | 2 +- .../convert/pdf-to-presentation.html | 2 +- .../templates/convert/pdf-to-text.html | 2 +- .../templates/convert/pdf-to-word.html | 2 +- .../templates/convert/pdf-to-xml.html | 2 +- .../templates/convert/url-to-pdf.html | 2 +- src/main/resources/templates/crop.html | 2 +- src/main/resources/templates/error.html | 2 +- .../resources/templates/extract-page.html | 2 +- .../resources/templates/fragments/common.html | 84 ++++++------- .../fragments/errorBannerPerPage.html | 4 +- .../resources/templates/fragments/footer.html | 2 +- .../templates/fragments/languages.html | 64 +++++----- .../resources/templates/fragments/navbar.html | 36 +++--- src/main/resources/templates/home.html | 118 +++++++++--------- src/main/resources/templates/login.html | 8 +- src/main/resources/templates/merge-pdfs.html | 4 +- .../resources/templates/misc/add-image.html | 6 +- .../templates/misc/add-page-numbers.html | 2 +- .../resources/templates/misc/auto-crop.html | 2 +- .../resources/templates/misc/auto-rename.html | 2 +- .../templates/misc/change-metadata.html | 2 +- .../templates/misc/compress-pdf.html | 2 +- .../templates/misc/extract-image-scans.html | 2 +- .../templates/misc/extract-images.html | 2 +- .../resources/templates/misc/fake-scan.html | 2 +- .../resources/templates/misc/flatten.html | 2 +- .../resources/templates/misc/ocr-pdf.html | 2 +- .../resources/templates/misc/print-file.html | 2 +- .../templates/misc/remove-annotations.html | 2 +- .../templates/misc/remove-blanks.html | 2 +- src/main/resources/templates/misc/repair.html | 2 +- .../templates/misc/show-javascript.html | 6 +- src/main/resources/templates/misc/stamp.html | 2 +- .../templates/multi-page-layout.html | 2 +- src/main/resources/templates/overlay-pdf.html | 2 +- .../resources/templates/pdf-organizer.html | 2 +- .../templates/pdf-to-single-page.html | 2 +- src/main/resources/templates/pipeline.html | 4 +- .../resources/templates/remove-pages.html | 2 +- src/main/resources/templates/rotate-pdf.html | 2 +- src/main/resources/templates/scale-pages.html | 2 +- .../templates/security/get-info-on-pdf.html | 2 +- src/main/resources/templates/sign.html | 8 +- .../templates/split-by-size-or-count.html | 2 +- .../templates/split-pdf-by-sections.html | 4 +- src/main/resources/templates/split-pdfs.html | 2 +- src/main/resources/templates/view-pdf.html | 22 ++-- 59 files changed, 233 insertions(+), 233 deletions(-) diff --git a/src/main/resources/templates/account.html b/src/main/resources/templates/account.html index 0e5246b8..ddb48a30 100644 --- a/src/main/resources/templates/account.html +++ b/src/main/resources/templates/account.html @@ -329,8 +329,8 @@ });
- Sign Out - Admin Settings + Sign Out + Admin Settings
diff --git a/src/main/resources/templates/auto-split-pdf.html b/src/main/resources/templates/auto-split-pdf.html index 00b65c8d..06915a47 100644 --- a/src/main/resources/templates/auto-split-pdf.html +++ b/src/main/resources/templates/auto-split-pdf.html @@ -21,7 +21,7 @@ -
+

@@ -43,9 +43,9 @@
  • -

    -

    diff --git a/src/main/resources/templates/convert/book-to-pdf.html b/src/main/resources/templates/convert/book-to-pdf.html index 8d0f74cb..926fe7c3 100644 --- a/src/main/resources/templates/convert/book-to-pdf.html +++ b/src/main/resources/templates/convert/book-to-pdf.html @@ -14,7 +14,7 @@

    - +
    diff --git a/src/main/resources/templates/convert/file-to-pdf.html b/src/main/resources/templates/convert/file-to-pdf.html index 2230da33..c5e7b8ad 100644 --- a/src/main/resources/templates/convert/file-to-pdf.html +++ b/src/main/resources/templates/convert/file-to-pdf.html @@ -20,7 +20,7 @@

    -
    +
    diff --git a/src/main/resources/templates/convert/html-to-pdf.html b/src/main/resources/templates/convert/html-to-pdf.html index 0f895484..511e7758 100644 --- a/src/main/resources/templates/convert/html-to-pdf.html +++ b/src/main/resources/templates/convert/html-to-pdf.html @@ -17,7 +17,7 @@ html
    - +
    diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html index 139ac8f8..b71afaf8 100644 --- a/src/main/resources/templates/convert/img-to-pdf.html +++ b/src/main/resources/templates/convert/img-to-pdf.html @@ -17,7 +17,7 @@ image
    - +
    diff --git a/src/main/resources/templates/convert/markdown-to-pdf.html b/src/main/resources/templates/convert/markdown-to-pdf.html index 97fa2c2d..0112dff4 100644 --- a/src/main/resources/templates/convert/markdown-to-pdf.html +++ b/src/main/resources/templates/convert/markdown-to-pdf.html @@ -17,7 +17,7 @@ markdown
    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-book.html b/src/main/resources/templates/convert/pdf-to-book.html index 018adbc4..2a59587e 100644 --- a/src/main/resources/templates/convert/pdf-to-book.html +++ b/src/main/resources/templates/convert/pdf-to-book.html @@ -14,7 +14,7 @@

    -
    +
    diff --git a/src/main/resources/templates/convert/pdf-to-csv.html b/src/main/resources/templates/convert/pdf-to-csv.html index 9e711097..60dd06b4 100644 --- a/src/main/resources/templates/convert/pdf-to-csv.html +++ b/src/main/resources/templates/convert/pdf-to-csv.html @@ -16,7 +16,7 @@ csv
    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-html.html b/src/main/resources/templates/convert/pdf-to-html.html index 6ac6e8f0..4843eead 100644 --- a/src/main/resources/templates/convert/pdf-to-html.html +++ b/src/main/resources/templates/convert/pdf-to-html.html @@ -17,7 +17,7 @@ html
    - +

    diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html index 0cf74dd0..9907c301 100644 --- a/src/main/resources/templates/convert/pdf-to-img.html +++ b/src/main/resources/templates/convert/pdf-to-img.html @@ -18,7 +18,7 @@

    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html index d7d46f1e..fd1e1826 100644 --- a/src/main/resources/templates/convert/pdf-to-pdfa.html +++ b/src/main/resources/templates/convert/pdf-to-pdfa.html @@ -18,7 +18,7 @@

    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-presentation.html b/src/main/resources/templates/convert/pdf-to-presentation.html index bb6784de..79431760 100644 --- a/src/main/resources/templates/convert/pdf-to-presentation.html +++ b/src/main/resources/templates/convert/pdf-to-presentation.html @@ -17,7 +17,7 @@ slideshow
    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-text.html b/src/main/resources/templates/convert/pdf-to-text.html index 71865624..cb2d0659 100644 --- a/src/main/resources/templates/convert/pdf-to-text.html +++ b/src/main/resources/templates/convert/pdf-to-text.html @@ -17,7 +17,7 @@ text_fields
    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-word.html b/src/main/resources/templates/convert/pdf-to-word.html index 6ac90136..7e5f96c0 100644 --- a/src/main/resources/templates/convert/pdf-to-word.html +++ b/src/main/resources/templates/convert/pdf-to-word.html @@ -17,7 +17,7 @@ description
    - +
    diff --git a/src/main/resources/templates/convert/pdf-to-xml.html b/src/main/resources/templates/convert/pdf-to-xml.html index ce545ce0..63395ea9 100644 --- a/src/main/resources/templates/convert/pdf-to-xml.html +++ b/src/main/resources/templates/convert/pdf-to-xml.html @@ -17,7 +17,7 @@ code
    - +

    diff --git a/src/main/resources/templates/convert/url-to-pdf.html b/src/main/resources/templates/convert/url-to-pdf.html index ee136b32..67167258 100644 --- a/src/main/resources/templates/convert/url-to-pdf.html +++ b/src/main/resources/templates/convert/url-to-pdf.html @@ -17,7 +17,7 @@ link - +
    diff --git a/src/main/resources/templates/crop.html b/src/main/resources/templates/crop.html index 50e5ad6a..84f4c66d 100644 --- a/src/main/resources/templates/crop.html +++ b/src/main/resources/templates/crop.html @@ -16,7 +16,7 @@ crop - +
    diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index f9e2088a..314d28b3 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/templates/extract-page.html b/src/main/resources/templates/extract-page.html index 1d054189..8413bc88 100644 --- a/src/main/resources/templates/extract-page.html +++ b/src/main/resources/templates/extract-page.html @@ -16,7 +16,7 @@ upload - +
    diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index ee673ea2..2e9316eb 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -10,67 +10,67 @@ - - - - - - + + + + + + - - - + + + - - - + + + - + - + - + - - - - - - - - + + + + + + + + - + - - - - - - - - - + + + + + + + + + - + - + - - - + + + @@ -138,9 +138,9 @@
    Score: 0
    High Score: 0
    Level: 1
    - favicon + favicon
    - + @@ -150,7 +150,7 @@ const multiple = [[${multiple}]] || false; const remoteCall = [[${remoteCall}]] || true; - +
    @@ -166,5 +166,5 @@
    - + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/errorBannerPerPage.html b/src/main/resources/templates/fragments/errorBannerPerPage.html index 9121f1b3..58c560a0 100644 --- a/src/main/resources/templates/fragments/errorBannerPerPage.html +++ b/src/main/resources/templates/fragments/errorBannerPerPage.html @@ -41,7 +41,7 @@ - + @@ -49,5 +49,5 @@ - + diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 1bb3df1e..686c05ca 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -3,7 +3,7 @@ - Licenses + Licenses Survey diff --git a/src/main/resources/templates/fragments/languages.html b/src/main/resources/templates/fragments/languages.html index b3cd932e..5028d656 100644 --- a/src/main/resources/templates/fragments/languages.html +++ b/src/main/resources/templates/fragments/languages.html @@ -1,34 +1,34 @@ - icon Български - icon العربية - icon Català - icon 简体中文 - icon 繁體中文 - icon Deutsch - icon English (GB) - icon English (US) - icon Euskara - icon Español - icon Français - icon Indonesia - icon Italiano - icon Nederlands - icon Polski - icon Português (BR) - icon Português (PT) - icon Romanian - icon Slovensky - icon Svenska - icon Türkçe - icon Русский - icon 한국어 - icon 日本語 - icon Ελληνικά - icon Hungarian - icon हिन्दी - icon Srpski - icon Українська - icon Česky - icon Hrvatski - icon Norsk + icon Български + icon العربية + icon Català + icon 简体中文 + icon 繁體中文 + icon Deutsch + icon English (GB) + icon English (US) + icon Euskara + icon Español + icon Français + icon Indonesia + icon Italiano + icon Nederlands + icon Polski + icon Português (BR) + icon Português (PT) + icon Romanian + icon Slovensky + icon Svenska + icon Türkçe + icon Русский + icon 한국어 + icon 日本語 + icon Ελληνικά + icon Hungarian + icon हिन्दी + icon Srpski + icon Українська + icon Česky + icon Hrvatski + icon Norsk diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index 756be79d..e53861aa 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -1,15 +1,15 @@
    - + - +
    - - + + - + + dontShowAgain.addEventListener('change', function() { + if (this.checked) { + localStorage.setItem('dontShowSurvey', 'true'); + localStorage.setItem('surveyVersion', surveyVersion); + } else { + localStorage.removeItem('dontShowSurvey'); + localStorage.removeItem('surveyVersion'); + } + }); + + takeSurveyButton.addEventListener('click', function() { + localStorage.setItem('dontShowSurvey', 'true'); + localStorage.setItem('surveyVersion', surveyVersion); + modal.hide(); + }); + + if (localStorage.getItem('dontShowSurvey')) { + modal.hide(); + } + }); + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 2832bad2..6bc13ff1 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -2,7 +2,7 @@ - + @@ -111,7 +111,7 @@ }
    - favicon + favicon

    Stirling-PDF

    @@ -134,7 +134,7 @@
    - +

    Please sign in

    @@ -154,7 +154,7 @@
    diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html index 6beda716..e60e271b 100644 --- a/src/main/resources/templates/misc/add-image.html +++ b/src/main/resources/templates/misc/add-image.html @@ -2,8 +2,8 @@ - - + + @@ -68,7 +68,7 @@
    - +
    -
    +

    diff --git a/src/main/resources/templates/misc/auto-crop.html b/src/main/resources/templates/misc/auto-crop.html index b5630cb7..ecc63728 100644 --- a/src/main/resources/templates/misc/auto-crop.html +++ b/src/main/resources/templates/misc/auto-crop.html @@ -17,7 +17,7 @@ crop
    - +

    diff --git a/src/main/resources/templates/misc/auto-rename.html b/src/main/resources/templates/misc/auto-rename.html index 025ed97c..6e94d59e 100644 --- a/src/main/resources/templates/misc/auto-rename.html +++ b/src/main/resources/templates/misc/auto-rename.html @@ -17,7 +17,7 @@ text_fields_alt
    - +

    diff --git a/src/main/resources/templates/misc/change-metadata.html b/src/main/resources/templates/misc/change-metadata.html index f547b4e8..7f19f40a 100644 --- a/src/main/resources/templates/misc/change-metadata.html +++ b/src/main/resources/templates/misc/change-metadata.html @@ -16,7 +16,7 @@ assignment - +

    diff --git a/src/main/resources/templates/misc/compress-pdf.html b/src/main/resources/templates/misc/compress-pdf.html index cdb679d5..7c80ad36 100644 --- a/src/main/resources/templates/misc/compress-pdf.html +++ b/src/main/resources/templates/misc/compress-pdf.html @@ -19,7 +19,7 @@ zoom_in_map
    - +
    diff --git a/src/main/resources/templates/misc/extract-image-scans.html b/src/main/resources/templates/misc/extract-image-scans.html index 4ae50678..e1e21568 100644 --- a/src/main/resources/templates/misc/extract-image-scans.html +++ b/src/main/resources/templates/misc/extract-image-scans.html @@ -18,7 +18,7 @@ - +
    diff --git a/src/main/resources/templates/misc/extract-images.html b/src/main/resources/templates/misc/extract-images.html index 8442b46b..6b0f5131 100644 --- a/src/main/resources/templates/misc/extract-images.html +++ b/src/main/resources/templates/misc/extract-images.html @@ -17,7 +17,7 @@ photo_library
    - +
    diff --git a/src/main/resources/templates/misc/fake-scan.html b/src/main/resources/templates/misc/fake-scan.html index 5de49969..5591b3a9 100644 --- a/src/main/resources/templates/misc/fake-scan.html +++ b/src/main/resources/templates/misc/fake-scan.html @@ -14,7 +14,7 @@

    - +

    diff --git a/src/main/resources/templates/misc/flatten.html b/src/main/resources/templates/misc/flatten.html index 51af6772..22567be9 100644 --- a/src/main/resources/templates/misc/flatten.html +++ b/src/main/resources/templates/misc/flatten.html @@ -17,7 +17,7 @@ layers_clear
    - +
    diff --git a/src/main/resources/templates/misc/ocr-pdf.html b/src/main/resources/templates/misc/ocr-pdf.html index 65dd17da..9971d6e5 100644 --- a/src/main/resources/templates/misc/ocr-pdf.html +++ b/src/main/resources/templates/misc/ocr-pdf.html @@ -39,7 +39,7 @@ quick_reference_all
    - +
    diff --git a/src/main/resources/templates/misc/print-file.html b/src/main/resources/templates/misc/print-file.html index e665139c..629ecd2c 100644 --- a/src/main/resources/templates/misc/print-file.html +++ b/src/main/resources/templates/misc/print-file.html @@ -14,7 +14,7 @@

    - +
    diff --git a/src/main/resources/templates/misc/remove-annotations.html b/src/main/resources/templates/misc/remove-annotations.html index 5d0d8219..1b685493 100644 --- a/src/main/resources/templates/misc/remove-annotations.html +++ b/src/main/resources/templates/misc/remove-annotations.html @@ -28,7 +28,7 @@
    - + + + - - + + @@ -229,7 +229,7 @@
    - +
    - +
    diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html index 2491dbde..be4d685b 100644 --- a/src/main/resources/templates/split-pdfs.html +++ b/src/main/resources/templates/split-pdfs.html @@ -18,7 +18,7 @@ cut
    - +
    diff --git a/src/main/resources/templates/view-pdf.html b/src/main/resources/templates/view-pdf.html index d2738b2e..9e42dfb7 100644 --- a/src/main/resources/templates/view-pdf.html +++ b/src/main/resources/templates/view-pdf.html @@ -28,18 +28,18 @@ See https://github.com/adobe-type-tools/cmap-resources PDF.js viewer - - + + - - + + - - + + - - + + @@ -298,8 +298,8 @@ See https://github.com/adobe-type-tools/cmap-resources - - icon + + icon Stirling PDF
    @@ -308,7 +308,7 @@ See https://github.com/adobe-type-tools/cmap-resources - + Back to Main Page