diff --git a/.djlintrc b/.djlintrc new file mode 100644 index 000000000..460601f39 --- /dev/null +++ b/.djlintrc @@ -0,0 +1,3 @@ +{ + "ignore": "T002,T003,H005,H006,H023,H029,H030,H031" +} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c38cc8890..e8833c9f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,13 @@ jobs: node-version: '16' cache: 'yarn' - - uses: pre-commit/action@v3.0.0 - - uses: pre-commit-ci/lite-action@v1.0.1 + - name: Install dependencies + run: | + pip install django==4.2.4 + sudo apt-get update && sudo apt-get install -y gettext + yarn install + - uses: pre-commit/action@v3.0.0 test: runs-on: ubuntu-latest strategy: 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 %} -
+ {% endblock %} {% block navbar %} {% include "header.html" %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/pub_base.html b/fragdenstaat_de/fds_cms/templates/cms/pub_base.html index 2c2d2137f..0e80bb9d2 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/pub_base.html +++ b/fragdenstaat_de/fds_cms/templates/cms/pub_base.html @@ -47,9 +47,11 @@
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/story.html b/fragdenstaat_de/fds_mailing/templates/email/default/story.html
index 3d3433152..9f4dcdcad 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/story.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/story.html
@@ -1,3 +1,4 @@
+{# djlint:off H021 #}
+{# djlint:on #} 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/fds_ogimage/templates/fds_ogimage/govplan_section.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html
index 805d4a058..17f598395 100644
--- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html
+++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html
@@ -1,3 +1,4 @@
+{# djlint:off H021 #}
{% extends "fds_ogimage/govplan_plan.html" %}
{% load govplan %}
{% block tagline %}Themenbereich {{ object.title }}{% endblock %}
@@ -17,3 +18,4 @@
{% endblock %}
+{# djlint:on #}
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:
{% 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 #}
|