From eafae40aca8f96cfeaa216f0756e6e6a8c03ed9f Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Sat, 19 Nov 2022 16:20:38 -0600
Subject: [PATCH] titles: fix all titles where needful

---
 files/templates/admin/admin_home.html        |  8 +-----
 files/templates/admin/app.html               |  8 +-----
 files/templates/admin/apps.html              |  8 +-----
 files/templates/admin/image_posts.html       | 12 +--------
 files/templates/admin/removed_comments.html  |  9 +------
 files/templates/admin/removed_posts.html     | 13 +--------
 files/templates/admin/reported_comments.html |  9 +------
 files/templates/admin/reported_posts.html    | 11 +-------
 files/templates/api.html                     |  6 +----
 files/templates/casino/game_screen.html      |  4 +--
 files/templates/contact.html                 |  4 +--
 files/templates/donate_WPD.html              |  6 +----
 files/templates/errors/error.html            |  7 +----
 files/templates/errors/nsfw.html             |  7 +----
 files/templates/errors/patron.html           |  7 +----
 files/templates/formatting.html              |  6 +----
 files/templates/hats.html                    |  6 +----
 files/templates/message.html                 |  8 +-----
 files/templates/oauth.html                   | 17 +-----------
 files/templates/poll_votes.html              | 13 +--------
 files/templates/shop.html                    |  7 +----
 files/templates/sidebar.html                 |  8 +-----
 files/templates/stats.html                   |  7 +----
 files/templates/sub/create_hole.html         | 28 +-------------------
 files/templates/submit_hats.html             |  7 +----
 files/templates/submit_marseys.html          |  7 +----
 files/templates/update_assets.html           |  4 +--
 files/templates/userpage/voted_comments.html | 10 +------
 files/templates/userpage/voted_posts.html    |  8 +-----
 files/templates/votes.html                   |  9 +------
 30 files changed, 30 insertions(+), 234 deletions(-)

diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html
index e26cabf49..b8a52c226 100644
--- a/files/templates/admin/admin_home.html
+++ b/files/templates/admin/admin_home.html
@@ -1,12 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}}</title>
-
-{% endblock %}
-
+{% block pagetitle %}{{SITE_NAME}}{% endblock %}
 {% block customPadding %}px-3{% endblock %}
-
 {% block content %}
 <h3 class="pb-2 mt-2">Admin Tools</h3>
 
diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html
index 9fb3f6def..7a738ebbf 100644
--- a/files/templates/admin/app.html
+++ b/files/templates/admin/app.html
@@ -1,12 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>API App Administration</title>
-
-{% endblock %}
-
+{% block pagetitle %}API App Administration{% endblock %}
 {% block content %}
-
 <div class="row">
 	<div class="col col-lg-8">
 		<div class="settings">
diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html
index 51edd4322..6c0255931 100644
--- a/files/templates/admin/apps.html
+++ b/files/templates/admin/apps.html
@@ -1,12 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>API App Administration</title>
-
-{% endblock %}
-
+{% block pagetitle %}API App Administration{% endblock %}
 {% block content %}
-
 <div class="row">
 	<div class="col col-lg-8">
 		<div class="settings">
diff --git a/files/templates/admin/image_posts.html b/files/templates/admin/image_posts.html
index 864581f7d..d98a42964 100644
--- a/files/templates/admin/image_posts.html
+++ b/files/templates/admin/image_posts.html
@@ -1,22 +1,12 @@
 {% extends "userpage.html" %}
-
 {% block pagetype %}userpage{% endblock %}
 {% block desktopBanner %}{% endblock %}
 {% block desktopUserBanner %}{% endblock %}
 {% block mobileUserBanner %}{% endblock %}
-
-{% block title %}
-<title>Image feed</title>
-
-{% endblock %}
-
-
+{% block pagetitle %}Image feed{% endblock %}
 {% block content %}
-
 <div class="row no-gutters">
-
 	<div class="col">
-
 	{% block listing %}
 		<div class="posts">
 			{% include "submission_listing.html" %}
diff --git a/files/templates/admin/removed_comments.html b/files/templates/admin/removed_comments.html
index c471c66db..c0b72427a 100644
--- a/files/templates/admin/removed_comments.html
+++ b/files/templates/admin/removed_comments.html
@@ -1,12 +1,6 @@
 {% extends "admin/removed_posts.html" %}
-
-{% block title %}
-<title>Removed Comments</title>
-{% endblock %}
-
+{% block pagetitle %}Removed Comments{% endblock %}
 {% block listing %}
