From 291d7e404e12e1d017403242f8ed199046f0904c Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Thu, 17 Nov 2022 19:21:00 -0700 Subject: Logged out experience, config, and profiles --- templates/activities/_menu.html | 38 +++++++++++++++++++++++++-------- templates/auth/login.html | 12 +++++------ templates/base.html | 45 ++++++++++++++++++++-------------------- templates/forms/_field.html | 9 ++++++-- templates/identity/_menu.html | 12 ++++++++--- templates/identity/view.html | 2 ++ templates/index.html | 12 ++++++----- templates/settings/_menu.html | 6 ++++++ templates/settings/settings.html | 2 +- 9 files changed, 90 insertions(+), 48 deletions(-) (limited to 'templates') diff --git a/templates/activities/_menu.html b/templates/activities/_menu.html index 6bb18c2..a671712 100644 --- a/templates/activities/_menu.html +++ b/templates/activities/_menu.html @@ -2,15 +2,35 @@ Home - - Notifications - - - Local - - - Federated - + {% if request.user.is_authenticated %} + + Notifications + + + Local + + + Federated + +

+ + Compose + + + Search + + + Settings + + {% else %} + + Local Posts + +

+ + Create Account + + {% endif %} {% if current_page == "home" %} diff --git a/templates/auth/login.html b/templates/auth/login.html index c892c78..b3b0a05 100644 --- a/templates/auth/login.html +++ b/templates/auth/login.html @@ -3,14 +3,14 @@ {% block title %}Login{% endblock %} {% block content %} -
{% csrf_token %} - {% for field in form %} - {% include "forms/_field.html" %} - {% endfor %} +
+ Login + {% for field in form %} + {% include "forms/_field.html" %} + {% endfor %} +
diff --git a/templates/base.html b/templates/base.html index edcb11a..b64f4f5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,56 +23,57 @@
{% if user.is_authenticated %} - Compose + - Search + - Settings +
{% if not request.identity %} No Identity - {% elif request.identity.icon %} - {{ request.identity.username }} - - {% elif request.identity.icon_uri %} - {{ request.identity.username }} - {% else %} {{ request.identity.username }} - + {% endif %} {% else %} - Login +
+ Login {% endif %}
{% block full_content %} -
-
- {% block content %} - {% endblock %} + {% block pre_content %} + {% endblock %} +
+
+ {% block content %} + {% endblock %} +
+
+ {% block right_content %} + {% include "activities/_menu.html" %} + {% endblock %} +
-
- {% block right_content %} - {% include "activities/_menu.html" %} - {% endblock %} -
-
{% endblock %}
+ + diff --git a/templates/forms/_field.html b/templates/forms/_field.html index 595546d..99db819 100644 --- a/templates/forms/_field.html +++ b/templates/forms/_field.html @@ -10,9 +10,14 @@

{% endif %} {{ field.errors }} + {% if field.field.widget.input_type == "file" and field.value %} +
+ Clear current value +
+ {% endif %} {{ field }} - {% if preview %} - + {% if field.field.widget.input_type == "file" %} + {% endif %} diff --git a/templates/identity/_menu.html b/templates/identity/_menu.html index fff70cb..f841284 100644 --- a/templates/identity/_menu.html +++ b/templates/identity/_menu.html @@ -1,5 +1,11 @@ diff --git a/templates/identity/view.html b/templates/identity/view.html index 0dd0592..223c2bb 100644 --- a/templates/identity/view.html +++ b/templates/identity/view.html @@ -2,6 +2,8 @@ {% block title %}{{ identity }}{% endblock %} +{% block body_class %}has-banner{% endblock %} + {% block content %}

{% if identity.local_image_url %} diff --git a/templates/index.html b/templates/index.html index 9e09a43..79f81cf 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,12 +2,14 @@ {% block title %}Welcome{% endblock %} -{% block content %} - +{% block content %} +
+ + {{ config.site_about|safe|linebreaks }} +
+

People

{% for identity in identities %} - {{ identity }} + {% include "activities/_identity.html" %} {% endfor %} {% endblock %} diff --git a/templates/settings/_menu.html b/templates/settings/_menu.html index e2dc70b..d85c878 100644 --- a/templates/settings/_menu.html +++ b/templates/settings/_menu.html @@ -11,6 +11,9 @@ Login & Security + + Logout +

Administration

Basic @@ -24,5 +27,8 @@ Identities + + Django Admin + {% endif %} diff --git a/templates/settings/settings.html b/templates/settings/settings.html index a933627..36a6c10 100644 --- a/templates/settings/settings.html +++ b/templates/settings/settings.html @@ -3,7 +3,7 @@ {% block subtitle %}{{ section.title }}{% endblock %} {% block content %} - + {% csrf_token %} {% for title, fields in fieldsets.items %}
-- cgit v1.2.3