From 89849cf0341e8049b0e25b40bb1870c3964cde3f Mon Sep 17 00:00:00 2001
From: Alek Ratzloff <alekratz@gmail.com>
Date: Sun, 17 Jul 2022 18:53:56 -0700
Subject: [PATCH] Add site title to all pages

Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
---
 board/templates/board/action_success.html     |  2 +-
 board/templates/board/ban_form.html           |  2 +
 board/templates/board/ban_success.html        |  2 +-
 board/templates/board/banned.html             |  9 +--
 board/templates/board/board_detail.html       |  4 +-
 board/templates/board/news_list.html          |  4 +-
 .../templates/board/post_confirm_delete.html  |  4 ++
 board/templates/board/post_create.html        |  4 ++
 board/templates/board/post_detail.html        |  8 ++-
 board/templates/board/post_modify.html        |  4 ++
 board/templates/board/post_success.html       |  4 ++
 board/templates/board/post_wipe.html          |  4 ++
 board/templates/board/reply_create.html       |  4 ++
 board/templates/board/report_form.html        |  2 +-
 board/templates/board/rules.html              | 57 ++++++++++++++++---
 15 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/board/templates/board/action_success.html b/board/templates/board/action_success.html
index 9c950ba..41163ec 100644
--- a/board/templates/board/action_success.html
+++ b/board/templates/board/action_success.html
@@ -1,7 +1,7 @@
 {% extends "board/base.html" %}
 {% load i18n static %}
 {# Title #}
-{% block title %}{% translate "Action success" %}{% endblock %}
+{% block title %}{% translate "Action success" %} {{block.super}}{% endblock %}
 {# Body #}
 {% block content %}
 <div class="row" id="message">
diff --git a/board/templates/board/ban_form.html b/board/templates/board/ban_form.html
index ac723af..91a90b4 100644
--- a/board/templates/board/ban_form.html
+++ b/board/templates/board/ban_form.html
@@ -1,6 +1,8 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
+{% block title %}Create new ban for {{ post.id }} {{ block.super }}{% endblock %}
+
 {% block content %}
 <form id="form" action="{% url 'board:ban_create' url=board.url id=post.id %}" method="post" autocomplete="off"> 
     {% csrf_token %}
diff --git a/board/templates/board/ban_success.html b/board/templates/board/ban_success.html
index 8d14073..1729a2f 100644
--- a/board/templates/board/ban_success.html
+++ b/board/templates/board/ban_success.html
@@ -1,7 +1,7 @@
 {% extends "board/base.html" %}
 {% load i18n static %}
 {# Title #}
-{% block title %}{% translate "Ban success" %}{% endblock %}
+{% block title %}{% translate "Ban success" %} {{block.super}}{% endblock %}
 {# Body #}
 {% block content %}
 <div class="row" id="message">
diff --git a/board/templates/board/banned.html b/board/templates/board/banned.html
index dcb2cf4..4ca597e 100644
--- a/board/templates/board/banned.html
+++ b/board/templates/board/banned.html
@@ -2,14 +2,11 @@
 
 {% block title %}
     {% if bans %}
-        {% with title="Banned" %}
-            {{ block.super }}
-        {% endwith %}
+        Banned
     {% else %}
-        {% with title="Not banned" %}
-            {{ block.super }}
-        {% endwith %}
+        Not banned
     {% endif %}
+    {{block.super}}
 {% endblock title %}
 
 {% block extrastyle %}
diff --git a/board/templates/board/board_detail.html b/board/templates/board/board_detail.html
index 6784b6b..4b7d5b5 100644
--- a/board/templates/board/board_detail.html
+++ b/board/templates/board/board_detail.html
@@ -3,9 +3,7 @@
 {% load i18n %}
 
 {% block title %}
-    {% with title=board.url %}
-        {{ block.super }}
-    {% endwith %}
+    /{{board.url}}/ - {{board.name}} {{block.super}}
 {% endblock title %}
 
 {% block content %}
diff --git a/board/templates/board/news_list.html b/board/templates/board/news_list.html
index 3825acb..67179a4 100644
--- a/board/templates/board/news_list.html
+++ b/board/templates/board/news_list.html
@@ -1,9 +1,7 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
-{% block title %}
-News
-{% endblock title %}
+{% block title %}News {{block.super}}{% endblock title %}
 
 {% block content %}
 
diff --git a/board/templates/board/post_confirm_delete.html b/board/templates/board/post_confirm_delete.html
index d43658e..15f3c5e 100644
--- a/board/templates/board/post_confirm_delete.html
+++ b/board/templates/board/post_confirm_delete.html
@@ -1,6 +1,10 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
+{% block title %}
+Deleting post {{post.id}} {{block.super}}
+{% endblock title %}
+
 {% block content %}
 <form id="form" method="post" action="{% url 'board:post_delete' post.id %}">
     {% csrf_token %}
diff --git a/board/templates/board/post_create.html b/board/templates/board/post_create.html
index 76a3b9f..ef26953 100644
--- a/board/templates/board/post_create.html
+++ b/board/templates/board/post_create.html
@@ -1,6 +1,10 @@
 {% extends "board/base.html" %}
 {% load i18n post_body %}
 
+{% block title %}
+Creating new post on /{{board.url}}/ {{block.super}}
+{% endblock %}
+
 {% block extrastyle %}
 <style>
 table {
diff --git a/board/templates/board/post_detail.html b/board/templates/board/post_detail.html
index 6fcf381..0a0b1a2 100644
--- a/board/templates/board/post_detail.html
+++ b/board/templates/board/post_detail.html
@@ -2,9 +2,11 @@
 {% load i18n post_body static %}
 
 {% block title %}
-    {% with title=board.url %}
-        {{ block.super }}
-    {% endwith %}
+    {% if post.subject %}
+    {{post.subject }} -
+    {% endif %}
+    /{{board.url}}/ - {{board.name}}
+    {{block.super}}
 {% endblock title %}
 
 {% block content %}
diff --git a/board/templates/board/post_modify.html b/board/templates/board/post_modify.html
index 61bbd36..bcd288b 100644
--- a/board/templates/board/post_modify.html
+++ b/board/templates/board/post_modify.html
@@ -1,6 +1,10 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
+{% block title %}
+Modifying post {{post.id}} {{block.super}}
+{% endblock title %}
+
 {% block content %}
 <form method="post" action="{% url 'board:post_modify' post.id %}">
     {% csrf_token %}
diff --git a/board/templates/board/post_success.html b/board/templates/board/post_success.html
index 75c96c7..053aef3 100644
--- a/board/templates/board/post_success.html
+++ b/board/templates/board/post_success.html
@@ -1,6 +1,10 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
+{% block title %}
+Post created {{block.super}}
+{% endblock title %}
+
 {% block content %}
 {% blocktranslate %}
 Post created. Closing window in {{window_timeout}} second(s).
diff --git a/board/templates/board/post_wipe.html b/board/templates/board/post_wipe.html
index 5a99592..1c7bdb0 100644
--- a/board/templates/board/post_wipe.html
+++ b/board/templates/board/post_wipe.html
@@ -1,6 +1,10 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
+{% block title %}
+Wiping posts {{block.super}}
+{% endblock title %}
+
 {% block content %}
     {% blocktranslate %}This will delete {{all_posts_count}} posts.{% endblocktranslate %}
     <form method="post" {# action="{% url 'board:post_wipe_success' %}" #}>
diff --git a/board/templates/board/reply_create.html b/board/templates/board/reply_create.html
index fda48c2..9bac1a0 100644
--- a/board/templates/board/reply_create.html
+++ b/board/templates/board/reply_create.html
@@ -1,6 +1,10 @@
 {% extends "board/base.html" %}
 {% load i18n post_body %}
 
+{% block title %}
+Replying to {{post.id}} {{block.super}}
+{% endblock title %}
+
 {% block extrastyle %}
 <style>
 table {
diff --git a/board/templates/board/report_form.html b/board/templates/board/report_form.html
index 31f2bff..0512391 100644
--- a/board/templates/board/report_form.html
+++ b/board/templates/board/report_form.html
@@ -1,7 +1,7 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 {# Title #}
-{% block title %}{% blocktranslate %}Reporting post {{post.id}}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktranslate %}Reporting post {{post.id}}{% endblocktranslate %}{{block.super}}{% endblock title %}
 {# Body #}
 {% block content %}
 <div class="row">
diff --git a/board/templates/board/rules.html b/board/templates/board/rules.html
index 497d68b..4bb6112 100644
--- a/board/templates/board/rules.html
+++ b/board/templates/board/rules.html
@@ -1,6 +1,8 @@
 {% extends "board/base.html" %}
 {% load i18n %}
 
+{% block title %}Rules {{block.super}}{% endblock title %}
+
 {% block content %}
 <div class="row">
     <div class="column">&nbsp;</div>
@@ -11,16 +13,53 @@
 <div class="row">
     <div class="column">&nbsp;</div>
     <div class="column">
-        <div class="row"><h2>Boards</h2></div>
-        {% for board in boards %}
-            <div class="row">
-                <a href="{% url 'board:board_detail' url=board.url %}">/{{board.url}}/ - {{board.name}}</a>
-            </div>
-        {% endfor %}
+        <p>
+        The rules exist to create a place for everyone to post. You are welcome
+        to have fun, but your fun should not come at the expense of others.
+        Violations of any of these rules may result in a ban.
+        </p>
 
-        <div class="row"><h2>Other links</h2></div>
-        <div class="row"><a href="{% url 'board:news_list' %}">News</a></div>
-        <div class="row"><a href="{% url 'board:rules_list' %}">News</a></div>
+        <p>
+        Please remember: most bans are not permanent and last only a few days.
+        If you receive a ban, it is not the end of the world. Log off and take a
+        break.
+        </p>
+
+        <h3>
+        Global rules
+        </h3>
+        
+        <p>
+        These rules apply to all boards unless noted otherwise.
+        </p>
+        
+        <p>
+            <ol>
+                <li>
+                    Do not post anything that violates United States law.
+                </li>
+                <li>
+                    {{settings.SITE_NAME}} is for users aged 18 and older only.
+                    Do not use this website if you are under the age of 18.
+                </li>
+                <li>
+                    Do not post anyone's personal information ("dox") or call
+                    for invasions ("raids"). Personal information includes, but
+                    is not limited to:
+                    <ul>
+                        <li>Phone numbers</li>
+                        <li>Addresses</li>
+                        <li>Email addresses</li>
+                        <li>Login information, passwords</li>
+                        <li>Other private information</li>
+                    </ul>
+                </li>
+                <li>Do not post pornography.</li>
+                <li>Do not use posts to advertise.</li>
+                <li>Do not complain about moderation practices.</li>
+                <li>Do not impersonate moderators or other staff.</li>
+            </ol>
+        </p>
     </div>
     <div class="column">&nbsp;</div>
 </div>