From 5dc4a934233710cf68b434b3d91e9f1afb0b8de0 Mon Sep 17 00:00:00 2001 From: Alastair Porter Date: Thu, 9 Jul 2026 13:32:11 +0200 Subject: [PATCH 1/3] Require keywords for optional arguments in templatetags This makes it easier to understand what a parameter to the templatetag means, and prevents issues from needing to update all call sites if the tag parameters change. Update bw_paginator/bw_user_avatar/bw_tag, which are our most used tags --- DEVELOPERS.md | 16 +++++++++ general/templatetags/bw_templatetags.py | 6 ++-- general/templatetags/tests.py | 35 ++++++++++++++++++-- templates/accounts/account.html | 4 +-- templates/accounts/attribution.html | 2 +- templates/accounts/display_user.html | 8 ++--- templates/accounts/edit.html | 2 +- templates/accounts/manage_sounds.html | 4 +-- templates/accounts/modal_comments.html | 2 +- templates/accounts/modal_downloads.html | 4 +-- templates/accounts/modal_follow.html | 6 ++-- templates/bookmarks/bookmarks.html | 2 +- templates/collections/collection.html | 4 +-- templates/donations/donation_list.html | 2 +- templates/forum/display_forum.html | 2 +- templates/forum/display_post.html | 2 +- templates/forum/display_thread.html | 6 ++-- templates/forum/hot_threads.html | 2 +- templates/forum/new_thread.html | 2 +- templates/forum/reply.html | 2 +- templates/forum/thread.html | 2 +- templates/forum/threads.html | 2 +- templates/front.html | 2 +- templates/messages/message.html | 4 +-- templates/messages/messages_list.html | 2 +- templates/moderation/assign_sounds.html | 2 +- templates/moderation/assigned.html | 2 +- templates/moderation/modal_annotations.html | 2 +- templates/moderation/modal_pending.html | 2 +- templates/moderation/modal_tardy.html | 2 +- templates/molecules/navbar_user_section.html | 2 +- templates/search/facet.html | 2 +- templates/search/search.html | 2 +- templates/search/search_forum.html | 2 +- templates/sounds/display_pack.html | 4 +-- templates/sounds/display_sound.html | 2 +- templates/sounds/modal_downloaders.html | 2 +- templates/sounds/modal_similar_sounds.html | 2 +- templates/sounds/pack.html | 4 +-- templates/sounds/sound.html | 6 ++-- templates/tags/tag_cloud.html | 2 +- 41 files changed, 106 insertions(+), 59 deletions(-) diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 54a4364e19..bd368d6b96 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -64,6 +64,22 @@ that were made, and allow feedback if necessary ## Specific notes +### Template tag optional arguments + +Optional arguments in template tags must always be keyword-only: + +```py +@register.inclusion_tag("atoms/avatar.html") +def bw_user_avatar(avatar_url, username, *, size=40, extra_class=""): +``` + +and templates need to specify the keywords in order to change the default: + +```html +{% bw_user_avatar url username size=32 %} +``` + + ### Custom Django permissions If there is a need for defining custom permissions we should define them in the corresponding model's `Meta` class diff --git a/general/templatetags/bw_templatetags.py b/general/templatetags/bw_templatetags.py index 21790a9025..77724d6b86 100644 --- a/general/templatetags/bw_templatetags.py +++ b/general/templatetags/bw_templatetags.py @@ -42,7 +42,7 @@ def bw_icon(name, class_name=""): @register.inclusion_tag("atoms/tag.html") -def bw_tag(tag_name, size=1, class_name="", url=None, weight=None): +def bw_tag(tag_name, *, size=1, class_name="", url=None, weight=None): """ Displays a BW tag with the given name """ @@ -66,7 +66,7 @@ def bw_tag(tag_name, size=1, class_name="", url=None, weight=None): @register.inclusion_tag("atoms/avatar.html") -def bw_user_avatar(avatar_url, username, size=40, extra_class=""): +def bw_user_avatar(avatar_url, username, *, size=40, extra_class=""): """ Displays a BW user avatar or no avatar if user has none We check if user has custom avatar by checking if the given avatar URL contains the filename of the default @@ -179,7 +179,7 @@ def bw_generic_stars(context, rating_0_10): @register.inclusion_tag("molecules/paginator.html", takes_context=True) -def bw_paginator(context, page, request, anchor="", non_grouped_number_of_results=-1, max_pages=None): +def bw_paginator(context, page, request, *, anchor="", non_grouped_number_of_results=-1, max_pages=None): """ Adds pagination context variables for use in displaying first, adjacent and last page links in addition to those created by the object_list generic diff --git a/general/templatetags/tests.py b/general/templatetags/tests.py index dfc0cf0e13..731a69e6b4 100644 --- a/general/templatetags/tests.py +++ b/general/templatetags/tests.py @@ -18,15 +18,16 @@ # See AUTHORS file. # +import pytest from django.core.paginator import Paginator -from django.template import Context, Template +from django.template import Context, Template, TemplateSyntaxError from django.test import RequestFactory def _render(num_pages, current_page, max_pages_expr): page = Paginator(range(num_pages * 15), 15).page(current_page) request = RequestFactory().get("/search/?q=wind") - tpl = Template("{% load bw_templatetags %}{% bw_paginator page request 'sound' -1 " + max_pages_expr + " %}") + tpl = Template("{% load bw_templatetags %}{% bw_paginator page request anchor='sound' " + max_pages_expr + " %}") return tpl.render(Context({"page": page, "request": request})) @@ -53,3 +54,33 @@ def test_next_arrow_hidden_at_capped_last_page(): def test_next_arrow_shown_below_cap(): html = _render(num_pages=700, current_page=50, max_pages_expr="max_pages=100") assert 'title="Next Page"' in html + + +def test_paginator_rejects_positional_optional(): + # Optionals are keyword-only (the `*` in the signature), so passing one positionally + # is a compile-time error rather than a silent rebind. bw_paginator has takes_context=True, + # exercising the most intricate parse_bits path. + with pytest.raises(TemplateSyntaxError): + Template("{% load bw_templatetags %}{% bw_paginator page request 'sound' %}") + + +def test_user_avatar_accepts_keyword_optionals(): + tpl = Template( + "{% load bw_templatetags %}" + '{% bw_user_avatar "https://example.com/a.png" "alice" size=64 extra_class="new-posts-notification" %}' + ) + html = tpl.render(Context({})) + assert "width:64px" in html + assert "new-posts-notification" in html + + +def test_tag_accepts_keyword_optionals(): + tpl = Template( + "{% load bw_templatetags %}" + "{% bw_tag \"windy\" size=3 class_name='h-spacing-1' url='/browse/tags/windy/' weight=1.0 %}" + ) + html = tpl.render(Context({})) + assert "windy" in html + assert "padding-3" in html + assert "h-spacing-1" in html + assert 'href="/browse/tags/windy/"' in html diff --git a/templates/accounts/account.html b/templates/accounts/account.html index dd67c0ba68..9ef03ae0ab 100644 --- a/templates/accounts/account.html +++ b/templates/accounts/account.html @@ -15,7 +15,7 @@
- {% bw_user_avatar user.profile.locations.avatar.XL.url user.username 100 %} + {% bw_user_avatar user.profile.locations.avatar.XL.url user.username size=100 %}

