From 45f7f9669ea5d7bd2c766a88252a22ebe2866f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 26 Jun 2018 08:46:40 +0200 Subject: [PATCH] general: mark cells as a block so they can be extended (#24773) --- .../calendar/templates/calendar/booking_calendar_cell.html | 2 ++ combo/apps/dashboard/templates/combo/dashboardcell.html | 2 ++ combo/apps/dataviz/templates/combo/gauge-cell.html | 2 ++ combo/apps/family/templates/family/infos.html | 2 ++ .../fargo/templates/combo/fargo/recent-documents-cell.html | 2 ++ combo/apps/lingo/templates/lingo/combo/basket.html | 2 ++ combo/apps/lingo/templates/lingo/combo/basket_link.html | 2 ++ combo/apps/lingo/templates/lingo/combo/items.html | 2 ++ .../apps/lingo/templates/lingo/combo/recent_transactions.html | 2 ++ .../templates/lingo/combo/self-declared-invoice-payment.html | 2 ++ combo/apps/maps/templates/maps/map_cell.html | 2 ++ .../apps/notifications/templates/combo/notificationscell.html | 2 ++ combo/apps/search/templates/combo/search-cell.html | 2 ++ combo/apps/wcs/templates/combo/wcs/category.html | 2 ++ combo/apps/wcs/templates/combo/wcs/current_drafts.html | 2 ++ combo/apps/wcs/templates/combo/wcs/current_forms.html | 2 ++ combo/apps/wcs/templates/combo/wcs/form.html | 2 ++ combo/apps/wcs/templates/combo/wcs/form_categories.html | 2 ++ combo/apps/wcs/templates/combo/wcs/forms_of_category.html | 2 ++ combo/apps/wcs/templates/combo/wcs/list_of_forms.html | 3 ++- combo/apps/wcs/templates/combo/wcs/tracking_code_input.html | 2 ++ combo/apps/wcs/templates/combo/wcs/user_all_forms.html | 2 ++ combo/apps/wcs/templates/combo/wcs/user_done_forms.html | 2 ++ combo/public/templates/combo/deferred-cell.html | 2 ++ combo/public/templates/combo/feed-cell.html | 2 ++ combo/public/templates/combo/json-cell.html | 2 ++ combo/public/templates/combo/json-error-cell.html | 2 ++ combo/public/templates/combo/json-list-cell.html | 2 ++ combo/public/templates/combo/link-cell.html | 2 ++ combo/public/templates/combo/menu-cell.html | 2 ++ combo/public/templates/combo/parameters-cell.html | 2 ++ combo/public/templates/combo/text-cell.html | 2 ++ 32 files changed, 64 insertions(+), 1 deletion(-) diff --git a/combo/apps/calendar/templates/calendar/booking_calendar_cell.html b/combo/apps/calendar/templates/calendar/booking_calendar_cell.html index ac8acc2..e70947d 100644 --- a/combo/apps/calendar/templates/calendar/booking_calendar_cell.html +++ b/combo/apps/calendar/templates/calendar/booking_calendar_cell.html @@ -1,4 +1,5 @@ {% load i18n calendar %} +{% block cell-content %} {% if cell.title %}

@@ -23,3 +24,4 @@ +{% endblock %} diff --git a/combo/apps/dashboard/templates/combo/dashboardcell.html b/combo/apps/dashboard/templates/combo/dashboardcell.html index 960c302..729f6c7 100644 --- a/combo/apps/dashboard/templates/combo/dashboardcell.html +++ b/combo/apps/dashboard/templates/combo/dashboardcell.html @@ -1,4 +1,5 @@ {% load combo i18n %} +{% block cell-content %} {% for tile in tiles %} {% with cell=tile.cell %}
{% render_cell cell %}
{% endwith %} {% endfor %} +{% endblock %} diff --git a/combo/apps/dataviz/templates/combo/gauge-cell.html b/combo/apps/dataviz/templates/combo/gauge-cell.html index 5a326be..3c5e7dd 100644 --- a/combo/apps/dataviz/templates/combo/gauge-cell.html +++ b/combo/apps/dataviz/templates/combo/gauge-cell.html @@ -1,3 +1,4 @@ +{% block cell-content %}
{% endif %}{{title}}{% if url %}{% endif %} {% endif %}
+{% endblock %} diff --git a/combo/apps/family/templates/family/infos.html b/combo/apps/family/templates/family/infos.html index 8561c62..7dcfd5d 100644 --- a/combo/apps/family/templates/family/infos.html +++ b/combo/apps/family/templates/family/infos.html @@ -1,4 +1,5 @@ {% load i18n combo %} +{% block cell-content %}

{% trans "Informations related to your family" %}

{% trans "Top content for unlinked users" as top_content %} @@ -62,3 +63,4 @@ {% 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 f0dd66c..1f49c7b 100644 --- a/combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html +++ b/combo/apps/fargo/templates/combo/fargo/recent-documents-cell.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %} +{% endblock %} diff --git a/combo/apps/lingo/templates/lingo/combo/basket.html b/combo/apps/lingo/templates/lingo/combo/basket.html index b73f2a0..ae0fd1b 100644 --- a/combo/apps/lingo/templates/lingo/combo/basket.html +++ b/combo/apps/lingo/templates/lingo/combo/basket.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %} {% if regies %}

