Merge branch 'main' into 0.22.8Clone

src/main/resources/templates/account.html

@@ -44,7 +44,7 @@
             </th:block>
             <!-- Change Username Form -->
             <h4 th:text="#{account.changeUsername}">Change Username?</h4>
-            <form id="bg-card" class="mt-4 mb-4" action="api/v1/user/change-username" method="post">
+            <form th:if="${!oAuth2Login}" id="bg-card" class="mt-4 mb-4" action="api/v1/user/change-username" method="post">
               <div class="mb-3">
                 <label for="newUsername" th:text="#{account.newUsername}">Change Username</label>
                 <input type="text" class="form-control" name="newUsername" id="newUsername"
@@ -62,7 +62,7 @@
             </form>
 
             <!-- Change Password Form -->
-            <h4 th:text="#{account.changePassword}">Change Password?</h4>
+            <h4 th:if="${!oAuth2Login}" th:text="#{account.changePassword}">Change Password?</h4>
             <form id="bg-card" class="mt-4 mb-4" action="api/v1/user/change-password" method="post">
               <div class="mb-3">
                 <label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
@@ -85,6 +85,7 @@
               </div>
             </form>
 
+
             <!-- API Key Form -->
             <h4 th:text="#{account.yourApiKey}">API Key</h4>
             <div class="card mt-4 mb-4">

src/main/resources/templates/addUsers.html

@@ -58,6 +58,7 @@
                 <div class="mb-3">
                   <label for="role" th:text="#{adminUserSettings.role}">Role</label>
                   <select name="role" class="form-control" required>
+                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
                     <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
                   </select>
                 </div>
@@ -66,6 +67,32 @@
                   <label class="form-check-label" for="forceChange" th:text="#{adminUserSettings.forceChange}">Force user to change username/password on login</label>
                 </div>
 
+                <!-- Add other fields as required -->
+                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
+              </form>
+              <hr />
+              <h2 th:text="#{adminUserSettings.changeUserRole}">Change User's Role</h2>
+              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{downgradeCurrentUserLongMessage}" th:text="#{help}">Help</button>
+              <div th:if="${param.messageType != null and param.messageType.size() > 0 and (param.messageType[0] == 'userNotFound' or param.messageType[0] == 'downgradeCurrentUser')}" class="alert alert-danger">
+                <span th:if="${param.messageType[0] == 'userNotFound'}" th:text="#{userNotFoundMessage}">Username not found</span>
+                <span th:if="${param.messageType[0] == 'downgradeCurrentUser'}" th:text="#{downgradeCurrentUserMessage}">Cannot downgrade current user's role</span>
+              </div>
+              <form action="/api/v1/user/admin/changeRole" method="post">
+                <div class="mb-3">
+                  <label for="username" th:text="#{username}">Username</label>
+                  <select name="username" class="form-control" required>
+                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
+                    <option th:each="user : ${users}" th:if="${user.username != currentUsername}" th:value="${user.username}" th:text="${user.username}">Username</option>
+                  </select>
+                </div>
+                <div class="mb-3">
+                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
+                  <select name="role" class="form-control" required>
+                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
+                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
+                  </select>
+                </div>
+
                 <!-- Add other fields as required -->
                 <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
               </form>
@@ -73,6 +100,11 @@
           </div>
         </div>
       </div>
+      <script th:inline="javascript">
+        $(document).ready(function() {
+          $('[data-toggle="tooltip"]').tooltip()
+        })
+      </script>
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>

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

@@ -20,6 +20,13 @@
               <p th:text="#{pdfToPDFA.tip}"></p>
               <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/pdf/pdfa}">
                 <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
+					<div class="mb-3">
+						<label th:text="#{pdfToPDFA.outputFormat}"></label>
+						<select class="form-control" name="outputFormat">
+							<option value="pdfa-1">PDF/A-1b</option>
+							<option value="pdfa">PDF/A-2b</option>
+						</select>
+					</div>
                 <br>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pdfToPDFA.submit}"></button>
               </form>
@@ -31,4 +38,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

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

@@ -22,14 +22,13 @@
                 <div class="mb-3">
                   <label th:text="#{PDFToText.selectText.1}"></label>
                   <select class="form-control" name="outputFormat">
