diff --git a/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html b/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html index 6e75326e9..12d091bcb 100644 --- a/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html +++ b/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html @@ -1,9 +1,7 @@ {% extends "admin/change_form.html" %} - {% load static %} - {% block after_field_sets %} {{ block.super }} {{ adminform.model_admin.charcount_fields|json_script:"charcount-fields" }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html b/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html index 54bff5bad..59ace0c50 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html @@ -1,122 +1,105 @@ {% load i18n cms_tags %} {% load markup %} {% load static %} - {% block article_header %} -
-
-
-
- -

- - {{ article.kicker }} - - {% render_model article "title" %} -

- - {% if article.teaser %} -
- {% render_model article "teaser" "" "" "safe" %} -
- {% endif %} - -
- - {% with authors=article.get_authors %} - {% if authors %} - - - {% for author in authors %} - {% if author.get_absolute_url %} - {% endif %}{% if not forloop.last %},{% endif %} - {% endfor %} - - {% endif %} - {% endwith %} -
- - {% block article_header_image %} - {% if article.image %} - {% include "fds_blog/includes/blog_picture_detail.html" with picture=article.image columns="col-12 col-lg-10" loading="eager" %} - {% endif %} - {% endblock article_header_image %} - -
+
+
+
+
+

+ {{ article.kicker }} + {% render_model article "title" %} +

+ {% if article.teaser %} +
{% render_model article "teaser" "" "" "safe" %}
+ {% endif %} +
+ + {% with authors=article.get_authors %} + {% if authors %} + - + {% for author in authors %} + {% if author.get_absolute_url %}{% endif %} + {% if not forloop.last %},{% endif %} + {% endfor %} + + {% endif %} + {% endwith %} +
+ {% block article_header_image %} + {% if article.image %} + {% include "fds_blog/includes/blog_picture_detail.html" with picture=article.image columns="col-12 col-lg-10" loading="eager" %} + {% endif %} + {% endblock article_header_image %} +
+
+
-
-
{% endblock article_header %} - {% block article_updates %} -{% if updated_articles %} -
-

- {% blocktranslate count counter=updated_articles|length %} + {% if updated_articles %} +

+

+ {% blocktranslate count counter=updated_articles|length %} Updated article: {% plural %} Updated articles: {% endblocktranslate %} - {% for related_article in updated_articles %} - {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – {{ related_article.title }}{% if not forloop.last %},{% endif %} - {% endfor %} -

-
-{% endif %} + {% for related_article in updated_articles %} + {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – {{ related_article.title }} + {% if not forloop.last %},{% endif %} + {% endfor %} +

+
+ {% endif %} {% endblock %} - {% block article_content %} - {% render_placeholder article.content_placeholder %} + {% render_placeholder article.content_placeholder %} {% endblock article_content %} - {% block article_previous %} -{% if previous_articles %} -
-

- {% blocktranslate count counter=previous_articles|length %} + {% if previous_articles %} +

+

+ {% blocktranslate count counter=previous_articles|length %} Previous article: {% plural %} Previous articles: {% endblocktranslate %} - {% for related_article in previous_articles %} - {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – {{ related_article.title }}{% if not forloop.last %},{% endif %} - {% endfor %} -

-
-{% endif %} + {% for related_article in previous_articles %} + {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – {{ related_article.title }} + {% if not forloop.last %},{% endif %} + {% endfor %} +

+
+ {% endif %} {% endblock %} - {% block article_ads %} -{% static_placeholder "banner_ad" %} + {% static_placeholder "banner_ad" %} {% endblock article_ads %} - {% block article_languages %} -
-
-
- {% with other_langs=article.other_languages %} - {% if other_langs %} -

- {% trans "This article is available in other languages." %} -

- - {% endif %} - {% endwith %} +
+
+
+ {% with other_langs=article.other_languages %} + {% if other_langs %} +

{% trans "This article is available in other languages." %}

+
    + {% for lang_article in other_langs %} +
  • + {{ lang_article.language|language_name }}: + {{ lang_article.title }} +
    • + {% endfor %} +
+ {% endif %} + {% endwith %} +
+
-
-
{% endblock article_languages %} - -{% block article_authors %}{% endblock article_authors %} +{% block article_authors %} +{% endblock article_authors %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html b/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html index 330260731..0d29525e6 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html @@ -3,63 +3,53 @@ {% load markup %} {% load static %} {% load blog_tags %} - -{% block canonical_url %}{% endblock canonical_url %} +{% block canonical_url %} + +{% endblock canonical_url %} {% block title %}{{ article.meta_title }}{% endblock %} - {% block meta %} - {% include "snippets/meta.html" with description=article.teaser|striptags keywords=article.tag_list %} - {% include "fds_blog/includes/social_meta.html" with article=article %} - {% with other_langs=article.other_languages %} - {% for lang_article in other_langs %} - - {% endfor %} - {% endwith %} + {% include "snippets/meta.html" with description=article.teaser|striptags keywords=article.tag_list %} + {% include "fds_blog/includes/social_meta.html" with article=article %} + {% with other_langs=article.other_languages %} + {% for lang_article in other_langs %} + + {% endfor %} + {% endwith %} {% endblock %} - -{% block content_blog %}{% spaceless %} -
- - {% include article.content_template %} - -
-{% endspaceless %} - -{% static_placeholder "blog_donation_banner" %} - -{% with next_read=article|get_next_read %} -{% if next_read %} -
-
-
- {% if next_read.image_id %} - {% include "fds_blog/includes/blog_picture.html" with picture=next_read.image columns="col-md-5" %} +{% block content_blog %} + {% spaceless %} +
{% include article.content_template %}
+ {% endspaceless %} + {% static_placeholder "blog_donation_banner" %} + {% with next_read=article|get_next_read %} + {% if next_read %} +
+
+
+ {% if next_read.image_id %} + + {% include "fds_blog/includes/blog_picture.html" with picture=next_read.image columns="col-md-5" %} + + {% endif %} +
+
+

+ + {% if next_read.kicker %}{{ next_read.kicker }}{% endif %} + {{ next_read.title }} + +

+

{% render_model next_read "teaser" "" "" "safe" %}

+

+

+ {% translate "Read article" %} +
+

+
+
+
{% endif %} -
-
-

- - {% if next_read.kicker %} - - {{ next_read.kicker }} - - {% endif %} - {{ next_read.title }} - -

-

- {% render_model next_read "teaser" "" "" "safe" %} -

-

-

- - {% translate "Read article" %} - -
-

-
-
-
-{% endif %} -{% endwith %} + {% endwith %} {% endblock content_blog %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html b/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html index be36bc5d2..718eb74ff 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html @@ -1,100 +1,106 @@ {% extends "fds_blog/base.html" %} -{% load i18n easy_thumbnails_tags cms_tags markup %}{% spaceless %} - -{% block canonical_url %}{% endblock canonical_url %} - -{% block title %}{% if author %}{{ author.get_full_name }} – {% elif archive_date %}{% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} – {% elif tagged_entries %}{{ tagged_entries|capfirst }} – {% elif category %}{{ category }} – {% endif %}{{ block.super }}{% endblock %} - - -{% block content_blog %} -
-
- - {% block blog_title %} - {% if author or archive_date or article_tag or category %} -
-

- {% if archive_date %}{% trans "Archive" %} {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} - {% elif article_tag %}{% trans "Tag" %} {{ article_tag.name }} - {% elif category %}{% trans "Category" %} {{ category }}{% endif %} -

- {% if category and category.description %}

{{ category.description }}

{% endif %} -
- - {% if author %} -

{% trans "Articles by" %}:

-
-
-
- {% if author.profile_photo %} - Bild des Autors - {% endif %} -
-
-

- {{ author.get_full_name }} -

-
- {{ author.profile_text | markdown }} -
-
-
-
- {% endif %} - - {% endif %} +{% load i18n easy_thumbnails_tags cms_tags markup %} +{% spaceless %} + {% block canonical_url %} + + {% endblock canonical_url %} + {% block title %} + {% if author %} + {{ author.get_full_name }} – + {% elif archive_date %} + {% if month %}{{ archive_date|date:'F' }}{% endif %} + {{ year }} – + {% elif tagged_entries %} + {{ tagged_entries|capfirst }} – + {% elif category %} + {{ category }} – + {% endif %} + {{ block.super }} {% endblock %} - - {% if featured %} -
-
-
-
- {% if featured.image %} - - {% include "fds_blog/includes/blog_picture.html" with picture=featured.image %} - - {% endif %} -
-

- - {% if featured.kicker %} - - {{ featured.kicker }} - + {% block content_blog %} +
+
+ {% block blog_title %} + {% if author or archive_date or article_tag or category %} +
+

+ {% if archive_date %} + {% trans "Archive" %} + {% if month %}{{ archive_date|date:'F' }}{% endif %} + {{ year }} + {% elif article_tag %} + {% trans "Tag" %} {{ article_tag.name }} + {% elif category %} + {% trans "Category" %} {{ category }} + {% endif %} +

+ {% if category and category.description %}

{{ category.description }}

{% endif %} +
+ {% if author %} +

{% trans "Articles by" %}:

+
+
+
+ {% if author.profile_photo %} + Bild des Autors + {% endif %} +
+
+

{{ author.get_full_name }}

+
{{ author.profile_text | markdown }}
+
+
+
+ {% endif %} {% endif %} - {{ featured.title }} - -

-
- {% render_model featured "teaser" "" "" "safe" %} + {% endblock %} + {% if featured %} +
+
+
+
+ {% if featured.image %} + + {% include "fds_blog/includes/blog_picture.html" with picture=featured.image %} + + {% endif %} +
+

+ + {% if featured.kicker %}{{ featured.kicker }}{% endif %} + {{ featured.title }} + +

+
{% render_model featured "teaser" "" "" "safe" %}
+
+
+
+
+
+ {% endif %} +
+ {% for article in article_list %} +
+ {% include "fds_blog/includes/blog_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} +
+ {% empty %} +
+

{% trans "No article found." %}

+
+ {% endfor %}
-
-
-
-
-
- {% endif %} - -
- {% for article in article_list %} -
- {% include "fds_blog/includes/blog_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} + {% if author or archive_date or tagged_entries %} +

+ {% trans "Back" %} +

+ {% endif %} + {% if is_paginated %} + {% include "pagination/pagination.html" with page_obj=page_obj %} + {% endif %} +
- {% empty %} -
-

{% trans "No article found." %}

-
- {% endfor %} -
- - {% if author or archive_date or tagged_entries %} -

{% trans "Back" %}

- {% endif %} - {% if is_paginated %} - {% include "pagination/pagination.html" with page_obj=page_obj %} - {% endif %} - - -{% endblock %} + {% endblock %} {% endspaceless %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/base.html b/fragdenstaat_de/fds_blog/templates/fds_blog/base.html index b22133a8c..e27966c06 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/base.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/base.html @@ -1,63 +1,71 @@ {% extends CMS_TEMPLATE %} - {% load i18n %} {% load cms_tags %} - {% block navbar %} - {% include "fds_blog/header_blog.html" %} + {% include "fds_blog/header_blog.html" %} {% endblock %} - {% block content %} -
- - - {% block content_blog %}{% endblock %} - -
+ + {% block content_blog %}{% endblock %} + {% endblock %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html b/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html index 4e6645b09..20baf788f 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html @@ -1,7 +1,7 @@
- {% for article in articles %} -
- {% include "fds_blog/includes/blog_item.html" with article=article image="true" %} -
- {% endfor %} -
\ No newline at end of file + {% for article in articles %} +
+ {% include "fds_blog/includes/blog_item.html" with article=article image="true" %} +
+ {% endfor %} + diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/content.html b/fragdenstaat_de/fds_blog/templates/fds_blog/content.html index 77969e5f4..389eefdad 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/content.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/content.html @@ -1,9 +1,7 @@ {% load cms_tags %} {% block before_main %}{% endblock %} {% render_placeholder placeholder language lang %} - {% for plugin in plugins %} - {% render_plugin plugin %} + {% render_plugin plugin %} {% endfor %} - {% block after_main %}{% endblock %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html b/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html index 7ba517b66..de0b91d9a 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html @@ -1,3 +1,2 @@ {% extends "fds_blog/_article_detail.html" %} - {% block article_header_image %}{% endblock %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html b/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html index de8c65858..0dbda3f5a 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html @@ -2,10 +2,9 @@ {% load markup %} {% load static %} {% load blog_tags %} -
- {{instance.title}} + {{ instance.title }} - {{instance.content|safe}} + {{ instance.content|safe }}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html b/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html index bf211eeef..897a3e518 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html @@ -1,57 +1,51 @@ {% extends "fds_blog/content.html" %} - {% load cms_tags %} {% load thumbnail markup i18n %} - {% block before_main %} -
- {% if object.teaser %}{{ object.teaser|safe }}{% endif %} - - {% if object.image %} -
- {# Use full domain URL because of use in feeds #} - {{ object.image.alt }} -
- {% if object.image.description %} -

{{ object.image.description }}

+
+ {% if object.teaser %}{{ object.teaser|safe }}{% endif %} + {% if object.image %} +
+ {# Use full domain URL because of use in feeds #} + {{ object.image.alt }} +
+ {% if object.image.description %}

{{ object.image.description }}

{% endif %} + {% if object.image.author %} + {% trans "image credit: " as article_image_label %} + {% if '](' in object.image.author %} + {# likely contains markdown #} + {{ article_image_label|add:object.image.author|markdown }} + {% else %} +

+ {{ article_image_label }} + {{ object.image.author|safe }} +

+ {% endif %} + {% endif %} +
+
{% endif %} - {% if object.image.author %} - {% trans "image credit: " as article_image_label %} - {% if '](' in object.image.author %} - {# likely contains markdown #} - {{ article_image_label|add:object.image.author|markdown }} - {% else %} -

- {{ article_image_label }} - {{ object.image.author|safe }} -

- {% endif %} - {% endif %} -
-
- {% endif %} - - {% if object.leadin %}{{ object.leadin|markdown }}{% endif %} - -
+ {% if object.leadin %}{{ object.leadin|markdown }}{% endif %} + {% endblock %} - {% block after_main %} - + {% static_placeholder "blog_feed_footer" %} {% endblock %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html b/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html index 89b98057a..aca726c87 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html @@ -1,5 +1,5 @@ {% extends "header.html" %} - {% block nav_search_class %}d-block d-md-none{% endblock %} - -{% block nav_search_url %}{% url 'blog:article-search' %}{% endblock %} +{% block nav_search_url %} + {% url 'blog:article-search' %} +{% endblock %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html index a90595188..2a1536e6c 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html @@ -1,20 +1,17 @@ {% load fds_cms_tags %} - - {% get_responsive_filer_image picture columns as respimg %} - - {% for source in respimg.sources %} - - {% endfor %} - - {{ picture.default_alt_text|default: + {% get_responsive_filer_image picture columns as respimg %} + {% for source in respimg.sources %} + + {% endfor %} + {{ picture.default_alt_text|default: diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html index 89b6a65bf..15e9e762d 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html @@ -1,56 +1,33 @@ {% load thumbnail %} -
-
- {% if article.image %} - - {% with picture=article.image %} - - {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %} - - - {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %} - - - {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %} - - {{ picture.default_alt_text|default:'' }} - - {% endwith %} - - {% endif %} -
-
-

- {% if article.kicker %} - - {{ article.kicker }} - - {% endif %} - - {{ article.title }} - -

-
- {{ article.start_publication|date:"DATE_FORMAT" }} -
-
-
+
+ {% if article.image %} + + {% with picture=article.image %} + + {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %} + + + {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %} + + + {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %} + + + + {% endwith %} + + {% endif %} +
+
+

+ {% if article.kicker %} + {{ article.kicker }} + {% endif %} + {{ article.title }} +

+
{{ article.start_publication|date:"DATE_FORMAT" }}
+
+ diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html index 94060ba75..38e9cbcd2 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html @@ -1,31 +1,26 @@ {% load i18n easy_thumbnails_tags cms_tags %} -
- {% if article.image_id %} - {% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %} - {% endif %} - -

- - - {{ article.kicker }} - - {{ article.title }} - -

- - {% if article.teaser %} -
- {% if not TRUNCWORDS_COUNT %} - {% render_model article "teaser" "" "" "safe" %} - {% else %} - {% render_model article "teaser" "" "" "truncatewords_html:TRUNCWORDS_COUNT|safe" %} - {% endif %} -
- - zum Artikel + {% if article.image_id %} + + {% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %} -
-
- {% endif %} + {% endif %} +

+ + {{ article.kicker }} + {{ article.title }} + +

+ {% if article.teaser %} +
+ {% if not TRUNCWORDS_COUNT %} + {% render_model article "teaser" "" "" "safe" %} + {% else %} + {% render_model article "teaser" "" "" "truncatewords_html:TRUNCWORDS_COUNT|safe" %} + {% endif %} +
+ zum Artikel +
+
+ {% endif %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html index 02152302b..7b47889d3 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html @@ -1,5 +1,4 @@ {% load markup %} -
- {% include "fds_blog/includes/_picture.html" with picture=picture columns=columns %} + {% include "fds_blog/includes/_picture.html" with picture=picture columns=columns %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html index bfaff72ad..1e7ac1d3a 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html @@ -1,22 +1,15 @@ {% load markup %} -
- - {% include "fds_blog/includes/_picture.html" with picture=picture columns="" loading=loading %} - - {% if picture.author or picture.description %} -
- {% if picture.description %} -
- {{ picture.description }} - {% if picture.author %} – {% endif %} -
+ {% include "fds_blog/includes/_picture.html" with picture=picture columns="" loading=loading %} + {% if picture.author or picture.description %} +
+ {% if picture.description %} +
+ {{ picture.description }} + {% if picture.author %}–{% endif %} +
+ {% endif %} + {% if picture.author %}
{{ picture.author|markdown }}
{% endif %} +
{% endif %} - {% if picture.author %} -
- {{ picture.author|markdown }} -
- {% endif %} -
-{% endif %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html index 73eb32a1d..da552827a 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html @@ -1,15 +1,9 @@ {% load thumbnail %} {% load markup %} -
- - {% thumbnail picture 540x0 crop=smart subject_location=picture.subject_location as thumb%} - - {{ picture.default_alt_text|default: - -
+ + {% thumbnail picture 540x0 crop=smart subject_location=picture.subject_location as thumb %} + + + + diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html index aeca9ad1f..97905e407 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html @@ -1,18 +1,13 @@ {% load i18n easy_thumbnails_tags cms_tags %} -
-
- {{ article.start_publication|date:"DATE_FORMAT" }} -
- {% if article.image %} - {% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %} - {% endif %} -

- {{ article.title }} -

- {% if article.query_highlight %} -
- {{ article.query_highlight }} -
- {% endif %} +
{{ article.start_publication|date:"DATE_FORMAT" }}
+ {% if article.image %} + + {% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %} + + {% endif %} +

+ {{ article.title }} +

+ {% if article.query_highlight %}
{{ article.query_highlight }}
{% endif %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html index 09e6bb5ea..c1b7780bc 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html @@ -1,15 +1,9 @@
-

- {% if article.kicker %} - - {{ article.kicker }} - - {% endif %} - - {{ article.title }} - -

-
- {{ article.start_publication|date:"DATE_FORMAT" }} -
+

+ {% if article.kicker %} + {{ article.kicker }} + {% endif %} + {{ article.title }} +

+
{{ article.start_publication|date:"DATE_FORMAT" }}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html index ced54c168..449b9a933 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html @@ -1,48 +1,36 @@ {% load cms_tags %} {% load thumbnail %} - {# Schema.org markup for Google+ #} -{% if article.abstract %} - -{% endif %} - - +{% if article.abstract %}{% endif %} {# Twitter Card data #} - -{% if article.teaser %} - -{% endif %} +{% if article.teaser %}{% endif %} - {% if article.image %} - - + + {% else %} - + {% endif %} - - - {# Open Graph data #} - - + {% if article.image %} - -{% endif %} - -{% if article.teaser %} - + {% endif %} +{% if article.teaser %}{% endif %} - {% if article.start_publication %} - + {% endif %} {% if article.last_update %} - + {% endif %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html b/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html index e05850950..139b5d7c0 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html @@ -2,7 +2,4 @@ {% load markup %} {% load static %} {% load blog_tags %} - -
- {{instance.content|safe}} -
+
{{ instance.content|safe }}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html index 7ea07150f..be7861db7 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html @@ -1,7 +1,6 @@ {% load cms_tags %} -
- {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html index 11c3babef..2785b2d96 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html @@ -1,9 +1,8 @@ -{% load i18n %}{% spaceless %} -{% for article in article_list %} -
-
- {% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %} -
-
-{% endfor %} +{% load i18n %} +{% spaceless %} + {% for article in article_list %} +
+
{% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %}
+
+ {% endfor %} {% endspaceless %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html index 592c17c36..8b7817586 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html @@ -1,7 +1,8 @@ -{% load i18n %}{% spaceless %} -
- {% for article in article_list %} - {% include "fds_blog/includes/blog_short_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} - {% endfor %} -
+{% load i18n %} +{% spaceless %} +
+ {% for article in article_list %} + {% include "fds_blog/includes/blog_short_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} + {% endfor %} +
{% endspaceless %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html index 62fa421d3..cb838332a 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html @@ -1,7 +1,8 @@ -{% load i18n %}{% spaceless %} - {% for article in article_list %} -
- {% include "fds_blog/includes/blog_simple_item.html" with article=article image="true" %} -
- {% endfor %} +{% load i18n %} +{% spaceless %} + {% for article in article_list %} +
+ {% include "fds_blog/includes/blog_simple_item.html" with article=article image="true" %} +
+ {% endfor %} {% endspaceless %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html index 2c4341b1b..c2103605c 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html @@ -1,5 +1,6 @@ -{% load i18n %}{% spaceless %} - {% for article in article_list %} - {% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %} - {% endfor %} +{% load i18n %} +{% spaceless %} + {% for article in article_list %} + {% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %} + {% endfor %} {% endspaceless %} diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/search.html b/fragdenstaat_de/fds_blog/templates/fds_blog/search.html index 964ff61ab..3fd009262 100644 --- a/fragdenstaat_de/fds_blog/templates/fds_blog/search.html +++ b/fragdenstaat_de/fds_blog/templates/fds_blog/search.html @@ -1,77 +1,63 @@ {% extends "fds_blog/base.html" %} - {% load i18n %} - -{% block title %}{% translate "Search articles" %}{% endblock %} - +{% block title %} + {% translate "Search articles" %} +{% endblock %} {% block content_blog %} - -
-
-
-

- {% translate "Search articles" %} -

- - - {% if object_list and form.q.value %} -

- {% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %} -

- {% for object in object_list %} -
- {% if object.image %} -
- - {% include "fds_blog/includes/blog_picture_small.html" with picture=object.image columns="col-sm-4" %} - -
- {% endif %} -
-
- - - {% if object.kicker %} – {% endif %} - {{ object.kicker }} - - - {{ object.title }} - - -
- {% if object.query_highlight %} -

- {{ object.query_highlight }} -

- {% endif %} +
+
+
+

{% translate "Search articles" %}

+ + {% if object_list and form.q.value %} +

{% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %}

+ {% for object in object_list %} +
+ {% if object.image %} +
+ + {% include "fds_blog/includes/blog_picture_small.html" with picture=object.image columns="col-sm-4" %} + +
+ {% endif %} +
+
+ + + {% if object.kicker %}–{% endif %} + {{ object.kicker }} + + {{ object.title }} +
+ {% if object.query_highlight %}

{{ object.query_highlight }}

{% endif %} +
+
+ {% endfor %} + {% elif form.q.value %} +

{% translate "No results found." %}

+ {% else %} +

{% translate "Please enter a search term." %}

+ {% endif %}
-
- {% endfor %} - {% elif form.q.value %} -

- {% translate "No results found." %} -

- {% else %} -

- {% translate "Please enter a search term." %} -

- {% endif %} +
-
-
{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/base.html b/fragdenstaat_de/fds_cms/templates/cms/base.html index 58f00a521..9afc6c541 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/base.html +++ b/fragdenstaat_de/fds_cms/templates/cms/base.html @@ -1,66 +1,52 @@ {% extends "cms/scaffold.html" %} - {% load cms_tags %} {% load static %} {% load sekizai_tags %} {% load frontendbuild %} - -{% block body_extra_attributes %} data-staticurl="{{ STATIC_URL }}"{% if request.user.is_staff %} data-sentry="{{ SENTRY_JS_URL}}"{% endif %}{% endblock %} - +{% block body_extra_attributes %} + data-staticurl="{{ STATIC_URL }}" + {% if request.user.is_staff %}data-sentry="{{ SENTRY_JS_URL }}"{% endif %} +{% endblock %} {% block body_tag %} - {% if request.user.is_authenticated and request.session.impostor %} - {% include "account/includes/impostor.html" %} - {% endif %} - - {% block top_block %} - - {% endblock %} - - {% block navbar %} - {% include "header.html" %} - {% endblock %} - - {% block body_wrapper %} -
- - {% block messages %} - {% include "snippets/messages.html" %} - {% endblock messages %} - - {% block body %} -
- {% block app_body %} - {% placeholder "content" %} - {% endblock %} -
+ {% if request.user.is_authenticated and request.session.impostor %} + {% include "account/includes/impostor.html" %} + {% endif %} + {% block top_block %} + + {% endblock %} + {% block navbar %} + {% include "header.html" %} + {% endblock %} + {% block body_wrapper %} +
+ {% block messages %} + {% include "snippets/messages.html" %} + {% endblock messages %} + {% block body %} +
+ {% block app_body %} + {% placeholder "content" %} + {% endblock %} +
+ {% endblock %} +
+ {% endblock %} + {% block footer_container %} +
+
{% static_placeholder "footer" %}
+
{% endblock %} -
- {% endblock %} - - {% block footer_container %} -
-
- {% static_placeholder "footer" %} -
-
- {% endblock %} - {% endblock body_tag %} - {% block scripts %} - {% renderfrontendhmr %} - {% include "_frontend.html" with entry_point="main.js" %} - - {% if cms_toolbar.edit_mode_active %} - {% include "_frontend.html" with entry_point="fds_cms.js" %} - {% endif %} - - {{ block.super }} + {% renderfrontendhmr %} + {% include "_frontend.html" with entry_point="main.js" %} + {% if cms_toolbar.edit_mode_active %} + {% include "_frontend.html" with entry_point="fds_cms.js" %} + {% endif %} + {{ block.super }} {% endblock %} - {% block below_scripts %} - {% block tracking_code %}{% include "snippets/tracking.html" %}{% endblock %} + {% block tracking_code %} + {% include "snippets/tracking.html" %} + {% endblock %} {% endblock %} - diff --git a/fragdenstaat_de/fds_cms/templates/cms/blog_base.html b/fragdenstaat_de/fds_cms/templates/cms/blog_base.html index f36073f93..78982acaa 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/blog_base.html +++ b/fragdenstaat_de/fds_cms/templates/cms/blog_base.html @@ -1,12 +1,13 @@ {% extends "cms/page_reduced.html" %} - {% block extra_head %} - {{ block.super }} - + {{ block.super }} + {% endblock %} - {% block body %} - {% block app_body %} - {% block content %}{% endblock %} - {% endblock %} + {% block app_body %} + {% block content %}{% endblock %} + {% endblock %} {% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html b/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html index 5544f2e5d..7fe861c25 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html +++ b/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html @@ -1,9 +1,9 @@ {% for ance in ancestors %} -
  • - {% if not forloop.last %} - {{ ance.get_menu_title }} - {% else %} - {{ ance.get_menu_title }} - {% endif %} -
    • -{% endfor %} \ No newline at end of file +
  • + {% if not forloop.last %} + {{ ance.get_menu_title }} + {% else %} + {{ ance.get_menu_title }} + {% endif %} +
    • +{% endfor %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/help_base.html b/fragdenstaat_de/fds_cms/templates/cms/help_base.html index ea5eaf048..d6c03a010 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/help_base.html +++ b/fragdenstaat_de/fds_cms/templates/cms/help_base.html @@ -1,72 +1,73 @@ {% extends "cms/page.html" %} - {% load i18n %} {% load cms_tags %} {% load menu_tags %} - {% block body %} - {% page_url 'help' as help_url %} -
    - - -
    -
    -
    - {% block app_body %} - {% placeholder "content" %} - {% endblock %} -
    - -
    +
    +
    +
    + {% block app_body %} + {% placeholder "content" %} + {% endblock %} +
    + +
    +
    + {% static_placeholder "help_footer" %}
    - - {% static_placeholder "help_footer" %} - -
    {% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/page.html b/fragdenstaat_de/fds_cms/templates/cms/page.html index a49705e01..ccdb7f90e 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/page.html +++ b/fragdenstaat_de/fds_cms/templates/cms/page.html @@ -1,9 +1,7 @@ {% extends "cms/base.html" %} - {% load cms_tags %} - {% block body %} - {% block app_body %} - {% placeholder "content" %} - {% endblock %} + {% block app_body %} + {% placeholder "content" %} + {% endblock %} {% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html b/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html index e6bc328ab..786285790 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html +++ b/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html @@ -1,18 +1,15 @@ {% extends "cms/page.html" %} - {% load cms_tags %} {% load menu_tags %} - {% block body %} - - - {% block app_body %} - {% placeholder "content" %} - {% endblock %} + + {% block app_body %} + {% placeholder "content" %} + {% endblock %} {% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html b/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html index ee61ee96e..7ef73ec2f 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html +++ b/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html @@ -1,5 +1,3 @@ {% extends "cms/page.html" %} - {% load cms_tags %} - {% block navbar %}{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html b/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html index 8d32b8d6b..f81c81b41 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html +++ b/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html @@ -1,7 +1,5 @@ {% extends "cms/page.html" %} - {% load cms_tags %} - {% block navbar %} - {% include "header_reduced.html" %} -{% endblock %} \ No newline at end of file + {% include "header_reduced.html" %} +{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html index 5fa03bf88..e1168a11a 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html @@ -1,7 +1,6 @@ {% load cms_tags %} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html index e83664112..1cc3865d5 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}10{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html index 88ab76b9d..e4a8655d5 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}12{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html index 0b96dffe9..9347d9969 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}2{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html index 52ac27313..90cdbd433 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}3{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html index 586f72dc3..be80292be 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}4{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html index fb6a2e516..5eacee524 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}5{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html index 7b2c6d79d..f7eca27e5 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}6{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html index 1f6768f21..e087d4557 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}7{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html index a91dd81a4..49363c802 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}8{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html index f64769180..f63c3d014 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colcount %}9{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html index 0a5cb1333..068509c72 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/col.html" %} - {% block colclass %}col-xs-12 col-md-6 col-lg-4{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html index b18652b14..88ba6ccef 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html @@ -1,7 +1,6 @@ {% load cms_tags %} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html index e77051d66..3d1884863 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html @@ -1,13 +1,12 @@ {% load cms_tags %} -
    {% if object.has_backdrop %} -
    +
    +
    {% endif %} - {% if object.container %}
    {% endif %} - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} - {% if object.container %}
    {% endif %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} + {% if object.container %}
    {% endif %}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html index 4968d2b60..41437b84b 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html @@ -1,7 +1,6 @@ {% load cms_tags %} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html index 4c8acd777..265002d73 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html @@ -1,9 +1,8 @@ {% load cms_tags %} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    -
    \ No newline at end of file +
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html index 3b4510468..a8cf44373 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html @@ -1,5 +1,3 @@

    - - {{ title }} - + {{ title }}

    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html index ea331ce33..0289bab26 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html @@ -1,12 +1,11 @@ {% load cms_tags %} - {% load i18n %} - -
    - - - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} +
    + + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html index 2e7db7504..6935110e3 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html @@ -1,5 +1,4 @@ {% load menu_tags %} - diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html index accc3d5cb..189214eb8 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html @@ -1,39 +1,23 @@ {% load thumbnail %} - {% if object.image %} - {% if object.link %}{% endif %} - {% with picture=object.image %} - {# TODO: duplicate of blog_feature_item #} - - {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %} - - - {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %} - - - {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %} - - {{ picture.default_alt_text|default: - - {% endwith %} - {% if object.link %}{% endif %} -{% endif %} + {% if object.link %}{% endif %} + {% with picture=object.image %} + {# TODO: duplicate of blog_feature_item #} + + {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %} + + + {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %} + + + {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %} + + + + {% endwith %} + {% if object.link %}{% endif %} + {% endif %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html index e62cbc71d..77ff50efc 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html @@ -2,32 +2,35 @@ {% load thumbnail %} {% load static %} {% load markup %} -
    - {% if "campaign-card__done" in object.extra_classes %} - Kampagne abgeschlossen - {% endif %} -
    - {% if object.image %} - - {% thumbnail object.image 250x0 crop subject_location=object.image.subject_location as thumb %} - - {{ object.image.default_alt_text|default: - + {% if "campaign-card__done" in object.extra_classes %} + Kampagne abgeschlossen {% endif %} -
    -

    {{ object.title }}

    -
    - {{ object.description | markdown }} -
    - {% if object.link %} -
    - - {% if object.link_label %}{{ object.link_label }}{% else %}{% trans "Read more" %}{% endif %} - -
    - {% endif %} -
    +
    + {% if object.image %} + + {% thumbnail object.image 250x0 crop subject_location=object.image.subject_location as thumb %} + + {{ object.image.default_alt_text|default: + + {% endif %} +
    +

    {{ object.title }}

    +
    {{ object.description | markdown }}
    + {% if object.link %} +
    + + {% if object.link_label %} + {{ object.link_label }} + {% else %} + {% trans "Read more" %} + {% endif %} + +
    + {% endif %} +
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html index c4ab31d9a..45e3fa7f3 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html @@ -1,17 +1,8 @@ {% load markup %} - - -
    - - {% include "cms/plugins/primarylink/_picture.html" with extra_classes="mb-4" %} - - {% if object.link %}{% endif %} -

    - {{ object.title }} -

    - {% if object.link %}    {% endif %} - -
    - {{ object.description | markdown }} -
    +
    + {% include "cms/plugins/primarylink/_picture.html" with extra_classes="mb-4" %} + {% if object.link %}{% endif %} +

    {{ object.title }}

    + {% if object.link %}    {% endif %} +
    {{ object.description | markdown }}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html index fd1b61dc9..47a7438b6 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html @@ -1,18 +1,10 @@ {% load markup %} -
    - - {% include "cms/plugins/primarylink/_picture.html" with extra_classes="z-index-10" %} - -
    - {% if object.link %}{% endif %} -

    - {{ object.title }} -

    - {% if object.link %}    {% endif %} - -
    - {{ object.description | markdown }} + {% include "cms/plugins/primarylink/_picture.html" with extra_classes="z-index-10" %} +
    + {% if object.link %}{% endif %} +

    {{ object.title }}

    + {% if object.link %}    {% endif %} +
    {{ object.description | markdown }}
    -
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html index 7abd7b25e..ebabd1d75 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html @@ -1,7 +1,6 @@ {% load cms_tags %} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html index bd7fbf566..d13b147a1 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/row.html" %} - {% block row_class %}justify-content-around{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html index f793fba19..edd7ca2e5 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/row.html" %} - {% block row_class %}justify-content-between{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html index 3f602b655..2c7a02932 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/row.html" %} - {% block row_class %}justify-content-start{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html index ff96efe95..21e49166f 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/row.html" %} - {% block extra_row_class %}{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html index 318bcd13f..2f5d3ffb1 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html @@ -1,3 +1,2 @@ {% extends "cms/plugins/row.html" %} - {% block row_class %}justify-content-end{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html index 241720018..548504719 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html @@ -1,10 +1,8 @@ {% load menu_tags %} - -
      {% show_menu request.current_page.node.depth|add:"-1" 100 0 1 "cms/plugins/submenu_child.html" %}
    -
    \ No newline at end of file +
    diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html index 0f6857dea..f01def869 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html +++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html @@ -1,8 +1,6 @@ {% for child in children %} -
  • - - {{ child.get_menu_title }} - -
    • +
  • + {{ child.get_menu_title }} +
    • {% endfor %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/pub_base.html b/fragdenstaat_de/fds_cms/templates/cms/pub_base.html index 998cafff2..5e0534df5 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/pub_base.html +++ b/fragdenstaat_de/fds_cms/templates/cms/pub_base.html @@ -1,69 +1,77 @@ {% extends "cms/page.html" %} - {% load i18n %} {% load cms_tags %} {% load menu_tags %} {% load fds_cms_tags %} - {% block body %} - -{% page_url request.current_page|get_soft_root as base_url %} -{% page_attribute "page_title" request.current_page|get_soft_root as base_title %} - -
    -
    - -
    -
      - {% show_menu 1 100 0 1 %} -
    -
    -
    -
    -
    -
    - {% if not request.current_page.soft_root and request.current_page.in_navigation %} -
    -
    -
    - {% endif %} -
    -
    - {% block app_body %} - {% placeholder "content" %} - {% endblock %} -
    +
    + {% if not request.current_page.soft_root and request.current_page.in_navigation %} +
    +
    +
    + {% endif %} +
    +
    + {% block app_body %} + {% placeholder "content" %} + {% endblock %} +
    +
    +
    -
    -
    - - {% static_placeholder "book_pub_footer" %} - - {% include "_frontend.html" with entry_point="bookpub.js" %} + {% static_placeholder "book_pub_footer" %} + {% include "_frontend.html" with entry_point="bookpub.js" %} {% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/cms/scaffold.html b/fragdenstaat_de/fds_cms/templates/cms/scaffold.html index 891bb0da7..d43433d96 100644 --- a/fragdenstaat_de/fds_cms/templates/cms/scaffold.html +++ b/fragdenstaat_de/fds_cms/templates/cms/scaffold.html @@ -1,38 +1,40 @@ -{% load i18n %}{% load static %}{% load cms_tags %}{% load sekizai_tags %} - - - - - - - {% block title %}{% page_attribute "page_title" %} - {{ SITE_NAME }}{% endblock %} - - {% block header_font %}{% endblock %} - - {% block css %} - {% block extra_css %} - {% endblock %} - {% endblock %} - {% render_block "css" %} - - {% block meta %} - {# Translators: meta description #} - {% include "snippets/meta.html" %} - {% include "fds_cms/social_meta.html" with object=request.current_page %} - {% endblock %} - - {% block extra_head %} - {% endblock %} - - - {% cms_toolbar %} - {% block body_tag %}{% endblock %} - - {% block extra_footer %}{% endblock %} - - {% block scripts %}{% endblock %} - {% render_block "js" %} - - {% block below_scripts %}{% endblock %} - +{% load i18n %} +{% load static %} +{% load cms_tags %} +{% load sekizai_tags %} + + + + + + + + + {% block title %} + {% page_attribute "page_title" %} - {{ SITE_NAME }} + {% endblock %} + + {% block header_font %}{% endblock %} + {% block css %} + {% block extra_css %}{% endblock %} + {% endblock %} + {% render_block "css" %} + {% block meta %} + {# Translators: meta description #} + {% include "snippets/meta.html" %} + {% include "fds_cms/social_meta.html" with object=request.current_page %} + {% endblock %} + {% block extra_head %}{% endblock %} + + + {% cms_toolbar %} + {% block body_tag %}{% endblock %} + {% block extra_footer %}{% endblock %} + {% block scripts %}{% endblock %} + {% render_block "js" %} + {% block below_scripts %}{% endblock %} + diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html index 2b16285dd..8d657b8a4 100644 --- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html +++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html @@ -1,6 +1,4 @@ {% load static %} {% load sekizai_tags %} - {% include "filingcabinet/_documentcollection_viewer.html" with object=object config=config documentcollection_data=documentcollection_data %} - {% include "_frontend.html" with entry_point="filingcabinet.js" %} diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html index 81cab17cb..696de7464 100644 --- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html +++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html @@ -1,3 +1,2 @@ {% include "filingcabinet/_document_viewer.html" with object=object page_number=page_number defaults=defaults config=config beta=beta %} - {% include "_frontend.html" with entry_point="filingcabinet.js" %} diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html index 12eb470db..2c73876c8 100644 --- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html +++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html @@ -1,18 +1,18 @@
    - {% if object.title %} -

    {{ object.title }}

    - {% endif %} -
    - {% for page in pages %} -
    - {% if page.image_url %} - - Seite {{ page.number }} - - {% else %} - - {% endif %} -
    - {% endfor %} -
    + {% if object.title %}

    {{ object.title }}

    {% endif %} +
    + {% for page in pages %} +
    + {% if page.image_url %} + + Seite {{ page.number }} + + {% else %} + + {% endif %} +
    + {% endfor %} +
    diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html index 67e6ced92..16d4aca5a 100644 --- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html +++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html @@ -1,34 +1,29 @@ {% load thumbnail %} -
    - {% if object.title %} -

    - {{ object.title }} -

    - {% endif %} - {% if object.description or object.highlight %} -
    - {% endif %} - - {% if object.image %} - - - - {{ object.title }} - - {% else %} - - {% endif %} - - {% if object.description or object.highlight %} -
    - {{ object.description }} - {% if object.highlight %}{% if object.description %}
    {% endif %}Hervorhebung von uns{% endif %} -
    -
    + {% if object.title %}

    {{ object.title }}

    {% endif %} + {% if object.description or object.highlight %}
    {% endif %} + {% if object.image %} + + + + {{ object.title }} + + {% else %} + + {% endif %} + {% if object.description or object.highlight %} +
    + {{ object.description }} + {% if object.highlight %} + {% if object.description %}
    {% endif %} + Hervorhebung von uns + {% endif %} +
    +
    {% endif %}
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html b/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html index 1aff4fd4b..b622a1444 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html @@ -1,13 +1,10 @@ {% extends "cms/base.html" %} - {% load cms_tags %} - - {% block body %} - {% block app_body %} -
    -

    Static Placeholder „{{ placeholder.code }}“

    - {% static_placeholder placeholder.code %} -
    - {% endblock %} -{% endblock %} \ No newline at end of file + {% block app_body %} +
    +

    Static Placeholder „{{ placeholder.code }}“

    + {% static_placeholder placeholder.code %} +
    + {% endblock %} +{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html b/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html index a2d8942cb..c859b5e69 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html @@ -1,15 +1,11 @@ {% load cms_tags %} -
    - <{{ instance.heading }} class="bordered-section-headline text-{{ color }}"> -
    - {{ instance.title }} + <{{ instance.heading }} class="bordered-section-headline text-{{ color }}"> +
    {{ instance.title }}
    + +
    + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %}
    - - -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} -
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html index b59fbac77..05122f8e0 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html @@ -1,19 +1,20 @@ {% load cms_tags %} - -{% if instance.link %}{% endif %} -
    -
    - {% for plugin in children %} - {% render_plugin plugin %} - {% endfor %} -
    - - {% if links|length > 0 %} -
    - {% for plugin in links %} - {% render_plugin plugin %} - {% endfor %} -
    +{% if instance.link %} +     {% endif %} -
    -{% if instance.link %}{% endif %} +
    +
    + {% for plugin in children %} + {% render_plugin plugin %} + {% endfor %} +
    + {% if links|length > 0 %} +
    + {% for plugin in links %} + {% render_plugin plugin %} + {% endfor %} +
    + {% endif %} +
    + {% if instance.link %}{% endif %} diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html index f4794a623..33031f3af 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html @@ -1,22 +1,19 @@ {% load cms_tags %} {% load thumbnail %} - {% if instance.background_image %} - + {% endif %} -
    -

    {{ instance.title }}

    - - {% if instance.icon %} -
    -
    - -
    -
    - {% endif %} +

    {{ instance.title }}

    + {% if instance.icon %} +
    +
    + +
    +
    + {% endif %}
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html index dfdcd1f0f..d8f7b272b 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html @@ -1,3 +1,3 @@
    - -
    \ No newline at end of file + +
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html index 1fcfd7d28..2ff851d80 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html @@ -1,25 +1,20 @@ {% load thumbnail %} {% load markup %} - -{% if instance.link %} - {% with picture=instance.image %} - - {% thumbnail picture size crop=smart subject_location=picture.subject_location as thumb %} - - {% if picture.mime_type != "image/svg+xml" %} - - +{% if instance.link %} + + {% with picture=instance.image %} + + {% thumbnail picture size crop=smart subject_location=picture.subject_location as thumb %} + {% if picture.mime_type != "image/svg+xml" %} + + + {% endif %} + + + {% endwith %} + {% if instance.link %} + {% else %} + {% endif %} - - {{ picture.default_alt_text|default: - - {% endwith %} -{% if instance.link %}{% else %}{% endif %} diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html index b3d34b23a..de0e1cb18 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html @@ -1,7 +1,6 @@ {% load cms_tags %} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} -
    \ No newline at end of file + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} + diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html index 32324c1a3..d31775f64 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html @@ -1,5 +1,8 @@ - {% if instance.icon %} - {% elif instance.arrow %}→ {% endif %} - {{ instance.title }} - \ No newline at end of file + {% if instance.icon %} + + {% elif instance.arrow %} + → + {% endif %} + {{ instance.title }} + diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html b/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html index cf40c88b3..ebc33569c 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html @@ -1,10 +1,10 @@ {% load cms_tags %} - -
    - {{ object.title }} -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} -
    +
    + {{ object.title }} +
    + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} +
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html b/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html index 7d44fdaeb..7a0309bed 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html @@ -1,12 +1,9 @@ {% load form_helper %} {% load i18n %} -
    - {% csrf_token %} - {% render_form form %} -

    - -

    -
    \ No newline at end of file + {% csrf_token %} + {% render_form form %} +

    + +

    + diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html b/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html index a0f81e025..78af7a326 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html @@ -1,11 +1,12 @@ {% load cms_tags %} - <{{ instance.tag_type }} id="{{ instance.identifier }}" tabindex="-1" role="dialog" aria-hidden="true" {{ instance.attributes_str }}> -
    +
    - {% for plugin in instance.child_plugin_instances %} - {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %} - {% endfor %} + {% for plugin in instance.child_plugin_instances %} + {% with forloop as parentloop %} + {% render_plugin plugin %} + {% endwith %} + {% endfor %}
    -
    +
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html b/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html index 64fbbb8ac..0cffdf295 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html @@ -1,13 +1,17 @@ {% load cms_tags %} - -
    -
    - {% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} - {% endfor %} -
    - -
    - -
    -
    \ No newline at end of file +
    +
    + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} +
    +
    + +
    +
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/search.html b/fragdenstaat_de/fds_cms/templates/fds_cms/search.html index abbb227db..a2b760c92 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/search.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/search.html @@ -1,64 +1,41 @@ {% extends CMS_TEMPLATE %} - {% load i18n %} {% load cms_tags %} {% load fds_cms_tags %} - {% block extra_breadcrumbs %} -
  • - {% comment %}Translators: Search as noun{% endcomment %} - {% translate "Search" %} -
    • +
  • + {% comment %}Translators: Search as noun{% endcomment %} + {% translate "Search" %} +
    • {% endblock %} - {% block app_body %} - -{% page_attribute "page_title" request.current_page|get_soft_root as base_title %} - -

    - {% blocktranslate with title=base_title %}Search in {{ title }}{% endblocktranslate %} -

    - - - -{% if object_list and form.cleaned_data.q %} -

    - {% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %} -

    -
      - {% for object in object_list %} -
    1. -
      - - {{ object.title }} - -
      - {% if object.meta_description %} - {{ object.meta_description }} - {% endif %} - {% if object.query_highlight %} -

      - {{ object.query_highlight }} -

      - {% endif %} -
      2. - {% endfor %} -
    -{% elif form.q.value %} -

    - {% translate "No results found." %} -

    -{% else %} -

    - {% translate "Please enter a search term." %} -

    -{% endif %} + {% page_attribute "page_title" request.current_page|get_soft_root as base_title %} +

    {% blocktranslate with title=base_title %}Search in {{ title }}{% endblocktranslate %}

    + + {% if object_list and form.cleaned_data.q %} +

    {% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %}

    +
      + {% for object in object_list %} +
    1. +
      + {{ object.title }} +
      + {% if object.meta_description %}{{ object.meta_description }}{% endif %} + {% if object.query_highlight %}

      {{ object.query_highlight }}

      {% endif %} +
      2. + {% endfor %} +
    + {% elif form.q.value %} +

    {% translate "No results found." %}

    + {% else %} +

    {% translate "Please enter a search term." %}

    + {% endif %} {% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html b/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html index 422db6418..4594c1787 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html @@ -1,11 +1,16 @@ -
    - - - +
    + + +
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html b/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html index ffe37962c..791d6f039 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html @@ -1,44 +1,49 @@ {% load cms_tags %} {% load i18n %} -
    -
    - -
    -
      - {% for plugin in instance.child_plugin_instances %} -
    • - {% if instance.wrapper_classes %} -
      - {% render_plugin plugin %} -
      - {% else %} - {% render_plugin plugin %} - {% endif %} -
      • - {% endfor %} -
    +
    +
    +
      + {% for plugin in instance.child_plugin_instances %} +
    • + {% if instance.wrapper_classes %} +
      {% render_plugin plugin %}
      + {% else %} + {% render_plugin plugin %} + {% endif %} +
      • + {% endfor %} +
    +
    +
    + + +
    +
    - -
    - - -
    - - -
    diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html index c4d2081c6..a03683eac 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html @@ -1,61 +1,48 @@ {% load cms_tags %} {% load i18n %} {% load thumbnail %} - {% if object.fdspageextension and not object.fdspageextension.search_index %} - + {% endif %} - {# Schema.org markup #} {% if not description %} - {% page_attribute 'meta_description' as description %} + {% page_attribute 'meta_description' as description %} {% endif %} {% if not title %} - {% page_attribute 'page_title' as title %} + {% page_attribute 'page_title' as title %} {% endif %} - -{% if description and description != "None" %} - -{% endif %} - - +{% if description and description != "None" %}{% endif %} + {# Twitter Card data #} - -{% if description and description != "None" %} - -{% endif %} +{% if description and description != "None" %}{% endif %} - {% if image_url %} - - + + {% elif object.fdspageextension.image %} - - + + {% else %} - - + + {% endif %} - - - {# Open Graph data #} - - + {% if image_url %} - + {% elif object.fdspageextension.image %} - + {% else %} - -{% endif %} -{% if description and description != "None" %} - + {% endif %} - +{% if description and description != "None" %}{% endif %} diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html b/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html index 4cf475622..5ef622cf1 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html @@ -1 +1 @@ -{{ svg | safe }} \ No newline at end of file +{{ svg | safe }} diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html b/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html index c1be64e62..0136ac5b3 100644 --- a/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html +++ b/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html @@ -1,10 +1,8 @@ {% load static %} {% load sekizai_tags %} -
    - {% if instance.title %}
    {{ instance.title }}
    {% endif %} - {% if instance.description %}

    {{ instance.description|linebreaksbr }}

    {% endif %} -
    + {% if instance.title %}
    {{ instance.title }}
    {% endif %} + {% if instance.description %}

    {{ instance.description|linebreaksbr }}

    {% endif %} +
    - {% include "_frontend.html" with entry_point="vegacharts.js" %} diff --git a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html index 3a2362a55..4b2b33d67 100644 --- a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html +++ b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html @@ -1,9 +1,9 @@
      - {% for object in object_list %} -
    • - {% block pre_item %}{% endblock %} - {% include "foirequest/snippets/request_item.html" %} - {% block post_item %}{% endblock %} -
      • - {% endfor %} + {% for object in object_list %} +
    • + {% block pre_item %}{% endblock %} + {% include "foirequest/snippets/request_item.html" %} + {% block post_item %}{% endblock %} +
      • + {% endfor %}
    diff --git a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html index 839b7deca..87ab9c782 100644 --- a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html +++ b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html @@ -1,22 +1,15 @@ {% extends "foirequest/cms_plugins/list.html" %} - {% load follow_tags %} - {% block pre_item %} -
    -
    -{% endblock %} - -{% block post_item %} -
    - - {% if object.user != request.user %} -
    -
    - {% follow_form "request" object %} -
    +
    +
    + {% endblock %} + {% block post_item %} +
    + {% if object.user != request.user %} +
    +
    {% follow_form "request" object %}
    +
    + {% endif %}
    - {% endif %} - -
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html index c28112120..3958f82c1 100644 --- a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html +++ b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html @@ -1 +1 @@ -{% include "foirequest/snippets/make_same_request.html" with hide_intro=True %} \ No newline at end of file +{% include "foirequest/snippets/make_same_request.html" with hide_intro=True %} diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html index 793641c2d..849e9f2f2 100644 --- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html +++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html @@ -1,49 +1,52 @@ {% extends "admin/change_list.html" %} - {% load i18n %} - {% block object-tools-items %} -
  • - - {% trans "Export CSV" %} - -
    • - {{ block.super }} +
  • + + {% trans "Export CSV" %} + +
    • + {{ block.super }} {% endblock %} - - {% block result_list %} -

    - Summe: {{ cl.amount_sum }} EUR -
    Durchschnitt: {{ cl.amount_avg }} EUR -
    Median: {{ cl.amount_median }} EUR -
    Erhalten: {{ cl.amount_received_sum }} EUR -
    Anzahl Spender: {{ cl.donor_count }} -
    Wiederkehrend Monatssumme der Spendenden: {{ cl.recurring_donor_amount }} EUR -

    - -{{ block.super }} +

    + Summe: {{ cl.amount_sum }} EUR +
    + Durchschnitt: {{ cl.amount_avg }} EUR +
    + Median: {{ cl.amount_median }} EUR +
    + Erhalten: {{ cl.amount_received_sum }} EUR +
    + Anzahl Spender: {{ cl.donor_count }} +
    + Wiederkehrend Monatssumme der Spendenden: {{ cl.recurring_donor_amount }} EUR +

    + {{ block.super }} {% endblock %} - {% block content %} - {{ block.super }} -
    -

    Überweisungen (XLS/XLSX)

    -
    {% csrf_token %} - - - -
    -
    -
    -

    Paypal (CSV)

    -
    {% csrf_token %} - - -
    -
    + {{ block.super }} +
    +

    Überweisungen (XLS/XLSX)

    +
    + {% csrf_token %} + + + +
    +
    +
    +

    Paypal (CSV)

    +
    + {% csrf_token %} + + +
    +
    {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html index f6675b6cb..20da22553 100644 --- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html +++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html @@ -1,12 +1,10 @@ {% extends "admin/change_form.html" %} {% load i18n %} {% block object-tools-items %} -{% if original.pk %} -
  • - - {% trans "Donations" %} - -
    • -{% endif %} -{{ block.super }} + {% if original.pk %} +
  • + {% trans "Donations" %} +
    • + {% endif %} + {{ block.super }} {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html index f950239ed..35a83d2ba 100644 --- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html +++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html @@ -1,15 +1,18 @@ {% extends "admin/change_list.html" %} - {% load i18n %} - {% block result_list %} -

    - Summe: {{ cl.amount_total_sum }} EUR -
    Durchschnitt: {{ cl.amount_total_avg }} EUR -
    Median: {{ cl.amount_total_median }} EUR -
    Summe letztes Jahr: {{ cl.amount_last_year_sum }} EUR -
    Durchschnitt letztes Jahr: {{ cl.amount_last_year_avg }} EUR -
    Wiederkehrend Monatssumme: {{ cl.total_amount_recurring }} EUR -

    -{{ block.super }} +

    + Summe: {{ cl.amount_total_sum }} EUR +
    + Durchschnitt: {{ cl.amount_total_avg }} EUR +
    + Median: {{ cl.amount_total_median }} EUR +
    + Summe letztes Jahr: {{ cl.amount_last_year_sum }} EUR +
    + Durchschnitt letztes Jahr: {{ cl.amount_last_year_avg }} EUR +
    + Wiederkehrend Monatssumme: {{ cl.total_amount_recurring }} EUR +

    + {{ block.super }} {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html index 585054b39..ccb9daefb 100644 --- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html +++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html @@ -1,34 +1,26 @@ {% extends "helper/admin_base_action.html" %} - {% load i18n l10n %} - {% block action_title %}{{ headline }}{% endblock %} - {% block breadcrumbs_action_label %}{{ headline }}{% endblock %} - {% block action_content %} -
    - {% csrf_token %} -
    -

    - {{ headline }} -

    - - {{ form.as_div }} - - - {% if select_across %} - - {# set invalid selected, so confirmation action path is chosen in admin #} - - {% else %} - {% for obj in queryset %} - - {% endfor %} - {% endif %} - - - -
    -
    +
    + {% csrf_token %} +
    +

    {{ headline }}

    + {{ form.as_div }} + {% 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/fds_donation/templates/admin/fds_donation/donor/merge_donors.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html index 5218801cf..0d1421e0b 100644 --- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html +++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html @@ -1,70 +1,64 @@ {% extends "helper/admin_base_action.html" %} - {% load i18n l10n static %} {% load form_helper %} - -{% block action_title %}{% trans 'Merge Donors' %}{% endblock %} - +{% block action_title %} + {% trans 'Merge Donors' %} +{% endblock %} {% block breadcrumbs_action_label %} - {% trans 'Merge Donors' %} + {% trans 'Merge Donors' %} {% endblock %} - {% block action_content %} -
    {% csrf_token %} -
    - - - - - - - {% for donor in queryset %} - - {% endfor %} - - - - - - - {% for donor in queryset %} - - {% endfor %} - - {% for field in form %} - - - - {% for donor in queryset %} - {% with val=donor|get_field_by_key:field.name %} - - {% endwith %} - {% endfor %} - + + {% csrf_token %} +
    +
    FieldValueDonor {{ donor.id }}
    Primary- - -
    {{ field.label }} - {{ field }} - - - {{ val }} - -
    + + + + + {% for donor in queryset %}{% endfor %} + + + + + + + {% for donor in queryset %} + + {% endfor %} + + {% for field in form %} + + + + {% for donor in queryset %} + {% with val=donor|get_field_by_key:field.name %} + + {% endwith %} + {% endfor %} + + {% endfor %} + +
    FieldValueDonor {{ donor.id }}
    Primary- + +
    {{ field.label }}{{ field }} + {{ val }} +
    + +

    + +

    +
    + {% for obj in queryset %} + {% endfor %} - - - - - -

    - -

    -
    - {% for obj in queryset %} - - {% endfor %} - - + + {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/base.html b/fragdenstaat_de/fds_donation/templates/fds_donation/base.html index 10a0fa818..cf8cdb4b3 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/base.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/base.html @@ -1,10 +1,8 @@ {% extends "base.html" %} - {% block extra_head %} - {{ block.super }} - + {{ block.super }} + {% endblock %} - {% block navbar %} - {% include "header_reduced.html" %} + {% include "header_reduced.html" %} {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html index 5e2ce6733..b33b294e0 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html @@ -1,20 +1,34 @@ {% load i18n %} {% load humanize %} - {% with amount_str=amount|intcomma donation_goal_str=donation_goal|intcomma reached_goal_str=reached_goal|intcomma %} -
    -
    - {% if reached_goal %} -
    {{ reached_goal_str }}
    - {% endif %} -
    {% if amount > donation_goal and not reached_goal %}{{ donation_goal_str }}{% endif %}
    -
    -
    - - {% blocktrans %} +
    +
    + {% if reached_goal %} +
    {{ reached_goal_str }}
    + {% endif %} +
    + {% if amount > donation_goal and not reached_goal %}{{ donation_goal_str }}{% endif %} +
    +
    +
    + + {% blocktrans %} {{ amount_str }} € of {{ donation_goal_str }} € {% endblocktrans %} - + +
    -
    {% endwith %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html index 0588d2818..87e712a43 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html @@ -1,12 +1,10 @@ {% load form_helper %} - -
    - {% csrf_token %} - {% render_form form %} - -

    - -

    + + {% csrf_token %} + {% render_form form %} + +

    + +

    diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html index 0238bb393..9181f7522 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html @@ -1,7 +1,6 @@ {% load cms_tags %} - {% if should_render %} -{% for plugin in instance.child_plugin_instances %} - {% render_plugin plugin %} -{% endfor %} -{% endif %} \ No newline at end of file + {% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} +{% endif %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html index 525c51082..ef644dfae 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html @@ -1,49 +1,46 @@ {% extends "fds_donation/base.html" %} - {% load i18n %} {% load static %} - {% block app_body %} -

    {% translate "Thank you for your donation!" %}

    -
    -
    - {% translate 'You got mail' %} +

    {% translate "Thank you for your donation!" %}

    +
    +
    + {% translate 'You got mail' %} +
    -
    -
    -
    -

    - {% translate "Please confirm your email address!" %} -

    +
    +
    +

    {% translate "Please confirm your email address!" %}

    +
    -
    -
    -
    - {% if email %} -
      -
    1. - {% blocktranslate %}Check your emails for your account{% endblocktranslate %}
      - {{ email }} -
      2. -
    2. - {% blocktranslate %} +
      +
      + {% if email %} +
        +
      1. + {% blocktranslate %}Check your emails for your account{% endblocktranslate %} +
        + {{ email }} +
        2. +
      2. + {% blocktranslate %} Click the confirmation link in the email from {{ SITE_NAME }}. {% endblocktranslate %} -
        3. -
      - {% else %} -

      - {% translate "Please go to your email account and click the confirmation link." %} -

      - {% endif %} - {% if receipt %} -

      - {% blocktranslate %} +

      3. +
    + {% else %} +

    + {% translate "Please go to your email account and click the confirmation link." %} +

    + {% endif %} + {% if receipt %} +

    + {% blocktranslate %} The donation receipts that we send at the beginning of next year can only be sent to confirmed email addresses! {% endblocktranslate %} -

    - {% endif %} - +

    + {% endif %} +
    -
    {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html index aff4e51f8..cb1f5e42a 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html @@ -1,21 +1,15 @@ {% extends "fds_donation/base.html" %} - {% load i18n %} {% load cms_tags %} - {% block app_body %} - {% page_url "donate" as donate_url %} - -

    {% translate "Donation failed!" %}

    - -

    - {% blocktranslate %} + {% page_url "donate" as donate_url %} +

    {% translate "Donation failed!" %}

    +

    + {% blocktranslate %} Your donation with your chosen payment provider has not completed successfully. {% endblocktranslate %} -

    -

    - - {% translate "Try again" %} - -

    +

    +

    + {% translate "Try again" %} +

    {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html index 73ccc6bf1..2c9450df7 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html @@ -1,55 +1,41 @@ {% extends "fds_donation/base.html" %} - {% load form_helper %} - {% block title %}Ihre Spende aktualisieren{% endblock %} - {% block app_body %} -
    - -

    - Legen Sie eine neue Spende an -

    - -{% if subscriptions %} -
    -

    Bitte beachten Sie, dass momentan folgende Dauerspenden für Sie aktiv sind:

    -
      - {% for subscription in subscriptions %} -
    • - {{ subscription.plan }} (Details / Kündigung) -
      • - {% endfor %} -
    -

    Wenn Sie Ihre Dauerspende anpassen wollen, können Sie diese auf der Detailseite kündigen und hier neu anlegen.

    -
    -{% endif %} - -
    - {% csrf_token %} - {{ form.form_settings }} - {{ form.reference }} - {{ form.keyword }} - - {% for field in form %} - {% if field.is_hidden %} - {{ field }} - {% else %} -
    -
    - {% render_field field stacked=True %} +
    +
    +

    Legen Sie eine neue Spende an

    + {% if subscriptions %} +
    +

    Bitte beachten Sie, dass momentan folgende Dauerspenden für Sie aktiv sind:

    +
      + {% for subscription in subscriptions %} +
    • + {{ subscription.plan }} (Details / Kündigung) +
      • + {% endfor %} +
    +

    Wenn Sie Ihre Dauerspende anpassen wollen, können Sie diese auf der Detailseite kündigen und hier neu anlegen.

    +
    + {% endif %} + + {% csrf_token %} + {{ form.form_settings }} + {{ form.reference }} + {{ form.keyword }} + {% for field in form %} + {% if field.is_hidden %} + {{ field }} + {% else %} +
    +
    {% render_field field stacked=True %}
    +
    + {% endif %} + {% endfor %} + + Abbrechen +
    -
    - {% endif %} - {% endfor %} - - - - - Abbrechen - - -
    +
    {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html index 221a49fd4..dd3cd93ce 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html @@ -1,82 +1,61 @@ {% extends "base.html" %} - {% load i18n %} - {% block title %}Ihre Spende{% endblock %} - -{% block extra_head %} - -{% endblock %} - +{% block extra_head %}{% endblock %} {% block app_body %} -

    - Vielen Dank für Ihre Spende! -

    - -{% if last_donation and last_donation.payment.variant == 'banktransfer' %} -
    - {% include "fds_donation/includes/banktransfer.html" with payment=last_donation.payment order=last_donation.payment.order %} -
    -{% endif %} - -

    - - Spenderdaten aktualisieren - - - Neue Spende anlegen - -

    - -

    - Hier finden Sie eine Übersicht Ihrer Spenden. -

    - -{% if subscriptions %} - {% for subscription in subscriptions %} -

    - Dauerspende {{ subscription.plan }} (Details) +

    Vielen Dank für Ihre Spende!

    + {% if last_donation and last_donation.payment.variant == 'banktransfer' %} +
    + {% include "fds_donation/includes/banktransfer.html" with payment=last_donation.payment order=last_donation.payment.order %} +
    + {% endif %} +

    + Spenderdaten aktualisieren + Neue Spende anlegen

    - {% endfor %} -{% endif %} - - - - - - - - - - - - {% for donation in donations %} - - - - - - - {% endfor %} - -
    DatumBetragVerwendungszweckDetails
    {{ donation.timestamp|date:"DATE_FORMAT" }}{{ donation.amount }} Euro{{ donation.purpose }} - {% if donation.payment %} - {% if donation.payment.is_deferred %} - {% translate "Confirmation pending" %} - {% else %} - {{ donation.payment.get_status_display }} - Details - {% endif %} - {% else %} - {% if donation.received_timestamp %} - Bestätigt - {% endif %} - {% endif %} -
    - -{% if donor.user %} -
    - {% include "account/includes/set_password_now.html" %} -{% endif %} - +

    Hier finden Sie eine Übersicht Ihrer Spenden.

    + {% if subscriptions %} + {% for subscription in subscriptions %} +

    + Dauerspende {{ subscription.plan }} (Details) +

    + {% endfor %} + {% endif %} + + + + + + + + + + + {% for donation in donations %} + + + + + + + {% endfor %} + +
    DatumBetragVerwendungszweckDetails
    {{ donation.timestamp|date:"DATE_FORMAT" }}{{ donation.amount }} Euro{{ donation.purpose }} + {% if donation.payment %} + {% if donation.payment.is_deferred %} + {% translate "Confirmation pending" %} + {% else %} + {{ donation.payment.get_status_display }} + Details + {% endif %} + {% else %} + {% if donation.received_timestamp %}Bestätigt{% endif %} + {% endif %} +
    + {% if donor.user %} +
    + {% include "account/includes/set_password_now.html" %} + {% endif %} {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html index 16fa00047..962f7ffd1 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html @@ -1,29 +1,17 @@ {% extends "fds_donation/base.html" %} - {% load form_helper %} - {% block app_body %} -
    - -

    - Aktualisieren Sie hier Ihre Spenderdaten. -

    - -

    - Auf Basis dieser Informationen lassen wir Ihnen Ihre Spendenbescheinigung zukommen. -

    - -
    - {% csrf_token %} - {% render_form form %} - - - - - Abbrechen - -
    -
    -{% endblock %} \ No newline at end of file +
    +
    +

    Aktualisieren Sie hier Ihre Spenderdaten.

    +

    Auf Basis dieser Informationen lassen wir Ihnen Ihre Spendenbescheinigung zukommen.

    +
    + {% csrf_token %} + {% render_form form %} + + Abbrechen +
    +
    +
    +{% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html index 1d5f6134e..b535b73af 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html @@ -1,248 +1,188 @@ {% load i18n %} {% load form_helper %} - -
    - {% csrf_token %} - {{ form.form_settings }} - {{ form.reference }} - {{ form.keyword }} -
    - - {% if form.settings.title %} - {{ form.settings.title }} - {% else %} - {% trans "Your donation frees information" %} - {% endif %} - - {% if form.chosen_gift %} - {% if form.chosen_gift.is_hidden %} - {{ form.chosen_gift }} - {% else %} -
    -
    - {% render_field form.chosen_gift %} -
    -
    - {% endif %} - {% endif %} -
    -
    - {% render_field form.amount stacked=True %} -
    -
    - {% if form.interval.is_hidden %} - {{ form.interval }} - {% else %} -
    -
    - {% render_field form.interval inline=True %} -
    -
    - {% endif %} - {% if form.purpose.is_hidden %} - {{ form.purpose }} - {% else %} -
    -
    - {% render_field form.purpose stacked=True %} -
    -
    - {% endif %} - - {% if form.settings.collapsed %} - - {% endif %} - -
    - - {% if form.settings.collapsed %} -
    - {% endif%} - -
    - - {% trans "Your details" %} - -
    -
    - {% render_field form.salutation stacked=True %} -
    -
    -
    -
    - {% render_field form.first_name stacked=True %} -
    -
    - {% render_field form.last_name stacked=True %} -
    -
    -
    -
    -
    -
    - {% render_field form.email stacked=True %} - - - {% trans "→ Do you want to donate as a company?" %} - - -
    -
    -
    -
    - {% render_field form.company_name stacked=True %} -
    -
    -
    -
    - {% render_field form.receipt inline=True %} -
    -
    -
    -
    -
    - {% render_field form.address stacked=True %} -
    -
    -
    -
    - {% render_field form.postcode stacked=True %} -
    -
    - {% render_field form.city stacked=True %} -
    -
    -
    -
    - {% render_field form.country stacked=True %} -
    -
    -
    -
    - - {% if form.chosen_gift %} + + {% csrf_token %} + {{ form.form_settings }} + {{ form.reference }} + {{ form.keyword }}
    - - {% trans "Shipping details" %} - -
    -
    - + + {% if form.settings.title %} + {{ form.settings.title }} + {% else %} + {% trans "Your donation frees information" %} + {% endif %} + + {% if form.chosen_gift %} + {% if form.chosen_gift.is_hidden %} + {{ form.chosen_gift }} + {% else %} +
    +
    {% render_field form.chosen_gift %}
    +
    + {% endif %} + {% endif %} +
    +
    {% render_field form.amount stacked=True %}
    -
    -
    -
    -
    -
    - {% render_field form.shipping_first_name stacked=True %} + {% if form.interval.is_hidden %} + {{ form.interval }} + {% else %} +
    +
    {% render_field form.interval inline=True %}
    -
    - {% render_field form.shipping_last_name stacked=True %} + {% endif %} + {% if form.purpose.is_hidden %} + {{ form.purpose }} + {% else %} +
    +
    {% render_field form.purpose stacked=True %}
    -
    -
    -
    -
    -
    -
    - {% render_field form.shipping_address stacked=True %} -
    -
    -
    -
    - {% render_field form.shipping_postcode stacked=True %} -
    -
    - {% render_field form.shipping_city stacked=True %} -
    -
    -
    -
    - {% render_field form.shipping_country stacked=True %} -
    -
    -
    + {% endif %} + {% if form.settings.collapsed %} + + {% endif %}
    - {% endif %} - -
    - - {% trans "Payment method" %} - -
    -
    -
    - {% trans "Donations via credit card, SEPA or Paypal do not work via our .onion-site." %} -
    -
    - {% render_field form.payment_method stacked=True %} -
    -

    - - {% trans "Your payment details will be transmitted securely in the next step." %}

    -
    -
    -
    -
    - - {% trans "Stay up to date" %} - -
    -
    -
    -

    {{ form.contact.label }}

    -
    -

    - {% trans "Receive our newsletter about freedom of information in German." %} -

    - {% render_field form.contact stacked=True show_label=False %} -
    -
    -
    -
    -
    - {% if request.user.is_authenticated %} -
    -

    {% trans "FragDenStaat Account" %}

    + {% if form.settings.collapsed %}
    {% endif %} +
    + {% trans "Your details" %} +
    +
    {% render_field form.salutation stacked=True %}
    +
    +
    +
    {% render_field form.first_name stacked=True %}
    +
    {% render_field form.last_name stacked=True %}
    +
    +
    +
    +
    +
    + {% render_field form.email stacked=True %} + + {% trans "→ Do you want to donate as a company?" %} + +
    +
    +
    +
    {% render_field form.company_name stacked=True %}
    +
    +
    +
    {% render_field form.receipt inline=True %}
    +
    +
    +
    +
    {% render_field form.address stacked=True %}
    +
    +
    +
    {% render_field form.postcode stacked=True %}
    +
    {% render_field form.city stacked=True %}
    +
    +
    +
    {% render_field form.country stacked=True %}
    +
    -
    - {% trans "You can manage your donation in your FragDenStaat account." %} +
    + {% if form.chosen_gift %} +
    + {% trans "Shipping details" %} +
    +
    + +
    +
    +
    +
    +
    +
    {% render_field form.shipping_first_name stacked=True %}
    +
    {% render_field form.shipping_last_name stacked=True %}
    +
    +
    +
    +
    +
    +
    {% render_field form.shipping_address stacked=True %}
    +
    +
    +
    {% render_field form.shipping_postcode stacked=True %}
    +
    {% render_field form.shipping_city stacked=True %}
    +
    +
    +
    {% render_field form.shipping_country stacked=True %}
    +
    +
    +
    + {% endif %} +
    + {% trans "Payment method" %} +
    +
    +
    + {% trans "Donations via credit card, SEPA or Paypal do not work via our .onion-site." %} +
    +
    {% render_field form.payment_method stacked=True %}
    +

    + + {% trans "Your payment details will be transmitted securely in the next step." %} +

    +
    - {% else %} -
    -

    {% trans "Get an account" %}

    +
    +
    + {% trans "Stay up to date" %} +
    +
    +
    +
    +

    {{ form.contact.label }}

    +
    +
    +

    {% trans "Receive our newsletter about freedom of information in German." %}

    + {% render_field form.contact stacked=True show_label=False %} +
    +
    +
    +
    +
    + {% if request.user.is_authenticated %} +
    +

    {% trans "FragDenStaat Account" %}

    +
    +
    {% trans "You can manage your donation in your FragDenStaat account." %}
    + {% else %} +
    +

    {% trans "Get an account" %}

    +
    +
    +
    + + {% render_field form.account stacked=True show_label=False %} +
    +
    + {% endif %} +
    +
    -
    -
    - - {% render_field form.account stacked=True show_label=False %} -
    +
    +
    +
    + {% if form.test %} + {% render_field form.test %} + {% endif %} +
    - {% endif %}
    -
    -
    -
    - -
    -
    - {% if form.test %} - {% render_field form.test %} - {% endif %} - -
    -
    - - {% if form.settings.collapsed %} -
    - {% endif %} - + {% if form.settings.collapsed %}
    {% endif %} 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 551c679f7..2abcc49d6 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html @@ -1,14 +1,13 @@ {% extends "base.html" %} {% load i18n %} - -{% block title %}{% trans "Donation" %}{% endblock title %} - +{% block title %} + {% trans "Donation" %} +{% endblock title %} + {% block top_block %}{% endblock %} - {% block navbar %} - {% include "header_minimal.html" %} + {% include "header_minimal.html" %} {% endblock %} - {% block app_body %} - {% include "fds_donation/forms/_donation_form.html" %} + {% include "fds_donation/forms/_donation_form.html" %} {% endblock %} 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 acb21a29a..307dc4cd1 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 @@ -1,20 +1,24 @@ {% load i18n %} -
    - {% if presets %} -
    - {% for preset in presets %} -
    - -
    - {% endfor %} -
    - -
    + {% if presets %} +
    + {% for preset in presets %} +
    + +
    + {% endfor %} +
    + +
    +
    + {% endif %} +
    + {% include "django/forms/widgets/text.html" %} + {{ currency }}
    - {% endif %} -
    - {% include "django/forms/widgets/text.html" %} - {{ currency }} -
    diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html index 2546868bc..94ae49a92 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html @@ -1,29 +1,35 @@ {% if not payment.is_confirmed %} -
    - Der Status von Spenden per Überweisung aktualisiert sich erst zu Beginn des Folgemonats, da erst dann die Kontoauszüge abgeglichen werden. -
    -
    -
    - {% if order.is_recurring %} -

    Bitte richten Sie einen Dauerauftrag ein

    - {% else %} -

    Bitte überweisen Sie {{ order.total_gross }} EUR an

    - {% endif %} +
    + Der Status von Spenden per Überweisung aktualisiert sich erst zu Beginn des Folgemonats, da erst dann die Kontoauszüge abgeglichen werden.
    -
    -

    - Kontoinhaber: Open Knowledge Foundation Deutschland e.V.
    - IBAN: DE36 4306 0967 1173 8932 00
    - BIC: GENODEM1GLS
    - Betrag: {{ order.total_gross }} EUR
    - {% if order.is_recurring %} - Turnus:  {{ order.subscription.plan.get_interval_description }}
    - {% endif %} - Verwendungszweck: {{ order.remote_reference }}
    - BLZ: 430 609 67 (GLS Bank) -

    - {% comment %}

    - Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:
    +

    +
    + {% if order.is_recurring %} +

    Bitte richten Sie einen Dauerauftrag ein

    + {% else %} +

    Bitte überweisen Sie {{ order.total_gross }} EUR an

    + {% endif %} +
    +
    +

    + Kontoinhaber: Open Knowledge Foundation Deutschland e.V. +
    + IBAN: DE36 4306 0967 1173 8932 00 +
    + BIC: GENODEM1GLS +
    + Betrag: {{ order.total_gross }} EUR +
    + {% if order.is_recurring %} + Turnus:  {{ order.subscription.plan.get_interval_description }} +
    + {% endif %} + Verwendungszweck: {{ order.remote_reference }} +
    + BLZ: 430 609 67 (GLS Bank) +

    + {% comment %}

    + Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:
    {% if order.is_recurring %} {% else %} @@ -31,10 +37,8 @@

    Bitte überweisen Sie {{ order.total_gross }} EUR an

    {% endif %} Direktlink für Banking-App -

    {% endcomment %} -

    - Vielen Dank! -

    +

    {% endcomment %} +

    Vielen Dank!

    +
    -
    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html index 03eda8e06..b310bfb06 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html @@ -1,18 +1,24 @@ {% if not payment.is_confirmed %} - {% if order.is_recurring %} -

    Bitte richten Sie einen Dauerauftrag ein

    - {% else %} -

    Bitte überweisen Sie {{ order.total_gross }} EUR an

    - {% endif %} -

    - Kontoinhaber: Open Knowledge Foundation Deutschland e.V.
    - IBAN: DE36 4306 0967 1173 8932 00
    - BIC: GENODEM1GLS
    - Betrag: {{ order.total_gross }} EUR
    {% if order.is_recurring %} - Turnus:  {{ order.subscription.plan.get_interval_description }}
    +

    Bitte richten Sie einen Dauerauftrag ein

    + {% else %} +

    Bitte überweisen Sie {{ order.total_gross }} EUR an

    {% endif %} - Verwendungszweck: {{ order.remote_reference }}
    - BLZ: 430 609 67 (GLS Bank) -

    -{% endif %} \ No newline at end of file +

    + Kontoinhaber: Open Knowledge Foundation Deutschland e.V. +
    + IBAN: DE36 4306 0967 1173 8932 00 +
    + BIC: GENODEM1GLS +
    + Betrag: {{ order.total_gross }} EUR +
    + {% if order.is_recurring %} + Turnus:  {{ order.subscription.plan.get_interval_description }} +
    + {% endif %} + Verwendungszweck: {{ order.remote_reference }} +
    + BLZ: 430 609 67 (GLS Bank) +

    +{% endif %} diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html b/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html index 076395775..54c31eb14 100644 --- a/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html +++ b/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html @@ -1,8 +1,9 @@ -{% load i18n %} +{% load i18n %} + - - - - Zuwendungsbestätigung für {{ object.get_full_name }} {{ year }} - - - - -
    -
    - Aussteller (Bezeichnung und Anschrift der steuerbegünstigten Einrichtung): - - - -

    - Open Knowledge Foundation Deutschland e. V.;
    - Singerstraße 109; 10179 Berlin -

    -
    - -

    Bestätigung über Geldzuwendungen/Mitgliedsbeitrag

    -

    - im Sinne des § 10b des Einkommensteuergesetzes an eine der in § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes bezeichneten Körperschaften, Personenvereinigungen oder Vermögensmassen -

    - -
    - Name und Anschrift des Zuwendenden: -

    - {{ Spendenname }}; {{ Strasse }}; {{ PLZ }} {{ Ort }} -

    -
    - -
    -
    - Betrag der Zuwendung - in Ziffern - -

    - {{ Jahressumme }} € + + Zuwendungsbestätigung für {{ object.get_full_name }} {{ year }} + + + +

    +
    + Aussteller (Bezeichnung und Anschrift der steuerbegünstigten Einrichtung): + +

    + Open Knowledge Foundation Deutschland e. V.; +
    + Singerstraße 109; 10179 Berlin +

    +
    +

    Bestätigung über Geldzuwendungen/Mitgliedsbeitrag

    +

    + im Sinne des § 10b des Einkommensteuergesetzes an eine der in § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes bezeichneten Körperschaften, Personenvereinigungen oder Vermögensmassen

    -
    - -
    - - in Buchstaben - -

    - {{ JahressummeInWorten }} +

    + Name und Anschrift des Zuwendenden: +

    {{ Spendenname }}; {{ Strasse }}; {{ PLZ }} {{ Ort }}

    +
    +
    +
    + Betrag der Zuwendung - in Ziffern - +

    {{ Jahressumme }} €

    +
    +
    + - in Buchstaben - +

    {{ JahressummeInWorten }}

    +
    +
    + Tag der Zuwendung: +

    01.01. - 31.12.{{ year }}

    +
    +
    +

    + Es handelt sich um den Verzicht auf Erstattung von Aufwendungen Ja ☐ Nein ☒

    -
    - -
    - Tag der Zuwendung: -

    - 01.01. - 31.12.{{ year }} +

    + ☒ Wir sind wegen Förderung von Wissenschaft und Forschung sowie Förderung der Volks- und Berufsbildung nach der Anlage zum Körperschaftsteuerbescheid des Finanzamtes Berlin für Körperschaften I StNr. 27/674/52428 vom 13.09.2022 für den letzten Veranlagungszeitraum 2021 nach § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes von der Körperschaftsteuer und nach § 3 Nr. 6 des Gewerbesteuergesetzes von der Gewerbesteuer befreit.

    -
    -
    - -

    Es handelt sich um den Verzicht auf Erstattung von Aufwendungen Ja ☐ Nein ☒

    - -

    - ☒ Wir sind wegen Förderung von Wissenschaft und Forschung sowie Förderung der Volks- und Berufsbildung nach der Anlage zum Körperschaftsteuerbescheid des Finanzamtes Berlin für Körperschaften I StNr. 27/674/52428 vom 13.09.2022 für den letzten Veranlagungszeitraum 2021 nach § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes von der Körperschaftsteuer und nach § 3 Nr. 6 des Gewerbesteuergesetzes von der Gewerbesteuer befreit. -

    -

    - ☒ Die Einhaltung der satzungsgemäßen Voraussetzungen nach den §§ 51, 59, 60 und 61 AO wurde vom Finanzamt Berlin für Körperschaften I StNr. 27/674/52428 mit Bescheid vom 14.08.2014 nach § 60a AO gesondert festgestellt. Wir fördern nach unserer Satzung die Wissenschaft und Forschung sowie die Volks- und Berufsbildung, das demokratische Staatswesen im Geltungsbereich der Abgabenordnung, und das bürgerschaftliche Engagement zugunsten gemeinnütziger Zwecke. -

    - -
    -

    - Es wird bestätigt, dass die Zuwendung nur zur Förderung (Angabe des begünstigten Zwecks / der begünstigten Zwecke) -

    - -

    - der Wissenschaft und Forschung, der Volks- und Berufsbildung, des demokratischen Staatswesens im Geltungsbereich der Abgabenordnung sowie des bürgerschaftlichen Engagements zugunsten gemeinnütziger Zwecke -

    - -

    - verwendet wird.
    - - Nur für steuerbegünstigte Einrichtungen, bei denen die Mitgliedsbeiträge steuerlich nicht abziehbar sind:
    - - ☐ Es wird bestätigt, dass es sich nicht um einen Mitgliedsbeitrag handelt, dessen Abzug nach § 10b Abs. 1 des Einkommensteuergesetzes ausgeschlossen ist. -

    - -
    - - -
    - - (Ort, Datum und Unterschrift des Zuwendungsempfängers) - -

    - Hinweis:
    - Der Zuwendungsempfänger hat die Nutzung des maschinellen Verfahrens zur Erstellung der Zuwendungsbestätigung dem Finanzamt Leipzig I mit Schreiben vom 04.09.2020 angezeigt. -

    - Wer vorsätzlich oder grob fahrlässig eine unrichtige Zuwendungsbestätigung erstellt oder veranlasst, dass Zuwendungen nicht zu den in der Zuwendungsbestätigung angegebenen steuerbegünstigten Zwecken verwendet werden, haftet für die entgangene Steuer (§ 10b Abs. 4 EStG, § 9 Abs. 3 KStG, § 9 Nr. 5 GewStG). -

    -

    - Diese Bestätigung wird nicht als Nachweis für die steuerliche Berücksichtigung der Zuwendung anerkannt, wenn das Datum des Freistellungsbescheides länger als 5 Jahre bzw. das Datum der Feststellung der Einhaltung der satzungsmäßigen Voraussetzungen nach § 60a Abs. 1 AO länger als 3 Jahre seit Ausstellung des Bescheides zurückliegt (§ 63 Abs. 5 AO). -

    -
    - -
    -

    Anlage zur Sammelbestätigung

    -

    Seite 1/1

    - - - - - - - - - - - - {% for donation in donations %} - - - - - - - {% endfor %} - -
    - Datum der Zuwendung - - Art der Zuwendung (Geldzuwendung / Mitgliedsbeitrag) - - Verzicht auf die Erstattung von Aufwendungen (ja/nein) - - Betrag in Euro -
    - {{ donation.date }} - - Geldzuwendung - - Nein - - {{ donation.formatted_amount }} - {% if donation.receipt_date %}*{% endif %} -
    - -

    Gesamtsumme: {{ Jahressumme }} €

    - {% if receipt_already %} -

    - * Zuwendung wurde bereits bestätigt. -

    - {% endif %} -
    - +

    + ☒ Die Einhaltung der satzungsgemäßen Voraussetzungen nach den §§ 51, 59, 60 und 61 AO wurde vom Finanzamt Berlin für Körperschaften I StNr. 27/674/52428 mit Bescheid vom 14.08.2014 nach § 60a AO gesondert festgestellt. Wir fördern nach unserer Satzung die Wissenschaft und Forschung sowie die Volks- und Berufsbildung, das demokratische Staatswesen im Geltungsbereich der Abgabenordnung, und das bürgerschaftliche Engagement zugunsten gemeinnütziger Zwecke. +

    +
    +

    + Es wird bestätigt, dass die Zuwendung nur zur Förderung (Angabe des begünstigten Zwecks / der begünstigten Zwecke) +

    +

    + der Wissenschaft und Forschung, der Volks- und Berufsbildung, des demokratischen Staatswesens im Geltungsbereich der Abgabenordnung sowie des bürgerschaftlichen Engagements zugunsten gemeinnütziger Zwecke +

    +

    + verwendet wird. +
    + Nur für steuerbegünstigte Einrichtungen, bei denen die Mitgliedsbeiträge steuerlich nicht abziehbar sind: +
    + ☐ Es wird bestätigt, dass es sich nicht um einen Mitgliedsbeitrag handelt, dessen Abzug nach § 10b Abs. 1 des Einkommensteuergesetzes ausgeschlossen ist. +

    +
    + +
    + (Ort, Datum und Unterschrift des Zuwendungsempfängers) +

    + Hinweis: +
    + Der Zuwendungsempfänger hat die Nutzung des maschinellen Verfahrens zur Erstellung der Zuwendungsbestätigung dem Finanzamt Leipzig I mit Schreiben vom 04.09.2020 angezeigt. +
    +
    + Wer vorsätzlich oder grob fahrlässig eine unrichtige Zuwendungsbestätigung erstellt oder veranlasst, dass Zuwendungen nicht zu den in der Zuwendungsbestätigung angegebenen steuerbegünstigten Zwecken verwendet werden, haftet für die entgangene Steuer (§ 10b Abs. 4 EStG, § 9 Abs. 3 KStG, § 9 Nr. 5 GewStG). +

    +

    + Diese Bestätigung wird nicht als Nachweis für die steuerliche Berücksichtigung der Zuwendung anerkannt, wenn das Datum des Freistellungsbescheides länger als 5 Jahre bzw. das Datum der Feststellung der Einhaltung der satzungsmäßigen Voraussetzungen nach § 60a Abs. 1 AO länger als 3 Jahre seit Ausstellung des Bescheides zurückliegt (§ 63 Abs. 5 AO). +

    + +
    +

    Anlage zur Sammelbestätigung

    +

    Seite 1/1

    + + + + + + + + + + + {% for donation in donations %} + + + + + + + {% endfor %} + +
    Datum der ZuwendungArt der Zuwendung (Geldzuwendung / Mitgliedsbeitrag)Verzicht auf die Erstattung von Aufwendungen (ja/nein)Betrag in Euro
    {{ donation.date }}GeldzuwendungNein + {{ donation.formatted_amount }} + {% if donation.receipt_date %}*{% endif %} +
    +

    Gesamtsumme: {{ Jahressumme }} €

    + {% if receipt_already %}

    * Zuwendung wurde bereits bestätigt.

    {% endif %} +
    + diff --git a/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html b/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html index 00f7434c5..e711213d9 100644 --- a/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html +++ b/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html @@ -1,7 +1,5 @@ {% extends "froide_payment/payment/status/base.html" %} - {% load i18n %} - {% block custom_content %} - {% include "fds_donation/includes/banktransfer.html" %} + {% include "fds_donation/includes/banktransfer.html" %} {% endblock %} diff --git a/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html b/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html index 3a1a33625..fa3fc0014 100644 --- a/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html +++ b/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html @@ -1,26 +1,31 @@ {% extends "froide_payment/subscription/default.html" %} - {% block custom_content %} -
    -
    -

    Bitte richten Sie einen Dauerauftrag ein

    -
    -
    -

    - Kontoinhaber: Open Knowledge Foundation Deutschland e.V.
    - IBAN: DE36 4306 0967 1173 8932 00
    - BIC: GENODEM1GLS
    - Betrag: {{ subscription.plan.total_gross }} EUR
    - Turnus:  {{ subscription.plan.get_interval_description }}
    - Verwendungszweck: {{ subscription.remote_reference }}
    - BLZ: 430 609 67 (GLS Bank) -

    - {% comment %}

    - Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:
    +

    +
    +

    Bitte richten Sie einen Dauerauftrag ein

    +
    +
    +

    + Kontoinhaber: Open Knowledge Foundation Deutschland e.V. +
    + IBAN: DE36 4306 0967 1173 8932 00 +
    + BIC: GENODEM1GLS +
    + Betrag: {{ subscription.plan.total_gross }} EUR +
    + Turnus:  {{ subscription.plan.get_interval_description }} +
    + Verwendungszweck: {{ subscription.remote_reference }} +
    + BLZ: 430 609 67 (GLS Bank) +

    + {% comment %}

    + Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:
    Direktlink für Banking-App -

    {% endcomment %} +

    {% endcomment %} +
    -
    {% endblock %} diff --git a/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html b/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html index 8d2fee8fe..122ad0208 100644 --- a/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html +++ b/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html @@ -1,43 +1,56 @@ {% load i18n %} {% load static %} -
    - - +
    -