openrs2
/
openrs2
3
1
Fork 3
Code Issues 71 Pull Requests Releases Activity

Update Bootstrap

Browse Source 
Signed-off-by: Graham <gpe@openrs2.org>
pull/132/head
Graham 3 years ago
parent ee151aef56
commit 1c0bf7529c
6 changed files with 28 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      archive/build.gradle.kts
  2. 4
      archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
  3. 32
      archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
  4. 4
      archive/src/main/resources/org/openrs2/archive/templates/index.html
  5. 10
      archive/src/main/resources/org/openrs2/archive/templates/layout.html
  6. 3
      gradle/libs.versions.toml

1
archive/build.gradle.kts
Unescape View File

@ -30,6 +30,7 @@ dependencies {
implementation(libs.guava) implementation(libs.guava)
implementation(libs.hikaricp) implementation(libs.hikaricp)
implementation(libs.jdom) implementation(libs.jdom)
implementation(libs.jquery)
implementation(libs.jsoup) implementation(libs.jsoup)
implementation(libs.kotlin.coroutines.core) implementation(libs.kotlin.coroutines.core)
implementation(libs.postgres) implementation(libs.postgres)

4
archive/src/main/resources/org/openrs2/archive/templates/caches/index.html
Unescape View File

@ -13,7 +13,7 @@
<h1>Caches</h1> <h1>Caches</h1>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead class="thead-dark"> <thead class="table-dark">
<tr> <tr>
<th>Game</th> <th>Game</th>
<th>Build(s)</th> <th>Build(s)</th>
@ -75,7 +75,7 @@
<div class="btn-group"> <div class="btn-group">
<button type="button" <button type="button"
class="btn btn-primary btn-sm dropdown-toggle" class="btn btn-primary btn-sm dropdown-toggle"
data-toggle="dropdown"> data-bs-toggle="dropdown">
Download Download
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">

32
archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
Unescape View File

@ -14,49 +14,49 @@
<!--/*@thymesVar id="cache" type="org.openrs2.archive.cache.CacheExporter.Cache"*/--> <!--/*@thymesVar id="cache" type="org.openrs2.archive.cache.CacheExporter.Cache"*/-->
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<tr class="thead-dark"> <tr>
<th>Format</th> <th class="table-dark">Format</th>
<td th:text="${cache.masterIndex.format}">VERSIONED</td> <td th:text="${cache.masterIndex.format}">VERSIONED</td>
</tr> </tr>
<tr class="thead-dark"> <tr>
<th>Indexes</th> <th class="table-dark">Indexes</th>
<td th:class="${cache.stats}? (${cache.stats.allIndexesValid}? 'table-success' : 'table-danger')" <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...'"> th:text="${cache.stats}? ${cache.stats.validIndexes} + ' / ' + ${cache.stats.indexes} + ' (' + ${#numbers.formatPercent(cache.stats.validIndexesFraction, 1, 2)} + ')' : 'Calculating...'">
Calculating... Calculating...
</td> </td>
</tr> </tr>
<tr class="thead-dark"> <tr>
<th>Groups</th> <th class="table-dark">Groups</th>
<td th:class="${cache.stats}? (${cache.stats.allGroupsValid}? 'table-success' : 'table-warning')" <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...'"> 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... Calculating...
</td> </td>
</tr> </tr>
<tr class="thead-dark"> <tr>
<th>Keys<sup><a href="/caches#empty-locs">1</a></sup></th> <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')" <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...'"> 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... Calculating...
</td> </td>
</tr> </tr>
<tr class="thead-dark"> <tr>
<th>Size<sup><a href="/caches#size">2</a></sup></th> <th class="table-dark">Size<sup><a href="/caches#size">2</a></sup></th>
<!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/--> <!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/-->
<td th:text="${cache.stats}? ${#byteunits.format(cache.stats.size)} : 'Calculating...'"> <td th:text="${cache.stats}? ${#byteunits.format(cache.stats.size)} : 'Calculating...'">
Calculating... Calculating...
</td> </td>
</tr> </tr>
<tr class="thead-dark"> <tr>
<th>Download</th> <th class="table-dark">Download</th>
<td> <td>
<div class="btn-toolbar"> <div class="btn-toolbar">
<div class="btn-group mr-2"> <div class="btn-group me-2">
<a th:href="${'/caches/' + cache.id + '/disk.zip'}" <a th:href="${'/caches/' + cache.id + '/disk.zip'}"
class="btn btn-primary btn-sm">Cache (.dat2/.idx)</a> class="btn btn-primary btn-sm">Cache (.dat2/.idx)</a>
<a th:href="${'/caches/' + cache.id + '/flat-file.zip'}" <a th:href="${'/caches/' + cache.id + '/flat-file.zip'}"
class="btn btn-primary btn-sm">Cache (Flat file)</a> class="btn btn-primary btn-sm">Cache (Flat file)</a>
</div> </div>
<div class="btn-group mr-2"> <div class="btn-group me-2">
<a th:href="${'/caches/' + cache.id + '/keys.json'}" <a th:href="${'/caches/' + cache.id + '/keys.json'}"
class="btn btn-primary btn-sm">Keys (JSON)</a> class="btn btn-primary btn-sm">Keys (JSON)</a>
<a th:href="${'/caches/' + cache.id + '/keys.zip'}" <a th:href="${'/caches/' + cache.id + '/keys.zip'}"
@ -75,7 +75,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead class="thead-dark"> <thead class="table-dark">
<tr> <tr>
<th>Game</th> <th>Game</th>
<th>Build</th> <th>Build</th>
@ -104,7 +104,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead class="thead-dark"> <thead class="table-dark">
<tr> <tr>
<th>Archive</th> <th>Archive</th>
<th>Version</th> <th>Version</th>

4
archive/src/main/resources/org/openrs2/archive/templates/index.html
Unescape View File

@ -10,9 +10,9 @@
<body> <body>
<nav th:replace="layout.html :: nav"></nav> <nav th:replace="layout.html :: nav"></nav>
<main class="container"> <main class="container">
<div class="jumbotron"> <div class="p-5 mb-4 bg-light rounded-3">
<h1>Welcome to the OpenRS2 Archive</h1> <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 The OpenRS2 Archive is a collection of caches and XTEA keys
for all versions of RuneScape that use JS5 to manage assets for all versions of RuneScape that use JS5 to manage assets
(mainline RuneScape builds 402 and greater, and all builds (mainline RuneScape builds 402 and greater, and all builds

10
archive/src/main/resources/org/openrs2/archive/templates/layout.html
Unescape View File

@ -12,13 +12,13 @@
<nav class="navbar navbar-dark navbar-expand bg-dark mb-4" th:fragment="nav"> <nav class="navbar navbar-dark navbar-expand bg-dark mb-4" th:fragment="nav">
<div class="container"> <div class="container">
<a class="navbar-brand" href="/">OpenRS2 Archive</a> <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"*/--> <!--/*@thymesVar id="active" type="java.lang.String"*/-->
<li class="nav-item" th:classappend="${active == 'caches'}? 'active'"> <li class="nav-item">
<a class="nav-link" href="/caches">Caches</a> <a class="nav-link" th:classappend="${active == 'caches'}? 'active'" href="/caches">Caches</a>
</li> </li>
<li class="nav-item" th:classappend="${active == 'keys'}? 'active'"> <li class="nav-item">
<a class="nav-link" href="/keys">Keys</a> <a class="nav-link" th:classappend="${active == 'keys'}? 'active'" href="/keys">Keys</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/pub">Other</a> <a class="nav-link" href="/pub">Other</a>

3
gradle/libs.versions.toml
Unescape View File

@ -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-core = { module = "org.ow2.asm:asm", version.ref = "asm" }
asm-tree = { module = "org.ow2.asm:asm-tree", 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" } 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-pkix = { module = "org.bouncycastle:bcpkix-jdk15on", version = "1.68" }
bouncyCastle-provider = { module = "org.bouncycastle:bcprov-jdk15on", version = "1.68" } bouncyCastle-provider = { module = "org.bouncycastle:bcprov-jdk15on", version = "1.68" }
byteUnits = { module = "com.jakewharton.byteunits:byteunits", version = "0.9.1" } 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" } jdom = { module = "org.jdom:jdom2", version = "2.0.6" }
jgrapht = { module = "org.jgrapht:jgrapht-core", version = "1.5.1" } jgrapht = { module = "org.jgrapht:jgrapht-core", version = "1.5.1" }
jimfs = { module = "com.google.jimfs:jimfs", version.ref = "jimfs" } 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" } jsoup = { module = "org.jsoup:jsoup", version = "1.13.1" }
junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version = { strictly = "5.7.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" } junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }

Write Preview
Loading…
Cancel
Save