From 2154e6f02252576d8652e66f26fa4ae635d0f8ee Mon Sep 17 00:00:00 2001
From: Andrew Godwin
Date: Thu, 17 Nov 2022 17:43:00 -0700
Subject: Rework UI to have vertical menus

---
 templates/admin/_menu.html         |  6 ------
 templates/admin/domain_create.html | 20 +++++++++++---------
 templates/admin/domain_delete.html |  7 +------
 templates/admin/domain_edit.html   | 19 +++++++++++--------
 templates/admin/domains.html       |  7 ++-----
 templates/admin/identities.html    | 15 +++++----------
 templates/admin/settings.html      | 18 ------------------
 templates/admin/users.html         | 15 +++++----------
 8 files changed, 35 insertions(+), 72 deletions(-)
 delete mode 100644 templates/admin/_menu.html
 delete mode 100644 templates/admin/settings.html

(limited to 'templates/admin')

diff --git a/templates/admin/_menu.html b/templates/admin/_menu.html
deleted file mode 100644
index 8f0bc60..0000000
--- a/templates/admin/_menu.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
index 09dbc23..dcc57fa 100644
--- a/templates/admin/domain_create.html
+++ b/templates/admin/domain_create.html
@@ -1,11 +1,8 @@
-{% extends "base.html" %}
+{% extends "settings/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>
@@ -28,12 +25,17 @@
             service domain.
         </p>
         {% csrf_token %}
-        {% for field in form %}
-            {% include "forms/_field.html" %}
-        {% endfor %}
+        <fieldset>
+            <legend>Domain Details</legend>
+            {% include "forms/_field.html" with field=form.domain %}
+            {% include "forms/_field.html" with field=form.service_domain %}
+        </fieldset>
+        <fieldset>
+            <legend>Access Control</legend>
+            {% include "forms/_field.html" with field=form.public %}
+        </fieldset>
         <div class="buttons">
-            <a href="{{ domain.urls.delete }}" class="button delete">Delete</a>
-            <button>Save</button>
+            <button>Create</button>
         </div>
     </form>
 {% endblock %}
diff --git a/templates/admin/domain_delete.html b/templates/admin/domain_delete.html
index d47a673..5d077a5 100644
--- a/templates/admin/domain_delete.html
+++ b/templates/admin/domain_delete.html
@@ -1,12 +1,8 @@
-{% extends "base.html" %}
+{% extends "settings/base.html" %}
 
 {% block title %}Delete {{ domain.domain }} - Admin{% endblock %}
 
 {% block content %}
-    {% block menu %}
-        {% include "admin/_menu.html" %}
-    {% endblock %}
-
     <form action="." method="POST">
         {% csrf_token %}
 
@@ -28,6 +24,5 @@
                 <button class="delete">Confirm Deletion</button>
             </div>
         {% endif %}
-    </form>
 
 {% endblock %}
diff --git a/templates/admin/domain_edit.html b/templates/admin/domain_edit.html
index 64e195c..59bb8a2 100644
--- a/templates/admin/domain_edit.html
+++ b/templates/admin/domain_edit.html
@@ -1,16 +1,19 @@
-{% extends "base.html" %}
+{% extends "settings/base.html" %}
 
-{% block title %}{{ domain.domain }} - Admin{% endblock %}
+{% block subtitle %}{{ domain.domain }}{% 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 %}
+        <fieldset>
+            <legend>Domain Details</legend>
+            {% include "forms/_field.html" with field=form.domain %}
+            {% include "forms/_field.html" with field=form.service_domain %}
+        </fieldset>
+        <fieldset>
+            <legend>Access Control</legend>
+            {% include "forms/_field.html" with field=form.public %}
+        </fieldset>
         <div class="buttons">
             <a href="{{ domain.urls.delete }}" class="button delete">Delete</a>
             <button>Save</button>
diff --git a/templates/admin/domains.html b/templates/admin/domains.html
index b7925da..bb7d8e4 100644
--- a/templates/admin/domains.html
+++ b/templates/admin/domains.html
@@ -1,11 +1,8 @@
-{% extends "base.html" %}
+{% extends "settings/base.html" %}
 
-{% block title %}{{ section.title }} - Admin{% endblock %}
+{% block subtitle %}Domains{% 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 }}">
diff --git a/templates/admin/identities.html b/templates/admin/identities.html
index 86e70db..556e915 100644
--- a/templates/admin/identities.html
+++ b/templates/admin/identities.html
@@ -1,14 +1,9 @@
-{% extends "base.html" %}
+{% extends "settings/base.html" %}
 
-{% block title %}Identities - Admin{% endblock %}
+{% block subtitle %}Identities{% 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>
+    <p>
+        Please use the <a href="/djadmin/users/identity/">Django Admin</a> for now.
+    </p>
 {% endblock %}
diff --git a/templates/admin/settings.html b/templates/admin/settings.html
deleted file mode 100644
index e031347..0000000
--- a/templates/admin/settings.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% 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
index 0b75b88..f2dc864 100644
--- a/templates/admin/users.html
+++ b/templates/admin/users.html
@@ -1,14 +1,9 @@
-{% extends "base.html" %}
+{% extends "settings/base.html" %}
 
-{% block title %}Users - Admin{% endblock %}
+{% block subtitle %}Users{% 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>
+    <p>
+        Please use the <a href="/djadmin/users/user/">Django Admin</a> for now.
+    </p>
 {% endblock %}
-- 
cgit v1.2.3