{{ user.username }}

@@ -207,7 +207,7 @@
Latest geotags
Most used tags
{% for tag in tags|add_sizes:"count:0.1:1.0" %} - {% bw_tag tag.name 1 '' tag.browse_url tag.size %} + {% bw_tag tag.name size=1 class_name='' url=tag.browse_url weight=tag.size %} {% endfor %}
{% endif %} diff --git a/templates/accounts/attribution.html b/templates/accounts/attribution.html index 5f97b1b110..3c9720b5f2 100644 --- a/templates/accounts/attribution.html +++ b/templates/accounts/attribution.html @@ -78,6 +78,6 @@

Downloaded on {{group.grouper}}

-{% bw_paginator page request "download" %} +{% bw_paginator page request anchor="download" %} {% endblock %} \ No newline at end of file diff --git a/templates/accounts/display_user.html b/templates/accounts/display_user.html index 3830646d2e..3bdee455bb 100644 --- a/templates/accounts/display_user.html +++ b/templates/accounts/display_user.html @@ -4,7 +4,7 @@ {% if size == 'comment' %}
- {% bw_user_avatar user.profile.locations.avatar.M.url user.username 40 %} + {% bw_user_avatar user.profile.locations.avatar.M.url user.username size=40 %}
{{ user.username | truncate_string:15 }} @@ -14,7 +14,7 @@ {% elif size == 'basic' %}
- {% bw_user_avatar user.profile.locations.avatar.M.url user.username 36 %} + {% bw_user_avatar user.profile.locations.avatar.M.url user.username size=36 %}
@@ -29,7 +29,7 @@ {% elif size == 'follow_lists' %}
- {% bw_user_avatar user.profile.locations.avatar.M.url user.username 50 %} + {% bw_user_avatar user.profile.locations.avatar.M.url user.username size=50 %}
@@ -51,7 +51,7 @@ {% elif size == 'top_donor' %}
- {% bw_user_avatar user.profile.locations.avatar.M.url user.username 36 %} + {% bw_user_avatar user.profile.locations.avatar.M.url user.username size=36 %}
{{ user.username }} diff --git a/templates/accounts/edit.html b/templates/accounts/edit.html index de2895dac4..d209e06167 100644 --- a/templates/accounts/edit.html +++ b/templates/accounts/edit.html @@ -12,7 +12,7 @@

Edit profile

{% else %} - {% bw_user_avatar profile.locations.avatar.XL.url user.username 100 %} + {% bw_user_avatar profile.locations.avatar.XL.url user.username size=100 %} {% endif %}
diff --git a/templates/accounts/manage_sounds.html b/templates/accounts/manage_sounds.html index d85dbe5335..2063f3bde9 100644 --- a/templates/accounts/manage_sounds.html +++ b/templates/accounts/manage_sounds.html @@ -58,7 +58,7 @@ {% if tab == "packs" %} {% if packs_to_select %} {% packs_selector_with_select_buttons packs_to_select %} - {% bw_paginator page request "pack" %} + {% bw_paginator page request anchor="pack" %} {% else %}
No packs...
@@ -70,7 +70,7 @@
No packs...
{% else %} {% if sounds_to_select %} {% sounds_selector_with_select_buttons sounds_to_select %} - {% bw_paginator page request "sound" %} + {% bw_paginator page request anchor="sound" %} {% else %}
No sounds...
diff --git a/templates/accounts/modal_comments.html b/templates/accounts/modal_comments.html index e454cf6cff..f27ada9ed8 100644 --- a/templates/accounts/modal_comments.html +++ b/templates/accounts/modal_comments.html @@ -67,7 +67,7 @@

{% if mode == "for_user" %}Comments on - {% bw_paginator page request "comments" %} + {% bw_paginator page request anchor="comments" %}

{% else %}
diff --git a/templates/accounts/modal_downloads.html b/templates/accounts/modal_downloads.html index 9d3d352838..a01c8509cb 100644 --- a/templates/accounts/modal_downloads.html +++ b/templates/accounts/modal_downloads.html @@ -32,9 +32,9 @@
Downloaded on {{group.grouper}}
{% endfor %}
{% if type_sounds %} - {% bw_paginator page request "sounds" %} + {% bw_paginator page request anchor="sounds" %} {% else %} - {% bw_paginator page request "packs" %} + {% bw_paginator page request anchor="packs" %} {% endif %}
{% else %} diff --git a/templates/accounts/modal_follow.html b/templates/accounts/modal_follow.html index 7c8fa52fcb..313031b682 100644 --- a/templates/accounts/modal_follow.html +++ b/templates/accounts/modal_follow.html @@ -26,7 +26,7 @@

{{ user.username }}'s followers ({{paginator.count}}) {% endfor %}
- {% bw_paginator page request "" -1 %} + {% bw_paginator page request %}
{% elif follow_page == 'following' %} @@ -44,7 +44,7 @@

Users followed by {{ user.username }} ({{paginator.count}})

{% endfor %}
- {% bw_paginator page request "" -1 %} + {% bw_paginator page request %}
{% elif follow_page == 'tags' %} @@ -79,7 +79,7 @@

Tags followed by {{ user.username }} ({{paginator.count}})

{% endfor %}
- {% bw_paginator page request "" -1 %} + {% bw_paginator page request %}
{% endif %}
diff --git a/templates/bookmarks/bookmarks.html b/templates/bookmarks/bookmarks.html index 137f9cd92b..8fd947bef6 100644 --- a/templates/bookmarks/bookmarks.html +++ b/templates/bookmarks/bookmarks.html @@ -49,7 +49,7 @@

