From c3948e1741a1ee4f42e964c75696bfb76da88be3 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud
Date: Thu, 29 Sep 2022 11:51:33 +0200
Subject: [PATCH 1/2] misc: apply djhtml (#69422)
---
.../combo/manager_asset_confirm_delete.html | 18 +-
.../combo/manager_asset_overwrite.html | 24 +-
.../templates/combo/manager_asset_upload.html | 18 +-
.../templates/combo/manager_assets.html | 64 +--
.../combo/manager_assets_browse.html | 80 +--
.../combo/manager_assets_fragment.html | 60 +-
.../combo/manager_assets_import.html | 24 +-
.../templates/combo/manager_slot_assets.html | 12 +-
.../calendar/booking_calendar_cell.html | 34 +-
.../calendar/booking_calendar_content.html | 80 +--
.../templates/combo/dashboard_cell_icons.html | 30 +-
.../templates/combo/dashboardcell.html | 22 +-
.../templates/combo/chart-filters.html | 94 ++--
.../dataviz/templates/combo/chartngcell.html | 70 +--
.../templates/combo/chartngcell_form.html | 56 +-
.../dataviz/templates/combo/gauge-cell.html | 28 +-
.../manager/weekly_agenda_cell_form.html | 26 +-
.../templates/combo/family/weekly_agenda.html | 100 ++--
.../combo/fargo/recent-documents-cell.html | 24 +-
.../templates/combo/gallery_image_form.html | 34 +-
.../templates/combo/gallery_manager.html | 38 +-
.../gallery/templates/combo/gallerycell.html | 64 +--
.../combo/latest-page-updates-cell.html | 38 +-
.../lingo/basketitem_error_list.html | 88 +--
.../lingo/templates/lingo/combo/basket.html | 70 +--
.../templates/lingo/combo/basket_link.html | 20 +-
.../templates/lingo/combo/cancel-item.html | 26 +-
.../invoice_email_notification_body.html | 14 +-
.../lingo/combo/invoice_fullpage.html | 28 +-
.../lingo/templates/lingo/combo/item.html | 134 ++---
.../lingo/templates/lingo/combo/items.html | 136 ++---
.../templates/lingo/combo/payment-status.html | 80 +--
.../lingo/combo/recent_transactions.html | 32 +-
.../combo/self-declared-invoice-payment.html | 54 +-
.../lingo/templates/lingo/manager_base.html | 6 +-
.../lingo/templates/lingo/payment_form.html | 26 +-
.../lingo/paymentbackend_confirm_delete.html | 18 +-
.../templates/lingo/paymentbackend_form.html | 26 +-
.../templates/lingo/paymentbackend_list.html | 50 +-
.../templates/lingo/regie_confirm_delete.html | 18 +-
.../lingo/templates/lingo/regie_form.html | 34 +-
.../lingo/templates/lingo/regie_list.html | 52 +-
.../apps/lingo/templates/lingo/tipi_form.html | 26 +-
.../templates/lingo/transaction_export.html | 18 +-
.../templates/lingo/transaction_list.html | 112 ++--
.../templates/maps/colour_or_text_input.html | 46 +-
.../templates/maps/layer_options_form.html | 26 +-
.../maps/templates/maps/manager_base.html | 6 +-
.../maps/templates/maps/manager_home.html | 88 +--
combo/apps/maps/templates/maps/map_cell.html | 56 +-
.../maps/templates/maps/map_cell_form.html | 54 +-
.../maps/map_layer_confirm_delete.html | 18 +-
.../maps/templates/maps/map_layer_form.html | 48 +-
.../map_layer_request_parameters_form.html | 6 +-
.../templates/combo/notificationscell.html | 102 ++--
.../pwa/templates/combo/pwa/manager_base.html | 10 +-
.../pwa/templates/combo/pwa/manager_form.html | 18 +-
.../pwa/templates/combo/pwa/manager_home.html | 174 +++---
.../pwa/templates/combo/pwa/navigation.html | 68 +--
.../apps/pwa/templates/combo/pwa/offline.html | 100 ++--
.../templates/combo/manager/engine-form.html | 18 +-
.../combo/manager/search-cell-form.html | 112 ++--
.../templates/combo/search-cell-results.html | 32 +-
.../search/templates/combo/search-cell.html | 144 ++---
.../combo/wcs/backoffice_submission.html | 36 +-
.../templates/combo/wcs/card-field-value.html | 50 +-
combo/apps/wcs/templates/combo/wcs/card.html | 178 +++---
.../wcs/templates/combo/wcs/cards-field.html | 60 +-
combo/apps/wcs/templates/combo/wcs/cards.html | 126 ++---
.../wcs/templates/combo/wcs/care_forms.html | 68 +--
.../wcs/templates/combo/wcs/category.html | 8 +-
.../templates/combo/wcs/current_drafts.html | 40 +-
.../templates/combo/wcs/current_forms.html | 22 +-
combo/apps/wcs/templates/combo/wcs/form.html | 6 +-
.../templates/combo/wcs/form_categories.html | 22 +-
.../combo/wcs/form_link_fragment.html | 4 +-
.../combo/wcs/forms_of_category.html | 66 +--
.../templates/combo/wcs/list_of_forms.html | 34 +-
.../wcs/manager/card-cell-form-display.html | 528 +++++++++---------
.../combo/wcs/tracking_code_input.html | 84 +--
.../templates/combo/wcs/user_all_forms.html | 22 +-
.../templates/combo/wcs/user_done_forms.html | 22 +-
.../combo/manager/link-list-cell-form.html | 114 ++--
.../widgets/select_with_other_option.html | 6 +-
.../templates/combo/cell_appearance.html | 10 +-
.../templates/combo/cell_duplicate.html | 18 +-
combo/manager/templates/combo/cell_form.html | 2 +-
.../manager/templates/combo/cell_options.html | 26 +-
.../templates/combo/cell_visibility.html | 24 +-
.../manager/templates/combo/delete_page.html | 38 +-
.../combo/generic_confirm_delete.html | 18 +-
.../templates/combo/invalid_cell_report.html | 30 +-
.../templates/combo/link_cell_form.html | 26 +-
.../manager/templates/combo/manager_base.html | 22 +-
.../combo/manager_edit_cell_block.html | 72 +--
.../manager/templates/combo/manager_home.html | 116 ++--
combo/manager/templates/combo/page_add.html | 38 +-
.../templates/combo/page_duplicate.html | 18 +-
.../manager/templates/combo/page_export.html | 18 +-
.../templates/combo/page_extra_variables.html | 52 +-
.../manager/templates/combo/page_history.html | 68 +--
combo/manager/templates/combo/page_view.html | 382 ++++++-------
.../templates/combo/placeholder_options.html | 18 +-
.../manager/templates/combo/site_export.html | 28 +-
.../manager/templates/combo/site_import.html | 18 +-
.../templates/combo/site_settings.html | 66 +--
.../templates/combo/snapshot_restore.html | 24 +-
.../templates/combo/snapshot_save.html | 18 +-
.../templates/combo/widgets/flexsize.html | 14 +-
.../manager/templates/registration/login.html | 10 +-
combo/profile/templates/combo/profile.html | 22 +-
combo/public/templates/combo/404.html | 18 +-
.../combo/asset_picture_fragment.html | 2 +-
.../public/templates/combo/deferred-cell.html | 8 +-
combo/public/templates/combo/empty_site.html | 114 ++--
combo/public/templates/combo/feed-cell.html | 28 +-
combo/public/templates/combo/json-cell.html | 8 +-
.../templates/combo/json-error-cell.html | 4 +-
.../templates/combo/json-list-cell.html | 20 +-
combo/public/templates/combo/link-cell.html | 4 +-
.../templates/combo/link-list-cell.html | 60 +-
.../templates/combo/mellon_base_template.html | 4 +-
combo/public/templates/combo/menu-cell.html | 2 +-
combo/public/templates/combo/menu.html | 34 +-
.../public/templates/combo/page_template.html | 86 +--
.../combo/page_template_sidebar.html | 16 +-
combo/public/templates/combo/placeholder.html | 44 +-
combo/public/templates/combo/text-cell.html | 4 +-
.../page_template_outer_tag_placeholder.html | 16 +-
...page_template_synchronous_placeholder.html | 16 +-
tests/wcs/test_card.py | 6 +-
131 files changed, 3209 insertions(+), 3209 deletions(-)
diff --git a/combo/apps/assets/templates/combo/manager_asset_confirm_delete.html b/combo/apps/assets/templates/combo/manager_asset_confirm_delete.html
index 182c287d..de4edfae 100644
--- a/combo/apps/assets/templates/combo/manager_asset_confirm_delete.html
+++ b/combo/apps/assets/templates/combo/manager_asset_confirm_delete.html
@@ -2,16 +2,16 @@
{% load i18n %}
{% block appbar %}
-{% trans 'Delete Asset' %}
+ {% trans 'Delete Asset' %}
{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/combo/apps/assets/templates/combo/manager_asset_overwrite.html b/combo/apps/assets/templates/combo/manager_asset_overwrite.html
index a7b44228..a5ed8150 100644
--- a/combo/apps/assets/templates/combo/manager_asset_overwrite.html
+++ b/combo/apps/assets/templates/combo/manager_asset_overwrite.html
@@ -2,20 +2,20 @@
{% load i18n %}
{% block appbar %}
-{% trans "Overwrite Asset" %}
+ {% trans "Overwrite Asset" %}
{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/combo/apps/assets/templates/combo/manager_asset_upload.html b/combo/apps/assets/templates/combo/manager_asset_upload.html
index 4de3cb13..3373dba1 100644
--- a/combo/apps/assets/templates/combo/manager_asset_upload.html
+++ b/combo/apps/assets/templates/combo/manager_asset_upload.html
@@ -2,17 +2,17 @@
{% load i18n %}
{% block appbar %}
-{% trans "Asset Upload" %}
+ {% trans "Asset Upload" %}
{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/combo/apps/assets/templates/combo/manager_assets.html b/combo/apps/assets/templates/combo/manager_assets.html
index fa80f1f7..5f60529b 100644
--- a/combo/apps/assets/templates/combo/manager_assets.html
+++ b/combo/apps/assets/templates/combo/manager_assets.html
@@ -2,49 +2,49 @@
{% load i18n %}
{% block appbar %}
-{% trans 'Assets' %}
-
-
-{% trans 'Upload' %}
-
-
+ {% trans 'Assets' %}
+
+
+ {% trans 'Upload' %}
+
+
{% endblock %}
{% block breadcrumb %}
-{{ block.super }}
-{% trans 'Assets' %}
+ {{ block.super }}
+ {% trans 'Assets' %}
{% endblock %}
{% block content %}
-{% if not object_list and not query %}
-
- {% blocktrans %}
- This site doesn't have any asset yet. You can add some directly when editing
- pages, in the "Upload Image" dialog.
- {% endblocktrans %}
-
+ {% if not object_list and not query %}
+
+ {% blocktrans %}
+ This site doesn't have any asset yet. You can add some directly when editing
+ pages, in the "Upload Image" dialog.
+ {% endblocktrans %}
+
-{% else %}
+ {% else %}
-
+
-
-
- {% include "combo/manager_assets_fragment.html" %}
-
-
-
+
+
+ {% include "combo/manager_assets_fragment.html" %}
+
+
+
-{% include "gadjo/pagination.html" %}
+ {% include "gadjo/pagination.html" %}
-{% endif %}
+ {% endif %}
{% endblock %}
diff --git a/combo/apps/assets/templates/combo/manager_assets_browse.html b/combo/apps/assets/templates/combo/manager_assets_browse.html
index 228e579b..9f4ee50c 100644
--- a/combo/apps/assets/templates/combo/manager_assets_browse.html
+++ b/combo/apps/assets/templates/combo/manager_assets_browse.html
@@ -2,11 +2,11 @@
{% load static i18n %}
{% block css %}
-
+
{% endblock %}
{% block extrascripts %}
-
+
{% endblock %}
{% block user-links %}{% endblock %}
@@ -16,61 +16,61 @@
{% block footer %}{% endblock %}
{% block appbar %}
-{% trans "Browse for the file you want, then click 'Embed File' to continue..." %}
+ {% trans "Browse for the file you want, then click 'Embed File' to continue..." %}
{% endblock %}
{% block content %}
-{% if not object_list and not query %}
-
- {% trans "No files found. Upload files using the 'Image Button' or 'Link Button' dialog's 'Upload' tab." %}
-
+ {% if not object_list and not query %}
+
+ {% trans "No files found. Upload files using the 'Image Button' or 'Link Button' dialog's 'Upload' tab." %}
+
-{% else %}
+ {% else %}
-
+
-
-
- {% with asset_for_ckeditor=True %}
- {% include "combo/manager_assets_fragment.html" %}
- {% endwith %}
-
-
-
+
+
+ {% with asset_for_ckeditor=True %}
+ {% include "combo/manager_assets_fragment.html" %}
+ {% endwith %}
+
+
+
-{% include "gadjo/pagination.html" %}
+ {% include "gadjo/pagination.html" %}
-
-
-
+
+
+
-{% endif %}
-
+
{% endblock %}
diff --git a/combo/apps/assets/templates/combo/manager_assets_fragment.html b/combo/apps/assets/templates/combo/manager_assets_fragment.html
index 4986fe6a..06001208 100644
--- a/combo/apps/assets/templates/combo/manager_assets_fragment.html
+++ b/combo/apps/assets/templates/combo/manager_assets_fragment.html
@@ -6,41 +6,41 @@
{% trans "Size" %}
{% if not asset_for_ckeditor %}
-
+
{% endif %}
{% for asset in object_list %}
-
-
- {% if asset_for_ckeditor %}
- {{ asset.name }}
- {% elif asset.src %}
- {{ asset.name }}
- {% else %}
- {{ asset.name }} ({% trans "not defined" %})
- {% endif %}
- {% if asset.size %}{{ asset.size|filesizeformat }}{% else %}-{% endif %}
- {% if asset.is_image %} {% endif %}
- {% if not asset_for_ckeditor %}
-
- {% if asset.key %}{# theme asset #}
- {% trans 'Overwrite' %}
- {% if asset.asset %}
- {% trans 'Delete' %}
- {% endif %}
- {% else %}
- {% trans 'Overwrite' %}
- {% trans 'Delete' %}
- {% endif %}
-
- {% endif %}
-
+
+
+ {% if asset_for_ckeditor %}
+ {{ asset.name }}
+ {% elif asset.src %}
+ {{ asset.name }}
+ {% else %}
+ {{ asset.name }} ({% trans "not defined" %})
+ {% endif %}
+ {% if asset.size %}{{ asset.size|filesizeformat }}{% else %}-{% endif %}
+ {% if asset.is_image %} {% endif %}
+ {% if not asset_for_ckeditor %}
+
+ {% if asset.key %}{# theme asset #}
+ {% trans 'Overwrite' %}
+ {% if asset.asset %}
+ {% trans 'Delete' %}
+ {% endif %}
+ {% else %}
+ {% trans 'Overwrite' %}
+ {% trans 'Delete' %}
+ {% endif %}
+
+ {% endif %}
+
{% endfor %}
diff --git a/combo/apps/assets/templates/combo/manager_assets_import.html b/combo/apps/assets/templates/combo/manager_assets_import.html
index e81d448c..010ad6ed 100644
--- a/combo/apps/assets/templates/combo/manager_assets_import.html
+++ b/combo/apps/assets/templates/combo/manager_assets_import.html
@@ -2,20 +2,20 @@
{% load i18n %}
{% block appbar %}
-{% trans "Assets Import" %}
+ {% trans "Assets Import" %}
{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/combo/apps/assets/templates/combo/manager_slot_assets.html b/combo/apps/assets/templates/combo/manager_slot_assets.html
index 6905430d..0e1c9ade 100644
--- a/combo/apps/assets/templates/combo/manager_slot_assets.html
+++ b/combo/apps/assets/templates/combo/manager_slot_assets.html
@@ -2,18 +2,18 @@
{% load i18n %}
{% block appbar %}
-{% trans 'Assets' %}
+ {% trans 'Assets' %}
{% endblock %}
{% block breadcrumb %}
-{{ block.super }}
-{% trans 'Assets' %}
+ {{ block.super }}
+ {% trans 'Assets' %}
{% endblock %}
{% block content %}
-
-{% include "combo/manager_assets_fragment.html" %}
-
+
+ {% include "combo/manager_assets_fragment.html" %}
+
{% endblock %}
diff --git a/combo/apps/calendar/templates/calendar/booking_calendar_cell.html b/combo/apps/calendar/templates/calendar/booking_calendar_cell.html
index e70947da..36d974b6 100644
--- a/combo/apps/calendar/templates/calendar/booking_calendar_cell.html
+++ b/combo/apps/calendar/templates/calendar/booking_calendar_cell.html
@@ -1,27 +1,27 @@
{% load i18n calendar %}
{% block cell-content %}
-{% if cell.title %}
-
- {{cell.title}}
- {% if calendar %}
-
- {% with calendar.get_first_available_slot as slot %}
- ({% if slot %}{% trans "Next available slot:" %} {{ slot.date_time|date:"DATETIME_FORMAT"}}{% else %}{% trans "No available slots." %}{% endif %})
- {% endwith %}
-
- {% endif %}
-
-{% endif %}
+ {% if cell.title %}
+
+ {{cell.title}}
+ {% if calendar %}
+
+ {% with calendar.get_first_available_slot as slot %}
+ ({% if slot %}{% trans "Next available slot:" %} {{ slot.date_time|date:"DATETIME_FORMAT"}}{% else %}{% trans "No available slots." %}{% endif %})
+ {% endwith %}
+
+ {% endif %}
+
+ {% endif %}
-{% if error %}
+ {% if error %}
-{% else %}
+ {% else %}
- {% include 'calendar/booking_calendar_content.html' %}
+ {% include 'calendar/booking_calendar_content.html' %}
-{% endif %}
+ {% endif %}
-
+
{% endblock %}
diff --git a/combo/apps/calendar/templates/calendar/booking_calendar_content.html b/combo/apps/calendar/templates/calendar/booking_calendar_content.html
index 80de8d6a..1df8eb12 100644
--- a/combo/apps/calendar/templates/calendar/booking_calendar_content.html
+++ b/combo/apps/calendar/templates/calendar/booking_calendar_content.html
@@ -1,57 +1,57 @@
{% load i18n calendar %}
{% if calendar_days.has_other_pages %}
-
+
-{% if calendar_days.has_previous %}
-{% trans "previous" %}
-{% else %}
-{% trans "previous" %}
-{% endif %}
-
- {{ calendar_days.number }} / {{ calendar_days.paginator.num_pages }}
-
-{% if calendar_days.has_next %}
-{% trans "next" %}
-{% else %}
-{% trans "next" %}
-{% endif %}
-
+ {% if calendar_days.has_previous %}
+ {% trans "previous" %}
+ {% else %}
+ {% trans "previous" %}
+ {% endif %}
+
+ {{ calendar_days.number }} / {{ calendar_days.paginator.num_pages }}
+
+ {% if calendar_days.has_next %}
+ {% trans "next" %}
+ {% else %}
+ {% trans "next" %}
+ {% endif %}
+
{% endif %}
{% if calendar_days %}
-
+
{% endif %}
diff --git a/combo/apps/dashboard/templates/combo/dashboard_cell_icons.html b/combo/apps/dashboard/templates/combo/dashboard_cell_icons.html
index 558f1197..1a21a2d6 100644
--- a/combo/apps/dashboard/templates/combo/dashboard_cell_icons.html
+++ b/combo/apps/dashboard/templates/combo/dashboard_cell_icons.html
@@ -1,18 +1,18 @@
{% load i18n dashboard %}
{% block content %}
-{% if user.is_authenticated %}
-
-{% if not in_dashboard %}
- {% with tile=cell|as_dashboard_cell:request.user %}
- {% if tile %}
-
- {% else %}
-
- {% endif %}
- {% endwith %}
-{% else %}
-
-{% endif %}
-
-{% endif %}
+ {% if user.is_authenticated %}
+
+ {% if not in_dashboard %}
+ {% with tile=cell|as_dashboard_cell:request.user %}
+ {% if tile %}
+
+ {% else %}
+
+ {% endif %}
+ {% endwith %}
+ {% else %}
+
+ {% endif %}
+
+ {% endif %}
{% endblock %}
diff --git a/combo/apps/dashboard/templates/combo/dashboardcell.html b/combo/apps/dashboard/templates/combo/dashboardcell.html
index 991181c4..5158ea43 100644
--- a/combo/apps/dashboard/templates/combo/dashboardcell.html
+++ b/combo/apps/dashboard/templates/combo/dashboardcell.html
@@ -1,14 +1,14 @@
{% load i18n %}
{% block cell-content %}
-{% for tile in tiles %}
-{% with cell=tile.cell %}
-
-{% endwith %}
-{% endfor %}
+ {% for tile in tiles %}
+ {% with cell=tile.cell %}
+
+ {% endwith %}
+ {% endfor %}
{% endblock %}
diff --git a/combo/apps/dataviz/templates/combo/chart-filters.html b/combo/apps/dataviz/templates/combo/chart-filters.html
index e8e5e4da..b231d9ef 100644
--- a/combo/apps/dataviz/templates/combo/chart-filters.html
+++ b/combo/apps/dataviz/templates/combo/chart-filters.html
@@ -1,61 +1,61 @@
{% load i18n %}
{% block cell-content %}
-{{ cell.title }}
+ {{ cell.title }}
-
- {% if form.fields %}
-
- {% else %}
-
- {% blocktrans trimmed %}
- No filters are available. Note that only filters that are shared between all chart cells will appear. Furthermore, in case they have a value, it must be the same accross all cells.
- {% endblocktrans %}
-
- {% endif %}
-
+
+ {% if form.fields %}
+
+ {% else %}
+
+ {% blocktrans trimmed %}
+ No filters are available. Note that only filters that are shared between all chart cells will appear. Furthermore, in case they have a value, it must be the same accross all cells.
+ {% endblocktrans %}
+
+ {% endif %}
+
-
+
{% endblock %}
diff --git a/combo/apps/dataviz/templates/combo/chartngcell.html b/combo/apps/dataviz/templates/combo/chartngcell.html
index 10e47303..ba15acc9 100644
--- a/combo/apps/dataviz/templates/combo/chartngcell.html
+++ b/combo/apps/dataviz/templates/combo/chartngcell.html
@@ -1,41 +1,41 @@
{% load i18n %}
{% if cell.title %}{{cell.title}} {% endif %}
{% if cell.chart_type == "table" or cell.chart_type == "table-inverted" %}
-
-
+
{% else %}
-
-
-
-
+
+
+
+
{% endif %}
diff --git a/combo/apps/dataviz/templates/combo/chartngcell_form.html b/combo/apps/dataviz/templates/combo/chartngcell_form.html
index 6dbdb886..85bb701e 100644
--- a/combo/apps/dataviz/templates/combo/chartngcell_form.html
+++ b/combo/apps/dataviz/templates/combo/chartngcell_form.html
@@ -1,33 +1,33 @@
diff --git a/combo/apps/dataviz/templates/combo/gauge-cell.html b/combo/apps/dataviz/templates/combo/gauge-cell.html
index 3c5e7ddc..6e1ec197 100644
--- a/combo/apps/dataviz/templates/combo/gauge-cell.html
+++ b/combo/apps/dataviz/templates/combo/gauge-cell.html
@@ -1,16 +1,16 @@
{% block cell-content %}
-
+
{% endblock %}
diff --git a/combo/apps/family/templates/combo/family/manager/weekly_agenda_cell_form.html b/combo/apps/family/templates/combo/family/manager/weekly_agenda_cell_form.html
index 03ac52fa..e7721deb 100644
--- a/combo/apps/family/templates/combo/family/manager/weekly_agenda_cell_form.html
+++ b/combo/apps/family/templates/combo/family/manager/weekly_agenda_cell_form.html
@@ -1,17 +1,17 @@
{% extends "combo/cell_form.html" %}
{% block cell-form %}
-{{ block.super }}
-
+ {{ block.super }}
+
{% endblock %}
diff --git a/combo/apps/family/templates/combo/family/weekly_agenda.html b/combo/apps/family/templates/combo/family/weekly_agenda.html
index 6ba8ce68..fc7c442a 100644
--- a/combo/apps/family/templates/combo/family/weekly_agenda.html
+++ b/combo/apps/family/templates/combo/family/weekly_agenda.html
@@ -1,58 +1,58 @@
{% load i18n %}
{% block cell-content %}
-{% if json.data %}
+ {% if json.data %}
-{% if cell.title %}
-
- {{ cell.title }}
-
-{% endif %}
+ {% if cell.title %}
+
+ {{ cell.title }}
+
+ {% endif %}
-
-{% with first_monday=json.data.0.date|date|adjust_to_week_monday last_item=json.data|last %}
- {% with last_day=last_item.date|date|adjust_to_week_monday|add_days:6 %}
- {% now 'Y-m-W' as current_week %}
- {% spaceless %}
-
←
-
-
- {% for day in first_monday|iterate_days_until:last_day %}
- {% if day.weekday == 0 %}
- {% with sunday=day|add_days:6 %}
-
- {% blocktrans with day_date=day|date:'d/m' sunday_date=sunday|date:'d/m' %}Week of {{ day_date }} to {{ sunday_date }}{% endblocktrans %}
-
- {% endwith %}
- {% endif %}
-
-
- {{ day|date:"l d/m" }}
-
- {% with day_str=day|date:"Y-m-d" %}
- {% for item in json.data %}
- {% if item.date == day_str %}
-
-
{{ item.label }}
-
+
+ {% with first_monday=json.data.0.date|date|adjust_to_week_monday last_item=json.data|last %}
+ {% with last_day=last_item.date|date|adjust_to_week_monday|add_days:6 %}
+ {% now 'Y-m-W' as current_week %}
+ {% spaceless %}
+
←
+
+
+ {% for day in first_monday|iterate_days_until:last_day %}
+ {% if day.weekday == 0 %}
+ {% with sunday=day|add_days:6 %}
+
+ {% blocktrans with day_date=day|date:'d/m' sunday_date=sunday|date:'d/m' %}Week of {{ day_date }} to {{ sunday_date }}{% endblocktrans %}
+
+ {% endwith %}
{% endif %}
+
+
+ {{ day|date:"l d/m" }}
+
+ {% with day_str=day|date:"Y-m-d" %}
+ {% for item in json.data %}
+ {% if item.date == day_str %}
+
+
{{ item.label }}
+
+ {% endif %}
+ {% endfor %}
+ {% endwith %}
+
{% trans "No activity this week" %}
+
{% endfor %}
- {% endwith %}
-
{% trans "No activity this week" %}
+
- {% endfor %}
-
-
- →
- {% if booking_form_url %}
-
- {% trans "Update bookings" %}
-
- {% endif %}
- {% endspaceless %}
- {% endwith %}
-{% endwith %}
-
-{% endif %}
+ →
+ {% if booking_form_url %}
+
+ {% trans "Update bookings" %}
+
+ {% endif %}
+ {% endspaceless %}
+ {% endwith %}
+ {% endwith %}
+
+ {% endif %}
{% endblock %}
diff --git a/combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html b/combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html
index 1f49c7b7..378a811d 100644
--- a/combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html
+++ b/combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html
@@ -1,15 +1,15 @@
{% load i18n %}
{% block cell-content %}
-
-
{% trans 'Recent Documents' %}
-{% if results %}
-
-{% else %}
-
{% trans "You don't have any recent document." %}
-{% endif %}
-
+
+
{% trans 'Recent Documents' %}
+ {% if results %}
+
+ {% else %}
+
{% trans "You don't have any recent document." %}
+ {% endif %}
+
{% endblock %}
diff --git a/combo/apps/gallery/templates/combo/gallery_image_form.html b/combo/apps/gallery/templates/combo/gallery_image_form.html
index e38d1016..973d6123 100644
--- a/combo/apps/gallery/templates/combo/gallery_image_form.html
+++ b/combo/apps/gallery/templates/combo/gallery_image_form.html
@@ -2,25 +2,25 @@
{% load i18n %}
{% block appbar %}
-{% if object.id %}
-{% trans "Edit Image" %}
-{% else %}
-{% trans "New Image" %}
-{% endif %}
+ {% if object.id %}
+ {% trans "Edit Image" %}
+ {% else %}
+ {% trans "New Image" %}
+ {% endif %}
{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/combo/apps/gallery/templates/combo/gallery_manager.html b/combo/apps/gallery/templates/combo/gallery_manager.html
index a2befa48..c7bdca2d 100644
--- a/combo/apps/gallery/templates/combo/gallery_manager.html
+++ b/combo/apps/gallery/templates/combo/gallery_manager.html
@@ -2,26 +2,26 @@
{% load static thumbnail i18n %}
{% block cell-form %}
-
-{% for image in cell.image_set.all %}
-
-{% thumbnail image.image "120x120" crop="50% 25%" as im %}
-
-{% endthumbnail %}
-
-
-
-
-
-{% endfor %}
-{% trans 'Add an Image' %}
-
+
+ {% for image in cell.image_set.all %}
+
+ {% thumbnail image.image "120x120" crop="50% 25%" as im %}
+
+ {% endthumbnail %}
+
+
+
+
+
+ {% endfor %}
+ {% trans 'Add an Image' %}
+
-
-
+
+
-
-{{form.as_p}}
-
+
+ {{form.as_p}}
+
{% endblock %}
diff --git a/combo/apps/gallery/templates/combo/gallerycell.html b/combo/apps/gallery/templates/combo/gallerycell.html
index 24be0780..a821502c 100644
--- a/combo/apps/gallery/templates/combo/gallerycell.html
+++ b/combo/apps/gallery/templates/combo/gallerycell.html
@@ -1,37 +1,37 @@
{% load thumbnail %}
{% block cell-content %}
-{% if cell.title %}
-{{ cell.title }}
-{% endif %}
-
-{% for image in cell.image_set.all %}
- {% if forloop.first %}
-{% thumbnail image.image "640x480" crop="50% 25%" as im %}
-
-
-
-
-{% endthumbnail %}
+ {% if cell.title %}
+
{{ cell.title }}
{% endif %}
-{% thumbnail image.image "60x60" crop="50% 25%" as im %}
-{% thumbnail image.image "640x480" crop="50% 25%" as im_large %}
-
-{% endthumbnail %}
-{% endthumbnail %}
-{% endfor %}
-
-
-
+
+ {% for image in cell.image_set.all %}
+ {% if forloop.first %}
+ {% thumbnail image.image "640x480" crop="50% 25%" as im %}
+
+
+
+
+ {% endthumbnail %}
+ {% endif %}
+ {% thumbnail image.image "60x60" crop="50% 25%" as im %}
+ {% thumbnail image.image "640x480" crop="50% 25%" as im_large %}
+
+ {% endthumbnail %}
+ {% endthumbnail %}
+ {% endfor %}
+
+
+
{% endblock %}
diff --git a/combo/apps/kb/templates/combo/latest-page-updates-cell.html b/combo/apps/kb/templates/combo/latest-page-updates-cell.html
index 9ae02195..3ed94eba 100644
--- a/combo/apps/kb/templates/combo/latest-page-updates-cell.html
+++ b/combo/apps/kb/templates/combo/latest-page-updates-cell.html
@@ -1,22 +1,22 @@
{% load i18n %}
{% block cell-content %}
-{% trans "Latest Page Updates" %}
-
+ {% trans "Latest Page Updates" %}
+
{% endblock %}
diff --git a/combo/apps/lingo/templates/lingo/basketitem_error_list.html b/combo/apps/lingo/templates/lingo/basketitem_error_list.html
index fb314c1c..228bb6ea 100644
--- a/combo/apps/lingo/templates/lingo/basketitem_error_list.html
+++ b/combo/apps/lingo/templates/lingo/basketitem_error_list.html
@@ -2,57 +2,57 @@
{% load i18n %}
{% block appbar %}
-{% trans 'Payments in error' %}
+ {% trans 'Payments in error' %}
{% endblock %}
{% block breadcrumb %}
-{{ block.super }}
-{% trans 'Payments in error' %}
+ {{ block.super }}
+ {% trans 'Payments in error' %}
{% endblock %}
{% block content %}
-
-
+
+
-{% if object_list %}
-
-
-
- {% trans 'Item' %}
- {% trans 'Amount' %}
- {% trans 'Date' %}
-
-
-
-{% for object in object_list %}
-
- {% if object.source_url %}{{ object.subject }} {% else %}{{ object.subject }}{% endif %}
- {{ object.amount }} €
- {{ object.payment_date }}
-
- {% if object.transaction_status != 99 %}
- {% trans "See transaction" %}
- {% if object.source_url %}
-
- {% trans "Mark as notified" %}
- {% endif %}
- {% endif %}
-
-
-{% endfor %}
-
-
+ {% if object_list %}
+
+
+
+ {% trans 'Item' %}
+ {% trans 'Amount' %}
+ {% trans 'Date' %}
+
+
+
+ {% for object in object_list %}
+
+ {% if object.source_url %}{{ object.subject }} {% else %}{{ object.subject }}{% endif %}
+ {{ object.amount }} €
+ {{ object.payment_date }}
+
+ {% if object.transaction_status != 99 %}
+ {% trans "See transaction" %}
+ {% if object.source_url %}
+
+ {% trans "Mark as notified" %}
+ {% endif %}
+ {% endif %}
+
+
+ {% endfor %}
+
+
-{% include "gadjo/pagination.html" %}
+ {% include "gadjo/pagination.html" %}
-{% else %}
-
- {% blocktrans %}
- This site doesn't have any payment in error.
- {% endblocktrans %}
-
-{% endif %}
-
+ {% else %}
+
+ {% blocktrans %}
+ This site doesn't have any payment in error.
+ {% endblocktrans %}
+
+ {% endif %}
+
{% endblock %}
diff --git a/combo/apps/lingo/templates/lingo/combo/basket.html b/combo/apps/lingo/templates/lingo/combo/basket.html
index 2eb11e8f..ff2d0a39 100644
--- a/combo/apps/lingo/templates/lingo/combo/basket.html
+++ b/combo/apps/lingo/templates/lingo/combo/basket.html
@@ -1,40 +1,40 @@
{% load i18n %}
{% block cell-content %}
-{% if regies %}
-{% trans "Basket" %}
-
-{% for regie_info in regies %}
-
-{% if regies|length != 1 %}
{{regie_info.regie.label}} {% endif %}
-
-
+ {% if regies %}
+
{% trans "Basket" %}
+
+ {% for regie_info in regies %}
+
+ {% if regies|length != 1 %}
{{regie_info.regie.label}} {% endif %}
+
+
-{% if not regie_info.regie.can_pay_only_one_basket_item %}
-
-{% endif %}
+ {% if not regie_info.regie.can_pay_only_one_basket_item %}
+
+ {% endif %}
-{% endfor %}
-{% endif %}
-
+ {% endfor %}
+ {% endif %}
+
{% endblock %}
diff --git a/combo/apps/lingo/templates/lingo/combo/basket_link.html b/combo/apps/lingo/templates/lingo/combo/basket_link.html
index db11f45b..a1792266 100644
--- a/combo/apps/lingo/templates/lingo/combo/basket_link.html
+++ b/combo/apps/lingo/templates/lingo/combo/basket_link.html
@@ -1,13 +1,13 @@
{% load i18n %}
{% block cell-content %}
-{% if total %}
-{% trans 'Basket:' %}
- {% blocktrans count counter=items|length %}
- {{counter}} item
- {% plural %}
- {{counter}} items
- {% endblocktrans %}
- ({{ total }} €)
-
-{% endif %}
+ {% if total %}
+ {% trans 'Basket:' %}
+ {% blocktrans count counter=items|length %}
+ {{counter}} item
+ {% plural %}
+ {{counter}} items
+ {% endblocktrans %}
+ ({{ total }} €)
+
+ {% endif %}
{% endblock %}
diff --git a/combo/apps/lingo/templates/lingo/combo/cancel-item.html b/combo/apps/lingo/templates/lingo/combo/cancel-item.html
index 687d924b..0665d872 100644
--- a/combo/apps/lingo/templates/lingo/combo/cancel-item.html
+++ b/combo/apps/lingo/templates/lingo/combo/cancel-item.html
@@ -3,18 +3,18 @@
-
-