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/activities/_home_menu.html | 29 ++++++++++++++++--- templates/activities/compose.html | 13 ++++----- templates/activities/federated.html | 20 ++++---------- templates/activities/home.html | 49 ++++++++++----------------------- templates/activities/local.html | 20 ++++---------- templates/activities/notifications.html | 21 ++++---------- 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 ++++------ templates/base.html | 21 ++++++++++---- templates/forms/_field.html | 25 ++++++++++------- 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 ++----- templates/settings/_menu.html | 29 +++++++++++++++++-- templates/settings/base.html | 7 +++++ templates/settings/profile.html | 22 +++++++++------ templates/settings/settings.html | 16 ++++++----- 25 files changed, 201 insertions(+), 217 deletions(-) delete mode 100644 templates/admin/_menu.html delete mode 100644 templates/admin/settings.html delete mode 100644 templates/identity/_identity_menu.html create mode 100644 templates/identity/_menu.html create mode 100644 templates/identity/base.html create mode 100644 templates/settings/base.html (limited to 'templates') diff --git a/templates/activities/_home_menu.html b/templates/activities/_home_menu.html index c88a1d7..db441a2 100644 --- a/templates/activities/_home_menu.html +++ b/templates/activities/_home_menu.html @@ -1,6 +1,27 @@ + +{% if current_page == "home" %} +

Compose

+
+ {% csrf_token %} + {{ form.text }} + {{ form.content_warning }} +
+ CW + +
+
+{% endif %} diff --git a/templates/activities/compose.html b/templates/activities/compose.html index dfa6d1e..55b4eb3 100644 --- a/templates/activities/compose.html +++ b/templates/activities/compose.html @@ -3,15 +3,14 @@ {% block title %}Compose{% endblock %} {% block content %} - -
{% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} +
+ Content + {% include "forms/_field.html" with field=form.text %} + {% include "forms/_field.html" with field=form.content_warning %} + {% include "forms/_field.html" with field=form.visibility %} +
diff --git a/templates/activities/federated.html b/templates/activities/federated.html index b6143c3..4b57b9d 100644 --- a/templates/activities/federated.html +++ b/templates/activities/federated.html @@ -3,19 +3,9 @@ {% block title %}Federated Timeline{% endblock %} {% block content %} - {% include "activities/_home_menu.html" %} - -
-
- {% for post in posts %} - {% include "activities/_post.html" %} - {% empty %} - No posts yet. - {% endfor %} -
-
-

?

-
- -
+ {% for post in posts %} + {% include "activities/_post.html" %} + {% empty %} + No posts yet. + {% endfor %} {% endblock %} diff --git a/templates/activities/home.html b/templates/activities/home.html index 08e338e..5171842 100644 --- a/templates/activities/home.html +++ b/templates/activities/home.html @@ -3,39 +3,18 @@ {% block title %}Home{% endblock %} {% block content %} - {% include "activities/_home_menu.html" %} - -
- -
- {% for event in events %} - {% if event.type == "post" %} - {% include "activities/_post.html" with post=event.subject_post %} - {% elif event.type == "boost" %} -
- - {{ event.subject_identity.name_or_handle }} - boosted -
- {% include "activities/_post.html" with post=event.subject_post %} - {% endif %} - {% empty %} - Nothing to show yet. - {% endfor %} -
- -
-

Compose

- - {% csrf_token %} - {{ form.text }} - {{ form.content_warning }} -
- CW - -
- -
- -
+ {% for event in events %} + {% if event.type == "post" %} + {% include "activities/_post.html" with post=event.subject_post %} + {% elif event.type == "boost" %} +
+ + {{ event.subject_identity.name_or_handle }} + boosted +
+ {% include "activities/_post.html" with post=event.subject_post %} + {% endif %} + {% empty %} + Nothing to show yet. + {% endfor %} {% endblock %} diff --git a/templates/activities/local.html b/templates/activities/local.html index 520a0ce..79ce9a3 100644 --- a/templates/activities/local.html +++ b/templates/activities/local.html @@ -3,19 +3,9 @@ {% block title %}Local Timeline{% endblock %} {% block content %} - {% include "activities/_home_menu.html" %} - -
-
- {% for post in posts %} - {% include "activities/_post.html" %} - {% empty %} - No posts yet. - {% endfor %} -
-
-

?

-
- -
+ {% for post in posts %} + {% include "activities/_post.html" %} + {% empty %} + No posts yet. + {% endfor %} {% endblock %} diff --git a/templates/activities/notifications.html b/templates/activities/notifications.html index c071a49..9bf66bb 100644 --- a/templates/activities/notifications.html +++ b/templates/activities/notifications.html @@ -3,20 +3,9 @@ {% block title %}Notifications{% endblock %} {% block content %} - {% include "activities/_home_menu.html" %} - -
-
- {% for event in events %} - {% include "activities/_event.html" %} - {% empty %} - No events yet. - {% endfor %} -
- -
-

?