-
-
 		<div class="posts">
 			{% with comments=listing %}
 				{% include "comments.html" %}
@@ -21,5 +15,4 @@
 			</div>
 				{% endif %}
 		</div>
-
 {% endblock %}
diff --git a/files/templates/admin/removed_posts.html b/files/templates/admin/removed_posts.html
index 38ef4eb03..cb6ec9704 100644
--- a/files/templates/admin/removed_posts.html
+++ b/files/templates/admin/removed_posts.html
@@ -1,17 +1,10 @@
 {% extends "userpage.html" %}
-
 {% block pagetype %}userpage{% endblock %}
 {% block desktopBanner %}{% endblock %}
 {% block desktopUserBanner %}{% endblock %}
 {% block mobileUserBanner %}{% endblock %}
-
-{% block title %}
-<title>Removed Posts</title>
-
-{% endblock %}
-
+{% block pagetitle %}Removed Posts{% endblock %}
 {% block content %}
-
 <ul class="nav post-nav py-2">
 	<li class="nav-item">
 		<a class="nav-link {% if request.path=="/admin/removed/posts" %} active{% endif %}" href="/admin/removed/posts">
@@ -24,11 +17,8 @@
 		</a>
 	</li>
 </ul>
-
 <div class="row no-gutters">
-
 	<div class="col">
-
 	{% block listing %}
 		<div class="posts">
 			{% include "submission_listing.html" %}
@@ -37,7 +27,6 @@
 	</div>
 </div>
 {% endblock %}
-
 {% block pagenav %}
 <nav aria-label="Page navigation">
 	<ul class="pagination pagination-sm py-3 pl-3 mb-0">
diff --git a/files/templates/admin/reported_comments.html b/files/templates/admin/reported_comments.html
index f8442a73a..496999687 100644
--- a/files/templates/admin/reported_comments.html
+++ b/files/templates/admin/reported_comments.html
@@ -1,12 +1,6 @@
 {% extends "admin/reported_posts.html" %}
-
-{% block title %}
-<title>Reported Comments</title>
-{% endblock %}
-
+{% block pagetitle %}Reported Comments{% endblock %}
 {% block listing %}
-
-
 		<div class="posts">
 			{% with comments=listing %}
 				{% include "comments.html" %}
@@ -21,5 +15,4 @@
 			</div>
 				{% endif %}
 		</div>
-
 {% endblock %}
diff --git a/files/templates/admin/reported_posts.html b/files/templates/admin/reported_posts.html
index bd7bdf221..2531b0dd5 100644
--- a/files/templates/admin/reported_posts.html
+++ b/files/templates/admin/reported_posts.html
@@ -1,17 +1,10 @@
 {% extends "userpage.html" %}
-
 {% block pagetype %}userpage{% endblock %}
 {% block desktopBanner %}{% endblock %}
 {% block desktopUserBanner %}{% endblock %}
 {% block mobileUserBanner %}{% endblock %}
-
-{% block title %}
-<title>Reported Posts</title>
-
-{% endblock %}
-
+{% block pagetitle %}Reported Posts{% endblock %}
 {% block content %}
-
 <ul class="nav post-nav py-2">
 	<li class="nav-item">
 		<a class="nav-link {% if request.path=="/admin/reported/posts" %} active{% endif %}" href="/admin/reported/posts">
@@ -26,9 +19,7 @@
 </ul>
 
 <div class="row no-gutters">
-
 	<div class="col">
-
 	{% block listing %}
 		<div class="posts">
 			{% include "submission_listing.html" %}
diff --git a/files/templates/api.html b/files/templates/api.html
index 1f97a6177..dba2e5fba 100644
--- a/files/templates/api.html
+++ b/files/templates/api.html
@@ -1,9 +1,5 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}} - API</title>
-
-{% endblock %}
+{% block pagetitle %}API{% endblock %}
 
 {% block content %}
 <h1 class="mt-3 mb-1">API Guide for Bots</h1>
