From 5b34ea46c3f458a174c5443714ade43c21defdac Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Wed, 16 Nov 2022 21:42:25 -0700
Subject: Call it admin rather than system settings

---
 templates/admin/_menu.html                         |  6 ++++
 templates/admin/domain_create.html                 | 39 ++++++++++++++++++++++
 templates/admin/domain_delete.html                 | 33 ++++++++++++++++++
 templates/admin/domain_edit.html                   | 19 +++++++++++
 templates/admin/domains.html                       | 28 ++++++++++++++++
 templates/admin/identities.html                    | 14 ++++++++
 templates/admin/settings.html                      | 18 ++++++++++
 templates/admin/users.html                         | 14 ++++++++
 templates/base.html                                |  4 +--
 templates/settings/_menu.html                      |  5 +++
 templates/settings/_settings_identity_menu.html    |  5 ---
 templates/settings/_settings_system_menu.html      |  5 ---
 templates/settings/settings.html                   | 18 ++++++++++
 templates/settings/settings_identity.html          |  7 ----
 templates/settings/settings_system.html            | 18 ----------
 .../settings/settings_system_domain_create.html    | 39 ----------------------
 .../settings/settings_system_domain_delete.html    | 33 ------------------
 .../settings/settings_system_domain_edit.html      | 19 -----------
 templates/settings/settings_system_domains.html    | 28 ----------------
 19 files changed, 196 insertions(+), 156 deletions(-)
 create mode 100644 templates/admin/_menu.html
 create mode 100644 templates/admin/domain_create.html
 create mode 100644 templates/admin/domain_delete.html
 create mode 100644 templates/admin/domain_edit.html
 create mode 100644 templates/admin/domains.html
 create mode 100644 templates/admin/identities.html
 create mode 100644 templates/admin/settings.html
 create mode 100644 templates/admin/users.html
 create mode 100644 templates/settings/_menu.html
 delete mode 100644 templates/settings/_settings_identity_menu.html
 delete mode 100644 templates/settings/_settings_system_menu.html
 create mode 100644 templates/settings/settings.html
 delete mode 100644 templates/settings/settings_identity.html
 delete mode 100644 templates/settings/settings_system.html
 delete mode 100644 templates/settings/settings_system_domain_create.html
 delete mode 100644 templates/settings/settings_system_domain_delete.html
 delete mode 100644 templates/settings/settings_system_domain_edit.html
 delete mode 100644 templates/settings/settings_system_domains.html

(limited to 'templates')