-                    <option value="rtf">RTF</option>
+                    <option th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
                     <option value="txt">TXT</option>
                   </select>
                 </div>
-                <br>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToText.submit}"></button>
               </form>
-              <p class="mt-3" th:text="#{PDFToText.credit}"></p>
+              <p th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" class="mt-3" th:text="#{PDFToText.credit}"></p>
             </div>
           </div>
         </div>

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

@@ -66,6 +66,7 @@
   <!-- Help Modal -->
   <link rel="stylesheet" href="css/errorBanner.css">
 
+  <script src="js/cacheFormInputs.js"></script>
   <script src="js/tab-container.js"></script>
   <script src="js/darkmode.js"></script>
 </th:block>

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

@@ -26,4 +26,5 @@
                       <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>
                       <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="hi_IN"> <img src="images/flags/in.svg" alt="icon" width="20" height="15"> हिन्दी</a>
                       <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="sr_LATN_RS"> <img src="images/flags/rs.svg" alt="icon" width="20" height="15"> Srpski</a>
+                      <a class="dropdown-item lang_dropdown-item" href="" data-bs-language-code="uk_UA"> <img src="images/flags/ua.svg" alt="icon" width="20" height="15"> Українська</a>
 </th:block>

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

@@ -3,6 +3,7 @@
   <script th:inline="javascript">
     const currentVersion = /*[[${@appVersion}]]*/ '';
     const noFavourites = /*[[#{noFavourites}]]*/ '';
+    const updateAvailable =  /*[[#{settings.updateAvailable}]]*/ '';
   </script>
   <script th:src="@{js/githubVersion.js}"></script>
   <nav class="navbar navbar-expand-lg">
@@ -367,7 +368,7 @@
 
             <a href="swagger-ui/index.html" class="btn btn-sm btn-outline-primary mx-1" role="button"
               target="_blank">API</a>
-            <a href="https://github.com/Stirling-Tools/Stirling-PDF/releases"
+            <a th:if="${@shouldShow}" href="https://github.com/Stirling-Tools/Stirling-PDF/releases"
               class="btn btn-sm btn-outline-primary mx-1" id="update-btn" th:utext="#{settings.update}" role="button"
               target="_blank"></a>
           </div>
@@ -389,14 +390,19 @@
             <span id="zipThresholdValue" class="ms-2"></span>
           </div>
           <div class="form-check mb-3">
-            <input type="checkbox" id="boredWaiting">
+            <input type="checkbox" id="boredWaiting" th:title="#{settings.bored.help}">
             <label for="boredWaiting" th:text="#{bored}"></label>
           </div>
-          <a th:if="${@loginEnabled}" href="account" class="btn btn-sm btn-outline-primary" role="button"
+           <div class="form-check mb-3">
+            <input type="checkbox" id="cacheInputs" th:title="#{settings.cacheInputs.help}">
+            <label  for="cacheInputs" th:text="#{settings.cacheInputs.name}"></label>
+          </div>
+                  
+          <a th:if="${@loginEnabled and @activSecurity}" href="account" class="btn btn-sm btn-outline-primary" role="button"
             th:text="#{settings.accountSettings}" target="_blank">Account Settings</a>
         </div>
         <div class="modal-footer">
-          <a th:if="${@loginEnabled}" class="btn btn-danger" role="button" th:text="#{settings.signOut}"
+          <a th:if="${@loginEnabled and @activSecurity}" class="btn btn-danger" role="button" th:text="#{settings.signOut}"
             href="logout">Sign Out</a>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" th:text="#{close}"></button>
         </div>

src/main/resources/templates/home.html

@@ -22,7 +22,6 @@
       <br class="d-md-none">
       <!-- Features -->
       <script src="js/homecard.js"></script>
-
       <div class=" container">
         <br>
         <span class="material-symbols-rounded search-icon">
@@ -30,6 +29,22 @@
         </span>
         <input type="text" id="searchBar" onkeyup="filterCards()" th:placeholder="#{home.searchBar}" autofocus>
         <div class="features-container">