diff --git a/files/templates/casino/game_screen.html b/files/templates/casino/game_screen.html
index 3b41b1b80..dc67e5fda 100644
--- a/files/templates/casino/game_screen.html
+++ b/files/templates/casino/game_screen.html
@@ -1,6 +1,4 @@
-{% extends "default.html" %} {% block title %}
-<title>{{game.capitalize()}}</title>
-{% endblock %} {% block content %}
+{% extends "default.html" %} {% block pagetitle %}{{game.capitalize()}}{% endblock %} {% block content %}
 <style>
 	.game_screen-title {
 		display: flex;
diff --git a/files/templates/contact.html b/files/templates/contact.html
index e4af44e79..e9e80554e 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -1,7 +1,5 @@
 {% extends "default.html" %}
-{% block title %}
-<title>{{SITE_NAME}} - Contact</title>
-{% endblock %}
+{% block pagetitle %}Contact{% endblock %}
 {% block content %}
 	{% if msg %}
 		<div class="alert alert-success alert-dismissible fade show my-3" role="alert">
diff --git a/files/templates/donate_WPD.html b/files/templates/donate_WPD.html
index 381cf9b4f..219507850 100644
--- a/files/templates/donate_WPD.html
+++ b/files/templates/donate_WPD.html
@@ -1,9 +1,5 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}} - Donate</title>
-{% endblock %}
-
+{% block pagetitle %}Donate{% endblock %}
 {% block content %}
 	<h1 class="py-3">Donate</h1>
 	<div class="overflow-x-auto">
diff --git a/files/templates/errors/error.html b/files/templates/errors/error.html
index 1e0eac8e4..d4f92a9dc 100644
--- a/files/templates/errors/error.html
+++ b/files/templates/errors/error.html
@@ -1,11 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{code}} {{title}}</title>
-{% endblock %}
-
+{% block pagetitle %}{{code}} {{title}}{% endblock %}
 {% block pagetype %}error-{{code}}{% endblock %}
-
 {% block content %}
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 7be6352e6..b14275e7d 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -1,11 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>+18</title>
-{% endblock %}
-
+{% block pagetitle %}+18{% endblock %}
 {% block pagetype %}error-451{% endblock %}
-
 {% block content %}
 <div class="row justify-content-center">
 	<div class="col col-md-5">
diff --git a/files/templates/errors/patron.html b/files/templates/errors/patron.html
index e823600ce..f143eee19 100644
--- a/files/templates/errors/patron.html
+++ b/files/templates/errors/patron.html
@@ -1,11 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>401 Not Authorized</title>
-{% endblock %}
-
+{% block pagetitle %}401 Not Authorized{% endblock %}
 {% block pagetype %}error-401{% endblock %}
-
 {% block content %}
 	<div class="row justify-content-center">
 		<div class="col-10 col-md-5">
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 0e6dba20c..39584c9a1 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -1,9 +1,5 @@
 {% extends "default.html" %}
-{% block title %}
-<title>{{SITE_NAME}} - Formatting</title>
-
-{% endblock %}
-
+{% block pagetitle %}Formatting{% endblock %}
 {% block content %}
 <h3 class="ml-2 mt-4">Markdown Formatting</h3>
 
diff --git a/files/templates/hats.html b/files/templates/hats.html
index ed65bc632..3cd49cdef 100644
--- a/files/templates/hats.html
+++ b/files/templates/hats.html
@@ -1,9 +1,5 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>Hats</title>
-{% endblock %}
-
+{% block pagetitle %}Hats{% endblock %}
 {% block pagetype %}message{% endblock %}
 
 {% block Banner %}
diff --git a/files/templates/message.html b/files/templates/message.html
index 16f28a281..b05d2b39d 100644
--- a/files/templates/message.html
+++ b/files/templates/message.html
@@ -1,13 +1,7 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{title}}</title>
-{% endblock %}
-
+{% block pagetitle %}{{title}}{% endblock %}
 {% block pagetype %}message{% endblock %}
-
 {% block customPadding %}{% endblock %}
-
 {% block content %}
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
diff --git a/files/templates/oauth.html b/files/templates/oauth.html
index e2f60dde9..6e2097e09 100644
--- a/files/templates/oauth.html
+++ b/files/templates/oauth.html
@@ -1,34 +1,19 @@
 {% extends "login.html" %}
-
-{% block title %}
-<title>Application Request for Access</title>
-{% endblock %}
-
+{% block pagetitle %}Application Request for Access{% endblock %}
 {% block content %}
-
 <div id="auth-form">
-
 		<h2>{{application.app_name}}</h2>
-
 		<p class="mb-md-5">wants to access your @{{v.username}} account.</p>
-
 		<p class="mb-md-5">It will not be able to see your password, or change your account settings.</p>
-
 		<form action="/authorize" method="post" class="mt-md-3" id="login">
-
 				<input type="hidden" name="formkey" value="{{v|formkey}}">
 				<input type="hidden" name="scopes" value="{{scopes_txt}}">
 				<input type="hidden" name="redirect_uri" value="{{redirect_uri}}">
 				<input type="hidden" name="permanent" value="{{permanent}}">
 				<input type="hidden" name="client_id" value="{{application.client_id}}">
 				<input type="hidden" name="state" value="{{state}}">