diff --git a/templates/admin/_menu.html b/templates/admin/_menu.html
new file mode 100644
index 0000000..8f0bc60
--- /dev/null
+++ b/templates/admin/_menu.html
@@ -0,0 +1,6 @@
+<nav>
+    <a href="{% url "admin_basic" %}" {% if section == "basic" %}class="selected"{% endif %}>Basic</a>
+    <a href="{% url "admin_domains" %}" {% if section == "domains" %}class="selected"{% endif %}>Domains</a>
+    <a href="{% url "admin_users" %}" {% if section == "users" %}class="selected"{% endif %}>Users</a>
+    <a href="{% url "admin_identities" %}" {% if section == "identities" %}class="selected"{% endif %}>Identities</a>
+</nav>
diff --git a/templates/admin/domain_create.html b/templates/admin/domain_create.html
new file mode 100644
index 0000000..09dbc23
--- /dev/null
+++ b/templates/admin/domain_create.html
@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+
+{% block title %}Add Domain - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+    <form action="." method="POST">
+        <h1>Add A Domain</h1>
+        <p>
+            Use this form to add a domain that your users can create identities
+            on.
+        </p>
+        <p>
+            Takahē supports multiple domains per server, but note that when
+            identities are created they are <b>fixed to their chosen domain</b>,
+            and you will <b>not be able to delete a domain with identities on it</b>.
+        </p>
+        <p>
+            If you will be serving Takahē on the domain you choose, you can leave
+            the "service domain" field blank. If you would like to let users create
+            accounts on a domain serving something else, you must pick a unique
+            "service domain" that pairs up to your chosen domain name, make sure
+            Takahē is served on that, and add redirects
+            for <tt>/.well-known/webfinger</tt>, <tt>/.well-known/host-meta</tt>
+            and <tt>/.well-known/nodeinfo</tt> from the main domain to the
+            service domain.
+        </p>
+        {% csrf_token %}
+        {% for field in form %}
+            {% include "forms/_field.html" %}
+        {% endfor %}
+        <div class="buttons">
+            <a href="{{ domain.urls.delete }}" class="button delete">Delete</a>
+            <button>Save</button>
+        </div>
+    </form>
+{% endblock %}
diff --git a/templates/admin/domain_delete.html b/templates/admin/domain_delete.html
new file mode 100644
index 0000000..d47a673
--- /dev/null
+++ b/templates/admin/domain_delete.html
@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+
+{% block title %}Delete {{ domain.domain }} - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+
+    <form action="." method="POST">
+        {% csrf_token %}
+
+        <h1>Deleting {{ domain.domain }}</h1>
+
+        {% if num_identities %}
+            <p>
+                You cannot delete this domain as it has <b>{{ num_identities }}
+                identit{{ num_identities|pluralize:"y,ies" }}</b> registered on it.
+            </p>
+            <p>
+                You will need to manually remove all identities from this domain in
+                order to delete it.
+            </p>
+        {% else %}
+            <p>Please confirm deletion of this domain - there are no identities registed on it.</p>
+            <div class="buttons">
+                <a class="button" href="{{ domain.urls.edit }}">Cancel</a>
+                <button class="delete">Confirm Deletion</button>
+            </div>
+        {% endif %}
+    </form>
+
+{% endblock %}
diff --git a/templates/admin/domain_edit.html b/templates/admin/domain_edit.html
new file mode 100644
index 0000000..64e195c
--- /dev/null
+++ b/templates/admin/domain_edit.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block title %}{{ domain.domain }} - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+    <form action="." method="POST">
+        {% csrf_token %}
+        {% for field in form %}
+            {% include "forms/_field.html" %}
+        {% endfor %}
+        <div class="buttons">
+            <a href="{{ domain.urls.delete }}" class="button delete">Delete</a>
+            <button>Save</button>
+        </div>
+    </form>
+{% endblock %}
diff --git a/templates/admin/domains.html b/templates/admin/domains.html
new file mode 100644
index 0000000..b7925da
--- /dev/null
+++ b/templates/admin/domains.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block title %}{{ section.title }} - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+    <section class="icon-menu">
+        {% for domain in domains %}
+            <a class="option" href="{{ domain.urls.edit }}">
+                <i class="fa-solid fa-globe"></i>
+                <span class="handle">
+                    {{ domain.domain }}
+                    <small>
+                        {% if domain.public %}Public{% else %}Private{% endif %}
+                        {% if domain.service_domain %}({{ domain.service_domain }}){% endif %}
+                    </small>
+                </span>
+            </a>
+        {% empty %}
+            <p class="option empty">You have no domains set up.</p>
+        {% endfor %}
+        <a href="{% url "admin_domains_create" %}" class="option new">
+            <i class="fa-solid fa-plus"></i> Add a domain
+        </a>
+    </section>
+{% endblock %}
diff --git a/templates/admin/identities.html b/templates/admin/identities.html
new file mode 100644
index 0000000..86e70db
--- /dev/null
+++ b/templates/admin/identities.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% block title %}Identities - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+    <form>
+        <p>
+            Please use the <a href="/djadmin/users/identity/">Django Admin</a> for now.
+        </p>
+    </form>
+{% endblock %}
diff --git a/templates/admin/settings.html b/templates/admin/settings.html
new file mode 100644
index 0000000..e031347
--- /dev/null
+++ b/templates/admin/settings.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block title %}{{ section.title }} - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+    <form action="." method="POST">
+        {% csrf_token %}
+        {% for field in form %}
+            {% include "forms/_field.html" %}
+        {% endfor %}
+        <div class="buttons">
+            <button>Save</button>
+        </div>
+    </form>
+{% endblock %}
diff --git a/templates/admin/users.html b/templates/admin/users.html
new file mode 100644
index 0000000..0b75b88
--- /dev/null
+++ b/templates/admin/users.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% block title %}Users - Admin{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "admin/_menu.html" %}
+    {% endblock %}
+    <form>
+        <p>
+            Please use the <a href="/djadmin/users/user/">Django Admin</a> for now.
+        </p>
+    </form>
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 402dcd3..bce5e1b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -31,11 +31,11 @@
                     <a href="/compose/" title="Compose" {% if top_section == "compose" %}class="selected"{% endif %}>
                         <i class="fa-solid fa-feather"></i> Compose
                     </a>
