From 8aac0c0327ec27a96a6abbe2c1d3999205b965f3 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:19:18 +0100
Subject: [PATCH] bs5 more

---
 .../resources/templates/fragments/navbar.html | 27 ++++++-------------
 .../templates/security/get-info-on-pdf.html   |  8 ++++--
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index 060ebaf0..1f034384 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -305,9 +305,7 @@
         <div class="modal-content dark-card">
             <div class="modal-header">
                 <h5 class="modal-title" id="settingsModalLabel" th:text="#{settings.title}"></h5>
-                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <div class="d-flex justify-content-between align-items-center mb-3">
@@ -318,12 +316,9 @@
                     <a href="swagger-ui/index.html" target="_blank">
                         <button type="button" class="btn btn-sm btn-outline-primary">API</button>
                     </a>
-
                     <a href="https://github.com/Frooodle/Stirling-PDF/releases" target="_blank">
 					    <button type="button" class="btn btn-sm btn-outline-primary" id="update-btn" th:utext="#{settings.update}"></button>
 					</a>
-
-
                 </div>
                 <div class="mb-3">
                     <label for="downloadOption" th:utext="#{settings.downloadOption.title}"></label>
@@ -335,35 +330,29 @@
                 </div>
                 <div class="mb-3">
                     <label for="zipThreshold" th:utext="#{settings.zipThreshold}"></label>
-                    <input type="range" class="custom-range" min="1" max="9" step="1" id="zipThreshold" value="4">
+                    <input type="range" class="form-range" min="1" max="9" step="1" id="zipThreshold" value="4">
                     <span id="zipThresholdValue" class="ms-2"></span>
                 </div>
-                <div class="mb-3">
-                  <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="boredWaiting">
-                    <label class="custom-control-label" for="boredWaiting" th:text="#{bored}"></label>
-                  </div>
+                <div class="mb-3 form-check">
+                    <input type="checkbox" class="form-check-input" id="boredWaiting">
+                    <label class="form-check-label" for="boredWaiting" th:text="#{bored}"></label>
                 </div>
                 <a th:if="${@loginEnabled}" href="account" target="_blank">
                     <button type="button" class="btn btn-sm btn-outline-primary" th:text="#{settings.accountSettings}">Account Settings</button>
                 </a>
-
-
             </div>
-
-
             <div class="modal-footer">
             	<a th:if="${@loginEnabled}" href="/logout">
-	                  <button type="button" class="btn btn-danger" th:text="#{settings.signOut}">Sign Out</button>
-	              </a>
+	                <button type="button" class="btn btn-danger" th:text="#{settings.signOut}">Sign Out</button>
+	            </a>
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" th:text="#{close}"></button>
             </div>
-
         </div>
     </div>
 </div>
 
 
+
 <script src="js/settings.js"></script>
 
 
diff --git a/src/main/resources/templates/security/get-info-on-pdf.html b/src/main/resources/templates/security/get-info-on-pdf.html
index cf15ec4e..d5cc3eca 100644
--- a/src/main/resources/templates/security/get-info-on-pdf.html
+++ b/src/main/resources/templates/security/get-info-on-pdf.html
@@ -142,13 +142,17 @@
 						    const buttonElem = document.createElement('button');
 						    buttonElem.className = 'btn btn-link';
 						    buttonElem.type = 'button';
-						    buttonElem.dataset.toggle = "collapse";
-						    buttonElem.dataset.target = `#${safeKey}-content-${depth}`;
+						    buttonElem.dataset.bsToggle = "collapse";
+						    buttonElem.dataset.bsTarget = `#${safeKey}-content-${depth}`;
 						    buttonElem.setAttribute('aria-expanded', 'true');
 						    buttonElem.setAttribute('aria-controls', `${safeKey}-content-${depth}`);
 						    buttonElem.textContent = key;
 						    return buttonElem;
 						}
+						const collapsibleElems = document.querySelectorAll('[data-bs-toggle="collapse"]');
+						collapsibleElems.forEach(elem => {
+						    new bootstrap.Collapse(elem);
+						});
                        </script>
 					</div>
 				</div>