-
 				<input type="submit" onclick="disable(this)" class="btn btn-primary" id="auth_button" value="Authorize {{application.app_name}}">
-
 				<a href="/" class="btn btn-secondary">No, back to {{SITE_NAME}}</a>
-
 		</form>
-
 </div>
-
 {% endblock %}
diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html
index 834b982d4..1e621c6bf 100644
--- a/files/templates/poll_votes.html
+++ b/files/templates/poll_votes.html
@@ -1,14 +1,7 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}}</title>
-
-{% endblock %}
-
+{% block pagetitle %}Poll Votes{% endblock %}
 {% block content %}
-
 {% if thing %}
-
 <h3 class="mt-5">{{thing.body_html | safe}} - {{ups | length}} {% if thing.exclusive == 2 %}bets{% else %}votes{% endif %}</h3>
 <div class="overflow-x-auto mt-5">
 	<table class="table table-striped mb-5">
@@ -35,10 +28,6 @@
 		{% endfor %}
 	</table>
 </div>
-
 <script defer src="{{'js/sort_table.js' | asset}}"></script>
-
 {% endif %}
-
-
 {% endblock %}
diff --git a/files/templates/shop.html b/files/templates/shop.html
index d62f95a3b..e4f328d49 100644
--- a/files/templates/shop.html
+++ b/files/templates/shop.html
@@ -5,13 +5,8 @@
 		'WPD': 'Watch people die.',
 	}[SITE_NAME]
 -%}
-
-{% block title %}
-<title>Shop</title>
-{% endblock %}
-
+{% block pagetitle %}Shop{% endblock %}
 {% block pagetype %}message{% endblock %}
-
 {% block Banner %}
 	<style>
 		.shop-tabs {
diff --git a/files/templates/sidebar.html b/files/templates/sidebar.html
index 44d0b64b8..24913161c 100644
--- a/files/templates/sidebar.html
+++ b/files/templates/sidebar.html
@@ -1,14 +1,8 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}} Sidebar</title>
-
-{% endblock %}
-
+{% block pagetitle %}{{SITE_NAME}} Sidebar{% endblock %}
 {% block content %}
 <div class="mx-4 mt-4 mb-6">
 	<h1 class="text-muted text-uppercase">Sidebar</h5>
-
 	<div id="sidebar" class="my-3">
 		{% if has_sidebar %}
 			{% include "sidebar_" + SITE_NAME + ".html" %}
diff --git a/files/templates/stats.html b/files/templates/stats.html
index 32d05ede0..0b03d0cbc 100644
--- a/files/templates/stats.html
+++ b/files/templates/stats.html
@@ -1,10 +1,5 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}}</title>
-
-{% endblock %}
-
+{% block pagetitle %}{{SITE_NAME}}{% endblock %}
 {% block content %}
 <div class="overflow-x-auto mt-1"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
diff --git a/files/templates/sub/create_hole.html b/files/templates/sub/create_hole.html
index d59e714aa..9370f0256 100644
--- a/files/templates/sub/create_hole.html
+++ b/files/templates/sub/create_hole.html
@@ -1,57 +1,31 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>Create a {{HOLE_NAME}}</title>
-{% endblock %}
-
+{% block pagetitle %}Create a {{HOLE_NAME}}{% endblock %}
 {% block content %}
-
 <form class="mt-3" id="submitform" action="/create_hole" method="post">
-
 	<div class="container">
-
 		<div class="row justify-content-center mb-4 pb-7">
-
 			<div class="col col-md-6 p-3 py-md-0">
-
 				<h1 class="d-mob-none">Create a {{HOLE_NAME}}</h1>
-
 				<h3 class=" d-md-none">Create a {{HOLE_NAME}}</h3>
-
 				<div class="body">
-
 					<input type="hidden" name="formkey" value="{{v|formkey}}">
-
 					<label for="title">Sub Name</label>
-
 					<input minlength="3" maxlength="25" pattern='[a-zA-Z0-9_\-]*' class="form-control" id="title-register" aria-describedby="titleHelpRegister" type="text" name="name" required>
 					<small class="form-text text-muted">3-25 characters, including letters, numbers, _ , and -</small>
-
-
 					<div class="footer">
-
 						<div class="d-flex">
-	
 							{% if error %}
 							<p class="mb-0">
 								<span class="text-danger text-small" style="vertical-align: sub;">{{error}}</span>
 							</p>
 							{% endif %}