{% trans "Basket" %}

{% for regie_info in regies %} @@ -21,3 +22,4 @@ {% 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 1b34fec..db11f45 100644 --- a/combo/apps/lingo/templates/lingo/combo/basket_link.html +++ b/combo/apps/lingo/templates/lingo/combo/basket_link.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %} {% if total %}

{% trans 'Basket:' %} {% blocktrans count counter=items|length %} @@ -9,3 +10,4 @@ ({{ total }} €)

{% endif %} +{% endblock %} diff --git a/combo/apps/lingo/templates/lingo/combo/items.html b/combo/apps/lingo/templates/lingo/combo/items.html index 35034e9..3dd2bae 100644 --- a/combo/apps/lingo/templates/lingo/combo/items.html +++ b/combo/apps/lingo/templates/lingo/combo/items.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %} {% if title %}

{{ title|safe }}

{% endif %}
{% if text %}{{ text|safe }}{% endif %} @@ -44,3 +45,4 @@ {% trans "No items yet" %} {% endif %}
+{% endblock %} diff --git a/combo/apps/lingo/templates/lingo/combo/recent_transactions.html b/combo/apps/lingo/templates/lingo/combo/recent_transactions.html index ba72ce2..6c6a6e4 100644 --- a/combo/apps/lingo/templates/lingo/combo/recent_transactions.html +++ b/combo/apps/lingo/templates/lingo/combo/recent_transactions.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %}

{% trans "Recent Transactions" %}

{% csrf_token %} +{% endblock %} diff --git a/combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html b/combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html index d56e984..2b0387b 100644 --- a/combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html +++ b/combo/apps/lingo/templates/lingo/combo/self-declared-invoice-payment.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %} {% if title %}

{{ title }}

{% endif %}
{% if text %}

{{ text|safe }}

{% endif %} @@ -27,3 +28,4 @@
+{% endblock %} diff --git a/combo/apps/maps/templates/maps/map_cell.html b/combo/apps/maps/templates/maps/map_cell.html index d7f5279..ec8ac06 100644 --- a/combo/apps/maps/templates/maps/map_cell.html +++ b/combo/apps/maps/templates/maps/map_cell.html @@ -1,4 +1,5 @@ {% load l10n %} +{% block cell-content %} {% if title %}

{{ title }}

{% endif %} {% localize off %}
{% endlocalize %}
+{% endblock %} diff --git a/combo/apps/notifications/templates/combo/notificationscell.html b/combo/apps/notifications/templates/combo/notificationscell.html index b815597..de13da1 100644 --- a/combo/apps/notifications/templates/combo/notificationscell.html +++ b/combo/apps/notifications/templates/combo/notificationscell.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %}

{% trans "Notifications" %}

{% if notifications %} {% endfor %} +{% endblock %} diff --git a/combo/apps/wcs/templates/combo/wcs/forms_of_category.html b/combo/apps/wcs/templates/combo/wcs/forms_of_category.html index ffc94da..367638c 100644 --- a/combo/apps/wcs/templates/combo/wcs/forms_of_category.html +++ b/combo/apps/wcs/templates/combo/wcs/forms_of_category.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %}

{{ title }}

{% if description %} @@ -32,3 +33,4 @@
+{% endblock %} diff --git a/combo/apps/wcs/templates/combo/wcs/list_of_forms.html b/combo/apps/wcs/templates/combo/wcs/list_of_forms.html index bc53666..648a8c4 100644 --- a/combo/apps/wcs/templates/combo/wcs/list_of_forms.html +++ b/combo/apps/wcs/templates/combo/wcs/list_of_forms.html @@ -1,3 +1,4 @@ +{% block cell-content %} {% if forms %} {% endif %} - +{% endblock %} diff --git a/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html b/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html index e7d8ea8..b0a3907 100644 --- a/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html +++ b/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %}

{% trans 'Tracking Code' %}

@@ -26,3 +27,4 @@
+{% endblock %} diff --git a/combo/apps/wcs/templates/combo/wcs/user_all_forms.html b/combo/apps/wcs/templates/combo/wcs/user_all_forms.html index 2155a69..5a27248 100644 --- a/combo/apps/wcs/templates/combo/wcs/user_all_forms.html +++ b/combo/apps/wcs/templates/combo/wcs/user_all_forms.html @@ -1,7 +1,9 @@ {% load combo i18n %} +{% block cell-content %}