+        
+          <div th:if="${@shouldShow}" class="feature-card favorite" id="update-link" style="display: none;">
+			  <a href="https://github.com/Stirling-Tools/Stirling-PDF/releases" target="_blank" class="nav-link text-body-secondary px-2" rel="noopener">
+			    <div class="d-flex align-items-center">
+			      <!-- Replace the existing icon markup with the new one -->
+			      <div class="icon" alt="icon" th:class="advance">
+			        <img class="card-icon home-card-icon home-card-icon-colour" src="images/update.svg" alt="Icon" width="30" height="30">
+			      </div>
+			      <!-- End of icon markup replacement -->
+			      <h5 class="card-title lookatme ms-2" th:text="#{settings.update}" th:data-lookatme-text="#{settings.update}"></h5>
+			    </div>
+			    <p class="card-text" id="app-update"></p>
+			  </a>
+			</div>
+
+
           <div
             th:replace="~{fragments/card :: card(id='pipeline', cardTitle=#{home.pipeline.title}, cardText=#{home.pipeline.desc}, cardLink='pipeline', toolIcon='family_history', tags=#{pipeline.tags}, toolGroup='advance')}">
           </div>

src/main/resources/templates/login.html

@@ -32,7 +32,7 @@
 
           document.addEventListener('DOMContentLoaded', function() {
 
-            const defaultLocale = document.documentElement.getAttribute('language') || 'en_GB';
+            const defaultLocale = document.documentElement.getAttribute('data-language') || 'en_GB';
             const storedLocale = localStorage.getItem('languageCode') || defaultLocale;
 
             const currentURL = new URL(window.location.href);
@@ -120,9 +120,17 @@
           <div class="text-center">
             <img class="mb-4" src="favicon.svg?v=2" alt="" width="144" height="144">
             <h1 class="h1 mb-3 fw-normal" th:text="${@appName}">Stirling-PDF</h1>
+            <div th:if="${oAuth2Enabled}">
+            <a href="oauth2/authorization/oidc" class="w-100 btn btn-lg btn-primary" th:text="#{login.ssoSignIn}">Login Via SSO</a>
+            <div class="text-danger text-center">
+              <div th:if="${error == 'oauth2AutoCreateDisabled'}" th:text="#{login.oauth2AutoCreateDisabled}">OAUTH2 Auto-Create User Disabled.</div>
+            </div>
+            <hr />
+          </div>
             <h2 class="h5 mb-3 fw-normal" th:text="#{login.signinTitle}">Please sign in</h2>
           </div>
 
+
           <div class="form-floating">
             <input type="text" class="form-control" id="username" name="username" placeholder="admin">
             <label for="username" th:text="#{username}">Username</label>

src/main/resources/templates/misc/fake-scan.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+  <head>
+  <th:block th:insert="~{fragments/common :: head(title=#{fakeScan.title}, header=#{fakeScan.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <div id="page-container">
+      <div id="content-wrap">
+        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+        <br><br>
+        <div class="container">
+          <div class="row justify-content-center">
+            <div class="col-md-6">
+              <h2 th:text="#{fakeScan.header}"></h2>
+              <form method="post" enctype="multipart/form-data" th:action="@{api/v1/misc/fake-scan}">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
+                <br>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{fakeScan.submit}"></button>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>

src/main/resources/templates/misc/print-file.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
+  <head>
+  <th:block th:insert="~{fragments/common :: head(title=#{printFile.title}, header=#{printFile.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <div id="page-container">
+      <div id="content-wrap">
+        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+        <br><br>
+        <div class="container">
+          <div class="row justify-content-center">
+            <div class="col-md-6">
+              <h2 th:text="#{printFile.header}"></h2>
+              <form action="#" th:action="@{api/v1/misc/print-file}" method="post" enctype="multipart/form-data">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf,image/*')}"></div>
+                <div class="card mb-3">
+                  <div class="card-body">
+                    <h4 th:text="#{printFile.selectText.1}">Select Printer</h4> <!-- Assuming the message code printFile.selectText.3 corresponds to "Select Printer" -->
+				    <label for="printerName" th:text="#{printFile.selectText.2}">Printer Name:</label> <!-- Assuming the message code printFile.selectText.4 corresponds to "Printer Name:" -->
+				    <input type="text" name="printerName" id="printerName" class="form-control">
+                  </div>
+                </div>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{printFile.submit}"></button>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>