Category: {% if category %}{{category.n {% else %}
There are no {% if not category %}uncategorized{% endif %} bookmarks {% if category %}in this category{% endif %} 😟
{% endif %} - {% bw_paginator page request "bookmark" %} + {% bw_paginator page request anchor="bookmark" %}

diff --git a/templates/collections/collection.html b/templates/collections/collection.html index 7c6165a035..9f2a9e814d 100644 --- a/templates/collections/collection.html +++ b/templates/collections/collection.html @@ -21,7 +21,7 @@

Collection: {{ collection.name }}

{% bw_generic_stars collection.avg_rating %}{% if collection.num_ratings %}Collection sound's overall rating ({{ collection.num_ratings|formatnumber }}){% else %}Not enough ratings{% endif %}
- {% bw_user_avatar collection.user.profile.locations.avatar.M.url collection.user.username 40 %} + {% bw_user_avatar collection.user.profile.locations.avatar.M.url collection.user.username size=40 %}
{{ collection.user.username | truncate_string:15 }} @@ -55,7 +55,7 @@

Collection: {{ collection.name }}

{% endif %}
{% for tag in collection.get_collection_tags_bw|add_sizes:"count:0.1:1.0" %} - {% bw_tag tag.name 1 '' tag.browse_url tag.size %} + {% bw_tag tag.name size=1 class_name='' url=tag.browse_url weight=tag.size %} {% endfor %}
diff --git a/templates/donations/donation_list.html b/templates/donations/donation_list.html index 3b0e4765fb..ea5a1d768a 100644 --- a/templates/donations/donation_list.html +++ b/templates/donations/donation_list.html @@ -52,7 +52,7 @@

{{donation_m.grouper}}

{% endfor %}
- {% bw_paginator page_obj request "donations" %} + {% bw_paginator page_obj request anchor="donations" %}
{% endblock %} diff --git a/templates/forum/display_forum.html b/templates/forum/display_forum.html index 05f7fa5f0e..7d4b194910 100644 --- a/templates/forum/display_forum.html +++ b/templates/forum/display_forum.html @@ -19,7 +19,7 @@
{{ forum.name }}

Latest reply {{ forum.last_post.created|timesince }} ago

-
{% bw_user_avatar forum.last_post.author.profile.locations.avatar.M.url forum.last_post.author.username 30 %}
+
{% bw_user_avatar forum.last_post.author.profile.locations.avatar.M.url forum.last_post.author.username size=30 %}

by {{ forum.last_post.author.username }}

{% endif %} diff --git a/templates/forum/display_post.html b/templates/forum/display_post.html index 1f45f004cb..c708601a66 100644 --- a/templates/forum/display_post.html +++ b/templates/forum/display_post.html @@ -9,7 +9,7 @@
- {% bw_user_avatar post.author.profile.locations.avatar.L.url post.author.username 70 %} + {% bw_user_avatar post.author.profile.locations.avatar.L.url post.author.username size=70 %}
{{ post.author.username }}
diff --git a/templates/forum/display_thread.html b/templates/forum/display_thread.html index 52fed6ce65..fc0488b450 100644 --- a/templates/forum/display_thread.html +++ b/templates/forum/display_thread.html @@ -5,9 +5,9 @@
{% if thread.last_post.created > request.last_action_time and thread.forum.last_post.author != request.user %} - {% bw_user_avatar thread.author.profile.locations.avatar.M.url thread.author.username 50 "new-posts-notification" %} + {% bw_user_avatar thread.author.profile.locations.avatar.M.url thread.author.username size=50 extra_class="new-posts-notification" %} {% else %} - {% bw_user_avatar thread.author.profile.locations.avatar.M.url thread.author.username 50 %} + {% bw_user_avatar thread.author.profile.locations.avatar.M.url thread.author.username size=50 %} {% endif %}
@@ -20,7 +20,7 @@
- {% bw_user_avatar user_avatar_url username 32 %} + {% bw_user_avatar user_avatar_url username size=32 %}
{% endfor %} {% if info.num_extra_commenters > 0 %} diff --git a/templates/forum/hot_threads.html b/templates/forum/hot_threads.html index c54f03fd92..81d160650e 100644 --- a/templates/forum/hot_threads.html +++ b/templates/forum/hot_threads.html @@ -16,6 +16,6 @@ {% endfor %}
- {% bw_paginator page request "" %} + {% bw_paginator page request %}
{% endblock %} \ No newline at end of file diff --git a/templates/forum/new_thread.html b/templates/forum/new_thread.html index ed88f2070d..1361262797 100644 --- a/templates/forum/new_thread.html +++ b/templates/forum/new_thread.html @@ -28,7 +28,7 @@
- {% bw_user_avatar request.user.profile.locations.avatar.L.url request.user.username 75 %} + {% bw_user_avatar request.user.profile.locations.avatar.L.url request.user.username size=75 %}
{{ request.user.username }}
diff --git a/templates/forum/reply.html b/templates/forum/reply.html index 7799adf195..99a9d2340b 100644 --- a/templates/forum/reply.html +++ b/templates/forum/reply.html @@ -33,7 +33,7 @@
- {% bw_user_avatar request.user.profile.locations.avatar.L.url request.user.username 75 %} + {% bw_user_avatar request.user.profile.locations.avatar.L.url request.user.username size=75 %}
{{ request.user.username }}
diff --git a/templates/forum/thread.html b/templates/forum/thread.html index 4709d93e51..580a8ac6c1 100644 --- a/templates/forum/thread.html +++ b/templates/forum/thread.html @@ -54,6 +54,6 @@

{{ thread.title }}

Post reply
- {% bw_paginator page request "thread" %} + {% bw_paginator page request anchor="thread" %}
{% endblock %} diff --git a/templates/forum/threads.html b/templates/forum/threads.html index 092de388f6..0d3d9c1e44 100644 --- a/templates/forum/threads.html +++ b/templates/forum/threads.html @@ -49,6 +49,6 @@ {% endfor %}
- {% bw_paginator page request "thread" %} + {% bw_paginator page request anchor="thread" %}
{% endblock %} \ No newline at end of file diff --git a/templates/front.html b/templates/front.html index cf8a7027fe..826fea44f1 100644 --- a/templates/front.html +++ b/templates/front.html @@ -113,7 +113,7 @@

Popular searches

{% for search_term, url in popular_searches_slice %}
- {% bw_tag search_term 4 'w-100 h-75 display-inline-block' url 1.0 %} + {% bw_tag search_term size=4 class_name='w-100 h-75 display-inline-block' url=url weight=1.0 %}
{% endfor %}
diff --git a/templates/messages/message.html b/templates/messages/message.html index 5ace39b690..345c9a157e 100644 --- a/templates/messages/message.html +++ b/templates/messages/message.html @@ -16,7 +16,7 @@
Message from:
- {% bw_user_avatar message.user_from.profile.locations.avatar.L.url message.user_from.username 70 %} + {% bw_user_avatar message.user_from.profile.locations.avatar.L.url message.user_from.username size=70 %}
{{ message.user_from.username }}
@@ -28,7 +28,7 @@
{{
Message to:
- {% bw_user_avatar message.user_to.profile.locations.avatar.L.url message.user_to.username 70 %} + {% bw_user_avatar message.user_to.profile.locations.avatar.L.url message.user_to.username size=70 %}
{{ message.user_to.username }}
diff --git a/templates/messages/messages_list.html b/templates/messages/messages_list.html index 2f8abb0431..3960da0516 100644 --- a/templates/messages/messages_list.html +++ b/templates/messages/messages_list.html @@ -18,7 +18,7 @@
- {% bw_paginator page request "message" %} + {% bw_paginator page request anchor="message" %}
{% endblock %} diff --git a/templates/moderation/assign_sounds.html b/templates/moderation/assign_sounds.html index 436f1e30d2..e46cb91e1e 100644 --- a/templates/moderation/assign_sounds.html +++ b/templates/moderation/assign_sounds.html @@ -26,7 +26,7 @@

Unassigned sound tickets ({{ num_sounds_pending }})

- {% bw_user_avatar item.user.profile.locations.avatar.L.url item.user.username 70 %} + {% bw_user_avatar item.user.profile.locations.avatar.L.url item.user.username size=70 %}
{{ item.username }} diff --git a/templates/moderation/assigned.html b/templates/moderation/assigned.html index bdf44fec48..f4d2bdaa38 100644 --- a/templates/moderation/assigned.html +++ b/templates/moderation/assigned.html @@ -52,7 +52,7 @@
No sound tickets in your queue... 😊
{% if show_pagination %} - {% bw_paginator page request "ticket" %} + {% bw_paginator page request anchor="ticket" %} {% endif %}
diff --git a/templates/moderation/modal_annotations.html b/templates/moderation/modal_annotations.html index 4e63ca1841..57b3d2e7f0 100644 --- a/templates/moderation/modal_annotations.html +++ b/templates/moderation/modal_annotations.html @@ -15,7 +15,7 @@

{{ user.username }}'s mod annotations

- {% bw_user_avatar user.profile.locations.avatar.M.url user.username 50 %} + {% bw_user_avatar user.profile.locations.avatar.M.url user.username size=50 %}
{{ user.username }} diff --git a/templates/moderation/modal_pending.html b/templates/moderation/modal_pending.html index 8e46de3b6f..ac805471fc 100644 --- a/templates/moderation/modal_pending.html +++ b/templates/moderation/modal_pending.html @@ -22,7 +22,7 @@

{{user.usern {% endfor %}

- {% bw_paginator page request "tickets" %} + {% bw_paginator page request anchor="tickets" %}
{% bw_icon "plus" %}Assign all sounds to me diff --git a/templates/moderation/modal_tardy.html b/templates/moderation/modal_tardy.html index 170dcda79e..543b95925d 100644 --- a/templates/moderation/modal_tardy.html +++ b/templates/moderation/modal_tardy.html @@ -22,7 +22,7 @@

Tickets with tardy {% if type == "tardy_users" %}users{% {% endfor %}

- {% bw_paginator page request "tickets" %} + {% bw_paginator page request anchor="tickets" %}
{% else %}
diff --git a/templates/molecules/navbar_user_section.html b/templates/molecules/navbar_user_section.html index 560a5678cc..8d08a875e7 100644 --- a/templates/molecules/navbar_user_section.html +++ b/templates/molecules/navbar_user_section.html @@ -6,7 +6,7 @@
  • - {% bw_user_avatar request.user.profile.locations.avatar.S.url request.user.username 32 %} + {% bw_user_avatar request.user.profile.locations.avatar.S.url request.user.username size=32 %}
    • diff --git a/templates/search/facet.html b/templates/search/facet.html index d6fcc86127..4c0c4265d2 100644 --- a/templates/search/facet.html +++ b/templates/search/facet.html @@ -29,7 +29,7 @@ {% if type == "cloud" %}
      {% for f in facet %} - {% bw_tag f.display_value 1 '' f.add_filter_url f.weight %} + {% bw_tag f.display_value size=1 class_name='' url=f.add_filter_url weight=f.weight %} {% endfor %}
      {% endif %} diff --git a/templates/search/search.html b/templates/search/search.html index 134e171942..1c5590b0ce 100644 --- a/templates/search/search.html +++ b/templates/search/search.html @@ -314,7 +314,7 @@

      {% endif %}

    • - {% bw_paginator page request "sound" non_grouped_number_of_results max_pages=search_max_page_limit %} + {% bw_paginator page request anchor="sound" non_grouped_number_of_results=non_grouped_number_of_results max_pages=search_max_page_limit %}
    {% endif %} diff --git a/templates/search/search_forum.html b/templates/search/search_forum.html index 6d5b454df2..6fef575c5b 100644 --- a/templates/search/search_forum.html +++ b/templates/search/search_forum.html @@ -65,7 +65,7 @@ {% endif %}
    - {% bw_paginator page request "" -1 %} + {% bw_paginator page request %}
    {% endif %} diff --git a/templates/sounds/display_pack.html b/templates/sounds/display_pack.html index e246943859..6eaeea3ece 100644 --- a/templates/sounds/display_pack.html +++ b/templates/sounds/display_pack.html @@ -95,7 +95,7 @@
    {% for tag in tags|slice:":5" %} - {% bw_tag tag.name 1 '' tag.browse_url %} + {% bw_tag tag.name size=1 class_name='' url=tag.browse_url %} {% endfor %}
    {% endif %} @@ -105,7 +105,7 @@
    - {% bw_user_avatar pack.user_profile_locations.avatar.S.url pack.user.username 32 %} + {% bw_user_avatar pack.user_profile_locations.avatar.S.url pack.user.username size=32 %}
    {{ pack.user | truncate_string:15 }} {{ pack.created|date:"F jS, Y" }} diff --git a/templates/sounds/display_sound.html b/templates/sounds/display_sound.html index c892c2a2ee..0c16732cb1 100644 --- a/templates/sounds/display_sound.html +++ b/templates/sounds/display_sound.html @@ -134,7 +134,7 @@
    - {% bw_user_avatar user_profile_locations.avatar.S.url sound.username 32 %} + {% bw_user_avatar user_profile_locations.avatar.S.url sound.username size=32 %}
    {{ sound.username | truncate_string:15 }}
    {{ sound.created|date:"F jS, Y" }}
    diff --git a/templates/sounds/modal_downloaders.html b/templates/sounds/modal_downloaders.html index d6ac4cf3f4..ca98c1bcc0 100644 --- a/templates/sounds/modal_downloaders.html +++ b/templates/sounds/modal_downloaders.html @@ -28,7 +28,7 @@
    Downloaded on {{group.grouper}}
    {% endfor %}
    - {% bw_paginator page request "" -1 %} + {% bw_paginator page request %}
    {% else %}
    diff --git a/templates/sounds/modal_similar_sounds.html b/templates/sounds/modal_similar_sounds.html index a6d52b7e86..494ba119e5 100644 --- a/templates/sounds/modal_similar_sounds.html +++ b/templates/sounds/modal_similar_sounds.html @@ -32,7 +32,7 @@

    Sounds similar to
    - {% bw_paginator page request "" -1 %} + {% bw_paginator page request %}
    See more results... diff --git a/templates/sounds/pack.html b/templates/sounds/pack.html index ce71ba2b84..15eef1dc3e 100644 --- a/templates/sounds/pack.html +++ b/templates/sounds/pack.html @@ -25,7 +25,7 @@

    Pack: {{ pack.name }}

    {% bw_generic_stars pack.avg_rating %}{% if pack.num_ratings %}Pack sound's overall rating ({{ pack.num_ratings|formatnumber }}){% else %}Not enough ratings{% endif %}
    - {% bw_user_avatar pack.user.profile.locations.avatar.M.url pack.user.username 40 %} + {% bw_user_avatar pack.user.profile.locations.avatar.M.url pack.user.username size=40 %}
    {{ pack.user.username | truncate_string:15 }} @@ -49,7 +49,7 @@

    Pack: {{ pack.name }}

    {% endif %}
    {% for tag in pack.get_pack_tags_bw|add_sizes:"count:0.1:1.0" %} - {% bw_tag tag.name 1 '' tag.browse_url tag.size %} + {% bw_tag tag.name size=1 class_name='' url=tag.browse_url weight=tag.size %} {% endfor %}
    diff --git a/templates/sounds/sound.html b/templates/sounds/sound.html index 7f501bfda2..e0c92143e5 100644 --- a/templates/sounds/sound.html +++ b/templates/sounds/sound.html @@ -92,7 +92,7 @@

    - {% bw_user_avatar sound.user.profile.locations.avatar.M.url sound.user.username 40 %} + {% bw_user_avatar sound.user.profile.locations.avatar.M.url sound.user.username size=40 %}
    {{ sound.user.username | truncate_string:15 }} @@ -151,7 +151,7 @@

    {% for tag in sound.tags.all %} - {% bw_tag tag.name 1 "h-spacing-1" %} + {% bw_tag tag.name size=1 class_name="h-spacing-1" %} {% endfor %}

    @@ -234,7 +234,7 @@
    Comments
    {% endfor %}
    - {% bw_paginator page request "comments" %} + {% bw_paginator page request anchor="comments" %}
    {% else %} diff --git a/templates/tags/tag_cloud.html b/templates/tags/tag_cloud.html index 1e8b8171f7..3945ed42dd 100644 --- a/templates/tags/tag_cloud.html +++ b/templates/tags/tag_cloud.html @@ -25,7 +25,7 @@

    Choose a tag to start browsing

    {% for tag in initial_tagcloud|add_sizes:"count:0.1:1.0" %} - {% bw_tag tag.name 1 '' tag.browse_url tag.size %} + {% bw_tag tag.name size=1 class_name='' url=tag.browse_url weight=tag.size %} {% endfor %}

    From 20db7e34822b84fb15ce604c118ea46228fba6a6 Mon Sep 17 00:00:00 2001 From: Alastair Porter Date: Thu, 9 Jul 2026 13:37:22 +0200 Subject: [PATCH 2/3] Require keywords for optional arguments in templatetags (the rest) Finish adding required keyword arg names for our custom template tags --- accounts/templatetags/display_user.py | 2 +- accounts/templatetags/filefunctions.py | 2 +- accounts/templatetags/flag_user.py | 2 +- general/templatetags/bw_templatetags.py | 4 ++- general/templatetags/tests.py | 33 +----------------------- search/templatetags/search.py | 2 +- sounds/templatetags/display_pack.py | 2 +- sounds/templatetags/display_sound.py | 4 +-- templates/accounts/manage_sounds.html | 2 +- templates/accounts/modal_comments.html | 4 +-- templates/forum/display_post.html | 2 +- templates/messages/message.html | 2 +- templates/molecules/object_selector.html | 8 +++--- templates/search/search.html | 4 +-- templates/sounds/sound.html | 6 ++--- 15 files changed, 25 insertions(+), 54 deletions(-) diff --git a/accounts/templatetags/display_user.py b/accounts/templatetags/display_user.py index cc3435e382..b28b756372 100644 --- a/accounts/templatetags/display_user.py +++ b/accounts/templatetags/display_user.py @@ -97,7 +97,7 @@ def display_user_comment(context, user, comment_created): @register.inclusion_tag("accounts/display_user_selectable.html", takes_context=True) -def display_user_small_selectable(context, user, selected=False): +def display_user_small_selectable(context, user, *, selected=False): context = context.get("original_context", context) tvars = display_user(context, user, size="basic") tvars.update( diff --git a/accounts/templatetags/filefunctions.py b/accounts/templatetags/filefunctions.py index defaab5d9a..2ad300127f 100644 --- a/accounts/templatetags/filefunctions.py +++ b/accounts/templatetags/filefunctions.py @@ -24,5 +24,5 @@ @register.inclusion_tag("accounts/recursive_file.html") -def show_file(file_structure, non_recursive=False): +def show_file(file_structure, *, non_recursive=False): return {"file": file_structure, "non_recursive": non_recursive} diff --git a/accounts/templatetags/flag_user.py b/accounts/templatetags/flag_user.py index 6ec44206a9..a4474a5295 100644 --- a/accounts/templatetags/flag_user.py +++ b/accounts/templatetags/flag_user.py @@ -26,7 +26,7 @@ @register.inclusion_tag("accounts/flag_user.html", takes_context=True) -def flag_user(context, flag_type, username, content_id, text=None, user_sounds=None): +def flag_user(context, flag_type, username, content_id, *, text=None, user_sounds=None): no_show = False link_text = "Report spam/offensive" diff --git a/general/templatetags/bw_templatetags.py b/general/templatetags/bw_templatetags.py index 77724d6b86..f8a484f983 100644 --- a/general/templatetags/bw_templatetags.py +++ b/general/templatetags/bw_templatetags.py @@ -91,7 +91,9 @@ def bw_user_avatar(avatar_url, username, *, size=40, extra_class=""): @register.inclusion_tag("atoms/stars.html", takes_context=True) -def bw_sound_stars(context, sound, allow_rating=True, use_request_user_rating=False, show_added_rating_on_save=False): +def bw_sound_stars( + context, sound, *, allow_rating=True, use_request_user_rating=False, show_added_rating_on_save=False +): if isinstance(sound, dict): sound_user = sound["username"] sound_avg_rating = sound["avg_rating"] diff --git a/general/templatetags/tests.py b/general/templatetags/tests.py index 731a69e6b4..15b271c408 100644 --- a/general/templatetags/tests.py +++ b/general/templatetags/tests.py @@ -18,9 +18,8 @@ # See AUTHORS file. # -import pytest from django.core.paginator import Paginator -from django.template import Context, Template, TemplateSyntaxError +from django.template import Context, Template from django.test import RequestFactory @@ -54,33 +53,3 @@ def test_next_arrow_hidden_at_capped_last_page(): def test_next_arrow_shown_below_cap(): html = _render(num_pages=700, current_page=50, max_pages_expr="max_pages=100") assert 'title="Next Page"' in html - - -def test_paginator_rejects_positional_optional(): - # Optionals are keyword-only (the `*` in the signature), so passing one positionally - # is a compile-time error rather than a silent rebind. bw_paginator has takes_context=True, - # exercising the most intricate parse_bits path. - with pytest.raises(TemplateSyntaxError): - Template("{% load bw_templatetags %}{% bw_paginator page request 'sound' %}") - - -def test_user_avatar_accepts_keyword_optionals(): - tpl = Template( - "{% load bw_templatetags %}" - '{% bw_user_avatar "https://example.com/a.png" "alice" size=64 extra_class="new-posts-notification" %}' - ) - html = tpl.render(Context({})) - assert "width:64px" in html - assert "new-posts-notification" in html - - -def test_tag_accepts_keyword_optionals(): - tpl = Template( - "{% load bw_templatetags %}" - "{% bw_tag \"windy\" size=3 class_name='h-spacing-1' url='/browse/tags/windy/' weight=1.0 %}" - ) - html = tpl.render(Context({})) - assert "windy" in html - assert "padding-3" in html - assert "h-spacing-1" in html - assert 'href="/browse/tags/windy/"' in html diff --git a/search/templatetags/search.py b/search/templatetags/search.py index 425f685098..b2883c6a25 100644 --- a/search/templatetags/search.py +++ b/search/templatetags/search.py @@ -158,7 +158,7 @@ def display_facet_beta(context, facet_name, facet_title=None): @register.inclusion_tag("search/search_option.html", takes_context=True) -def display_search_option(context, option_name, widget=None): +def display_search_option(context, option_name, *, widget=None): sqp = context["sqp"] option = sqp.options[option_name] if widget is None: diff --git a/sounds/templatetags/display_pack.py b/sounds/templatetags/display_pack.py index 619a4499fd..17c5555f53 100644 --- a/sounds/templatetags/display_pack.py +++ b/sounds/templatetags/display_pack.py @@ -73,7 +73,7 @@ def display_pack_big(context, pack): @register.inclusion_tag("sounds/display_pack_selectable.html", takes_context=True) -def display_pack_small_selectable(context, pack, selected=False): +def display_pack_small_selectable(context, pack, *, selected=False): context = context.get("original_context", context) # This is to allow passing context in nested inclusion tags tvars = display_pack(context, pack, size="small") tvars.update( diff --git a/sounds/templatetags/display_sound.py b/sounds/templatetags/display_sound.py index edab069bc6..ef79802eae 100644 --- a/sounds/templatetags/display_sound.py +++ b/sounds/templatetags/display_sound.py @@ -355,7 +355,7 @@ def display_sound_small_no_sound_object_no_bookmark(context, file_data): @register.inclusion_tag("sounds/display_sound_selectable.html", takes_context=True) -def display_sound_small_selectable(context, sound, selected=False): +def display_sound_small_selectable(context, sound, *, selected=False): context = context.get("original_context", context) # This is to allow passing context in nested inclusion tags tvars = display_sound_small_no_bookmark_no_ratings(context, sound) tvars.update( @@ -367,7 +367,7 @@ def display_sound_small_selectable(context, sound, selected=False): @register.inclusion_tag("sounds/display_sound_with_actions.html", takes_context=True) -def display_sound_small_with_actions(context, sound, is_featured=False): +def display_sound_small_with_actions(context, sound, *, is_featured=False): """Display sound with featured and remove action toggles below it.""" context = context.get("original_context", context) # This is to allow passing context in nested inclusion tags tvars = display_sound_small_no_bookmark_no_ratings(context, sound) diff --git a/templates/accounts/manage_sounds.html b/templates/accounts/manage_sounds.html index 2063f3bde9..9c7d2325c3 100644 --- a/templates/accounts/manage_sounds.html +++ b/templates/accounts/manage_sounds.html @@ -93,7 +93,7 @@
    No files to describe... 😟
    Select the files you want to describe:
    Select all·Select None
    - {% show_file file_structure True %} + {% show_file file_structure non_recursive=True %}
    {% endif %} diff --git a/templates/accounts/modal_comments.html b/templates/accounts/modal_comments.html index f27ada9ed8..2ba24d315d 100644 --- a/templates/accounts/modal_comments.html +++ b/templates/accounts/modal_comments.html @@ -23,7 +23,7 @@

    {% if mode == "for_user" %}Comments on {% display_user_comment comment.user comment.created %}
    - {% flag_user "SC" comment.user.username comment.id "" comment.user.profile.num_sounds %} + {% flag_user "SC" comment.user.username comment.id text="" user_sounds=comment.user.profile.num_sounds %} {% if perms.comments.delete_comment or sound.user == request.user or comment.user == request.user %} {% bw_icon 'trash' %} Delete {% endif %} @@ -47,7 +47,7 @@

    {% if mode == "for_user" %}Comments on {% display_user_comment comment.user comment.created %}
    - {% flag_user "SC" comment.user.username comment.id "" comment.user.profile.num_sounds %} + {% flag_user "SC" comment.user.username comment.id text="" user_sounds=comment.user.profile.num_sounds %} {% if perms.comments.delete_comment or sound.user == request.user or comment.user == request.user %} {% bw_icon 'trash' %} Delete {% endif %} diff --git a/templates/forum/display_post.html b/templates/forum/display_post.html index c708601a66..90955cd173 100644 --- a/templates/forum/display_post.html +++ b/templates/forum/display_post.html @@ -90,7 +90,7 @@
    {{ post.
    {% endif %}
    - {% flag_user "FP" post.author.username post.id "" post.author.profile.num_sounds %} + {% flag_user "FP" post.author.username post.id text="" user_sounds=post.author.profile.num_sounds %}
    {% endif %} diff --git a/templates/messages/message.html b/templates/messages/message.html index 345c9a157e..bafbfe6c22 100644 --- a/templates/messages/message.html +++ b/templates/messages/message.html @@ -44,7 +44,7 @@
    {{ message.subject }}
    {{ message.body.body|smileys|safe|linebreaks|strip_unnecessary_br }}
    -
    {% flag_user "PM" message.user_from.username message.id "" message.user_from.profile.num_sounds %}
    +
    {% flag_user "PM" message.user_from.username message.id text="" user_sounds=message.user_from.profile.num_sounds %}

    diff --git a/templates/molecules/object_selector.html b/templates/molecules/object_selector.html index 60ca7e93ad..1277b8a8bb 100644 --- a/templates/molecules/object_selector.html +++ b/templates/molecules/object_selector.html @@ -7,11 +7,11 @@ {% for object in objects %}
    {% if type == "sounds" %} - {% if show_actions %}{% display_sound_small_with_actions object object.is_featured %} - {% else %}{% display_sound_small_selectable object object.selected %} + {% if show_actions %}{% display_sound_small_with_actions object is_featured=object.is_featured %} + {% else %}{% display_sound_small_selectable object selected=object.selected %} {% endif %} - {% elif type == "packs" %}{% display_pack_small_selectable object object.selected %} - {% elif type == "users" %}{% display_user_small_selectable object object.selected %} + {% elif type == "packs" %}{% display_pack_small_selectable object selected=object.selected %} + {% elif type == "users" %}{% display_user_small_selectable object selected=object.selected %} {% endif %}
    {% endfor %} diff --git a/templates/search/search.html b/templates/search/search.html index 1c5590b0ce..a191c3c7e9 100644 --- a/templates/search/search.html +++ b/templates/search/search.html @@ -41,8 +41,8 @@ {% bw_icon 'close' %}
    - {% if not sqp.options.field_weights.is_default_value %} {% display_search_option "field_weights" "hidden" %}{% endif %} - {% if not sqp.options.similar_to.is_default_value %} {% display_search_option "similar_to" "hidden" %}{% endif %} + {% if not sqp.options.field_weights.is_default_value %} {% display_search_option "field_weights" widget="hidden" %}{% endif %} + {% if not sqp.options.similar_to.is_default_value %} {% display_search_option "similar_to" widget="hidden" %}{% endif %}
    {% if sqp.tags_mode_active %} {% comment %}"sounds tagged as" label with follow/unfollow buttons{% endcomment %} diff --git a/templates/sounds/sound.html b/templates/sounds/sound.html index e0c92143e5..48e0457dcf 100644 --- a/templates/sounds/sound.html +++ b/templates/sounds/sound.html @@ -88,7 +88,7 @@

    {% bw_sound_stars sound False %}{{ sound.get_ratings_count_text }}

    +
    {% bw_sound_stars sound allow_rating=False %}{{ sound.get_ratings_count_text }}
    @@ -220,7 +220,7 @@
    Comments
    {% display_user_comment comment.user comment.created %}
    - {% flag_user "SC" comment.user.username comment.id "" comment.user.profile.num_sounds %} + {% flag_user "SC" comment.user.username comment.id text="" user_sounds=comment.user.profile.num_sounds %} {% if perms.comments.delete_comment or sound.user == request.user or comment.user == request.user %} {% bw_icon 'trash' %} Delete {% endif %} @@ -279,7 +279,7 @@
    Comments

    Your rating:

    - {% bw_sound_stars sound True True True %} + {% bw_sound_stars sound allow_rating=True use_request_user_rating=True show_added_rating_on_save=True %}
    {% endif %} From 5e4ed72e23dd91982a2a70f7db1eb0b2ed509453 Mon Sep 17 00:00:00 2001 From: Alastair Porter Date: Thu, 9 Jul 2026 13:41:18 +0200 Subject: [PATCH 3/3] Make whitespace in templatetag {% tag %} consistent --- templates/accounts/account.html | 2 +- templates/accounts/account_settings_base.html | 14 +++++++------- templates/accounts/admin_delete_confirmation.html | 4 ++-- templates/accounts/attribution.html | 8 ++++---- templates/accounts/charts.html | 12 ++++++------ templates/accounts/display_user.html | 2 +- templates/accounts/manage_sounds.html | 4 ++-- templates/accounts/modal_follow.html | 2 +- templates/atoms/stars.html | 6 +++--- templates/bookmarks/bookmarks.html | 2 +- templates/collections/display_collection.html | 2 +- templates/collections/edit_collection.html | 6 +++--- templates/collections/your_collections.html | 4 ++-- templates/donations/donation_list.html | 4 ++-- .../emails/email_notification_approved_but.txt | 2 +- templates/emails/email_stream.txt | 2 +- templates/forum/display_thread.html | 2 +- templates/moderation/assigned.html | 6 +++--- templates/moderation/ticket.html | 2 +- templates/molecules/carousel.html | 2 +- templates/molecules/geotag_form_field.html | 2 +- templates/monitor/base.html | 10 +++++----- templates/monitor/moderation.html | 2 +- templates/search/search.html | 2 +- templates/search/search_forum.html | 2 +- templates/sounds/display_pack.html | 4 ++-- templates/sounds/display_sound.html | 4 ++-- templates/sounds/edit_and_describe.html | 6 +++--- templates/sounds/modal_similar_sounds.html | 2 +- templates/sounds/multiple_sounds_attribution.txt | 2 +- templates/sounds/pack.html | 2 +- templates/sounds/sound.html | 6 +++--- 32 files changed, 66 insertions(+), 66 deletions(-) diff --git a/templates/accounts/account.html b/templates/accounts/account.html index 9ef03ae0ab..91d297134b 100644 --- a/templates/accounts/account.html +++ b/templates/accounts/account.html @@ -211,7 +211,7 @@
    Most used tags
    {% endfor %} {% endif %} - {% endwith%} + {% endwith %} {% endcache %}
    diff --git a/templates/accounts/account_settings_base.html b/templates/accounts/account_settings_base.html index 4398fcb8c6..4e848a014c 100644 --- a/templates/accounts/account_settings_base.html +++ b/templates/accounts/account_settings_base.html @@ -10,25 +10,25 @@

    Account settings

    diff --git a/templates/collections/display_collection.html b/templates/collections/display_collection.html index 597a419f51..d96bbf2fe3 100644 --- a/templates/collections/display_collection.html +++ b/templates/collections/display_collection.html @@ -52,7 +52,7 @@
    {% if collection.description %} {% with collection.description|striptags|safe as preprocessed_description %} -
    = 55%}title="{{ preprocessed_description|truncatewords_html:200|force_escape }}"{% endif %}> +
    = 55 %}title="{{ preprocessed_description|truncatewords_html:200|force_escape }}"{% endif %}> {{ preprocessed_description|truncatechars_html:55 }}
    {% endwith %} diff --git a/templates/collections/edit_collection.html b/templates/collections/edit_collection.html index d9986d35b9..c7d24d8f9c 100644 --- a/templates/collections/edit_collection.html +++ b/templates/collections/edit_collection.html @@ -46,7 +46,7 @@

    {{ collection.name }}

    {% if form.maintainers.errors %}
    {{form.maintainers.errors}}
    {% endif %} - {% users_selector form.collection_maintainers_objects%} + {% users_selector form.collection_maintainers_objects %}
    @@ -91,11 +91,11 @@

    {{ collection.name }}

    - {% if is_owner or is_maintainer%} + {% if is_owner or is_maintainer %} {% endif %} - {% if is_owner%} + {% if is_owner %}
    diff --git a/templates/collections/your_collections.html b/templates/collections/your_collections.html index 576d78fe40..d0d9c19d0d 100644 --- a/templates/collections/your_collections.html +++ b/templates/collections/your_collections.html @@ -5,8 +5,8 @@ {% load util %} {% load display_collections %} -{% block title%}Your Collections{%endblock title%} -{% block page-title%}Your Collections{%endblock page-title%} +{% block title %}Your Collections{% endblock title %} +{% block page-title %}Your Collections{% endblock page-title %} {% block page-content %}
    diff --git a/templates/donations/donation_list.html b/templates/donations/donation_list.html index ea5a1d768a..fdee656434 100644 --- a/templates/donations/donation_list.html +++ b/templates/donations/donation_list.html @@ -12,12 +12,12 @@ {% for donation_m in donations %}

    {{donation_m.grouper}}

    - {% for donation in donation_m.list%} + {% for donation in donation_m.list %}
    {% if donation.is_anonymous %} - {% bw_user_avatar None "anonymous" %} + {% bw_user_avatar None "anonymous" %} {% else %} {% if donation.user %} {% bw_user_avatar donation.user.profile.locations.avatar.XL.url donation.user.username %} diff --git a/templates/emails/email_notification_approved_but.txt b/templates/emails/email_notification_approved_but.txt index 37566bd612..d8fc48158e 100644 --- a/templates/emails/email_notification_approved_but.txt +++ b/templates/emails/email_notification_approved_but.txt @@ -15,7 +15,7 @@ to see the moderator's message: You can access the sound's page here: -{% absurl "sound" ticket.sound.user ticket.sound.id %} +{% absurl "sound" ticket.sound.user ticket.sound.id %} Thank you for adding to Freesound! {% endblock %} diff --git a/templates/emails/email_stream.txt b/templates/emails/email_stream.txt index 3db928045c..f0257967c8 100644 --- a/templates/emails/email_stream.txt +++ b/templates/emails/email_stream.txt @@ -16,7 +16,7 @@ Check out these new cool sounds that you might be interested in: {% absurl "sounds-search" %}?f={{ more_url_params.0 }}&s={{ more_url_params.1 }} {% endif %} -{% endfor %}{% for tags, sound_objs, more_url_params, more_count, new_count in tags_sounds %}There {% if new_count == 1 %}is{% else %}are{% endif %} {{ new_count }} new sound{{ new_count|pluralize }} with tag{{tags|pluralize}} [{{ tags|join:", " }}]: +{% endfor %}{% for tags, sound_objs, more_url_params, more_count, new_count in tags_sounds %}There {% if new_count == 1 %}is{% else %}are{% endif %} {{ new_count }} new sound{{ new_count|pluralize }} with tag{{tags|pluralize}} [{{ tags|join:", " }}]: {% for sound_obj in sound_objs %} {{ sound_obj.original_filename }}, uploaded by {{ sound_obj.user.username }} {% absurl "sound" sound_obj.user.username sound_obj.id %} diff --git a/templates/forum/display_thread.html b/templates/forum/display_thread.html index fc0488b450..63893e9594 100644 --- a/templates/forum/display_thread.html +++ b/templates/forum/display_thread.html @@ -12,7 +12,7 @@
    {{ thread.title|safe }}
    -

    Started by {{ thread.author.username }} {{thread.first_post.created|timesince}} ago · {{ thread.num_replies|bw_intcomma }} repl{{ thread.num_replies|pluralize:"y,ies" }}

    +

    Started by {{ thread.author.username }} {{thread.first_post.created|timesince}} ago · {{ thread.num_replies|bw_intcomma }} repl{{ thread.num_replies|pluralize:"y,ies" }}

    {% cache 86400 bw_thread_common_commenters thread.id %} diff --git a/templates/moderation/assigned.html b/templates/moderation/assigned.html index f4d2bdaa38..9c20ee08a3 100644 --- a/templates/moderation/assigned.html +++ b/templates/moderation/assigned.html @@ -88,14 +88,14 @@

    Messages for ticket #{{ ticket.id }}

    {% if message.sender %} {{ message.sender.username }} {% else %} Anonymous {% endif %}·{{ message.created }} {% if message.moderator_only %}{% bw_icon 'notification' 'rotate180' %}{% endif %}
    -
    {{ message.text|safe|linebreaksbr }}
    +
    {{ message.text|safe|linebreaksbr }}
    {% endif %} {% endfor %} {% endif %} {% endwith %}
    - {%endfor%} + {% endfor %}
    {% endif %}
    @@ -117,7 +117,7 @@

    data-text="{{text|force_escape}}" title="{{text|force_escape}}">{{ label }} {% if not forloop.last %} · - {% endif%} + {% endif %} {% endfor %}
    diff --git a/templates/moderation/ticket.html b/templates/moderation/ticket.html index a1c2e658c0..6dbfc8e9a2 100644 --- a/templates/moderation/ticket.html +++ b/templates/moderation/ticket.html @@ -52,7 +52,7 @@

    Messages ({{ticket.messages.all.count}})

    {% if message.sender %} {{ message.sender.username }} {% else %} Anonymous {% endif %}·{{ message.created }} {% if message.moderator_only %}{% bw_icon 'notification' 'rotate180' %}{% endif %}
    -
    {{ message.text|safe|linebreaksbr }}
    +
    {{ message.text|safe|linebreaksbr }}
    {% endif %} {% endfor %} diff --git a/templates/molecules/carousel.html b/templates/molecules/carousel.html index 0db1aec1d9..cf03892ace 100644 --- a/templates/molecules/carousel.html +++ b/templates/molecules/carousel.html @@ -7,7 +7,7 @@
    {% for element in elements %}
    - {% if type == "sound"%}{% if show_timesince %}{% display_sound_small_with_timesince element %}{% else %}{% display_sound_small element %}{% endif %}{% elif type == "pack" %}{% display_pack element %}{% endif %} + {% if type == "sound" %}{% if show_timesince %}{% display_sound_small_with_timesince element %}{% else %}{% display_sound_small element %}{% endif %}{% elif type == "pack" %}{% display_pack element %}{% endif %}
    {% endfor %}
    diff --git a/templates/molecules/geotag_form_field.html b/templates/molecules/geotag_form_field.html index 700ce538cb..3ff87bc199 100644 --- a/templates/molecules/geotag_form_field.html +++ b/templates/molecules/geotag_form_field.html @@ -1,6 +1,6 @@ {% load bw_templatetags %}
    Use this section to add geolocation information so your sound can be placed on a map.
    -
    +