{% trans 'All Forms' %}

{% for slug, forms in user_forms.iteritems %}
{% include "combo/wcs/list_of_forms.html" with forms=forms %}
{% endfor %} +{% endblock %} diff --git a/combo/apps/wcs/templates/combo/wcs/user_done_forms.html b/combo/apps/wcs/templates/combo/wcs/user_done_forms.html index 452941f..ddebc54 100644 --- a/combo/apps/wcs/templates/combo/wcs/user_done_forms.html +++ b/combo/apps/wcs/templates/combo/wcs/user_done_forms.html @@ -1,7 +1,9 @@ {% load combo i18n %} +{% block cell-content %}

{% trans 'Done Forms' %}

{% for slug, forms in user_forms.iteritems %}
{% include "combo/wcs/list_of_forms.html" with forms=forms %}
{% endfor %} +{% endblock %} diff --git a/combo/public/templates/combo/deferred-cell.html b/combo/public/templates/combo/deferred-cell.html index db42653..6b0b11c 100644 --- a/combo/public/templates/combo/deferred-cell.html +++ b/combo/public/templates/combo/deferred-cell.html @@ -1,4 +1,6 @@ +{% block cell-content %} {% load i18n %}
{{ cell.loading_message }}
+{% endblock %} diff --git a/combo/public/templates/combo/feed-cell.html b/combo/public/templates/combo/feed-cell.html index 93e8acd..2a1724b 100644 --- a/combo/public/templates/combo/feed-cell.html +++ b/combo/public/templates/combo/feed-cell.html @@ -1,4 +1,5 @@ {% load i18n %} +{% block cell-content %} {% if cell.title %}

{{ cell.title }}

{% endif %} @@ -12,3 +13,4 @@ {% if entry.summary %}
{{entry.summary|safe}}
{% endif %} {% endfor %} +{% endblock %} diff --git a/combo/public/templates/combo/json-cell.html b/combo/public/templates/combo/json-cell.html index 9870a86..f72574f 100644 --- a/combo/public/templates/combo/json-cell.html +++ b/combo/public/templates/combo/json-cell.html @@ -1,4 +1,6 @@ +{% block cell-content %} {% if title %}

{{title}}

{% endif %} +{% endblock %} diff --git a/combo/public/templates/combo/json-error-cell.html b/combo/public/templates/combo/json-error-cell.html index 26f2906..70555b2 100644 --- a/combo/public/templates/combo/json-error-cell.html +++ b/combo/public/templates/combo/json-error-cell.html @@ -1,3 +1,5 @@ {% load i18n %} +{% block cell-content %} {% if title %}

{{title}}

{% endif %}

{% trans "Technical error getting data." %}

+{% endblock %} diff --git a/combo/public/templates/combo/json-list-cell.html b/combo/public/templates/combo/json-list-cell.html index cb116eb..a2890ff 100644 --- a/combo/public/templates/combo/json-list-cell.html +++ b/combo/public/templates/combo/json-list-cell.html @@ -1,3 +1,4 @@ +{% block cell-content %} +{% endblock %} diff --git a/combo/public/templates/combo/link-cell.html b/combo/public/templates/combo/link-cell.html index 75a5b59..2969438 100644 --- a/combo/public/templates/combo/link-cell.html +++ b/combo/public/templates/combo/link-cell.html @@ -1 +1,3 @@ +{% block cell-content %} {{title}} +{% endblock %} diff --git a/combo/public/templates/combo/menu-cell.html b/combo/public/templates/combo/menu-cell.html index 0d18b89..90b16aa 100644 --- a/combo/public/templates/combo/menu-cell.html +++ b/combo/public/templates/combo/menu-cell.html @@ -1 +1,3 @@ +{% block cell-content %} {{menu}} +{% endblock %} diff --git a/combo/public/templates/combo/parameters-cell.html b/combo/public/templates/combo/parameters-cell.html index 40fc22d..4b7bc9a 100644 --- a/combo/public/templates/combo/parameters-cell.html +++ b/combo/public/templates/combo/parameters-cell.html @@ -1,3 +1,4 @@ +{% block cell-content %} {% if form %} {% if title %}

{% if url %}{% endif %}{{title}}{% if url %}{% endif %}

@@ -10,3 +11,4 @@ Choice: {{ form.cleaned_data.choice|pprint }} --> {% endif %} +{% endblock %} diff --git a/combo/public/templates/combo/text-cell.html b/combo/public/templates/combo/text-cell.html index 6dee0db..f7cc986 100644 --- a/combo/public/templates/combo/text-cell.html +++ b/combo/public/templates/combo/text-cell.html @@ -1 +1,3 @@ +{% block cell-content %} {{cell.text|safe}} +{% endblock %} -- 2.18.0