From 1c0bf7529ca888ef5b3235f9d617cbef06d39102 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Sun, 9 May 2021 13:01:00 +0100
Subject: [PATCH] Update Bootstrap

Signed-off-by: Graham <gpe@openrs2.org>
---
 archive/build.gradle.kts                      |  1 +
 .../archive/templates/caches/index.html       |  4 +--
 .../archive/templates/caches/show.html        | 32 +++++++++----------
 .../org/openrs2/archive/templates/index.html  |  4 +--
 .../org/openrs2/archive/templates/layout.html | 10 +++---
 gradle/libs.versions.toml                     |  3 +-
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/archive/build.gradle.kts b/archive/build.gradle.kts
index f48c8d0a..5addd3e0 100644
--- a/archive/build.gradle.kts
+++ b/archive/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     implementation(libs.guava)
     implementation(libs.hikaricp)
     implementation(libs.jdom)
+    implementation(libs.jquery)
     implementation(libs.jsoup)
     implementation(libs.kotlin.coroutines.core)
     implementation(libs.postgres)
diff --git a/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html b/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
index 69a1adb6..c6a21299 100644
--- a/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
+++ b/archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
@@ -13,7 +13,7 @@
 			<h1>Caches</h1>
 			<div class="table-responsive">
 				<table class="table table-striped table-bordered table-hover">
-					<thead class="thead-dark">
+					<thead class="table-dark">
 						<tr>
 							<th>Game</th>
 							<th>Build(s)</th>
@@ -75,7 +75,7 @@
 									<div class="btn-group">
 										<button type="button"
 										        class="btn btn-primary btn-sm dropdown-toggle"
-										        data-toggle="dropdown">
+										        data-bs-toggle="dropdown">
 											Download
 										</button>
 										<ul class="dropdown-menu">
diff --git a/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html b/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
index a2da1217..d771fcf1 100644
--- a/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
+++ b/archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
@@ -14,49 +14,49 @@
 
 			<!--/*@thymesVar id="cache" type="org.openrs2.archive.cache.CacheExporter.Cache"*/-->
 			<table class="table table-striped table-bordered table-hover">
-				<tr class="thead-dark">
-					<th>Format</th>
+				<tr>
+					<th class="table-dark">Format</th>
 					<td th:text="${cache.masterIndex.format}">VERSIONED</td>
 				</tr>
-				<tr class="thead-dark">
-					<th>Indexes</th>
+				<tr>
+					<th class="table-dark">Indexes</th>
 					<td th:class="${cache.stats}? (${cache.stats.allIndexesValid}? 'table-success' : 'table-danger')"
 					    th:text="${cache.stats}? ${cache.stats.validIndexes} + ' / ' + ${cache.stats.indexes} + ' (' + ${#numbers.formatPercent(cache.stats.validIndexesFraction, 1, 2)} + ')' : 'Calculating...'">
 						Calculating...
 					</td>
 				</tr>
-				<tr class="thead-dark">
-					<th>Groups</th>
+				<tr>
+					<th class="table-dark">Groups</th>
 					<td th:class="${cache.stats}? (${cache.stats.allGroupsValid}? 'table-success' : 'table-warning')"
 					    th:text="${cache.stats}? ${#numbers.formatInteger(cache.stats.validGroups, 1, 'COMMA')} + ' / ' + ${#numbers.formatInteger(cache.stats.groups, 1, 'COMMA')} + ' (' + ${#numbers.formatPercent(cache.stats.validGroupsFraction, 1, 2)} + ')' : 'Calculating...'">
 						Calculating...
 					</td>
 				</tr>
-				<tr class="thead-dark">
-					<th>Keys<sup><a href="/caches#empty-locs">1</a></sup></th>
+				<tr>
+					<th class="table-dark">Keys<sup><a href="/caches#empty-locs">1</a></sup></th>
 					<td th:class="${cache.stats}? (${cache.stats.allKeysValid}? 'table-success' : 'table-warning')"
 					    th:text="${cache.stats}? ${#numbers.formatInteger(cache.stats.validKeys, 1, 'COMMA')} + ' / ' + ${#numbers.formatInteger(cache.stats.keys, 1, 'COMMA')} + ' (' + ${#numbers.formatPercent(cache.stats.validKeysFraction, 1, 2)} + ')' : 'Calculating...'">
 						Calculating...
 					</td>
 				</tr>
-				<tr class="thead-dark">
-					<th>Size<sup><a href="/caches#size">2</a></sup></th>
+				<tr>
+					<th class="table-dark">Size<sup><a href="/caches#size">2</a></sup></th>
 					<!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/-->
 					<td th:text="${cache.stats}? ${#byteunits.format(cache.stats.size)} : 'Calculating...'">
 						Calculating...
 					</td>
 				</tr>