-                    <a href="/settings/" title="Settings" {% if top_section == "settings" %}class="selected"{% endif %}>
+                    <a href="{% url "settings" %}" title="Settings" {% if top_section == "settings" %}class="selected"{% endif %}>
                         <i class="fa-solid fa-gear"></i> Settings
                     </a>
                     {% if request.user.admin %}
-                        <a href="/settings/system/" title="Admin" {% if top_section == "settings_system" %}class="selected"{% endif %}>
+                        <a href="{% url "admin" %}" title="Admin" {% if top_section == "admin" %}class="selected"{% endif %}>
                             <i class="fa-solid fa-toolbox"></i> Admin
                         </a>
                     {% endif %}
diff --git a/templates/settings/_menu.html b/templates/settings/_menu.html
new file mode 100644
index 0000000..bdae143
--- /dev/null
+++ b/templates/settings/_menu.html
@@ -0,0 +1,5 @@
+<nav>
+    <a href="#" {% if section == "profile" %}class="selected"{% endif %}>Profile</a>
+    <a href="#" {% if section == "interface" %}class="selected"{% endif %}>Interface</a>
+    <a href="#" {% if section == "filtering" %}class="selected"{% endif %}>Filtering</a>
+</nav>
diff --git a/templates/settings/_settings_identity_menu.html b/templates/settings/_settings_identity_menu.html
deleted file mode 100644
index bdae143..0000000
--- a/templates/settings/_settings_identity_menu.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<nav>
-    <a href="#" {% if section == "profile" %}class="selected"{% endif %}>Profile</a>
-    <a href="#" {% if section == "interface" %}class="selected"{% endif %}>Interface</a>
-    <a href="#" {% if section == "filtering" %}class="selected"{% endif %}>Filtering</a>
-</nav>
diff --git a/templates/settings/_settings_system_menu.html b/templates/settings/_settings_system_menu.html
deleted file mode 100644
index 9206045..0000000
--- a/templates/settings/_settings_system_menu.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<nav>
-    <a href="/settings/system/basic/" {% if section == "basic" %}class="selected"{% endif %}>Basic</a>
-    <a href="/settings/system/domains/" {% if section == "domains" %}class="selected"{% endif %}>Domains</a>
-    <a href="/settings/system/users/" {% if section == "users" %}class="selected"{% endif %}>Users</a>
-</nav>
diff --git a/templates/settings/settings.html b/templates/settings/settings.html
new file mode 100644
index 0000000..016eebb
--- /dev/null
+++ b/templates/settings/settings.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block title %}{{ section.title }} - Settings{% endblock %}
+
+{% block content %}
+    {% block menu %}
+        {% include "settings/_menu.html" %}
+    {% endblock %}
+    <form action="." method="POST">
+        {% csrf_token %}
+        {% for field in form %}
+            {% include "forms/_field.html" %}
+        {% endfor %}
+        <div class="buttons">
+            <button>Save</button>
+        </div>
+    </form>
+{% endblock %}
diff --git a/templates/settings/settings_identity.html b/templates/settings/settings_identity.html
deleted file mode 100644
index cdbf197..0000000
--- a/templates/settings/settings_identity.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "settings/settings_system.html" %}
-
-{% block title %}{{ section.title }} - Settings{% endblock %}
-
-{% block menu %}
-    {% include "settings/_settings_identity_menu.html" %}
-{% endblock %}
diff --git a/templates/settings/settings_system.html b/templates/settings/settings_system.html
deleted file mode 100644
index c10964f..0000000
--- a/templates/settings/settings_system.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ section.title }} - System Settings{% endblock %}
-
-{% block content %}
-    {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
-    {% endblock %}
-    <form action="." method="POST">
-        {% csrf_token %}
-        {% for field in form %}
-            {% include "forms/_field.html" %}
-        {% endfor %}
-        <div class="buttons">
-            <button>Save</button>
-        </div>
-    </form>
-{% endblock %}
diff --git a/templates/settings/settings_system_domain_create.html b/templates/settings/settings_system_domain_create.html
deleted file mode 100644
index 54d3640..0000000
--- a/templates/settings/settings_system_domain_create.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Add Domain - System Settings{% endblock %}
-
-{% block content %}
-    {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
-    {% endblock %}
-    <form action="." method="POST">
-        <h1>Add A Domain</h1>
-        <p>
-            Use this form to add a domain that your users can create identities
-            on.
-        </p>
-        <p>
-            Takahē supports multiple domains per server, but note that when
-            identities are created they are <b>fixed to their chosen domain</b>,
-            and you will <b>not be able to delete a domain with identities on it</b>.
-        </p>
-        <p>
-            If you will be serving Takahē on the domain you choose, you can leave
-            the "service domain" field blank. If you would like to let users create
-            accounts on a domain serving something else, you must pick a unique
-            "service domain" that pairs up to your chosen domain name, make sure
-            Takahē is served on that, and add redirects
-            for <tt>/.well-known/webfinger</tt>, <tt>/.well-known/host-meta</tt>
-            and <tt>/.well-known/nodeinfo</tt> from the main domain to the
-            service domain.
-        </p>
-        {% csrf_token %}
-        {% for field in form %}
-            {% include "forms/_field.html" %}
-        {% endfor %}
-        <div class="buttons">
-            <a href="{{ domain.urls.delete }}" class="button delete">Delete</a>
-            <button>Save</button>
-        </div>
-    </form>
-{% endblock %}
diff --git a/templates/settings/settings_system_domain_delete.html b/templates/settings/settings_system_domain_delete.html
deleted file mode 100644
index 220bbb9..0000000
--- a/templates/settings/settings_system_domain_delete.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Delete {{ domain.domain }} - System Settings{% endblock %}
-
-{% block content %}
-    {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
-    {% endblock %}
-
-    <form action="." method="POST">
-        {% csrf_token %}
-
-        <h1>Deleting {{ domain.domain }}</h1>
-
-        {% if num_identities %}
-            <p>
-                You cannot delete this domain as it has <b>{{ num_identities }}
-                identit{{ num_identities|pluralize:"y,ies" }}</b> registered on it.
-            </p>
-            <p>
-                You will need to manually remove all identities from this domain in
-                order to delete it.
-            </p>
-        {% else %}
-            <p>Please confirm deletion of this domain - there are no identities registed on it.</p>
-            <div class="buttons">
-                <a class="button" href="{{ domain.urls.edit }}">Cancel</a>
-                <button class="delete">Confirm Deletion</button>
-            </div>
-        {% endif %}
-    </form>
-
-{% endblock %}
diff --git a/templates/settings/settings_system_domain_edit.html b/templates/settings/settings_system_domain_edit.html
deleted file mode 100644
index c05d5d5..0000000
--- a/templates/settings/settings_system_domain_edit.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ domain.domain }} - System Settings{% endblock %}
-
-{% block content %}
-    {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
-    {% endblock %}
-    <form action="." method="POST">
-        {% csrf_token %}
-        {% for field in form %}
-            {% include "forms/_field.html" %}
-        {% endfor %}
-        <div class="buttons">
-            <a href="{{ domain.urls.delete }}" class="button delete">Delete</a>
-            <button>Save</button>
-        </div>
-    </form>
-{% endblock %}
diff --git a/templates/settings/settings_system_domains.html b/templates/settings/settings_system_domains.html
deleted file mode 100644
index dccde65..0000000
--- a/templates/settings/settings_system_domains.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ section.title }} - System Settings{% endblock %}
-
-{% block content %}
-    {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
-    {% endblock %}
-    <section class="icon-menu">
-        {% for domain in domains %}
-            <a class="option" href="{{ domain.urls.edit }}">
-                <i class="fa-solid fa-globe"></i>
-                <span class="handle">
-                    {{ domain.domain }}
-                    <small>
-                        {% if domain.public %}Public{% else %}Private{% endif %}
-                        {% if domain.service_domain %}({{ domain.service_domain }}){% endif %}
-                    </small>
-                </span>
-            </a>
-        {% empty %}
-            <p class="option empty">You have no domains set up.</p>
-        {% endfor %}
-        <a href="/settings/system/domains/create/" class="option new">
-            <i class="fa-solid fa-plus"></i> Add a domain
-        </a>
-    </section>
-{% endblock %}
-- 
cgit v1.2.3