-
- -
+ {% for event in events %} + {% include "activities/_event.html" %} + {% empty %} + No events yet. + {% endfor %} {% endblock %} 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 @@ - 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 %}

Add A Domain

@@ -28,12 +25,17 @@ service domain.

{% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} +
+ Domain Details + {% include "forms/_field.html" with field=form.domain %} + {% include "forms/_field.html" with field=form.service_domain %} +
+
+ Access Control + {% include "forms/_field.html" with field=form.public %} +
- Delete - +
{% 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 %} -
{% csrf_token %} @@ -28,6 +24,5 @@ {% endif %} -
{% 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 %}
{% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} +
+ Domain Details + {% include "forms/_field.html" with field=form.domain %} + {% include "forms/_field.html" with field=form.service_domain %} +
+
+ Access Control + {% include "forms/_field.html" with field=form.public %} +
Delete 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 %}
{% for domain in domains %} 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 %} - -

- Please use the Django Admin for now. -

- +

+ Please use the Django Admin for now. +

{% 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 %} -
- {% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} -
- -
-
-{% 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 %} -
-

- Please use the Django Admin for now. -

-
+

+ Please use the Django Admin for now. +

{% endblock %} diff --git a/templates/base.html b/templates/base.html index 616d5b6..31bbc7b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -31,14 +31,12 @@ Compose + + Search + Settings - {% if request.user.admin %} - - Admin - - {% endif %}
{% if not request.identity %} @@ -61,7 +59,18 @@ - {% block content %} + {% block full_content %} +
+
+ {% block content %} + {% endblock %} +
+
+ {% block right_content %} + {% include "activities/_home_menu.html" %} + {% endblock %} +
+
{% endblock %} diff --git a/templates/forms/_field.html b/templates/forms/_field.html index 740432d..595546d 100644 --- a/templates/forms/_field.html +++ b/templates/forms/_field.html @@ -1,13 +1,18 @@
- - {% if field.help_text %} -

- {{ field.help_text|linebreaksbr }} -

+
+ + {% if field.help_text %} +

+ {{ field.help_text|linebreaksbr }} +

+ {% endif %} + {{ field.errors }} + {{ field }} +
+ {% if preview %} + {% endif %} - {{ field.errors }} - {{ field }}
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 @@ - 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 @@ + 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" %}

Create New Identity

You can have multiple identities - they are totally separate, and share nothing apart from your login details. Use them for alternates, projects, and more.

{% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} +
+ Identity Details + {% include "forms/_field.html" with field=form.username %} + {% include "forms/_field.html" with field=form.domain %} + {% include "forms/_field.html" with field=form.name %} +
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" %}
{% for identity in identities %} - {% if identity.icon_uri %} - - {% else %} - - {% endif %} + {{ identity.name_or_handle }} @{{ identity.handle }} diff --git a/templates/settings/_menu.html b/templates/settings/_menu.html index 4f71651..e2dc70b 100644 --- a/templates/settings/_menu.html +++ b/templates/settings/_menu.html @@ -1,5 +1,28 @@ diff --git a/templates/settings/base.html b/templates/settings/base.html new file mode 100644 index 0000000..d5efa69 --- /dev/null +++ b/templates/settings/base.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} + +{% block title %}{% block subtitle %}{% endblock %} - Settings{% endblock %} + +{% block right_content %} + {% include "settings/_menu.html" %} +{% endblock %} diff --git a/templates/settings/profile.html b/templates/settings/profile.html index 1a7c29f..5c00557 100644 --- a/templates/settings/profile.html +++ b/templates/settings/profile.html @@ -1,18 +1,22 @@ -{% extends "base.html" %} +{% extends "settings/base.html" %} -{% block title %}Profile - Settings{% endblock %} +{% block subtitle %}Profile{% endblock %} {% block content %} - {% block menu %} - {% include "settings/_menu.html" %} - {% endblock %} {% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} +
+ Details + {% include "forms/_field.html" with field=form.name %} + {% include "forms/_field.html" with field=form.summary %} +
+
+ Images + {% include "forms/_field.html" with field=form.icon preview=request.identity.icon.url %} + {% include "forms/_field.html" with field=form.image preview=request.identity.image.url %} +
- View Profile + View Profile
diff --git a/templates/settings/settings.html b/templates/settings/settings.html index 016eebb..a933627 100644 --- a/templates/settings/settings.html +++ b/templates/settings/settings.html @@ -1,15 +1,17 @@ -{% extends "base.html" %} +{% extends "settings/base.html" %} -{% block title %}{{ section.title }} - Settings{% endblock %} +{% block subtitle %}{{ section.title }}{% endblock %} {% block content %} - {% block menu %} - {% include "settings/_menu.html" %} - {% endblock %}
{% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} + {% for title, fields in fieldsets.items %} +
+ {{ title }} + {% for field in fields %} + {% include "forms/_field.html" %} + {% endfor %} +
{% endfor %}
-- cgit v1.2.3