13 files changed, 65 insertions, 25 deletions
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/settings/settings_system_domain_create.html b/templates/admin/domain_create.html
index 54d3640..09dbc23 100644
--- a/templates/settings/settings_system_domain_create.html
+++ b/templates/admin/domain_create.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}Add Domain - System Settings{% endblock %}
+{% block title %}Add Domain - Admin{% endblock %}
 
 {% block content %}
     {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
+        {% include "admin/_menu.html" %}
     {% endblock %}
     <form action="." method="POST">
         <h1>Add A Domain</h1>
diff --git a/templates/settings/settings_system_domain_delete.html b/templates/admin/domain_delete.html
index 220bbb9..d47a673 100644
--- a/templates/settings/settings_system_domain_delete.html
+++ b/templates/admin/domain_delete.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}Delete {{ domain.domain }} - System Settings{% endblock %}
+{% block title %}Delete {{ domain.domain }} - Admin{% endblock %}
 
 {% block content %}
     {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
+        {% include "admin/_menu.html" %}
     {% endblock %}
 
     <form action="." method="POST">
diff --git a/templates/settings/settings_system_domain_edit.html b/templates/admin/domain_edit.html
index c05d5d5..64e195c 100644
--- a/templates/settings/settings_system_domain_edit.html
+++ b/templates/admin/domain_edit.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}{{ domain.domain }} - System Settings{% endblock %}
+{% block title %}{{ domain.domain }} - Admin{% endblock %}
 
 {% block content %}
     {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
+        {% include "admin/_menu.html" %}
     {% endblock %}
     <form action="." method="POST">
         {% csrf_token %}
diff --git a/templates/settings/settings_system_domains.html b/templates/admin/domains.html
index dccde65..b7925da 100644
--- a/templates/settings/settings_system_domains.html
+++ b/templates/admin/domains.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}{{ section.title }} - System Settings{% endblock %}
+{% block title %}{{ section.title }} - Admin{% endblock %}
 
 {% block content %}
     {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
+        {% include "admin/_menu.html" %}
     {% endblock %}
     <section class="icon-menu">
         {% for domain in domains %}
@@ -21,7 +21,7 @@
         {% empty %}
             <p class="option empty">You have no domains set up.</p>
         {% endfor %}
-        <a href="/settings/system/domains/create/" class="option new">
+        <a href="{% url "admin_domains_create" %}" class="option new">
             <i class="fa-solid fa-plus"></i> Add a domain
         </a>
     </section>
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/settings/settings_system.html b/templates/admin/settings.html
index c10964f..e031347 100644
--- a/templates/settings/settings_system.html
+++ b/templates/admin/settings.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}{{ section.title }} - System Settings{% endblock %}
+{% block title %}{{ section.title }} - Admin{% endblock %}
 
 {% block content %}
     {% block menu %}
-        {% include "settings/_settings_system_menu.html" %}
+        {% include "admin/_menu.html" %}
     {% endblock %}
     <form action="." method="POST">
         {% csrf_token %}
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/_settings_identity_menu.html b/templates/settings/_menu.html
index bdae143..bdae143 100644
--- a/templates/settings/_settings_identity_menu.html
+++ b/templates/settings/_menu.html
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 %}