From 0c1e51322f25a1074c30dc29a5e24e1878e65c0a Mon Sep 17 00:00:00 2001 From: TAKAHASHI Shuuji Date: Tue, 10 Jan 2023 01:58:17 +0900 Subject: [PATCH] Add djhtml to pre-commit check (#382) --- .pre-commit-config.yaml | 7 + docs/_templates/sidebar/brand.html | 24 +- templates/activities/_event.html | 6 +- templates/activities/_hashtag.html | 6 +- templates/activities/_identity.html | 6 +- templates/activities/_image_upload.html | 12 +- templates/activities/_image_uploaded.html | 14 +- templates/activities/_image_viewer.html | 2 + templates/activities/_menu.html | 6 +- templates/activities/_post.html | 150 +++++------ templates/activities/_type_question.html | 18 +- templates/activities/debug_json.html | 114 ++++---- templates/activities/explore_tag.html | 16 +- templates/activities/follows.html | 48 ++-- templates/activities/search.html | 12 +- templates/admin/domain_delete.html | 2 +- templates/admin/hashtag_edit.html | 22 +- templates/admin/hashtags.html | 52 ++-- templates/admin/identities.html | 16 +- templates/admin/identity_edit.html | 16 +- templates/admin/user_edit.html | 6 +- templates/base.html | 176 ++++++------- templates/emails/_body_content.html | 2 +- templates/emails/_button.html | 26 +- templates/emails/_footer.html | 10 +- templates/emails/account_new.html | 36 +-- templates/emails/base.html | 290 ++++++++++----------- templates/emails/password_reset.html | 36 +-- templates/emails/report_new.html | 46 ++-- templates/forms/_field.html | 6 +- templates/forms/_json_name_value_list.html | 134 +++++----- templates/identity/_identity_banner.html | 56 ++-- templates/identity/_menu.html | 8 +- templates/identity/_view_menu.html | 68 ++--- templates/identity/create.html | 2 +- templates/identity/view.html | 24 +- templates/settings/_menu.html | 70 ++--- templates/settings/login_security.html | 2 +- 38 files changed, 780 insertions(+), 767 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 400f20c..f01c000 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -55,3 +55,10 @@ repos: types-cachetools, types-python-dateutil, ] + + - repo: https://github.com/rtts/djhtml + rev: v1.5.2 + hooks: + - id: djhtml + - id: djcss + - id: djjs diff --git a/docs/_templates/sidebar/brand.html b/docs/_templates/sidebar/brand.html index 38fd75f..9869d52 100644 --- a/docs/_templates/sidebar/brand.html +++ b/docs/_templates/sidebar/brand.html @@ -1,18 +1,18 @@ +
{% if not event.collapsed %} - {% include "activities/_post.html" with post=event.subject_post %} + {% include "activities/_post.html" with post=event.subject_post %} {% endif %} {% elif event.type == "mentioned" %}
@@ -23,7 +23,7 @@ mentioned you
{% if not event.collapsed %} - {% include "activities/_post.html" with post=event.subject_post %} + {% include "activities/_post.html" with post=event.subject_post %} {% endif %} {% elif event.type == "boosted" %}
@@ -32,7 +32,7 @@ boosted your post
{% if not event.collapsed %} - {% include "activities/_post.html" with post=event.subject_post event=event %} + {% include "activities/_post.html" with post=event.subject_post event=event %} {% endif %} {% else %} Unknown event type {{event.type}} diff --git a/templates/activities/_hashtag.html b/templates/activities/_hashtag.html index 19233e5..02d107a 100644 --- a/templates/activities/_hashtag.html +++ b/templates/activities/_hashtag.html @@ -4,8 +4,8 @@ {{ hashtag.display_name }} {% if not hide_stats %} - - Post count: {{ hashtag.stats.total }} - + + Post count: {{ hashtag.stats.total }} + {% endif %} diff --git a/templates/activities/_identity.html b/templates/activities/_identity.html index 386d5ee..38a6f7a 100644 --- a/templates/activities/_identity.html +++ b/templates/activities/_identity.html @@ -4,9 +4,9 @@
{% include "identity/_identity_banner.html" with identity=identity %} {% if created %} - + {% endif %}
diff --git a/templates/activities/_image_upload.html b/templates/activities/_image_upload.html index 974884a..c812c44 100644 --- a/templates/activities/_image_upload.html +++ b/templates/activities/_image_upload.html @@ -1,10 +1,10 @@
+ hx-encoding='multipart/form-data' + hx-post='{% url "compose_image_upload" %}' + hx-target="this" + hx-swap="outerHTML" + _="on htmx:xhr:progress(loaded, total) + set #attachmentProgress.value to (loaded/total)*100"> {% csrf_token %} {% include "forms/_field.html" with field=form.image %} {% include "forms/_field.html" with field=form.description %} diff --git a/templates/activities/_image_uploaded.html b/templates/activities/_image_uploaded.html index 2d9e555..e2424ce 100644 --- a/templates/activities/_image_uploaded.html +++ b/templates/activities/_image_uploaded.html @@ -9,11 +9,11 @@ {% if request.htmx %} - + {% endif %} diff --git a/templates/activities/_image_viewer.html b/templates/activities/_image_viewer.html index 14d9c73..2edbf06 100644 --- a/templates/activities/_image_viewer.html +++ b/templates/activities/_image_viewer.html @@ -1,4 +1,5 @@
diff --git a/templates/activities/_menu.html b/templates/activities/_menu.html index 9961999..517ae0d 100644 --- a/templates/activities/_menu.html +++ b/templates/activities/_menu.html @@ -29,9 +29,9 @@ Search {% if current_page == "tag" %} - - {{ hashtag.display_name }} - + + {{ hashtag.display_name }} + {% endif %} Settings diff --git a/templates/activities/_post.html b/templates/activities/_post.html index 4111d35..8848bf8 100644 --- a/templates/activities/_post.html +++ b/templates/activities/_post.html @@ -3,36 +3,36 @@
- {% include "identity/_identity_banner.html" with identity=post.author %} - + {% include "identity/_identity_banner.html" with identity=post.author %} +
+ +
{% if post.summary %} {% if config_identity.expand_linked_cws %} -
+
{% else %} -
+
{% endif %} - {{ post.summary }} + {{ post.summary }}
{% endif %} @@ -40,65 +40,65 @@ {{ post.safe_content_local }} {% if post.attachments.exists %} -
- {% for attachment in post.attachments.all %} - {% if attachment.is_image %} - - {{ attachment.name|default:'(no description)' }} - - {% elif attachment.is_video %} - - - - {% endif %} - {% endfor %} -
+
+ {% for attachment in post.attachments.all %} + {% if attachment.is_image %} + + {{ attachment.name|default:'(no description)' }} + + {% elif attachment.is_video %} + + + + {% endif %} + {% endfor %} +
{% endif %}
{% if post.edited %} -
- Edited {{ post.edited | timedeltashort }} ago -
+
+ Edited {{ post.edited | timedeltashort }} ago +
{% endif %} {% if request.identity %} - + + + View Post & Replies + + + Report + + {% if post.author == request.identity %} + + Edit + + + Delete + + {% elif not post.local and post.url %} + + See Original + + {% endif %} + {% if request.user.admin %} + + View In Admin + + {% endif %} + +
{% endif %}
diff --git a/templates/activities/_type_question.html b/templates/activities/_type_question.html index 1b7211a..5754e76 100644 --- a/templates/activities/_type_question.html +++ b/templates/activities/_type_question.html @@ -4,15 +4,15 @@

Options: {% if post.type_data.mode == "oneOf" %}(choose one){% endif %}

-{% for item in post.type_data.options %} -{% if forloop.first %}
    {% endif %}{% widthratio item.votes post.type_data.voter_count 100 as item_percent %} -
  • -{% if forloop.last %}
{% endif %} -{% endfor %} + {% for item in post.type_data.options %} + {% if forloop.first %}
    {% endif %}{% widthratio item.votes post.type_data.voter_count 100 as item_percent %} +
  • + {% if forloop.last %}
{% endif %} + {% endfor %}
{{ post.type_data.voter_count }} people — diff --git a/templates/activities/debug_json.html b/templates/activities/debug_json.html index 0811c16..bc72019 100644 --- a/templates/activities/debug_json.html +++ b/templates/activities/debug_json.html @@ -16,76 +16,76 @@ {% if result %} -
-

Summary

-
-
- Status Code: - {{ status_code }} +
+

Summary

+
+
+ Status Code: + {{ status_code }} +
+ +
+ Content-Type: + {{ content_type }} +
+ +
+ Bytes Downloaded: + {{ num_bytes_downloaded }} +
-
- Content-Type: - {{ content_type }} -
+

Payload

-
- Bytes Downloaded: - {{ num_bytes_downloaded }} -
-
- -

Payload

- -
-
- Raw Response: - - - - - - +
+ Raw Response: + + + + + + Show -
- + + {{ raw_result|escape }} +
-
- Canonical: - - - - - - + Canonical: + + + + + + Show +
+
-
-
{% endif %} {% endblock %} diff --git a/templates/activities/explore_tag.html b/templates/activities/explore_tag.html index b2fd79d..ae268ef 100644 --- a/templates/activities/explore_tag.html +++ b/templates/activities/explore_tag.html @@ -3,14 +3,14 @@ {% block title %}#{{ hashtag.display_name }} Timeline{% endblock %} {% block content %} -
Explore Trending Tags
+
Explore Trending Tags
-
- {% for hashtag in page_obj %} - {% include "activities/_hashtag.html" %} - {% empty %} - No tags are trending yet. - {% endfor %} +
+ {% for hashtag in page_obj %} + {% include "activities/_hashtag.html" %} + {% empty %} + No tags are trending yet. + {% endfor %} -
+
{% endblock %} diff --git a/templates/activities/follows.html b/templates/activities/follows.html index 53a56dd..c6bc486 100644 --- a/templates/activities/follows.html +++ b/templates/activities/follows.html @@ -17,31 +17,31 @@
{% for identity in page_obj %} -
- {% include "identity/_identity_banner.html" with identity=identity link_avatar=False link_handle=False %} -
-
- {% if identity.id in outbound_ids %} - Following - {% endif %} - {% if identity.id in inbound_ids %} - Follows You - {% endif %} +
+ {% include "identity/_identity_banner.html" with identity=identity link_avatar=False link_handle=False %} +
+
+ {% if identity.id in outbound_ids %} + Following + {% endif %} + {% if identity.id in inbound_ids %} + Follows You + {% endif %} - {% if inbound %} - - {% endif %} - -
+ {% if inbound %} + + {% endif %} + +
{% empty %}

You {% if inbound %}have no followers{% else %}are not following anyone{% endif %}.

diff --git a/templates/activities/search.html b/templates/activities/search.html index 58964b2..f1cf717 100644 --- a/templates/activities/search.html +++ b/templates/activities/search.html @@ -21,17 +21,17 @@ {% if results.posts %}

Posts

- {% for post in results.posts %} - {% include "activities/_post.html" %} - {% endfor %} + {% for post in results.posts %} + {% include "activities/_post.html" %} + {% endfor %}
{% endif %} {% if results.hashtags %}

Hashtags

- {% for hashtag in results.hashtags %} - {% include "activities/_hashtag.html" with hide_stats=True %} - {% endfor %} + {% for hashtag in results.hashtags %} + {% include "activities/_hashtag.html" with hide_stats=True %} + {% endfor %}
{% endif %} {% if results and not results.identities and not results.hashtags and not results.posts %} diff --git a/templates/admin/domain_delete.html b/templates/admin/domain_delete.html index f3255eb..01941b7 100644 --- a/templates/admin/domain_delete.html +++ b/templates/admin/domain_delete.html @@ -11,7 +11,7 @@ {% if num_identities %}

You cannot delete this domain as it has {{ num_identities }} - identit{{ num_identities|pluralize:"y,ies" }} registered on it. + identit{{ num_identities|pluralize:"y,ies" }} registered on it.

You will need to manually remove all identities from this domain in diff --git a/templates/admin/hashtag_edit.html b/templates/admin/hashtag_edit.html index 2733a75..08d17e9 100644 --- a/templates/admin/hashtag_edit.html +++ b/templates/admin/hashtag_edit.html @@ -18,22 +18,22 @@ Stats

{% for stat_month, stat_value in hashtag.usage_months.items|slice:":5" %} - {% if forloop.first %} - - - - - - {% endif %} + {% if forloop.first %} +
MonthUsage
+ + + + + {% endif %} - {% if forloop.last %} -
MonthUsage
{{ stat_month|date:"M Y" }} {{ stat_value }}
- {% endif %} + {% if forloop.last %} + + {% endif %} {% empty %} -

Hashtag is either not used or stats have not been computed yet.

+

Hashtag is either not used or stats have not been computed yet.

{% endfor %}
diff --git a/templates/admin/hashtags.html b/templates/admin/hashtags.html index b2a63b1..1e9c374 100644 --- a/templates/admin/hashtags.html +++ b/templates/admin/hashtags.html @@ -6,33 +6,33 @@
{% for hashtag in page_obj %} -
- - - {{ hashtag.display_name }} - - {% if hashtag.public %}Public{% elif hashtag.public is None %}Unreviewed{% else %}Private{% endif %} - - -
- {% if hashtag.stats %} -
- - {{ hashtag.stats.total }} - Total - +
+ + + {{ hashtag.display_name }} + + {% if hashtag.public %}Public{% elif hashtag.public is None %}Unreviewed{% else %}Private{% endif %} + +
- {% endif %} - {% if hashtag.aliases %} -
- - {% for alias in hashtag.aliases %} - {{ alias }}{% if not forloop.last %}, {% endif %} - {% endfor %} - Aliases - -
- {% endif %} + {% if hashtag.stats %} +
+ + {{ hashtag.stats.total }} + Total + +
+ {% endif %} + {% if hashtag.aliases %} +
+ + {% for alias in hashtag.aliases %} + {{ alias }}{% if not forloop.last %}, {% endif %} + {% endfor %} + Aliases + +
+ {% endif %} {% empty %}

There are no hashtags yet.

diff --git a/templates/admin/identities.html b/templates/admin/identities.html index ae97a6d..4614c5e 100644 --- a/templates/admin/identities.html +++ b/templates/admin/identities.html @@ -20,14 +20,14 @@
{% for identity in page_obj %} -
- {% include "identity/_identity_banner.html" with identity=identity link_avatar=False link_handle=False %} -
-
- {% if identity.banned %} - Banned - {% endif %} -
+
+ {% include "identity/_identity_banner.html" with identity=identity link_avatar=False link_handle=False %} +
+
+ {% if identity.banned %} + Banned + {% endif %} +
{% empty %}

diff --git a/templates/admin/identity_edit.html b/templates/admin/identity_edit.html index c093b7a..9ad2a37 100644 --- a/templates/admin/identity_edit.html +++ b/templates/admin/identity_edit.html @@ -59,14 +59,14 @@ {% if identity.local %} -

- Users -

- {% for user in identity.users.all %} - {{ user.email }}{% if not forloop.last %}, {% endif %} - {% endfor %} -

-
+
+ Users +

+ {% for user in identity.users.all %} + {{ user.email }}{% if not forloop.last %}, {% endif %} + {% endfor %} +

+
{% endif %}
Technical diff --git a/templates/admin/user_edit.html b/templates/admin/user_edit.html index 45be8d9..0e8b19a 100644 --- a/templates/admin/user_edit.html +++ b/templates/admin/user_edit.html @@ -10,9 +10,9 @@ Permissions {% include "forms/_field.html" with field=form.status %} {% if same_user %} -
    -
  • You cannot edit your own permission status!
    • -
+
    +
  • You cannot edit your own permission status!
    • +
{% endif %}
diff --git a/templates/base.html b/templates/base.html index 3ebc50b..7924b38 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,99 +1,99 @@ - - {% block title %}{% endblock %} - {{ config.site_name }} - - - {% load static %} - - - - - - - - - + {% if config_identity.custom_css %} + {% endif %} - - {% if config_identity.custom_css %} - - {% endif %} - {% block opengraph %} - {% include "_opengraph.html" with opengraph_local=opengraph_defaults %} - {% endblock %} - {% block extra_head %}{% endblock %} - {% block custom_head %}{% if config.custom_head %}{{ config.custom_head|safe }}{% endif %}{% endblock %} - - - Skip to Content - Skip to Navigation -
- {% block body_main %} -
- - - {% if user.is_authenticated %} - - + {% block opengraph %} + {% include "_opengraph.html" with opengraph_local=opengraph_defaults %} + {% endblock %} + {% block extra_head %}{% endblock %} + {% block custom_head %}{% if config.custom_head %}{{ config.custom_head|safe }}{% endif %}{% endblock %} + + + Skip to Content + Skip to Navigation +
+ {% block body_main %} +
+ - - - - {% if allows_refresh %} - - - - {% endif %} -
- - {% if not request.identity %} - No Identity - + + {% if user.is_authenticated %} + + + + + + + {% if allows_refresh %} + + + + {% endif %} +
+ + {% if not request.identity %} + No Identity + + {% else %} + {{ request.identity.username }} + + {% endif %} + {% else %} - {{ request.identity.username }} - +
+ Login {% endif %} - - {% else %} -
- Login - {% endif %} - -
+
+
- {% block full_content %} - {% include 'activities/_image_viewer.html' %} - {% block pre_content %} + {% block full_content %} + {% include 'activities/_image_viewer.html' %} + {% block pre_content %} + {% endblock %} +
+
+ {% block content %} + {% endblock %} +
+
+ {% block right_content %} + {% include "activities/_menu.html" %} + {% endblock %} + {% include "_footer.html" %} +
+
+ {% endblock %} {% endblock %} -
-
- {% block content %} - {% endblock %} -
-
- {% block right_content %} - {% include "activities/_menu.html" %} - {% endblock %} - {% include "_footer.html" %} -
-
- {% endblock %} - {% endblock %} -
+ - {% block footer %} - {% endblock %} + {% block footer %} + {% endblock %} - + diff --git a/templates/emails/_body_content.html b/templates/emails/_body_content.html index c41af1b..ae7581b 100644 --- a/templates/emails/_body_content.html +++ b/templates/emails/_body_content.html @@ -1,3 +1,3 @@ {% autoescape off %} -

{{ content }}

+

{{ content }}

{% endautoescape %} diff --git a/templates/emails/_button.html b/templates/emails/_button.html index 4d14181..e6c6ddb 100644 --- a/templates/emails/_button.html +++ b/templates/emails/_button.html @@ -1,17 +1,17 @@ {% autoescape off %} - - - - - - - + + {% endautoescape %} diff --git a/templates/emails/_footer.html b/templates/emails/_footer.html index 13c2c92..8c642da 100644 --- a/templates/emails/_footer.html +++ b/templates/emails/_footer.html @@ -1,7 +1,7 @@ {% autoescape off %} - - - {{ content }} - - + + + {{ content }} + + {% endautoescape %} diff --git a/templates/emails/account_new.html b/templates/emails/account_new.html index f0f36c3..3eda077 100644 --- a/templates/emails/account_new.html +++ b/templates/emails/account_new.html @@ -1,27 +1,27 @@ {% extends "emails/base.html" %} {% load mail_tags %} {% autoescape off %} -{% block title %}{{settings.MAIN_DOMAIN}} - New Account Created{% endblock title %} -{% block subtitle %}{{settings.MAIN_DOMAIN}} - New Account Created{% endblock subtitle %} + {% block title %}{{settings.MAIN_DOMAIN}} - New Account Created{% endblock title %} + {% block subtitle %}{{settings.MAIN_DOMAIN}} - New Account Created{% endblock subtitle %} -{% block body_greeting %} - {% email_body_content "Hi there," %} -{% endblock body_greeting %} + {% block body_greeting %} + {% email_body_content "Hi there," %} + {% endblock body_greeting %} -{% block body_content %} - {% email_body_content "Your email address was used to create a new account at {{config.site_name}} (https://{{settings.MAIN_DOMAIN}})." %} - {% email_body_content "To confirm your new account, go to this link:" %} -{% endblock body_content %} + {% block body_content %} + {% email_body_content "Your email address was used to create a new account at {{config.site_name}} (https://{{settings.MAIN_DOMAIN}})." %} + {% email_body_content "To confirm your new account, go to this link:" %} + {% endblock body_content %} -{% block body_button %} - {% email_button button_text="Confirm New Account" button_link="https://{{settings.MAIN_DOMAIN}}/auth/reset/{{reset.token}}/" %} -{% endblock body_button %} + {% block body_button %} + {% email_button button_text="Confirm New Account" button_link="https://{{settings.MAIN_DOMAIN}}/auth/reset/{{reset.token}}/" %} + {% endblock body_button %} -{% block body_signature %} - {% email_body_content "Thanks, Admins @{{settings.MAIN_DOMAIN}}" %} -{% endblock body_signature %} + {% block body_signature %} + {% email_body_content "Thanks, Admins @{{settings.MAIN_DOMAIN}}" %} + {% endblock body_signature %} -{% block extra_footer %} - {% email_footer "If this was not you, then please ignore this message - your email will not be used to make an account if this link is not visited." %} -{% endblock extra_footer %} + {% block extra_footer %} + {% email_footer "If this was not you, then please ignore this message - your email will not be used to make an account if this link is not visited." %} + {% endblock extra_footer %} {% endautoescape %} diff --git a/templates/emails/base.html b/templates/emails/base.html index f0e9d20..0b822d8 100644 --- a/templates/emails/base.html +++ b/templates/emails/base.html @@ -1,163 +1,163 @@ {% autoescape off %} - - - - - - {% block title %}{% endblock title %} - - - - - - - -