-				<tr class="thead-dark">
-					<th>Download</th>
+				<tr>
+					<th class="table-dark">Download</th>
 					<td>
 						<div class="btn-toolbar">
-							<div class="btn-group mr-2">
+							<div class="btn-group me-2">
 								<a th:href="${'/caches/' + cache.id + '/disk.zip'}"
 								   class="btn btn-primary btn-sm">Cache (.dat2/.idx)</a>
 								<a th:href="${'/caches/' + cache.id + '/flat-file.zip'}"
 								   class="btn btn-primary btn-sm">Cache (Flat file)</a>
 							</div>
-							<div class="btn-group mr-2">
+							<div class="btn-group me-2">
 								<a th:href="${'/caches/' + cache.id + '/keys.json'}"
 								   class="btn btn-primary btn-sm">Keys (JSON)</a>
 								<a th:href="${'/caches/' + cache.id + '/keys.zip'}"
@@ -75,7 +75,7 @@
 
 			<div class="table-responsive">
 				<table class="table table-striped table-bordered table-hover">
-					<thead class="thead-dark">
+					<thead class="table-dark">
 						<tr>
 							<th>Game</th>
 							<th>Build</th>
@@ -104,7 +104,7 @@
 
 			<div class="table-responsive">
 				<table class="table table-striped table-bordered table-hover">
-					<thead class="thead-dark">
+					<thead class="table-dark">
 						<tr>
 							<th>Archive</th>
 							<th>Version</th>
diff --git a/archive/src/main/resources/org/openrs2/archive/templates/index.html b/archive/src/main/resources/org/openrs2/archive/templates/index.html
index 32d00c6e..5d3bb387 100644
--- a/archive/src/main/resources/org/openrs2/archive/templates/index.html
+++ b/archive/src/main/resources/org/openrs2/archive/templates/index.html
@@ -10,9 +10,9 @@
 	<body>
 		<nav th:replace="layout.html :: nav"></nav>
 		<main class="container">
-			<div class="jumbotron">
+			<div class="p-5 mb-4 bg-light rounded-3">
 				<h1>Welcome to the OpenRS2 Archive</h1>
-				<p class="lead">
+				<p class="fs-4">
 					The OpenRS2 Archive is a collection of caches and XTEA keys
 					for all versions of RuneScape that use JS5 to manage assets
 					(mainline RuneScape builds 402 and greater, and all builds
diff --git a/archive/src/main/resources/org/openrs2/archive/templates/layout.html b/archive/src/main/resources/org/openrs2/archive/templates/layout.html
index 994d0987..d1dd21b1 100644
--- a/archive/src/main/resources/org/openrs2/archive/templates/layout.html
+++ b/archive/src/main/resources/org/openrs2/archive/templates/layout.html
@@ -12,13 +12,13 @@
 		<nav class="navbar navbar-dark navbar-expand bg-dark mb-4" th:fragment="nav">
 			<div class="container">
 				<a class="navbar-brand" href="/">OpenRS2 Archive</a>
-				<ul class="navbar-nav mr-auto">
+				<ul class="navbar-nav me-auto">
 					<!--/*@thymesVar id="active" type="java.lang.String"*/-->
-					<li class="nav-item" th:classappend="${active == 'caches'}? 'active'">
-						<a class="nav-link" href="/caches">Caches</a>
+					<li class="nav-item">
+						<a class="nav-link" th:classappend="${active == 'caches'}? 'active'" href="/caches">Caches</a>
 					</li>
-					<li class="nav-item" th:classappend="${active == 'keys'}? 'active'">
-						<a class="nav-link" href="/keys">Keys</a>
+					<li class="nav-item">
+						<a class="nav-link" th:classappend="${active == 'keys'}? 'active'" href="/keys">Keys</a>
 					</li>
 					<li class="nav-item">
 						<a class="nav-link" href="/pub">Other</a>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9b5577fa..556b73cb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
 asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
-bootstrap = { module = "org.webjars:bootstrap", version = "4.6.0-1" }
+bootstrap = { module = "org.webjars:bootstrap", version = "5.0.0" }
 bouncyCastle-pkix = { module = "org.bouncycastle:bcpkix-jdk15on", version = "1.68" }
 bouncyCastle-provider = { module = "org.bouncycastle:bcprov-jdk15on", version = "1.68" }
 byteUnits = { module = "com.jakewharton.byteunits:byteunits", version = "0.9.1" }
@@ -38,6 +38,7 @@ javaParser = { module = "com.github.javaparser:javaparser-symbol-solver-core", v
 jdom = { module = "org.jdom:jdom2", version = "2.0.6" }
 jgrapht = { module = "org.jgrapht:jgrapht-core", version = "1.5.1" }
 jimfs = { module = "com.google.jimfs:jimfs", version.ref = "jimfs" }
+jquery = { module = "org.webjars:jquery", version = "3.6.0" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.13.1" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version = { strictly = "5.7.1" } }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }