Skip to content

Commit 7760eb6

Browse files
TelesphoreoTelesphoreo
committed
Make the pages more consistent
1 parent cbc7907 commit 7760eb6

11 files changed

Lines changed: 72 additions & 11 deletions

‎build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ publishing {
6666
}
6767

6868
tasks.getByName<Jar>("jar") {
69+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
6970
archiveBaseName.set("Plex-HTTPD")
7071
archiveVersion.set("")
72+
from("src/main/resources") {
73+
exclude("dev/**")
74+
}
7175
}

‎src/main/resources/dev/test.html‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta name="viewport" content="width=device-width, initial-scale=1">
5+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
6+
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
7+
<script type="text/javascript"
8+
src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
9+
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
10+
crossorigin="anonymous"></script>
11+
<title>${TITLE} - Plex HTTPD</title>
12+
</head>
13+
<body>
14+
<nav class="navbar navbar-expand-lg navbar-light bg-light">
15+
<div class="container-fluid">
16+
<a class="navbar-brand" href="/">Plex HTTPD</a>
17+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
18+
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
19+
<span class="navbar-toggler-icon"></span>
20+
</button>
21+
<div class="collapse navbar-collapse" id="navbarNav">
22+
<ul class="navbar-nav">
23+
<li class="nav-item">
24+
<a class="nav-link ${ACTIVE_HOME}" href="/">Home</a>
25+
</li>
26+
<li class="nav-item">
27+
<a class="nav-link ${ACTIVE_ADMINS}" href="/api/admins/">Admins</a>
28+
</li>
29+
<li class="nav-item">
30+
<a class="nav-link ${ACTIVE_INDEFBANS}" href="/api/indefbans/">Indefinite Bans</a>
31+
</li>
32+
<li class="nav-item">
33+
<a class="nav-link ${ACTIVE_LIST}" href="/api/list/">List</a>
34+
</li>
35+
<li class="nav-item">
36+
<a class="nav-link ${ACTIVE_PUNISHMENTS}" href="/api/punishments/">Punishments</a>
37+
</li>
38+
<li class="nav-item dropdown">
39+
<a class="nav-link dropdown-toggle ${ACTIVE_SCHEMATICS}" id="navbarDropdownMenuLink" role="button"
40+
data-bs-toggle="dropdown" aria-expanded="false">
41+
Schematics
42+
</a>
43+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
44+
<li><a class="dropdown-item" href="/api/schematics/download/">Download</a></li>
45+
<li><a class="dropdown-item" href="/api/schematics/upload/">Upload</a></li>
46+
</ul>
47+
</li>
48+
</ul>
49+
</div>
50+
</div>
51+
</nav>
52+
<div style="text-align: center;" class="col-auto m-0 row justify-content-center p-4">
53+
</div>
54+
</body>
55+
</html>

‎src/main/resources/httpd/admins.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Admins
22
ADMINS
3-
<h2>Plex HTTPD</h2>
3+
<h2>Admins</h2>
44
<h5 class="alert alert-danger mb-3 w-auto p-3" role="alert"><b>Error:</b> ${MESSAGE}</h5>

‎src/main/resources/httpd/indefbans.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Indefinite Bans
22
INDEFBANS
3-
<h2>Plex HTTPD</h2>
3+
<h2>Indefinite Bans</h2>
44
<h5 class="alert alert-danger mb-3 w-auto p-3" role="alert"><b>Error:</b> ${MESSAGE}</h5>

‎src/main/resources/httpd/punishments.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Punishments
22
PUNISHMENTS
3-
<h2>Enter the UUID or username of the player you want to lookup</h2>
3+
<h2>Punishment Search</h2>
4+
<label for="uuid"><h5>Enter the UUID or username of the player you want to lookup</h5></label>
45
<div class="input-group mb-3 w-75 p-3">
56
<input id="uuid" type="text" autocomplete="off" autofocus class="form-control">
67
<button class="btn btn-outline-primary" type="submit"

‎src/main/resources/httpd/punishments_error.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Punishments
22
PUNISHMENTS
3-
<h2>Plex HTTPD</h2>
3+
<h2>Punishment Search</h2>
44
<h5 class="alert alert-danger mb-3 w-auto p-3" role="alert"><b>Error:</b> ${MESSAGE}</h5>

‎src/main/resources/httpd/punishments_good.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Punishments
22
PUNISHMENTS
3-
<h2>Plex HTTPD</h2>
3+
<h2>Punishment Search</h2>
44
<h5 class="alert alert-success mb-3 w-auto p-3" role="alert">${MESSAGE}</h5>

‎src/main/resources/httpd/schematic_download.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Schematics
22
SCHEMATICS
3-
<h2>Plex HTTPD</h2>
4-
<h5>A list of schematics is below. You can click on the schematic name to download it.</h5>
3+
<h2>Schematic Download</h2>
4+
<label for="schemList"><h5>A list of schematics is below. You can click on the schematic name to download it.</h5>
5+
</label>
56
<div class="input-group mb-3 w-75 p-3">
67
<input type="text" autocomplete="off" autofocus class="form-control" oninput="filterTable(this.value)"
78
placeholder="Search for a schematic...">

‎src/main/resources/httpd/schematic_upload.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Schematics
22
SCHEMATICS
3-
<h2>Plex HTTPD</h2>
3+
<h2>Schematic Upload</h2>
44
<div class="cos-xs-8 col-lg-5">
5-
<label for="formFile" class="form-label">Please select a schematic file to upload.</label>
5+
<label for="formFile" class="form-label"><h5>Please select a schematic file to upload.</h5></label>
66
<form class="input-group justify-content-center" enctype="multipart/form-data" method="post"
77
action="/api/schematics/uploading">
88
<div class="input-group">

‎src/main/resources/httpd/schematic_upload_bad.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Schematics
22
SCHEMATICS
3-
<h2>Plex HTTPD</h2>
3+
<h2>Schematic Upload</h2>
44
<h5 class="alert alert-danger mb-3 w-auto p-3" role="alert"><b>Error:</b> ${MESSAGE}</h5>

0 commit comments

Comments
 (0)