diff --git a/fragdenstaat_de/fds_cms/templates/cms/base.html b/fragdenstaat_de/fds_cms/templates/cms/base.html index 9afc6c541..57a289f53 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/base.html +++ b/fragdenstaat_de/fds_cms/templates/cms/base.html @@ -12,7 +12,7 @@ {% include "account/includes/impostor.html" %} {% endif %} {% block top_block %} - +
{% static_placeholder "top_banner" %}
{% endblock %} {% block navbar %} {% include "header.html" %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html index 2abcc49d6..01856b987 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html @@ -3,7 +3,6 @@ {% block title %} {% trans "Donation" %} {% endblock title %} - {% block top_block %}{% endblock %} {% block navbar %} {% include "header_minimal.html" %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html index 307dc4cd1..c69db5ee3 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html @@ -17,7 +17,9 @@ {% endif %} + {# djlint:off H021 #}
+ {# djlint:on #} {% include "django/forms/widgets/text.html" %} {{ currency }}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/action.html b/fragdenstaat_de/fds_mailing/templates/email/default/action.html index ebde30204..c0c6caa73 100644 --- a/fragdenstaat_de/fds_mailing/templates/email/default/action.html +++ b/fragdenstaat_de/fds_mailing/templates/email/default/action.html @@ -1,3 +1,4 @@ +{# djlint:off H021 #} {% if heading %} diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/base.html b/fragdenstaat_de/fds_mailing/templates/email/default/base.html index 30fc8c9b6..6530b19aa 100644 --- a/fragdenstaat_de/fds_mailing/templates/email/default/base.html +++ b/fragdenstaat_de/fds_mailing/templates/email/default/base.html @@ -1,3 +1,4 @@ +{# djlint:off H021 #} diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/section.html b/fragdenstaat_de/fds_mailing/templates/email/default/section.html index 059ebbecb..2001f2ba9 100644 --- a/fragdenstaat_de/fds_mailing/templates/email/default/section.html +++ b/fragdenstaat_de/fds_mailing/templates/email/default/section.html @@ -1,3 +1,4 @@ +{# djlint:off H021 #}
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html index c0df46182..930ff06a6 100644 --- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html +++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html @@ -1,3 +1,4 @@ +{# djlint:off H021 #} {% extends object.get_template %} {% load cms_tags %} {% block body %} diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html index edd7e6856..4f6f9c7f5 100644 --- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html +++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html @@ -30,10 +30,12 @@

{{ newsletter.title }}

{% elif has_newsletter and fallback %}

Unterstützen Sie FragDenStaat!

+ {# djlint:off D018 #} Jetzt spenden + {# djlint:on #}
{% endif %} diff --git a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html index 0a00527dc..3fcc7a70b 100644 --- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html +++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html @@ -1,3 +1,4 @@ +{# djlint:off H021 #} {% extends "fds_ogimage/base.html" %} {% load humanize %} {% block title %}{{ object.title }}{% endblock %} diff --git a/fragdenstaat_de/templates/account/admin_send_mail.html b/fragdenstaat_de/templates/account/admin_send_mail.html index 4d816b8ea..5567afcf8 100644 --- a/fragdenstaat_de/templates/account/admin_send_mail.html +++ b/fragdenstaat_de/templates/account/admin_send_mail.html @@ -14,23 +14,24 @@ +

+

+ +

+ + + {% if select_across %} + + {# set invalid selected, so confirmation action path is chosen in admin #} + + {% else %} + {% for obj in queryset %} + + {% endfor %} + {% endif %} + +{% endblock %} diff --git a/fragdenstaat_de/templates/account/new_terms.html b/fragdenstaat_de/templates/account/new_terms.html index 971e60b6b..49f794c35 100644 --- a/fragdenstaat_de/templates/account/new_terms.html +++ b/fragdenstaat_de/templates/account/new_terms.html @@ -1,7 +1,7 @@ {% extends 'account/new_terms.html' %} {% block terms_details %}

- Unsere Nutzungsbedingungen wurden von iRights.Law komplett überarbeitet und verständlicher gemacht. + Unsere Nutzungsbedingungen wurden von iRights.Law komplett überarbeitet und verständlicher gemacht.

Folgendes ist besser geworden:

    diff --git a/fragdenstaat_de/templates/campaign/food/request_banner.html b/fragdenstaat_de/templates/campaign/food/request_banner.html index de863c401..228849ddc 100644 --- a/fragdenstaat_de/templates/campaign/food/request_banner.html +++ b/fragdenstaat_de/templates/campaign/food/request_banner.html @@ -4,11 +4,13 @@
    + {# djlint:off D018 #} Topf Secret + {# djlint:off #}
    {% if campaign.description %}{{ campaign.description|markdown }}{% endif %} diff --git a/fragdenstaat_de/templates/djangocms_audio/default/file.html b/fragdenstaat_de/templates/djangocms_audio/default/file.html index 3359122d8..ad14c44df 100644 --- a/fragdenstaat_de/templates/djangocms_audio/default/file.html +++ b/fragdenstaat_de/templates/djangocms_audio/default/file.html @@ -28,8 +28,10 @@
    + {# djlint:off H021 #}
    00:00 / 00:00
    + {# djlint:on #}