-							
 							<button type="submit" class="btn btn-primary ml-auto" id="create_button" {% if cost > v.coins %}disabled{% endif %}>Create {{HOLE_NAME|capitalize}}</button>
-	
 						</div>
-	
 						<p class="mt-2 mr-1" style="float: right"><b>Cost</b>: {{cost}} coins</p>
-	
 					</div>	
 				</div>
-
 			</div>
-
 		</div>
 	</div>
-
 </form>
-
 {% endblock %}
diff --git a/files/templates/submit_hats.html b/files/templates/submit_hats.html
index 5d2e799d1..1be920cbf 100644
--- a/files/templates/submit_hats.html
+++ b/files/templates/submit_hats.html
@@ -1,11 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>Submit Hats</title>
-{% endblock %}
-
+{% block pagetitle %}Submit Hats{% endblock %}
 {% block pagetype %}message{% endblock %}
-
 {% block content %}
 	{% if error %}
 		<div class="alert alert-danger alert-dismissible fade show mb-3 mt-4" role="alert">
diff --git a/files/templates/submit_marseys.html b/files/templates/submit_marseys.html
index 99c4a5657..971397df6 100644
--- a/files/templates/submit_marseys.html
+++ b/files/templates/submit_marseys.html
@@ -1,11 +1,6 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>Submit Marseys</title>
-{% endblock %}
-
+{% block pagetitle %}Submit Marseys{% endblock %}
 {% block pagetype %}message{% endblock %}
-
 {% block content %}
 	<style>
 		input:not(.btn) {
diff --git a/files/templates/update_assets.html b/files/templates/update_assets.html
index 30fdbccf7..ddfb41f1d 100644
--- a/files/templates/update_assets.html
+++ b/files/templates/update_assets.html
@@ -1,7 +1,5 @@
 {% extends "default.html" %}
-{% block title %}
-<title>Update {{type}}</title>
-{% endblock %}
+{% block pagetitle %}Update {{type}}{% endblock %}
 {% block pagetype %}message{% endblock %}
 {% block content %}
 	{% if error %}
diff --git a/files/templates/userpage/voted_comments.html b/files/templates/userpage/voted_comments.html
index 772c999ef..fa36d355b 100644
--- a/files/templates/userpage/voted_comments.html
+++ b/files/templates/userpage/voted_comments.html
@@ -1,13 +1,6 @@
 {% extends "userpage/voted_posts.html" %}
-
-
-{% block title %}
-<title>Comments</title>
-{% endblock %}
-
+{% block pagetitle %}Comments{% endblock %}
 {% block listing %}
-
-
 		<div class="posts">
 			{% with comments=listing %}
 				{% include "comments.html" %}
@@ -22,5 +15,4 @@
 			</div>
 				{% endif %}
 		</div>
-
 {% endblock %}
diff --git a/files/templates/userpage/voted_posts.html b/files/templates/userpage/voted_posts.html
index 3bc1edf21..a0fca88dd 100644
--- a/files/templates/userpage/voted_posts.html
+++ b/files/templates/userpage/voted_posts.html
@@ -1,16 +1,10 @@
 {% extends "userpage.html" %}
-
 {% block pagetype %}userpage{% endblock %}
 {% block desktopBanner %}{% endblock %}
 {% block desktopUserBanner %}{% endblock %}
 {% block mobileUserBanner %}{% endblock %}
-
-{% block title %}
-<title>Posts</title>
-{% endblock %}
-
+{% block pagetitle %}Posts{% endblock %}
 {% block content %}
-
 <ul class="nav post-nav py-2">
 	<li class="nav-item">
 		<a class="nav-link {% if request.path.endswith('/posts') %}active" href="{{request.path}}"{% else %}" href="{{request.path.replace('comments','posts')}}"{% endif %}>
diff --git a/files/templates/votes.html b/files/templates/votes.html
index c9d0ed83c..359b55f37 100644
--- a/files/templates/votes.html
+++ b/files/templates/votes.html
@@ -1,14 +1,7 @@
 {% extends "default.html" %}
-
-{% block title %}
-<title>{{SITE_NAME}}</title>
-
-{% endblock %}
-
+{% block pagetitle %}{{SITE_NAME}}{% endblock %}
 {% block content %}
-
 {% if thing %}
-
 <h1 class="mt-2">Info</h1>
 <p><a href="{{thing.permalink}}">{{thing.permalink}}</a></p>
 <p><b>Author:</b> <a href="{{thing.author.url}}">@{{thing.author.username}}</a></p>