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/identity/_identity_menu.html |  5 -----
 templates/identity/_menu.html          |  5 +++++
 templates/identity/base.html           |  7 +++++++
 templates/identity/create.html         | 12 +++++++-----
 templates/identity/select.html         | 10 ++--------
 5 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 templates/identity/_identity_menu.html
 create mode 100644 templates/identity/_menu.html
 create mode 100644 templates/identity/base.html

(limited to 'templates/identity')

diff --git a/templates/identity/_identity_menu.html b/templates/identity/_identity_menu.html
deleted file mode 100644
index fff70cb..0000000
--- a/templates/identity/_identity_menu.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<nav>
-    <a href="/identity/select/" {% if identities %}class="selected"{% endif %}>Select Identity</a>
-    <a href="/identity/create/" {% if form %}class="selected"{% endif %}>Create Identity</a>
-    <a href="/auth/logout/">Logout</a>
-</nav>
diff --git a/templates/identity/_menu.html b/templates/identity/_menu.html
new file mode 100644
index 0000000..fff70cb
--- /dev/null
+++ b/templates/identity/_menu.html
@@ -0,0 +1,5 @@
+<nav>
+    <a href="/identity/select/" {% if identities %}class="selected"{% endif %}>Select Identity</a>
+    <a href="/identity/create/" {% if form %}class="selected"{% endif %}>Create Identity</a>
+    <a href="/auth/logout/">Logout</a>
+</nav>
diff --git a/templates/identity/base.html b/templates/identity/base.html
new file mode 100644
index 0000000..baff37f
--- /dev/null
+++ b/templates/identity/base.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block title %}{% block subtitle %}{% endblock %} - Settings{% endblock %}
+
+{% block right_content %}
+    {% include "identity/_menu.html" %}
+{% endblock %}
diff --git a/templates/identity/create.html b/templates/identity/create.html
index c69b55f..fbdd66c 100644
--- a/templates/identity/create.html
+++ b/templates/identity/create.html
@@ -1,17 +1,19 @@
-{% extends "base.html" %}
+{% extends "identity/base.html" %}
 
 {% block title %}Create Identity{% endblock %}
 
 {% block content %}
-    {% include "identity/_identity_menu.html" %}
     <form action="." method="POST">
         <h1>Create New Identity</h1>
         <p>You can have multiple identities - they are totally separate, and share
         nothing apart from your login details. Use them for alternates, projects, and more.</p>
         {% csrf_token %}
-        {% for field in form %}
-            {% include "forms/_field.html" %}
-        {% endfor %}
+        <fieldset>
+            <legend>Identity Details</legend>
+            {% include "forms/_field.html" with field=form.username %}
+            {% include "forms/_field.html" with field=form.domain %}
+            {% include "forms/_field.html" with field=form.name %}
+        </fieldset>
         <div class="buttons">
             <button>Create</button>
         </div>
diff --git a/templates/identity/select.html b/templates/identity/select.html
index d9959ab..c4fb569 100644
--- a/templates/identity/select.html
+++ b/templates/identity/select.html
@@ -1,18 +1,12 @@
-{% extends "base.html" %}
-{% load static %}
+{% extends "identity/base.html" %}
 
 {% block title %}Select Identity{% endblock %}
 
 {% block content %}
-    {% include "identity/_identity_menu.html" %}
     <section class="icon-menu">
         {% for identity in identities %}
             <a class="option" href="{{ identity.urls.activate }}">
-                {% if identity.icon_uri %}
-                    <img src="{{ identity.icon_uri }}">
-                {% else %}
-                    <img src="{% static "img/unknown-icon-128.png" %}">
-                {% endif %}
+                <img src="{{ identity.local_icon_url }}">
                 <span class="handle">
                     {{ identity.name_or_handle }}
                     <small>@{{ identity.handle }}</small>
-- 
cgit v1.2.3