From 05d6c52738b57fe521f2ce28173f3386bc32b767 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 22 Sep 2022 10:09:21 +0200 Subject: [PATCH 1/2] misc: apply djhtml (#69419) --- data/themes/django/templates/wcs/base.html | 42 +-- data/themes/django/templates/wcs/home.html | 24 +- .../qommon/forms/widgets/select--test.html | 20 +- wcs/qommon/templates/qommon/email_body.html | 34 +- wcs/qommon/templates/qommon/forms/widget.html | 74 ++-- .../qommon/forms/widgets/block_sub.html | 14 +- .../qommon/forms/widgets/checkboxes.html | 28 +- .../qommon/forms/widgets/comment.html | 6 +- .../templates/qommon/forms/widgets/date.html | 54 +-- .../templates/qommon/forms/widgets/file.html | 92 ++--- .../forms/widgets/map-marker-selection.html | 32 +- .../templates/qommon/forms/widgets/map.html | 22 +- .../qommon/forms/widgets/mini-rich-text.html | 12 +- .../qommon/forms/widgets/multiselect.html | 24 +- .../qommon/forms/widgets/radiobuttons.html | 22 +- .../forms/widgets/select-timetable.html | 318 ++++++++--------- .../qommon/forms/widgets/select.html | 22 +- .../forms/widgets/select_jsonp--address.html | 12 +- .../qommon/forms/widgets/select_jsonp.html | 26 +- .../templates/qommon/forms/widgets/time.html | 28 +- wcs/qommon/templates/qommon/saml-error.html | 6 +- wcs/templates/wcs/action.html | 36 +- wcs/templates/wcs/backoffice-legacy.html | 2 +- wcs/templates/wcs/backoffice.html | 48 +-- wcs/templates/wcs/backoffice/api_access.html | 50 +-- .../wcs/backoffice/api_accesses.html | 24 +- wcs/templates/wcs/backoffice/base.html | 10 +- .../wcs/backoffice/block-inspect.html | 40 +-- wcs/templates/wcs/backoffice/blocks.html | 46 +-- .../wcs/backoffice/card-data-import-form.html | 38 +- wcs/templates/wcs/backoffice/cards.html | 20 +- wcs/templates/wcs/backoffice/category.html | 108 +++--- wcs/templates/wcs/backoffice/changes.html | 24 +- .../wcs/backoffice/data-management.html | 16 +- wcs/templates/wcs/backoffice/data-source.html | 192 +++++----- .../wcs/backoffice/data-sources.html | 166 ++++----- .../wcs/backoffice/deprecations.html | 60 ++-- wcs/templates/wcs/backoffice/error.html | 10 +- .../wcs/backoffice/formdata-inspect.html | 130 +++---- .../wcs/backoffice/formdef-inspect.html | 146 ++++---- wcs/templates/wcs/backoffice/forms.html | 70 ++-- .../backoffice/includes/inspect-field.html | 18 +- .../wcs/backoffice/logged-error.html | 98 +++--- .../wcs/backoffice/logged-errors.html | 20 +- .../wcs/backoffice/mail-template.html | 52 +-- .../wcs/backoffice/mail-templates.html | 46 +-- .../wcs/backoffice/popup_response.html | 6 +- wcs/templates/wcs/backoffice/processing.html | 20 +- .../wcs/backoffice/settings/import.html | 94 ++--- wcs/templates/wcs/backoffice/snapshots.html | 160 ++++----- .../wcs/backoffice/snapshots_compare.html | 44 +-- wcs/templates/wcs/backoffice/studio.html | 108 +++--- .../workflow-fullscreen-schema.html | 8 +- .../wcs/backoffice/workflow-inspect.html | 178 +++++----- .../wcs/backoffice/workflow-status.html | 186 +++++----- wcs/templates/wcs/backoffice/workflow.html | 332 +++++++++--------- wcs/templates/wcs/backoffice/wscall.html | 74 ++-- wcs/templates/wcs/backoffice/wscalls.html | 26 +- wcs/templates/wcs/formdata_filling.html | 34 +- wcs/templates/wcs/formdata_history.html | 100 +++--- wcs/templates/wcs/formdata_popup_filling.html | 10 +- wcs/templates/wcs/formdata_sidebox.html | 64 ++-- wcs/templates/wcs/formdata_status.html | 62 ++-- wcs/templates/wcs/formdata_steps.html | 28 +- wcs/templates/wcs/formdata_validation.html | 14 +- wcs/templates/wcs/includes/drafts-recall.html | 32 +- 66 files changed, 1981 insertions(+), 1981 deletions(-) diff --git a/data/themes/django/templates/wcs/base.html b/data/themes/django/templates/wcs/base.html index 43675ec25..243ff32b6 100644 --- a/data/themes/django/templates/wcs/base.html +++ b/data/themes/django/templates/wcs/base.html @@ -8,27 +8,27 @@ {% endblock %} -
-
-
- {% block header %} -

WIP/DJANGO - {% if title %}{{ title }}{% else %}{{ site_name }}{% endif %}

- {% endblock %} -
-
- {% block content %} - {{ prelude }} +
+
+
+ {% block header %} +

WIP/DJANGO - {% if title %}{{ title }}{% else %}{{ site_name }}{% endif %}

+ {% endblock %} +
+
+ {% block content %} + {{ prelude }} - {% if breadcrumb %} - - {% endif %} + {% if breadcrumb %} + + {% endif %} - {% block body %} - {{ body|safe }} - {% endblock %} + {% block body %} + {{ body|safe }} + {% endblock %} - {% endblock %} -
- - - + {% endblock %} +
+ + + diff --git a/data/themes/django/templates/wcs/home.html b/data/themes/django/templates/wcs/home.html index 2875d94f1..9611fd9da 100644 --- a/data/themes/django/templates/wcs/home.html +++ b/data/themes/django/templates/wcs/home.html @@ -2,19 +2,19 @@ {% block body %} -
-

HELLO WORLD

+
+

HELLO WORLD

-{% regroup forms by category as category_list %} -{% for category in category_list %} -{% if category.grouper %}

{{ category.grouper }}

{% endif %} - -{% endfor %} + {% regroup forms by category as category_list %} + {% for category in category_list %} + {% if category.grouper %}

{{ category.grouper }}

{% endif %} + + {% endfor %} -
+
{% endblock %} diff --git a/tests/templates/qommon/forms/widgets/select--test.html b/tests/templates/qommon/forms/widgets/select--test.html index 463c500fa..8f9a16cdc 100644 --- a/tests/templates/qommon/forms/widgets/select--test.html +++ b/tests/templates/qommon/forms/widgets/select--test.html @@ -1,15 +1,15 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} - - - - - - - {% for option in widget.get_options %} - --- + {% for option in widget.get_options %} + {{ option.description }} - {% endfor %} - + {% endfor %} + {% endblock %} diff --git a/wcs/qommon/templates/qommon/email_body.html b/wcs/qommon/templates/qommon/email_body.html index 40fa3ffa4..713a02002 100644 --- a/wcs/qommon/templates/qommon/email_body.html +++ b/wcs/qommon/templates/qommon/email_body.html @@ -1,22 +1,22 @@ - - - - -
-
- {% block content %} - {{ content }} + + + + +
+
+ {% block content %} + {{ content }} + {% endblock %} +
+ {% block footer %} + {% if email_signature %} +
+ {{ email_signature|linebreaks }} +
+ {% endif %} {% endblock %}
- {% block footer %} - {% if email_signature %} -
- {{ email_signature|linebreaks }} -
- {% endif %} - {% endblock %} -
- + diff --git a/wcs/qommon/templates/qommon/forms/widget.html b/wcs/qommon/templates/qommon/forms/widget.html index 3189d4ae7..d2c0fdd85 100644 --- a/wcs/qommon/templates/qommon/forms/widget.html +++ b/wcs/qommon/templates/qommon/forms/widget.html @@ -1,45 +1,45 @@
+ {% if widget.readonly %}widget-readonly{% endif %} + {% if widget.get_error %}widget-with-error{% endif %} + {% if widget.is_required %}widget-required{% else %}widget-optional{% endif %} + {% if widget.is_prefilled %}widget-prefilled{% endif %}{% endblock %}" + {% block widget-attrs %} + {% if widget.is_hidden %}style="display: none"{% endif %} + {% if widget.field %}data-field-id="{{ widget.field.id }}"{% endif %} + data-widget-name="{{ widget.name }}" + {% if widget.div_id %}id="{{widget.div_id}}" data-valuecontainerid="form_{{widget.name}}"{% endif %} + {% if widget.a11y_role %}role="{{ a11y_role }}"{% endif %} + {% if widget.a11y_labelledby %}aria-labelledby="form_label_{{widget.name}}"{% endif %} + {% for attr in widget.prefill_attributes %} + data-{{attr}}="{{widget.prefill_attributes|get:attr}}" + {% endfor %} + {% if "data-dynamic-display-child-of" in widget.attrs %} + data-dynamic-display-child-of="{{widget.attrs|get:"data-dynamic-display-child-of"}}" + {% endif %} + {% if "data-dynamic-display-value" in widget.attrs %} + data-dynamic-display-value="{{widget.attrs|get:"data-dynamic-display-value"}}" + {% endif %} + {% if "data-dynamic-display-value-in" in widget.attrs %} + data-dynamic-display-value-in="{{widget.attrs|get:"data-dynamic-display-value-in"}}" + {% endif %} + {% if widget.live_condition_source %}data-live-source="true"{% endif %} + {% endblock %} +> {% block widget-title %} - {{widget.rendered_title}} + {{widget.rendered_title}} {% endblock %} {% block widget-content %} -
- {% block widget-error %}{{widget.rendered_error}}{% endblock %} - {% block widget-control %}{{widget.render_content|safe}}{% endblock %} - {% block widget-hint %}{{widget.rendered_hint}}{% endblock %} -
+
+ {% block widget-error %}{{widget.rendered_error}}{% endblock %} + {% block widget-control %}{{widget.render_content|safe}}{% endblock %} + {% block widget-hint %}{{widget.rendered_hint}}{% endblock %} +
{% endblock %} {% if widget.render_br %} -
+
{% endif %}
diff --git a/wcs/qommon/templates/qommon/forms/widgets/block_sub.html b/wcs/qommon/templates/qommon/forms/widgets/block_sub.html index c221fa77d..f7251b67d 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/block_sub.html +++ b/wcs/qommon/templates/qommon/forms/widgets/block_sub.html @@ -2,13 +2,13 @@ {% load i18n %} {% block widget-attrs %} -{{ block.super }} data-block-row="element{{ widget.index }}" + {{ block.super }} data-block-row="element{{ widget.index }}" {% endblock %} {% block widget-content %} -{% for subwidget in widget.get_widgets %} -{% if widget.readonly and not subwidget.field.include_in_validation_page %}
{% endif %} - {{ subwidget.render|safe }} -{% if widget.readonly and not subwidget.field.include_in_validation_page %}
{% endif %} -{% endfor %} -{% if not widget.readonly and widget.remove_button %}{% endif %} {% endblock %} + {% for subwidget in widget.get_widgets %} + {% if widget.readonly and not subwidget.field.include_in_validation_page %}
{% endif %} + {{ subwidget.render|safe }} + {% if widget.readonly and not subwidget.field.include_in_validation_page %}
{% endif %} + {% endfor %} + {% if not widget.readonly and widget.remove_button %}{% endif %} {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html b/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html index c17993b3d..d2aaba250 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html +++ b/wcs/qommon/templates/qommon/forms/widgets/checkboxes.html @@ -1,18 +1,18 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} -
    - {% for option in widget.get_options %} -
  • - {% if widget.readonly and option.selected %}{% endif %} -
    • -{% endfor %} -
+
    + {% for option in widget.get_options %} +
  • + {% if widget.readonly and option.selected %}{% endif %} +
    • + {% endfor %} +
{% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/comment.html b/wcs/qommon/templates/qommon/forms/widgets/comment.html index 069ea2994..1924a648d 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/comment.html +++ b/wcs/qommon/templates/qommon/forms/widgets/comment.html @@ -1,7 +1,7 @@
+ {% if widget.is_hidden %}style="display: none"{% endif %} + class="comment-field {{widget.extra_css_class|default_if_none:"" }}"> {% block widget-content %} - {{ widget.content|safe }} + {{ widget.content|safe }} {% endblock %}
diff --git a/wcs/qommon/templates/qommon/forms/widgets/date.html b/wcs/qommon/templates/qommon/forms/widgets/date.html index eef5deb6e..1eb41192d 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/date.html +++ b/wcs/qommon/templates/qommon/forms/widgets/date.html @@ -1,37 +1,37 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} -{% if "readonly" in widget.attrs %} -{# for readonly mode, add an hidden field with the correct value and a text #} -{# input with the formated date value; this will avoid displaying the date in #} -{# Y-m-d format, or including a date input with an ineffective reset × button. #} - - but also include js datetime picker #} -{# attributes, in case it's not supported. #} - + but also include js datetime picker #} + {# attributes, in case it's not supported. #} + -{% for w in widget.get_widgets %} - {{ w.render|safe }} -{% endfor %} -
- {% trans "Drop a file or click to select one" %} -
-
- {% trans "Upload done" %} -
- - -
- {% if widget.tempfile and not widget.is_remote_storage %}{{ widget.tempfile.base_filename }}{% elif widget.tempfile %}{{ widget.tempfile.base_filename }}{% endif %} -{% if not widget.readonly %} - {% trans "remove" %} -{% elif widget.has_tempfile_image %} - -{% endif %} -
-
-{% block portfolio-picker %} -{% if not widget.readonly and widget.allow_portfolio_picking and session_user %} -

{% trans "Use file from the portfolio" %}

-{% endif %} -{% endblock %} +
+ {% for w in widget.get_widgets %} + {{ w.render|safe }} + {% endfor %} +
+ {% trans "Drop a file or click to select one" %} +
+
+ {% trans "Upload done" %} +
+ + +
+ {% if widget.tempfile and not widget.is_remote_storage %}{{ widget.tempfile.base_filename }}{% elif widget.tempfile %}{{ widget.tempfile.base_filename }}{% endif %} + {% if not widget.readonly %} + {% trans "remove" %} + {% elif widget.has_tempfile_image %} + + {% endif %} +
+
+ {% block portfolio-picker %} + {% if not widget.readonly and widget.allow_portfolio_picking and session_user %} +

{% trans "Use file from the portfolio" %}

+ {% endif %} + {% endblock %} - + {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/map-marker-selection.html b/wcs/qommon/templates/qommon/forms/widgets/map-marker-selection.html index fc0918541..e9de03612 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/map-marker-selection.html +++ b/wcs/qommon/templates/qommon/forms/widgets/map-marker-selection.html @@ -11,21 +11,21 @@ {% endblock %} {% block widget-control %} -{{ block.super }} + {{ block.super }} - + {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/map.html b/wcs/qommon/templates/qommon/forms/widgets/map.html index 01dc04d08..fb30e9d67 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/map.html +++ b/wcs/qommon/templates/qommon/forms/widgets/map.html @@ -1,15 +1,15 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} - -
+ +
{% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/mini-rich-text.html b/wcs/qommon/templates/qommon/forms/widgets/mini-rich-text.html index 594af2630..de6612c32 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/mini-rich-text.html +++ b/wcs/qommon/templates/qommon/forms/widgets/mini-rich-text.html @@ -1,10 +1,10 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} - - + >{{widget.value|default:""}} + {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/multiselect.html b/wcs/qommon/templates/qommon/forms/widgets/multiselect.html index 5ba712824..1d71c5593 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/multiselect.html +++ b/wcs/qommon/templates/qommon/forms/widgets/multiselect.html @@ -1,20 +1,20 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} - -{% if widget.readonly %} - -{% endif %} + {% for option in widget.get_options %} + + {% endfor %} + + {% if widget.readonly %} + + {% endif %} {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/radiobuttons.html b/wcs/qommon/templates/qommon/forms/widgets/radiobuttons.html index 31b2197da..9bce21a2f 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/radiobuttons.html +++ b/wcs/qommon/templates/qommon/forms/widgets/radiobuttons.html @@ -3,15 +3,15 @@ {% block widget-css-classes %}{{ block.super }}{% if widget.field.inline %} widget-inline-radio{% endif %}{% endblock %} {% block widget-control %} -{% for option in widget.get_options %} - - {% if not forloop.last %}{{ widget.delim|safe }}{% endif %} -{% endfor %} + {% for option in widget.get_options %} + + {% if not forloop.last %}{{ widget.delim|safe }}{% endif %} + {% endfor %} {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/select-timetable.html b/wcs/qommon/templates/qommon/forms/widgets/select-timetable.html index 9310eaeb7..438b7afd6 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/select-timetable.html +++ b/wcs/qommon/templates/qommon/forms/widgets/select-timetable.html @@ -1,177 +1,177 @@ {% extends "qommon/forms/widget.html" %} {% load qommon i18n %} {% block widget-control %} - -
-
- + $table.find('span.selectable').on('click', function() { + $table.find('span.timetable-cell').removeClass('on'); + $(this).addClass('on'); + $select.val($(options[$(this).data('idx')]).attr('value')); + $select.parents('div.widget-prefilled').removeClass('widget-prefilled'); + $select.trigger('wcs:change'); + }); + }); + $select.trigger('wcs:options-change'); + }); + {% endblock %} {% block widget-hint %} -{% if widget.hint %}
{{widget.hint}}
{% endif %} + {% if widget.hint %}
{{widget.hint}}
{% endif %} {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/select.html b/wcs/qommon/templates/qommon/forms/widgets/select.html index 7a855876a..80543a4ff 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/select.html +++ b/wcs/qommon/templates/qommon/forms/widgets/select.html @@ -1,18 +1,18 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} - + {% for option in widget.get_options %} + {{ option.description }} + {% empty %} + {% if widget.separate_hint or not widget.hint %} + + {% endif %} + {% endfor %} + {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/select_jsonp--address.html b/wcs/qommon/templates/qommon/forms/widgets/select_jsonp--address.html index 647494887..a4024d33d 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/select_jsonp--address.html +++ b/wcs/qommon/templates/qommon/forms/widgets/select_jsonp--address.html @@ -1,10 +1,10 @@ {% extends "qommon/forms/widgets/select_jsonp.html" %} {% load i18n %} {% block widget-control %} -{{ block.super }} -{% if not widget.readonly %} -
- -
-{% endif %} + {{ block.super }} + {% if not widget.readonly %} +
+ +
+ {% endif %} {% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/select_jsonp.html b/wcs/qommon/templates/qommon/forms/widgets/select_jsonp.html index 4f4fc0a67..05963ea5b 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/select_jsonp.html +++ b/wcs/qommon/templates/qommon/forms/widgets/select_jsonp.html @@ -1,17 +1,17 @@ {% extends "qommon/forms/widget.html" %} {% load i18n %} {% block widget-control %} -
- -{% if widget.add_related_url %} -+ -{% endif %} -
+
+ + {% if widget.add_related_url %} + + + {% endif %} +
{% endblock %} diff --git a/wcs/qommon/templates/qommon/forms/widgets/time.html b/wcs/qommon/templates/qommon/forms/widgets/time.html index 7d6498706..83f4f8b3f 100644 --- a/wcs/qommon/templates/qommon/forms/widgets/time.html +++ b/wcs/qommon/templates/qommon/forms/widgets/time.html @@ -1,23 +1,23 @@ {% extends "qommon/forms/widget.html" %} {% block widget-control %} - {% endblock %} diff --git a/wcs/qommon/templates/qommon/saml-error.html b/wcs/qommon/templates/qommon/saml-error.html index 736634c3c..0ad8eb1ca 100644 --- a/wcs/qommon/templates/qommon/saml-error.html +++ b/wcs/qommon/templates/qommon/saml-error.html @@ -2,9 +2,9 @@ {% load i18n %} {% block body %} -
{% trans "There was a temporary error during your authentication, please retry later." %}
+
{% trans "There was a temporary error during your authentication, please retry later." %}
-
+ -
+ {% endblock %} diff --git a/wcs/templates/wcs/action.html b/wcs/templates/wcs/action.html index bf1b5eb2e..04d0180a1 100644 --- a/wcs/templates/wcs/action.html +++ b/wcs/templates/wcs/action.html @@ -2,22 +2,22 @@ {% load i18n %} {% block body %} -{% if done %} -

-{% if done_message %} -{{ done_message }} -{% else %} -{% trans "The action has been confirmed. You can now close this window." %} -{% endif %} -

-{% else %} -

-{% if message %} -{{ message }} -{% else %} -{% trans "Please confirm action." %} -{% endif %} -

-{{ html_form.render|safe }} -{% endif %} + {% if done %} +

+ {% if done_message %} + {{ done_message }} + {% else %} + {% trans "The action has been confirmed. You can now close this window." %} + {% endif %} +

+ {% else %} +

+ {% if message %} + {{ message }} + {% else %} + {% trans "Please confirm action." %} + {% endif %} +

+ {{ html_form.render|safe }} + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice-legacy.html b/wcs/templates/wcs/backoffice-legacy.html index 8737456a5..2116c27f9 100644 --- a/wcs/templates/wcs/backoffice-legacy.html +++ b/wcs/templates/wcs/backoffice-legacy.html @@ -1,6 +1,6 @@ {% extends "wcs/backoffice.html" %} {% block main-content %} -{{ body|safe }} + {{ body|safe }} {% endblock %} diff --git a/wcs/templates/wcs/backoffice.html b/wcs/templates/wcs/backoffice.html index beb4fd499..57f006ffe 100644 --- a/wcs/templates/wcs/backoffice.html +++ b/wcs/templates/wcs/backoffice.html @@ -5,14 +5,14 @@ {% block footer %}w.c.s. — Copyright © Entr'ouvert{% endblock %} {% block gadjo-js %} -{{script|safe}} + {{script|safe}} {% endblock %} {% block gadjo-css %} - -{{ block.super }} -{% block css %}{% endblock %} - + + {{ block.super }} + {% block css %}{% endblock %} + {% endblock %} {% block bodyargs %}class="section-{{section}} {% if admin_for_all %}admin-for-all{% endif %}"{% endblock %} @@ -27,35 +27,35 @@ {% endblock %} {% block sidepage %} -
- {{app_label}} - {{ header_menu|safe }} -
+
+ {{app_label}} + {{ header_menu|safe }} +
{% endblock %} {% block main-content %} {% block content %} {% block appbar %} -
-

{% block appbar-title %}{% endblock %}

-{% block appbar-actions %}{% endblock %} -
+
+

{% block appbar-title %}{% endblock %}

+ {% block appbar-actions %}{% endblock %} +
{% endblock %} {% block session-message %} -{{session_message|safe}} + {{session_message|safe}} {% endblock %} {% endblock %} {% endblock %} {% block sidebar %} -{% if sidebar or has_sidebar %} - -{% endif %} + {% if sidebar or has_sidebar %} + + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/api_access.html b/wcs/templates/wcs/backoffice/api_access.html index cec905bb7..621d1156a 100644 --- a/wcs/templates/wcs/backoffice/api_access.html +++ b/wcs/templates/wcs/backoffice/api_access.html @@ -1,31 +1,31 @@ {% load i18n %} {% block body %} -
-

{% trans "API access" %} - {{ api_access.name }}

- - {% trans "Delete" %} - {% trans "Edit" %} - -
+
+

{% trans "API access" %} - {{ api_access.name }}

+ + {% trans "Delete" %} + {% trans "Edit" %} + +
-{% if api_access.description %} -
{{ api_access.description }}
-{% endif %} + {% if api_access.description %} +
{{ api_access.description }}
+ {% endif %} -
-

{% trans "Parameters" %}

-
    -
  • {% trans "Access identifier:" %} {{ api_access.access_identifier }}
    • -
  • {% trans "Access key:" %} {{ api_access.access_key }}
    • - {% if api_access.restrict_to_anonymised_data %}
  • {% trans "Restricted to anonymised data" %}
    • {% endif %} - {% if api_access.get_roles %} -
  • {% trans "Roles:" %} -
      - {% for role in api_access.get_roles %}
    • {{ role.name }}
      • {% endfor %} -
    -
    • - {% endif %} -
-
+
+

{% trans "Parameters" %}

+
    +
  • {% trans "Access identifier:" %} {{ api_access.access_identifier }}
    • +
  • {% trans "Access key:" %} {{ api_access.access_key }}
    • + {% if api_access.restrict_to_anonymised_data %}
  • {% trans "Restricted to anonymised data" %}
    • {% endif %} + {% if api_access.get_roles %} +
  • {% trans "Roles:" %} +
      + {% for role in api_access.get_roles %}
    • {{ role.name }}
      • {% endfor %} +
    +
    • + {% endif %} +
+
{% endblock %} diff --git a/wcs/templates/wcs/backoffice/api_accesses.html b/wcs/templates/wcs/backoffice/api_accesses.html index 1e0a96d0a..b60bb2af8 100644 --- a/wcs/templates/wcs/backoffice/api_accesses.html +++ b/wcs/templates/wcs/backoffice/api_accesses.html @@ -4,19 +4,19 @@ {% block appbar-title %}{% trans "API access" %}{% endblock %} {% block appbar-actions %} -{% trans "New API access" %} + {% trans "New API access" %} {% endblock %} {% block content %} -{% if api_accesses %} - -{% else %} -
-{% trans "There are no API access defined." %} -
-{% endif %} + {% if api_accesses %} + + {% else %} +
+ {% trans "There are no API access defined." %} +
+ {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/base.html b/wcs/templates/wcs/backoffice/base.html index 5603f3dea..64fa5b853 100644 --- a/wcs/templates/wcs/backoffice/base.html +++ b/wcs/templates/wcs/backoffice/base.html @@ -1,12 +1,12 @@ {% block appbar %} -
-

{% block appbar-title %}{% endblock %}

-{% block appbar-actions %}{% endblock %} -
+
+

{% block appbar-title %}{% endblock %}

+ {% block appbar-actions %}{% endblock %} +
{% endblock %} {% block session-message %} -{{session_message|safe}} + {{session_message|safe}} {% endblock %} {% block content %} diff --git a/wcs/templates/wcs/backoffice/block-inspect.html b/wcs/templates/wcs/backoffice/block-inspect.html index 4e3a9fcb2..f5d0e9bce 100644 --- a/wcs/templates/wcs/backoffice/block-inspect.html +++ b/wcs/templates/wcs/backoffice/block-inspect.html @@ -5,27 +5,27 @@ {% block content %} -
-
- - -
-
+
+
+ + +
+
-
-
    -
  • {% trans "Title" %}{% trans ":" %} {{ blockdef.name|default:"-" }}
    • -
  • {% trans "Category" %}{% trans ":" %} {% if blockdef.category %}{{ blockdef.category.name }}{% else %}-{% endif %}
    • -
  • {% trans "Digest Template" %}{% trans ":" %} {{ blockdef.digest_template|default:"-" }}
    • -
-
+
+
    +
  • {% trans "Title" %}{% trans ":" %} {{ blockdef.name|default:"-" }}
    • +
  • {% trans "Category" %}{% trans ":" %} {% if blockdef.category %}{{ blockdef.category.name }}{% else %}-{% endif %}
    • +
  • {% trans "Digest Template" %}{% trans ":" %} {{ blockdef.digest_template|default:"-" }}
    • +
+
- -
+ +
-
+
{% endblock %} diff --git a/wcs/templates/wcs/backoffice/blocks.html b/wcs/templates/wcs/backoffice/blocks.html index 8cd8cd108..c2f33f045 100644 --- a/wcs/templates/wcs/backoffice/blocks.html +++ b/wcs/templates/wcs/backoffice/blocks.html @@ -4,34 +4,34 @@ {% block appbar-title %}{% trans "Field Blocks" %}{% endblock %} {% block appbar-actions %} -{% trans "Categories" %} -{% trans "Import" %} -{% trans "New field block" %} + {% trans "Categories" %} + {% trans "Import" %} + {% trans "New field block" %} {% endblock %} {% block content %} -{% if categories %} -{% for category in categories %} - {% if category.blocks %} -
-

{{ category.name }}

+ {% if categories %} + {% for category in categories %} + {% if category.blocks %} +
+

{{ category.name }}

+ +
+ {% endif %} + {% endfor %} + {% elif blocks %} -
+ {% else %} +
+ {% trans "There are no field blocks defined." %} +
{% endif %} -{% endfor %} -{% elif blocks %} - -{% else %} -
-{% trans "There are no field blocks defined." %} -
-{% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/card-data-import-form.html b/wcs/templates/wcs/backoffice/card-data-import-form.html index 78e6dbba2..99741d4af 100644 --- a/wcs/templates/wcs/backoffice/card-data-import-form.html +++ b/wcs/templates/wcs/backoffice/card-data-import-form.html @@ -2,30 +2,30 @@ {% load i18n %} {% block appbar %} -
-

{% trans "Import File" %}

-
+
+

{% trans "Import File" %}

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

{% trans "You can add data to this card by uploading a file." %}

+

{% trans "You can add data to this card by uploading a file." %}

-{% if not impossible_csv_fields %} -

{% trans "Download sample CSV file for this card" %}

-{% else %} -
-

- {% blocktrans count fields=impossible_csv_fields|length with labels=impossible_csv_fields|join:", " %} - {{ labels }} is required but cannot be filled from CSV. - {% plural %} - {{ labels }} are required but cannot be filled from CSV. - {% endblocktrans %} - {% trans "Only JSON files can be imported." %} -

-
-{% endif %} + {% if not impossible_csv_fields %} +

{% trans "Download sample CSV file for this card" %}

+ {% else %} +
+

+ {% blocktrans count fields=impossible_csv_fields|length with labels=impossible_csv_fields|join:", " %} + {{ labels }} is required but cannot be filled from CSV. + {% plural %} + {{ labels }} are required but cannot be filled from CSV. + {% endblocktrans %} + {% trans "Only JSON files can be imported." %} +

+
+ {% endif %} -{{ html_form.render|safe }} + {{ html_form.render|safe }} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/cards.html b/wcs/templates/wcs/backoffice/cards.html index 284ff5c51..96a4c2943 100644 --- a/wcs/templates/wcs/backoffice/cards.html +++ b/wcs/templates/wcs/backoffice/cards.html @@ -4,17 +4,17 @@ {% block appbar-title %}{% trans "Card Models" %}{% endblock %} {% block appbar-actions %} -{% if is_global_accessible_forms %} - {% trans "Data sources" %} - {% trans "Fields blocks" %} -{% endif %} -{% if is_global_accessible_cards %} - {% trans "Categories" %} -{% endif %} -{% trans "Import" %} -{% trans "New Card Model" %} + {% if is_global_accessible_forms %} + {% trans "Data sources" %} + {% trans "Fields blocks" %} + {% endif %} + {% if is_global_accessible_cards %} + {% trans "Categories" %} + {% endif %} + {% trans "Import" %} + {% trans "New Card Model" %} {% endblock %} {% block no-objects %} -{% trans "There are no card models defined." %} + {% trans "There are no card models defined." %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/category.html b/wcs/templates/wcs/backoffice/category.html index 21b7ec261..9ab924dff 100644 --- a/wcs/templates/wcs/backoffice/category.html +++ b/wcs/templates/wcs/backoffice/category.html @@ -4,66 +4,66 @@ {% block appbar-title %}{{ category.name }}{% endblock %} {% block appbar-actions %} -{% if not category.is_readonly %} -{% trans "Delete" %} -{% trans "Edit" %} -{% endif %} + {% if not category.is_readonly %} + {% trans "Delete" %} + {% trans "Edit" %} + {% endif %} {% endblock %} {% block content %} -{{ block.super }} + {{ block.super }} -{% if not category.snapshot_object %}{{ view.last_modification_block|safe }}{% endif %} + {% if not category.snapshot_object %}{{ view.last_modification_block|safe }}{% endif %} -{% if category.description %} -
{{ category.get_description_html_text|safe }}
-{% endif %} + {% if category.description %} +
{{ category.get_description_html_text|safe }}
+ {% endif %} -{% if not category.snapshot_object %} -
-

{% trans view.usage_title %}

-{% with view.get_formdefs as formdefs %} - {% if formdefs %} - - {% else %} -

{% trans view.empty_message %}

+ {% if not category.snapshot_object %} +
+

{% trans view.usage_title %}

+ {% with view.get_formdefs as formdefs %} + {% if formdefs %} + + {% else %} +

{% trans view.empty_message %}

+ {% endif %} + {% endwith %} +
{% endif %} -{% endwith %} -
-{% endif %} -{% if category.export_roles or category.statistics_roles or category.management_roles %} -
-

{% trans "Permissions" %}

-
-
    - {% if category.management_roles %} -
  • {% trans "Management roles:" %} -
      - {% for role in category.management_roles %}
    • {{ role.name }}
      • {% endfor %} -
    -
    • - {% endif %} - {% if category.export_roles %} -
  • {% trans "Export roles:" %} -
      - {% for role in category.export_roles %}
    • {{ role.name }}
      • {% endfor %} -
    -
    • - {% endif %} - {% if category.statistics_roles %} -
  • {% trans "Statistics roles:" %} -
      - {% for role in category.statistics_roles %}
    • {{ role.name }}
      • {% endfor %} -
    -
    • - {% endif %} -
-
-
-{% endif %} + {% if category.export_roles or category.statistics_roles or category.management_roles %} +
+

{% trans "Permissions" %}

+
+
    + {% if category.management_roles %} +
  • {% trans "Management roles:" %} +
      + {% for role in category.management_roles %}
    • {{ role.name }}
      • {% endfor %} +
    +
    • + {% endif %} + {% if category.export_roles %} +
  • {% trans "Export roles:" %} +
      + {% for role in category.export_roles %}
    • {{ role.name }}
      • {% endfor %} +
    +
    • + {% endif %} + {% if category.statistics_roles %} +
  • {% trans "Statistics roles:" %} +
      + {% for role in category.statistics_roles %}
    • {{ role.name }}
      • {% endfor %} +
    +
    • + {% endif %} +
+
+
+ {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/changes.html b/wcs/templates/wcs/backoffice/changes.html index 4818a8835..a56cf32bb 100644 --- a/wcs/templates/wcs/backoffice/changes.html +++ b/wcs/templates/wcs/backoffice/changes.html @@ -4,16 +4,16 @@ {% block appbar-title %}{% trans "All changes" context 'studio' %}{% endblock %} {% block content %} - -{{ pagination_links|safe }} + + {{ pagination_links|safe }} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/data-management.html b/wcs/templates/wcs/backoffice/data-management.html index 76ede3603..f36d10f10 100644 --- a/wcs/templates/wcs/backoffice/data-management.html +++ b/wcs/templates/wcs/backoffice/data-management.html @@ -4,13 +4,13 @@ {% block appbar-title %}{% trans "Cards" %}{% endblock %} {% block content %} -{% regroup view.get_carddefs by category.id as category_list %} -
    - {% for category_id, object_list in category_list %} - {% if not forloop.first or category_id %}

  • {{ object_list.0.category.name|default:_('Misc') }}

    • {% endif %} - {% for carddef in object_list %} -
  • {{ carddef.name }}
    • + {% regroup view.get_carddefs by category.id as category_list %} +
      + {% for category_id, object_list in category_list %} + {% if not forloop.first or category_id %}

    • {{ object_list.0.category.name|default:_('Misc') }}

      • {% endif %} + {% for carddef in object_list %} +
    • {{ carddef.name }}
      • + {% endfor %} {% endfor %} - {% endfor %} -
    +
{% endblock %} diff --git a/wcs/templates/wcs/backoffice/data-source.html b/wcs/templates/wcs/backoffice/data-source.html index 7bf1d29a6..b98ad1838 100644 --- a/wcs/templates/wcs/backoffice/data-source.html +++ b/wcs/templates/wcs/backoffice/data-source.html @@ -1,109 +1,109 @@ {% load i18n %} {% block body %} -
-

{% trans "Data Source" %} - {{ datasource.name }}

- - {% if not datasource.is_readonly %} - {% trans "Edit" %} +
+

{% trans "Data Source" %} - {{ datasource.name }}

+ + {% if not datasource.is_readonly %} + {% trans "Edit" %} + {% endif %} + +
+ + {% if datasource.description %} +
{{ datasource.description }}
{% endif %} - -
-{% if datasource.description %} -
{{ datasource.description }}
-{% endif %} + {% if datasource.data_source %} +
+

{% trans "Configuration" %}

+
    + {% if datasource.agenda_ds %} + {% with datasource.agenda_ds_origin as origin %} +
  • {% trans "Type of source:" %} {% trans "Agenda data" %}{% if origin %} ({% trans "Copy of:" %} {{ origin.name }}){% endif %}
    • +
  • {% trans "URL:" %} {{ datasource.data_source.value }}
    • + {% if datasource.qs_data %} +
  • {% trans "Extra query string data:" %} +
      + {% for k, v in datasource.qs_data.items %} +
    • {% blocktrans %}{{ k }}:{% endblocktrans %} {{ v }}
      • + {% endfor %} +
    +
    • + {% endif %} + {% endwith %} + {% else %} +
  • {% trans "Type of source:" %} {{ datasource.type_label }}
    • + {% if datasource.data_source.type == 'json' or datasource.data_source.type == 'jsonp' or datasource.data_source.type == 'geojson' %} +
  • {% trans "URL:" %} {{ datasource.data_source.value }}
    • + {% elif datasource.data_source.type == 'formula' %} +
  • {% trans "Python Expression:" %} {{ datasource.data_source.value }}
    • + {% elif datasource.data_source.type == 'wcs:users' %} + {% spaceless %} +
  • {% trans "Users with roles:" %} +
      + {% for role in roles %} + {% if role.0 in datasource.users_included_roles %} +
    • {{ role.1 }}
      • + {% endif %} + {% endfor %} +
    +
    • +
  • {% trans "Users without roles:" %} +
      + {% for role in roles %} + {% if role.0 in datasource.users_excluded_roles %} +
    • {{ role.1 }}
      • + {% endif %} + {% endfor %} +
    +
    • +
  • {% trans "Include disabled users:" %} + {% if datasource.include_disabled_users %} + {% trans "Yes" %} + {% else %} + {% trans "No" %} + {% endif %} +
    • + {% endspaceless %} + {% endif %} + {% endif %} + {% if datasource.cache_duration %} +
  • {% trans "Cache Duration:" %} {{ datasource.humanized_cache_duration }} + {% endif %} + {% if not datasource.data_source.type == 'wcs:users' %} +
  • {% trans "Notify on errors:" %} {{ datasource.notify_on_errors|yesno }}
    • +
  • {% trans "Record on errors:" %} {{ datasource.record_on_errors|yesno }}
    • + {% endif %} +
+
-{% if datasource.data_source %} -
-

{% trans "Configuration" %}

-
    - {% if datasource.agenda_ds %} - {% with datasource.agenda_ds_origin as origin %} -
  • {% trans "Type of source:" %} {% trans "Agenda data" %}{% if origin %} ({% trans "Copy of:" %} {{ origin.name }}){% endif %}
    • -
  • {% trans "URL:" %} {{ datasource.data_source.value }}
    • - {% if datasource.qs_data %} -
  • {% trans "Extra query string data:" %} -
      - {% for k, v in datasource.qs_data.items %} -
    • {% blocktrans %}{{ k }}:{% endblocktrans %} {{ v }}
      • - {% endfor %} -
    -
    • - {% endif %} + {% with preview_block=view.preview_block %} + {% if preview_block %} +
    +

    {% trans "Preview (first items only)" %}

    +
    + {{ view.preview_block|safe }} +
    +
    + {% endif %} {% endwith %} - {% else %} -
  • {% trans "Type of source:" %} {{ datasource.type_label }}
    • - {% if datasource.data_source.type == 'json' or datasource.data_source.type == 'jsonp' or datasource.data_source.type == 'geojson' %} -
  • {% trans "URL:" %} {{ datasource.data_source.value }}
    • - {% elif datasource.data_source.type == 'formula' %} -
  • {% trans "Python Expression:" %} {{ datasource.data_source.value }}
    • - {% elif datasource.data_source.type == 'wcs:users' %} - {% spaceless %} -
  • {% trans "Users with roles:" %} -
      - {% for role in roles %} - {% if role.0 in datasource.users_included_roles %} -
    • {{ role.1 }}
      • - {% endif %} - {% endfor %} -
    -
    • -
  • {% trans "Users without roles:" %} -
      - {% for role in roles %} - {% if role.0 in datasource.users_excluded_roles %} -
    • {{ role.1 }}
      • - {% endif %} + + {% with formdefs=view.usage_in_formdefs %} + {% if formdefs %} +
      +

      {% trans "Usage in forms" %}

      + - -
    • {% trans "Include disabled users:" %} - {% if datasource.include_disabled_users %} - {% trans "Yes" %} - {% else %} - {% trans "No" %} +
    +
{% endif %} - - {% endspaceless %} - {% endif %} - {% endif %} - {% if datasource.cache_duration %} -
  • {% trans "Cache Duration:" %} {{ datasource.humanized_cache_duration }} - {% endif %} - {% if not datasource.data_source.type == 'wcs:users' %} -
  • {% trans "Notify on errors:" %} {{ datasource.notify_on_errors|yesno }}
    • -
  • {% trans "Record on errors:" %} {{ datasource.record_on_errors|yesno }}
    • - {% endif %} - -
    - -{% with preview_block=view.preview_block %} -{% if preview_block %} -
    -

    {% trans "Preview (first items only)" %}

    -
    - {{ view.preview_block|safe }} -
    -
    -{% endif %} -{% endwith %} + {% endwith %} -{% with formdefs=view.usage_in_formdefs %} - {% if formdefs %} -
    -

    {% trans "Usage in forms" %}

    - -
    + {% else %} +

    {% trans "Not configured" %}

    {% endif %} -{% endwith %} - -{% else %} -

    {% trans "Not configured" %}

    -{% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/data-sources.html b/wcs/templates/wcs/backoffice/data-sources.html index c11d3c8da..1d73a19ca 100644 --- a/wcs/templates/wcs/backoffice/data-sources.html +++ b/wcs/templates/wcs/backoffice/data-sources.html @@ -4,94 +4,94 @@ {% block appbar-title %}{% trans "Data Sources" %}{% endblock %} {% block appbar-actions %} -{% trans "Categories" %} -{% if has_chrono %} -{% trans "Refresh agendas" %} -{% endif %} -{% trans "Import" %} -{% if has_users %} -{% trans "New User Data Source" %} -{% endif %} -{% trans "New Data Source" %} + {% trans "Categories" %} + {% if has_chrono %} + {% trans "Refresh agendas" %} + {% endif %} + {% trans "Import" %} + {% if has_users %} + {% trans "New User Data Source" %} + {% endif %} + {% trans "New Data Source" %} {% endblock %} {% block content %} -{% if has_users %} -
    -

    {% trans "Users Data Sources" %}

    -{% if user_data_sources %} - -{% else %} -
    -{% trans "There are no users data sources defined." %} -
    -{% endif %} -
    -{% endif %} + {% if has_users %} +
    +

    {% trans "Users Data Sources" %}

    + {% if user_data_sources %} + + {% else %} +
    + {% trans "There are no users data sources defined." %} +
    + {% endif %} +
    + {% endif %} -{% if categories %} -{% for category in categories %} - {% if category.data_sources %} -
    -

    {{ category.name }}

    - -
    + {% if categories %} + {% for category in categories %} + {% if category.data_sources %} +
    +

    {{ category.name }}

    + +
    + {% endif %} + {% endfor %} + {% else %} + {% if data_sources %} +
    +

    {% trans "Manually Configured Data Sources" %}

    + +
    + {% else %} +
    + {% trans "There are no data sources defined." %} +
    + {% endif %} {% endif %} -{% endfor %} -{% else %} -{% if data_sources %} -
    -

    {% trans "Manually Configured Data Sources" %}

    - -
    -{% else %} -
    -{% trans "There are no data sources defined." %} -
    -{% endif %} -{% endif %} -
    -

    {% trans "Data Sources from Card Models" %} - {% trans "automatically configured" %}

    -{% if generated_data_sources %} - -{% else %} -
    -{% trans "There are no data sources from card models." %} -
    -{% endif %} -
    +
    +

    {% trans "Data Sources from Card Models" %} - {% trans "automatically configured" %}

    + {% if generated_data_sources %} + + {% else %} +
    + {% trans "There are no data sources from card models." %} +
    + {% endif %} +
    -{% if has_chrono %} -
    -

    {% trans "Agendas" %} - {% trans "automatically configured" %}

    -{% if agenda_data_sources %} - -{% else %} -
    -{% trans "There are no agendas." %} -
    -{% endif %} -
    -{% endif %} + {% if has_chrono %} +
    +

    {% trans "Agendas" %} - {% trans "automatically configured" %}

    + {% if agenda_data_sources %} + + {% else %} +
    + {% trans "There are no agendas." %} +
    + {% endif %} +
    + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/deprecations.html b/wcs/templates/wcs/backoffice/deprecations.html index a4741ccb3..172b64306 100644 --- a/wcs/templates/wcs/backoffice/deprecations.html +++ b/wcs/templates/wcs/backoffice/deprecations.html @@ -3,39 +3,39 @@ {% block content %} -
    -

    {% trans "Deprecations Report" %}

    - -{% trans "Rescan for deprecations" %} - -
    +
    +

    {% trans "Deprecations Report" %}

    + + {% trans "Rescan for deprecations" %} + +
    -{% if not report.report_lines %} -
    -

    {% trans "No deprecated items were found on this site." %}

    -
    + {% if not report.report_lines %} +
    +

    {% trans "No deprecated items were found on this site." %}

    +
    -{% else %} -
    + {% else %} +
    -{% regroup report.report_lines by category as category_report_lines %} -{% for category in category_report_lines %} -

    {{ view.titles|get:category.grouper }}

    -
    -
    -

    {{ view.short_docs|get:category.grouper }} - {% trans "Read more" %}

    -
    - -
    -{% endfor %} -
    + {% regroup report.report_lines by category as category_report_lines %} + {% for category in category_report_lines %} +

    {{ view.titles|get:category.grouper }}

    +
    +
    +

    {{ view.short_docs|get:category.grouper }} + {% trans "Read more" %}

    +
    + +
    + {% endfor %} +
    -

    {% trans "Generated on:" %} {{ report.now|datetime }}

    -{% endif %} +

    {% trans "Generated on:" %} {{ report.now|datetime }}

    + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/error.html b/wcs/templates/wcs/backoffice/error.html index 9a8861775..33c79b3ad 100644 --- a/wcs/templates/wcs/backoffice/error.html +++ b/wcs/templates/wcs/backoffice/error.html @@ -2,9 +2,9 @@ {% load i18n %} {% block content %} -
    -

    {{ title }}

    -

    {{ error_message }}

    -

    {% trans "Go back" %}

    -
    +
    +

    {{ title }}

    +

    {{ error_message }}

    +

    {% trans "Go back" %}

    +
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/formdata-inspect.html b/wcs/templates/wcs/backoffice/formdata-inspect.html index 9a852c654..f58a77f48 100644 --- a/wcs/templates/wcs/backoffice/formdata-inspect.html +++ b/wcs/templates/wcs/backoffice/formdata-inspect.html @@ -4,80 +4,80 @@ {% block appbar-title %}{% trans "Data Inspector" %}{% endblock %} {% block appbar-actions %} -{% for action in actions %} -{{ action.label }} -{% endfor %} + {% for action in actions %} + {{ action.label }} + {% endfor %} {% endblock %} {% block content %} -{{ block.super }} + {{ block.super }} -
    -

    {% trans "Test tools" %}

    -
    -{{ html_form.render|safe }} -
    -{{ view.test_tool_result|safe }} -
    -
    -
    +
    +

    {% trans "Test tools" %}

    +
    + {{ html_form.render|safe }} +
    + {{ view.test_tool_result|safe }} +
    +
    +
    -
    -
    - - {% if view.formdef.workflow.roles %} - - {% endif %} - {% if has_tracing %} - - {% endif %} - {% if has_markers_stack %} - - {% endif %} - {% if has_relations %} - - {% endif %} -
    -
    +
    +
    + + {% if view.formdef.workflow.roles %} + + {% endif %} + {% if has_tracing %} + + {% endif %} + {% if has_markers_stack %} + + {% endif %} + {% if has_relations %} + + {% endif %} +
    +
    -
    -
      -{{ view.inspect_variables|safe }} -
    -
    +
    +
      + {{ view.inspect_variables|safe }} +
    +
    -{% if view.formdef.workflow.roles %} - -{% endif %} + {% if view.formdef.workflow.roles %} + + {% endif %} -{% if has_tracing %} - -{% endif %} + {% if has_tracing %} + + {% endif %} -{% if has_markers_stack %} - -{% endif %} + {% if has_markers_stack %} + + {% endif %} -{% if has_relations %} - -{% endif %} + {% if has_relations %} + + {% endif %} -
    -
    +
    +
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/formdef-inspect.html b/wcs/templates/wcs/backoffice/formdef-inspect.html index 570928f04..0ab0cc760 100644 --- a/wcs/templates/wcs/backoffice/formdef-inspect.html +++ b/wcs/templates/wcs/backoffice/formdef-inspect.html @@ -5,83 +5,83 @@ {% block content %} -
    -
    - - - - -
    -
    +
    +
    + + + + +
    +
    -
    -
      -
    • {% trans "Title" %}{% trans ":" %} {{ formdef.name|default:"-" }}
      • -
    • {% trans "Description" %}{% trans ":" %} {{ formdef.description|default:"-"|safe }}
      • -
    • {% trans "Keywords" %}{% trans ":" %} {{ formdef.keywords|default:"-" }}
      • -
    • {% trans "Category" %}{% trans ":" %} {% if formdef.category %}{{ formdef.category.name }}{% else %}-{% endif %}
      • -
    -
    +
    +
      +
    • {% trans "Title" %}{% trans ":" %} {{ formdef.name|default:"-" }}
      • +
    • {% trans "Description" %}{% trans ":" %} {{ formdef.description|default:"-"|safe }}
      • +
    • {% trans "Keywords" %}{% trans ":" %} {{ formdef.keywords|default:"-" }}
      • +
    • {% trans "Category" %}{% trans ":" %} {% if formdef.category %}{{ formdef.category.name }}{% else %}-{% endif %}
      • +
    +
    - + - - -
    + +
    -
    +
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/forms.html b/wcs/templates/wcs/backoffice/forms.html index eaff02cc0..5d9c366b1 100644 --- a/wcs/templates/wcs/backoffice/forms.html +++ b/wcs/templates/wcs/backoffice/forms.html @@ -4,45 +4,45 @@ {% block appbar-title %}{% trans "Forms" %}{% endblock %} {% block appbar-actions %} -{% if has_roles %} - {% if is_global_accessible_forms %} - {% trans "Data sources" %} - {% trans "Fields blocks" %} - {% if is_global_accessible_categories %} - {% trans "Categories" %} + {% if has_roles %} + {% if is_global_accessible_forms %} + {% trans "Data sources" %} + {% trans "Fields blocks" %} + {% if is_global_accessible_categories %} + {% trans "Categories" %} + {% endif %} {% endif %} + {% trans "Import" %} + {% trans "New Form" %} {% endif %} - {% trans "Import" %} - {% trans "New Form" %} -{% endif %} {% endblock %} {% block content %} -{% if not has_roles %} -

    {% trans "You first have to define roles." %}

    -{% elif objects %} -{% for category in categories %} - {% if category.objects %} -
    - {% if category.name %}

    {{ category.name }}

    {% endif %} - -
    + {% if not has_roles %} +

    {% trans "You first have to define roles." %}

    + {% elif objects %} + {% for category in categories %} + {% if category.objects %} +
    + {% if category.name %}

    {{ category.name }}

    {% endif %} + +
    + {% endif %} + {% endfor %} + {% else %} +
    + {% block no-objects %} + {% trans "There are no forms defined." %} + {% endblock %} +
    {% endif %} -{% endfor %} -{% else %} -
    -{% block no-objects %} -{% trans "There are no forms defined." %} -{% endblock %} -
    -{% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/includes/inspect-field.html b/wcs/templates/wcs/backoffice/includes/inspect-field.html index b67780b7f..2b5e40d46 100644 --- a/wcs/templates/wcs/backoffice/includes/inspect-field.html +++ b/wcs/templates/wcs/backoffice/includes/inspect-field.html @@ -1,11 +1,11 @@
    -

    {{ field.ellipsized_label }} - - - {% if field.key == 'block' %}{% endif %} - {{ field.get_type_label }} - {% if field.key == 'block' %}{% endif %} - -

    -{{ field.get_parameters_view|safe }} + data-field-id="{{ field.id }}"> +

    {{ field.ellipsized_label }} + - + {% if field.key == 'block' %}{% endif %} + {{ field.get_type_label }} + {% if field.key == 'block' %}{% endif %} + +

    + {{ field.get_parameters_view|safe }}
    diff --git a/wcs/templates/wcs/backoffice/logged-error.html b/wcs/templates/wcs/backoffice/logged-error.html index 18e42ed3b..bcc06fc00 100644 --- a/wcs/templates/wcs/backoffice/logged-error.html +++ b/wcs/templates/wcs/backoffice/logged-error.html @@ -5,57 +5,57 @@ {% block content %} -
    -
    - - {% for tab in tabs %} - - {% endfor %} -
    -
    +
    +
    + + {% for tab in tabs %} + + {% endfor %} +
    +
    -
    -
      -
    • {% trans "First occurence:" %} {{ error.first_occurence_timestamp }}
      • -
    • {% trans "Latest occurence:" %} {{ error.latest_occurence_timestamp }}
      • -
    • {% trans "Count:" %} {{ error.formatted_occurences_count }}
      • - {% if formdef %} -
    • {{ formdef.verbose_name }}{% trans ":" %} {{ formdef.name }} - ({% trans "inspector" %})
      • - {% endif %} - {% if workflow %} -
    • {% trans "Workflow:" %} {{ workflow.name }} - ({% trans "inspector" %}) - {% if status %} - - {% endif %} -
      • - {% endif %} - {% if error.expression or error.expression_type %} -
    • {{ view.error_expression_type_label }}{% trans ":" %} {{ error.expression }}
      • - {% endif %} - {% if error.exception_class or error.exception_message %} -
    • {% trans "Error message:" %} {{ error.exception_class }}: {{ error.exception_message }}
      • - {% endif %} - {% if formdata %} -
    • {% trans "Data:" %} {{ formdata.get_display_name }} - ({% trans "inspector" %})
      • - {% endif %} -
    -
    +
    +
      +
    • {% trans "First occurence:" %} {{ error.first_occurence_timestamp }}
      • +
    • {% trans "Latest occurence:" %} {{ error.latest_occurence_timestamp }}
      • +
    • {% trans "Count:" %} {{ error.formatted_occurences_count }}
      • + {% if formdef %} +
    • {{ formdef.verbose_name }}{% trans ":" %} {{ formdef.name }} + ({% trans "inspector" %})
      • + {% endif %} + {% if workflow %} +
    • {% trans "Workflow:" %} {{ workflow.name }} + ({% trans "inspector" %}) + {% if status %} + + {% endif %} +
      • + {% endif %} + {% if error.expression or error.expression_type %} +
    • {{ view.error_expression_type_label }}{% trans ":" %} {{ error.expression }}
      • + {% endif %} + {% if error.exception_class or error.exception_message %} +
    • {% trans "Error message:" %} {{ error.exception_class }}: {{ error.exception_message }}
      • + {% endif %} + {% if formdata %} +
    • {% trans "Data:" %} {{ formdata.get_display_name }} + ({% trans "inspector" %})
      • + {% endif %} +
    +
    -{% for tab in tabs %} - -{% endfor %} + {% for tab in tabs %} + + {% endfor %} -
    -
    +
    +
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/logged-errors.html b/wcs/templates/wcs/backoffice/logged-errors.html index f9edcf64d..ec40102d9 100644 --- a/wcs/templates/wcs/backoffice/logged-errors.html +++ b/wcs/templates/wcs/backoffice/logged-errors.html @@ -4,14 +4,14 @@ {% block appbar-title %}{% trans "Logged Errors" %}{% endblock %} {% block content %} - -{{ pagination_links|safe }} + + {{ pagination_links|safe }} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/mail-template.html b/wcs/templates/wcs/backoffice/mail-template.html index 8d9ab85e5..c92e8a6a5 100644 --- a/wcs/templates/wcs/backoffice/mail-template.html +++ b/wcs/templates/wcs/backoffice/mail-template.html @@ -4,37 +4,37 @@ {% block appbar-title %}{% trans "Mail Template" %} - {{ mail_template.name }}{% endblock %} {% block appbar-actions %} -{% if not mail_template.is_readonly %} -{% trans "Edit" %} -{% endif %} + {% if not mail_template.is_readonly %} + {% trans "Edit" %} + {% endif %} {% endblock %} {% block content %} -{% if mail_template.description %} -
    {{ mail_template.description }}
    -{% endif %} + {% if mail_template.description %} +
    {{ mail_template.description }}
    + {% endif %} -{% if mail_template.subject and mail_template.body %} -
    -

    {% trans "Subject:" %} {{ mail_template.subject }}

    -
    {{ mail_template.body }}
    -
    + {% if mail_template.subject and mail_template.body %} +
    +

    {% trans "Subject:" %} {{ mail_template.subject }}

    +
    {{ mail_template.body }}
    +
    -{% for workflow in mail_template.get_places_of_use %} -{% if forloop.first %} -
    -

    {% trans "Usage in workflows" %}

    - -
    -{% endif %} -{% endfor %} + {% for workflow in mail_template.get_places_of_use %} + {% if forloop.first %} +
    +

    {% trans "Usage in workflows" %}

    + +
    + {% endif %} + {% endfor %} -{% else %} -
    {% trans "This mail template still needs to be configured." %}
    -{% endif %} + {% else %} +
    {% trans "This mail template still needs to be configured." %}
    + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/mail-templates.html b/wcs/templates/wcs/backoffice/mail-templates.html index cd9a38632..05f8a9325 100644 --- a/wcs/templates/wcs/backoffice/mail-templates.html +++ b/wcs/templates/wcs/backoffice/mail-templates.html @@ -4,34 +4,34 @@ {% block appbar-title %}{% trans "Mail Templates" %}{% endblock %} {% block appbar-actions %} -{% trans "Categories" %} -{% trans "Import" %} -{% trans "New mail template" %} + {% trans "Categories" %} + {% trans "Import" %} + {% trans "New mail template" %} {% endblock %} {% block content %} -{% if categories %} -{% for category in categories %} - {% if category.mail_templates %} -
    -

    {{ category.name }}

    + {% if categories %} + {% for category in categories %} + {% if category.mail_templates %} +
    +

    {{ category.name }}

    + +
    + {% endif %} + {% endfor %} + {% elif mail_templates %} -
    + {% else %} +
    + {% trans "There are no mail templates defined." %} +
    {% endif %} -{% endfor %} -{% elif mail_templates %} - -{% else %} -
    -{% trans "There are no mail templates defined." %} -
    -{% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/popup_response.html b/wcs/templates/wcs/backoffice/popup_response.html index 114057a7e..46346826c 100644 --- a/wcs/templates/wcs/backoffice/popup_response.html +++ b/wcs/templates/wcs/backoffice/popup_response.html @@ -3,9 +3,9 @@ {% trans 'Popup closing...' %} diff --git a/wcs/templates/wcs/backoffice/processing.html b/wcs/templates/wcs/backoffice/processing.html index 136979050..e8cb63ee0 100644 --- a/wcs/templates/wcs/backoffice/processing.html +++ b/wcs/templates/wcs/backoffice/processing.html @@ -4,15 +4,15 @@ {% block appbar-title %}{% trans "Executing task..." %}{% endblock %} {% block content %} -
    -
    -
    {{ job.label }}
    -
    {% trans job.status %}
    -
    -
    +
    +
    +
    {{ job.label }}
    +
    {% trans job.status %}
    +
    +
    - + {% endblock %} diff --git a/wcs/templates/wcs/backoffice/settings/import.html b/wcs/templates/wcs/backoffice/settings/import.html index 42e5eaeb1..9775cbb45 100644 --- a/wcs/templates/wcs/backoffice/settings/import.html +++ b/wcs/templates/wcs/backoffice/settings/import.html @@ -4,52 +4,52 @@ {% block appbar-title %}{% trans "Import" %}{% endblock %} {% block content %} -{% if error %} -

    {% trans "Error:" %} {{ error }}

    -{% else %} -

    {% trans "Imported successfully:" %}

    -
      - {% if results.formdefs %} -
    • {% blocktrans count counter=results.formdefs %}1 form{% plural %}{{ counter }} forms{% endblocktrans %}
      • - {% endif %} - {% if results.carddefs %} -
    • {% blocktrans count counter=results.carddefs %}1 card{% plural %}{{ counter }} cards{% endblocktrans %}
      • - {% endif %} - {% if results.blockdefs %} -
    • {% blocktrans count counter=results.blockdefs %}1 fields block{% plural %}{{ counter }} fields blocks{% endblocktrans %}
      • - {% endif %} - {% if results.workflows %} -
    • {% blocktrans count counter=results.workflows %}1 workflow{% plural %}{{ counter }} workflows{% endblocktrans %}
      • - {% endif %} - {% if results.roles %} -
    • {% blocktrans count counter=results.roles %}1 role{% plural %}{{ counter }} roles{% endblocktrans %}
      • - {% endif %} - {% if results.categories %} -
    • {% blocktrans count counter=results.categories %}1 category{% plural %}{{ counter }} categories{% endblocktrans %}
      • - {% endif %} - {% if results.carddef_categories %} -
    • {% blocktrans count counter=results.carddef_categories %}1 card category{% plural %}{{ counter }} card categories{% endblocktrans %}
      • - {% endif %} - {% if results.workflow_categories %} -
    • {% blocktrans count counter=results.workflow_categories %}1 workflow category{% plural %}{{ counter }} workflow categories{% endblocktrans %}
      • - {% endif %} - {% if results.datasources %} -
    • {% blocktrans count counter=results.datasources %}1 data source{% plural %}{{ counter }} data sources{% endblocktrans %}
      • - {% endif %} - {% if results.mail_templates %} -
    • {% blocktrans count counter=results.mail_templates %}1 mail template{% plural %}{{ counter }} mail templates{% endblocktrans %}
      • - {% endif %} - {% if results.wscalls %} -
    • {% blocktrans count counter=results.wscalls %}1 webservice call{% plural %}{{ counter }} webservice calls{% endblocktrans %}
      • - {% endif %} - {% if results.apiaccess %} -
    • {% blocktrans count counter=results.apiaccess %}1 API access{% plural %}{{ counter }} API accesses{% endblocktrans %}
      • - {% endif %} - {% if results.settings %} -
    • {% trans "Settings" %}
      • - {% endif %} -
    - {% endif %} + {% if error %} +

    {% trans "Error:" %} {{ error }}

    + {% else %} +

    {% trans "Imported successfully:" %}

    +
      + {% if results.formdefs %} +
    • {% blocktrans count counter=results.formdefs %}1 form{% plural %}{{ counter }} forms{% endblocktrans %}
      • + {% endif %} + {% if results.carddefs %} +
    • {% blocktrans count counter=results.carddefs %}1 card{% plural %}{{ counter }} cards{% endblocktrans %}
      • + {% endif %} + {% if results.blockdefs %} +
    • {% blocktrans count counter=results.blockdefs %}1 fields block{% plural %}{{ counter }} fields blocks{% endblocktrans %}
      • + {% endif %} + {% if results.workflows %} +
    • {% blocktrans count counter=results.workflows %}1 workflow{% plural %}{{ counter }} workflows{% endblocktrans %}
      • + {% endif %} + {% if results.roles %} +
    • {% blocktrans count counter=results.roles %}1 role{% plural %}{{ counter }} roles{% endblocktrans %}
      • + {% endif %} + {% if results.categories %} +
    • {% blocktrans count counter=results.categories %}1 category{% plural %}{{ counter }} categories{% endblocktrans %}
      • + {% endif %} + {% if results.carddef_categories %} +
    • {% blocktrans count counter=results.carddef_categories %}1 card category{% plural %}{{ counter }} card categories{% endblocktrans %}
      • + {% endif %} + {% if results.workflow_categories %} +
    • {% blocktrans count counter=results.workflow_categories %}1 workflow category{% plural %}{{ counter }} workflow categories{% endblocktrans %}
      • + {% endif %} + {% if results.datasources %} +
    • {% blocktrans count counter=results.datasources %}1 data source{% plural %}{{ counter }} data sources{% endblocktrans %}
      • + {% endif %} + {% if results.mail_templates %} +
    • {% blocktrans count counter=results.mail_templates %}1 mail template{% plural %}{{ counter }} mail templates{% endblocktrans %}
      • + {% endif %} + {% if results.wscalls %} +
    • {% blocktrans count counter=results.wscalls %}1 webservice call{% plural %}{{ counter }} webservice calls{% endblocktrans %}
      • + {% endif %} + {% if results.apiaccess %} +
    • {% blocktrans count counter=results.apiaccess %}1 API access{% plural %}{{ counter }} API accesses{% endblocktrans %}
      • + {% endif %} + {% if results.settings %} +
    • {% trans "Settings" %}
      • + {% endif %} +
    + {% endif %} -

    {% trans "Back" %}

    +

    {% trans "Back" %}

    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/snapshots.html b/wcs/templates/wcs/backoffice/snapshots.html index ade55f5ac..3f956a33d 100644 --- a/wcs/templates/wcs/backoffice/snapshots.html +++ b/wcs/templates/wcs/backoffice/snapshots.html @@ -1,89 +1,89 @@ {% load i18n %} {% block body %} -
    -

    {% trans "History" %}

    -
    +
    +

    {% trans "History" %}

    +
    -{{ publisher.get_request.session.display_message|safe }} + {{ publisher.get_request.session.display_message|safe }} -{% with snapshots=view.snapshots %} -{% if snapshots %} -
    -
    -{% if snapshots|length > 1 %} -

    -{% endif %} - - - - - - - - - - - {% for snapshot in snapshots %} - - - - - - - - - {% endfor %} - -
    {% trans "Identifier" %}{% trans "Compare" %}{% trans 'Date' %}{% trans "Description" %}{% trans 'User' %}{% trans 'Actions' %}
    - #{{ snapshot.id }} - - {% if snapshots|length > 1 %} - {% if not forloop.last %}{% else %}      {% endif %} - {% if not forloop.first %}{% else %}      {% endif %} - {% endif %} - - {{ snapshot.timestamp }} - {% if snapshot.new_day and snapshot.day_other_count %} — - {% if snapshot.day_other_count >= 50 %}{% endif %} - {% blocktrans trimmed count counter=snapshot.day_other_count %} - 1 other this day - {% plural %} - {{ counter }} others - {% endblocktrans %} - {% endif %} - - {% if snapshot.label %}{{ snapshot.label }}{% elif snapshot.comment %}{{ snapshot.comment }}{% endif %} - {% if snapshot.user_id %}{{ snapshot.user }}{% endif %} - {% trans "View" %} - — - {% trans "Restore" %} - — - {% trans "Export" %} -
    -
      -
    -
    -
    -{% else %} -

    {% trans "No changes history" %}

    -{% endif %} -{% endwith %} + {% with snapshots=view.snapshots %} + {% if snapshots %} +
    +
    + {% if snapshots|length > 1 %} +

    + {% endif %} + + + + + + + + + + + {% for snapshot in snapshots %} + + + + + + + + + {% endfor %} + +
    {% trans "Identifier" %}{% trans "Compare" %}{% trans 'Date' %}{% trans "Description" %}{% trans 'User' %}{% trans 'Actions' %}
    + #{{ snapshot.id }} + + {% if snapshots|length > 1 %} + {% if not forloop.last %}{% else %}      {% endif %} + {% if not forloop.first %}{% else %}      {% endif %} + {% endif %} + + {{ snapshot.timestamp }} + {% if snapshot.new_day and snapshot.day_other_count %} — + {% if snapshot.day_other_count >= 50 %}{% endif %} + {% blocktrans trimmed count counter=snapshot.day_other_count %} + 1 other this day + {% plural %} + {{ counter }} others + {% endblocktrans %} + {% endif %} + + {% if snapshot.label %}{{ snapshot.label }}{% elif snapshot.comment %}{{ snapshot.comment }}{% endif %} + {% if snapshot.user_id %}{{ snapshot.user }}{% endif %} + {% trans "View" %} + — + {% trans "Restore" %} + — + {% trans "Export" %} +
    +
      +
    +
    +
    + {% else %} +

    {% trans "No changes history" %}

    + {% endif %} + {% endwith %} - + {% endblock %} diff --git a/wcs/templates/wcs/backoffice/snapshots_compare.html b/wcs/templates/wcs/backoffice/snapshots_compare.html index 89b2aef43..66f9d723e 100644 --- a/wcs/templates/wcs/backoffice/snapshots_compare.html +++ b/wcs/templates/wcs/backoffice/snapshots_compare.html @@ -3,31 +3,31 @@ {% block appbar-title %}{% trans "Compare snapshots" %}{% if has_inspect %} ({% if mode == 'xml' %}{% trans "XML" %}{% else %}{% trans "Inspect" %}{% endif %}){% endif %}{% endblock %} {% block appbar-actions %} -{% if has_inspect %} -{% trans "Compare inspect" %} -{% trans "Compare XML" %} -{% endif %} + {% if has_inspect %} + {% trans "Compare inspect" %} + {% trans "Compare XML" %} + {% endif %} {% endblock %} {% block content %} -

    {{ fromdesc|safe }} ➔ {{ todesc|safe }}

    -
    -{% if mode == 'xml' %} - {{ diff_serialization|safe }} -{% else %} -
    -
    - {% for tab in tabs %}{{ tab|safe }}{% endfor %} - {{ tab_list|safe }} -
    -
    - {% for attrs, panel in panels %} - - {{ panel|safe }} +

    {{ fromdesc|safe }} ➔ {{ todesc|safe }}

    +
    + {% if mode == 'xml' %} + {{ diff_serialization|safe }} + {% else %} +
    +
    + {% for tab in tabs %}{{ tab|safe }}{% endfor %} + {{ tab_list|safe }}
    - {% endfor %} -
    +
    + {% for attrs, panel in panels %} + + {{ panel|safe }} +
    + {% endfor %} +
    +
    + {% endif %}
    -{% endif %} -
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/studio.html b/wcs/templates/wcs/backoffice/studio.html index 21cda794b..df8768505 100644 --- a/wcs/templates/wcs/backoffice/studio.html +++ b/wcs/templates/wcs/backoffice/studio.html @@ -3,66 +3,66 @@ {% block content %} -{% block appbar %} -
    -

    {% trans "Studio" %}

    -
    -{% endblock %} - -
    -
    -
    - {% if user.can_go_in_backoffice_forms %} - {% trans "Forms" context "studio" %} -

    {% trans "Forms are typically used to collect user demands." %}

    -     - {% endif %} - {% if user.can_go_in_backoffice_cards %} - {% trans "Cards" context "studio" %} -

    {% trans "Cards are used to store list of structured data." %}

    -     - {% endif %} - {% if user.can_go_in_backoffice_workflows %} - {% trans "Workflows" context "studio" %} -

    {% trans "Workflows are used to add custom behaviours or actions to forms and cards." %}

    -     - {% endif %} - {% for link, label in extra_links %} - {{ label }} - {% endfor %} + {% block appbar %} +
    +

    {% trans "Studio" %}

    + {% endblock %} -
    -

    {% trans "Recent changes" context "studio" %}

    - - {% if show_all_changes %} -

    {% trans "See all changes" %}

    - {% endif %} -
    +
    -
    -
    -

    {% trans "Recent errors" context "studio" %}

    - {% if recent_errors %} -
    + +
    +
    +

    {% trans "Recent errors" context "studio" %}

    + {% if recent_errors %} + +

    {% trans "See all errors" context "studio" %}

    + {% else %} +

    {% trans "No errors, congratulations!" %}

    + {% endif %} +
    + +
    -
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/workflow-fullscreen-schema.html b/wcs/templates/wcs/backoffice/workflow-fullscreen-schema.html index 69fceadb5..4709f1f0d 100644 --- a/wcs/templates/wcs/backoffice/workflow-fullscreen-schema.html +++ b/wcs/templates/wcs/backoffice/workflow-fullscreen-schema.html @@ -11,9 +11,9 @@ {{script|safe}} -
    -{{ view.graphviz|safe }} -
    {% trans "Download" %}
    -
    +
    + {{ view.graphviz|safe }} +
    {% trans "Download" %}
    +
    diff --git a/wcs/templates/wcs/backoffice/workflow-inspect.html b/wcs/templates/wcs/backoffice/workflow-inspect.html index 613f09784..5076a6aeb 100644 --- a/wcs/templates/wcs/backoffice/workflow-inspect.html +++ b/wcs/templates/wcs/backoffice/workflow-inspect.html @@ -5,100 +5,100 @@ {% block content %} -
    -
    - - {% if workflow.global_actions %} - - {% endif %} - - {% if workflow.variables_formdef %} - - {% endif %} - {% if workflow.backoffice_fields_formdef %} - - {% endif %} - {% if workflow.criticality_levels %} - - {% endif %} -
    -
    +
    +
    + + {% if workflow.global_actions %} + + {% endif %} + + {% if workflow.variables_formdef %} + + {% endif %} + {% if workflow.backoffice_fields_formdef %} + + {% endif %} + {% if workflow.criticality_levels %} + + {% endif %} +
    +
    -
    -

    -{% blocktrans count status_count=workflow.possible_status|count %}{{ status_count }} status{% plural %}{{ status_count }} statuses{% endblocktrans %}. -

    - -
    -{% for status in workflow.possible_status %} -
    -

    - - {{ status.name }}

    -{% if status.backoffice_info_text %}
    {{ status.backoffice_info_text|safe }}
    {% endif %} -{% for item in status.items %} -

    {{ item.description }}

    -{{ item.get_parameters_view|safe }} -{% empty %} -

    {% trans "No actions in this status." %}

    -{% endfor %} -
    -{% endfor %} -
    -
    +
    +

    + {% blocktrans count status_count=workflow.possible_status|count %}{{ status_count }} status{% plural %}{{ status_count }} statuses{% endblocktrans %}. +

    + +
    + {% for status in workflow.possible_status %} +
    +

    + + {{ status.name }}

    + {% if status.backoffice_info_text %}
    {{ status.backoffice_info_text|safe }}
    {% endif %} + {% for item in status.items %} +

    {{ item.description }}

    + {{ item.get_parameters_view|safe }} + {% empty %} +

    {% trans "No actions in this status." %}

    + {% endfor %} +
    + {% endfor %} +
    +
    - + - + - + - + - + -
    -
    +
    +
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/workflow-status.html b/wcs/templates/wcs/backoffice/workflow-status.html index 588c95b96..a42f3a12e 100644 --- a/wcs/templates/wcs/backoffice/workflow-status.html +++ b/wcs/templates/wcs/backoffice/workflow-status.html @@ -4,111 +4,111 @@ {% block appbar-title %}{{ status.name }}{% endblock %} {% block content %} -{{ block.super }} + {{ block.super }} -{% if status.get_visibility_restricted_roles %} -
    -{% trans "This status is hidden from the user." %} -{% if not workflow.is_readonly %} -({% trans "change" %}) -{% endif %} -
    -{% endif %} + {% if status.get_visibility_restricted_roles %} +
    + {% trans "This status is hidden from the user." %} + {% if not workflow.is_readonly %} + ({% trans "change" %}) + {% endif %} +
    + {% endif %} -{% if not status.items %} -
    -{% trans "There are not yet any items in this status." %} -
    -{% else %} -{% spaceless %} -
    - {% if workflow.is_readonly %} -
    -{% endspaceless %} -{% endif %} -{% with source_statuses=view.get_source_statuses %} - {% if source_statuses %} -
    -

    {% trans "Jumps" %}

    -

    {% trans "This status is reachable from the following status:" %} - {% for source in source_statuses %} - {{ source.name }}{% if not forloop.last %}, {% endif %} - {% endfor %} -

    -
    - {% endif %} -{% endwith %} + {% with source_statuses=view.get_source_statuses %} + {% if source_statuses %} +
    +

    {% trans "Jumps" %}

    +

    {% trans "This status is reachable from the following status:" %} + {% for source in source_statuses %} + {{ source.name }}{% if not forloop.last %}, {% endif %} + {% endfor %} +

    +
    + {% endif %} + {% endwith %} -

    {% trans "Back to workflow main page" %}

    +

    {% trans "Back to workflow main page" %}

    -
    -{{ view.graphviz|safe }} -
    {% trans "Download" %} - - {% trans "Full Screen" %}
    -
    +
    + {{ view.graphviz|safe }} +
    {% trans "Download" %} - + {% trans "Full Screen" %}
    +
    {% endblock %} {% block sidebar-content %} -{% if workflow.is_default %} -

    -{% blocktrans %} -This is the default workflow, you cannot edit it but you can -duplicate it to base your own workflow on it. -{% endblocktrans %} -

    -{% elif workflow.is_readonly %} -

    {% trans "This workflow is readonly." %}

    -{% else %} + {% if workflow.is_default %} +

    + {% blocktrans %} + This is the default workflow, you cannot edit it but you can + duplicate it to base your own workflow on it. + {% endblocktrans %} +

    + {% elif workflow.is_readonly %} +

    {% trans "This workflow is readonly." %}

    + {% else %} -{% if status.is_endpoint %} -
    -

    -{% if status.forced_endpoint %} -{% trans "This status has been manually set to be considered as terminal." %} -
    {% trans "Unforce Terminal Status" %} -{% elif status.is_endpoint %} -{% trans "This status has been automatically evaluated as being terminal." %} -{% endif %} -

    -
    -{% endif %} + {% if status.is_endpoint %} +
    +

    + {% if status.forced_endpoint %} + {% trans "This status has been manually set to be considered as terminal." %} +
    {% trans "Unforce Terminal Status" %} + {% elif status.is_endpoint %} + {% trans "This status has been automatically evaluated as being terminal." %} + {% endif %} +

    +
    + {% endif %} - -
    -

    {% trans "New Action" %}

    -{{ view.get_new_item_form.render|safe }} -
    -{% endif %} + +
    +

    {% trans "New Action" %}

    + {{ view.get_new_item_form.render|safe }} +
    + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/workflow.html b/wcs/templates/wcs/backoffice/workflow.html index 2700ba044..05c225f38 100644 --- a/wcs/templates/wcs/backoffice/workflow.html +++ b/wcs/templates/wcs/backoffice/workflow.html @@ -4,184 +4,184 @@ {% block appbar-title %}{{ workflow.name }}{% endblock %} {% block appbar-actions %} -{% if not workflow.is_readonly %} -{% trans "change category" %} -{% trans "change title" %} -{% endif %} + {% if not workflow.is_readonly %} + {% trans "change category" %} + {% trans "change title" %} + {% endif %} {% endblock %} {% block content %} -{{ view.last_modification_block|safe }} + {{ view.last_modification_block|safe }} -
    -
    -

    {% trans "Possible Status" %}

    - {% if not workflow.possible_status %} -

    {% trans "There are not yet any status defined in this workflow." %}

    - {% else %} - {% if workflow.is_readonly %} -
      - {% else %} -

      {% trans "Use drag and drop with the handles to reorder status." %}

      -
        - {% endif %} - {% spaceless %} - {% for status in workflow.possible_status %} -
      • - {{ status.name }}
        • - {% endfor %} - {% endspaceless %} -
      - {% endif %} -
    -
    +
    +
    +

    {% trans "Possible Status" %}

    + {% if not workflow.possible_status %} +

    {% trans "There are not yet any status defined in this workflow." %}

    + {% else %} + {% if workflow.is_readonly %} +
      + {% else %} +

      {% trans "Use drag and drop with the handles to reorder status." %}

      +
        + {% endif %} + {% spaceless %} + {% for status in workflow.possible_status %} +
      • + {{ status.name }}
        • + {% endfor %} + {% endspaceless %} +
      + {% endif %} +
    +
    -
    -
    -

    {% trans "Workflow Functions" %} - {% if not workflow.is_readonly %} - ({% trans "add function" %}) - {% endif %} -

    - -
    +
    +
    +

    {% trans "Workflow Functions" %} + {% if not workflow.is_readonly %} + ({% trans "add function" %}) + {% endif %} +

    + +
    - {% if not workflow.is_default %} -
    -

    {% trans "Workflow Variables" %} - {% if not workflow.is_readonly %} - ({% trans "change" %}) - {% endif %} -

    - {% if workflow.variables_formdef %} - - {% endif %} -
    + {% if not workflow.is_default %} +
    +

    {% trans "Workflow Variables" %} + {% if not workflow.is_readonly %} + ({% trans "change" %}) + {% endif %} +

    + {% if workflow.variables_formdef %} + + {% endif %} +
    -
    -

    {% trans "Global Actions" %} - {% if not workflow.is_readonly %} - ({% trans "add global action" %}) - {% endif %} -

    - {% if workflow.is_readonly %} -
      - {% else %} -
        - {% endif %} - {% for action in workflow.global_actions %} -
      • {{ action.name }}
        • - {% endfor %} -
      -
    +
    +

    {% trans "Global Actions" %} + {% if not workflow.is_readonly %} + ({% trans "add global action" %}) + {% endif %} +

    + {% if workflow.is_readonly %} +
      + {% else %} +
        + {% endif %} + {% for action in workflow.global_actions %} +
      • {{ action.name }}
        • + {% endfor %} +
      +
    -
    -

    {% trans "Criticality Levels" %} - {% if not workflow.is_readonly %} - ({% trans "add criticality level" %}) - {% endif %} -

    - {% if workflow.is_readonly %} -
      - {% else %} -
        - {% endif %} - {% spaceless %} - {% for level in workflow.criticality_levels %} -
      • - {{ level.name }} -
        • - {% endfor %} - {% endspaceless %} -
      -
    +
    +

    {% trans "Criticality Levels" %} + {% if not workflow.is_readonly %} + ({% trans "add criticality level" %}) + {% endif %} +

    + {% if workflow.is_readonly %} +
      + {% else %} +
        + {% endif %} + {% spaceless %} + {% for level in workflow.criticality_levels %} +
      • + {{ level.name }} +
        • + {% endfor %} + {% endspaceless %} +
      +
    -
    -

    {% trans "Backoffice Fields" %} - {% if not workflow.is_readonly %} - ({% trans "change" %}) - {% endif %} -

    - {% if workflow.backoffice_fields_formdef %} - - {% endif %} -
    - {% endif %} {# not workflow.is_default #} -
    +
    +

    {% trans "Backoffice Fields" %} + {% if not workflow.is_readonly %} + ({% trans "change" %}) + {% endif %} +

    + {% if workflow.backoffice_fields_formdef %} + + {% endif %} +
    + {% endif %} {# not workflow.is_default #} +
    -
    +
    -{% if workflow.possible_status %} -
    -{{ view.graphviz|safe }} -
    {% trans "Download" %} - + {% if workflow.possible_status %} +
    + {{ view.graphviz|safe }} +
    {% trans "Download" %} - {% trans "Full Screen" %}
    -
    -{% endif %} +
    + {% endif %} -{% with formdefs=workflow.formdefs carddefs=workflow.carddefs mail_templates=workflow.mail_templates %} -{% if formdefs or carddefs or mail_templates %} -
    -

    {% trans "Usage" %}

    -
    -{% if formdefs %} -

    {% trans "This workflow is used for the following forms:" %} -

    -{% endif %} -{% if carddefs %} -

    {% trans "This workflow is used for the following card models:" %} -

    -{% endif %} -{% if mail_templates %} -

    {% trans "The following mail templates are used in this workflow:" %} -

    -{% endif %} -
    -
    -{% endif %} -{% endwith %} + {% with formdefs=workflow.formdefs carddefs=workflow.carddefs mail_templates=workflow.mail_templates %} + {% if formdefs or carddefs or mail_templates %} +
    +

    {% trans "Usage" %}

    +
    + {% if formdefs %} +

    {% trans "This workflow is used for the following forms:" %} +

    + {% endif %} + {% if carddefs %} +

    {% trans "This workflow is used for the following card models:" %} +

    + {% endif %} + {% if mail_templates %} +

    {% trans "The following mail templates are used in this workflow:" %} +

    + {% endif %} +
    +
    + {% endif %} + {% endwith %} {% endblock %} diff --git a/wcs/templates/wcs/backoffice/wscall.html b/wcs/templates/wcs/backoffice/wscall.html index c0e815272..684f56775 100644 --- a/wcs/templates/wcs/backoffice/wscall.html +++ b/wcs/templates/wcs/backoffice/wscall.html @@ -1,44 +1,44 @@ {% load i18n %} {% block body %} -
    -

    {% trans "Webservice Call" %} - {{ wscall.name }}

    -{% if not wscall.is_readonly %} - - {% trans "Edit" %} - -{% endif %} -
    +
    +

    {% trans "Webservice Call" %} - {{ wscall.name }}

    + {% if not wscall.is_readonly %} + + {% trans "Edit" %} + + {% endif %} +
    -{% if wscall.description %} -
    {{ wscall.description }}
    -{% endif %} - -
    -

    {% trans "Parameters" %}

    -
      - {% if wscall.request.url %}
    • {% trans "URL:" %} {{ wscall.request.url }}
      • {% endif %} - {% if wscall.request.request_signature_key %}
    • {% trans "Request Signature Key:" %} {{ wscall.request.request_signature_key }}
      • {% endif %} - {% if wscall.request.qs_data %} -
    • {% trans "Query string data:" %} -
        - {% for k, v in wscall.request.qs_data.items %} -
      • {% blocktrans %}{{ k }}:{% endblocktrans %} {{ v }}
        • - {% endfor %} -
      -
      • - {% endif %} -
    • {% trans "Method:" %} {% if wscall.request.method == 'POST' %}POST{% else %}GET{% endif %}
      • - {% if wscall.request.timeout %} -
    • {% trans "Timeout:" %} {{ wscall.request.timeout }}s
      • + {% if wscall.description %} +
      {{ wscall.description }}
      {% endif %} -
    -
    -
    -
      -
    • {% trans "Notify on errors:" %} {{ wscall.notify_on_errors|yesno }}
      • -
    • {% trans "Record on errors:" %} {{ wscall.record_on_errors|yesno }}
      • -
    -
    +
    +

    {% trans "Parameters" %}

    +
      + {% if wscall.request.url %}
    • {% trans "URL:" %} {{ wscall.request.url }}
      • {% endif %} + {% if wscall.request.request_signature_key %}
    • {% trans "Request Signature Key:" %} {{ wscall.request.request_signature_key }}
      • {% endif %} + {% if wscall.request.qs_data %} +
    • {% trans "Query string data:" %} +
        + {% for k, v in wscall.request.qs_data.items %} +
      • {% blocktrans %}{{ k }}:{% endblocktrans %} {{ v }}
        • + {% endfor %} +
      +
      • + {% endif %} +
    • {% trans "Method:" %} {% if wscall.request.method == 'POST' %}POST{% else %}GET{% endif %}
      • + {% if wscall.request.timeout %} +
    • {% trans "Timeout:" %} {{ wscall.request.timeout }}s
      • + {% endif %} +
    +
    + +
    +
      +
    • {% trans "Notify on errors:" %} {{ wscall.notify_on_errors|yesno }}
      • +
    • {% trans "Record on errors:" %} {{ wscall.record_on_errors|yesno }}
      • +
    +
    {% endblock %} diff --git a/wcs/templates/wcs/backoffice/wscalls.html b/wcs/templates/wcs/backoffice/wscalls.html index 47d3bf110..7278b18f1 100644 --- a/wcs/templates/wcs/backoffice/wscalls.html +++ b/wcs/templates/wcs/backoffice/wscalls.html @@ -4,20 +4,20 @@ {% block appbar-title %}{% trans "Webservice Calls" %}{% endblock %} {% block appbar-actions %} -{% trans "Import" %} -{% trans "New webservice call" %} + {% trans "Import" %} + {% trans "New webservice call" %} {% endblock %} {% block content %} -{% if wscalls %} - -{% else %} -
    -{% trans "There are no webservice calls defined." %} -
    -{% endif %} + {% if wscalls %} + + {% else %} +
    + {% trans "There are no webservice calls defined." %} +
    + {% endif %} {% endblock %} diff --git a/wcs/templates/wcs/formdata_filling.html b/wcs/templates/wcs/formdata_filling.html index 837eda159..59cd265d0 100644 --- a/wcs/templates/wcs/formdata_filling.html +++ b/wcs/templates/wcs/formdata_filling.html @@ -3,26 +3,26 @@ {% block body %} -{% block form-side %} -{{ form_side|default:"" }} -{{ publisher.get_request.session.display_message|safe }} -{% endblock %} + {% block form-side %} + {{ form_side|default:"" }} + {{ publisher.get_request.session.display_message|safe }} + {% endblock %} -{% block form-main %} + {% block form-main %} -{% block drafts-recall %}{% include "wcs/includes/drafts-recall.html" %}{% endblock %} + {% block drafts-recall %}{% include "wcs/includes/drafts-recall.html" %}{% endblock %} -{% block backoffice-only-one-info %} -{% if not view.edit_mode and page_no == 1 and publisher.get_request.is_in_backoffice and user_has_already_one_such_form %} -
    -{% blocktrans %} -This form is limited to one per user and the associated user has already one. -{% endblocktrans %} -
    -{% endif %} -{% endblock %} + {% block backoffice-only-one-info %} + {% if not view.edit_mode and page_no == 1 and publisher.get_request.is_in_backoffice and user_has_already_one_such_form %} +
    + {% blocktrans %} + This form is limited to one per user and the associated user has already one. + {% endblocktrans %} +
    + {% endif %} + {% endblock %} -{{ html_form.render|safe }} -{% endblock %} + {{ html_form.render|safe }} + {% endblock %} {% endblock %} diff --git a/wcs/templates/wcs/formdata_history.html b/wcs/templates/wcs/formdata_history.html index 4d4fe51e3..71c901f04 100644 --- a/wcs/templates/wcs/formdata_history.html +++ b/wcs/templates/wcs/formdata_history.html @@ -1,53 +1,53 @@ {% load i18n %}
    - {% block log-section-title %} -

    {% trans "Log" %}

    - {% endblock %} -
    -
      - {% for evolution in formdata.get_visible_evolution_parts %} - {% with status=evolution.get_status display_parts=evolution.display_parts %} -
    • - -
      - {% if evolution.status %} -
      - {{evolution.get_status_label}} - {% if status.get_visibility_restricted_roles %} - - {% endif %} - - {{evolution.datetime}} - {% if evolution.last_jump_datetime and user.is_admin %} - ({% trans "last check:" %} {{ evolution.last_jump_datetime }}) - {% endif %} - -
      - {% endif %} -
      - {% if evolution.who and include_authors %} - {{evolution.get_author_name|default_if_none:""}} - {% if evolution.get_author_qualification %}({{evolution.get_author_qualification}}){% endif %} - - {% endif %} - {% if not evolution.status %} - {{evolution.datetime}} - {% endif %} - {% if evolution.comment %} -
      - {{evolution.comment|linebreaks}} -
      - {% endif %} - {% for part in display_parts %} - {{part|safe}} - {% endfor %} -
      -
      -
      • - {% endwith %} - {% endfor %} -
    -
    + {% block log-section-title %} +

    {% trans "Log" %}

    + {% endblock %} +
    +
      + {% for evolution in formdata.get_visible_evolution_parts %} + {% with status=evolution.get_status display_parts=evolution.display_parts %} +
    • + +
      + {% if evolution.status %} +
      + {{evolution.get_status_label}} + {% if status.get_visibility_restricted_roles %} + + {% endif %} + + {{evolution.datetime}} + {% if evolution.last_jump_datetime and user.is_admin %} + ({% trans "last check:" %} {{ evolution.last_jump_datetime }}) + {% endif %} + +
      + {% endif %} +
      + {% if evolution.who and include_authors %} + {{evolution.get_author_name|default_if_none:""}} + {% if evolution.get_author_qualification %}({{evolution.get_author_qualification}}){% endif %} + + {% endif %} + {% if not evolution.status %} + {{evolution.datetime}} + {% endif %} + {% if evolution.comment %} +
      + {{evolution.comment|linebreaks}} +
      + {% endif %} + {% for part in display_parts %} + {{part|safe}} + {% endfor %} +
      +
      +
      • + {% endwith %} + {% endfor %} +
    +
    diff --git a/wcs/templates/wcs/formdata_popup_filling.html b/wcs/templates/wcs/formdata_popup_filling.html index 37688f703..ac4828cb2 100644 --- a/wcs/templates/wcs/formdata_popup_filling.html +++ b/wcs/templates/wcs/formdata_popup_filling.html @@ -6,12 +6,12 @@ {% block sidepage %}{% endblock %} {% block main-content %} -{% block form-side %} -{{ form_side|default:"" }} -{{ publisher.get_request.session.display_message|safe }} -{% endblock %} + {% block form-side %} + {{ form_side|default:"" }} + {{ publisher.get_request.session.display_message|safe }} + {% endblock %} -{{ html_form.render|safe }} + {{ html_form.render|safe }} {% endblock %} {% block footer %}{% endblock %} diff --git a/wcs/templates/wcs/formdata_sidebox.html b/wcs/templates/wcs/formdata_sidebox.html index c7a45bfd2..54d6e5f03 100644 --- a/wcs/templates/wcs/formdata_sidebox.html +++ b/wcs/templates/wcs/formdata_sidebox.html @@ -1,41 +1,41 @@ {% load i18n %}
    -{% if view.has_draft_support and data %} -{# display tracking code box if they are enabled and there's some data #} -{# (e.g. the user is not on a insufficient authenticiation context page). #} + {% if view.has_draft_support and data %} + {# display tracking code box if they are enabled and there's some data #} + {# (e.g. the user is not on a insufficient authenticiation context page). #} -{% block tracking-code-box %} -{% with get_tracking_code as tracking_code %} - {% if tracking_code or is_recalled_draft %} -
    - {% if view.formdef.enable_tracking_codes %} - {% add_javascript "popup.js" %} - {% block tracking-code %} -
    -

    {% trans "Tracking code" %}

    - {{ tracking_code }} - {% standard_text "tracking-code-short-text" %} -
    - {% endblock %} - {% endif %} + {% block tracking-code-box %} + {% with get_tracking_code as tracking_code %} + {% if tracking_code or is_recalled_draft %} +
    + {% if view.formdef.enable_tracking_codes %} + {% add_javascript "popup.js" %} + {% block tracking-code %} +
    +

    {% trans "Tracking code" %}

    + {{ tracking_code }} + {% standard_text "tracking-code-short-text" %} +
    + {% endblock %} + {% endif %} - {% if is_recalled_draft %} - {% block recalled-draft %} -
    - - -
    - {% endblock %} - {% endif %} + {% if is_recalled_draft %} + {% block recalled-draft %} +
    + + +
    + {% endblock %} + {% endif %} -
    +
    + {% endif %} + {% endwith %} + {% endblock %} {# tracking-code-box #} {% endif %} -{% endwith %} -{% endblock %} {# tracking-code-box #} -{% endif %} -{% block steps %} -{{ step }} -{% endblock %} + {% block steps %} + {{ step }} + {% endblock %}
    diff --git a/wcs/templates/wcs/formdata_status.html b/wcs/templates/wcs/formdata_status.html index 0d1d37d21..8115870d8 100644 --- a/wcs/templates/wcs/formdata_status.html +++ b/wcs/templates/wcs/formdata_status.html @@ -2,40 +2,40 @@ {% load i18n %} {% block body %} -{% block session-message %} -{{session_message|safe}} -{% endblock %} + {% block session-message %} + {{session_message|safe}} + {% endblock %} -{% with workflow_messages=view.workflow_messages %} - {% if workflow_messages %} - {{ workflow_messages|safe }} - {% else %} -
    - {{ view.recorded_message|safe }} - {% if mine %} - {{ view.get_handling_role_info_text|safe }} - {% endif %} - {% if mine and formdata.formdef.enable_tracking_codes and formdata.tracking_code %} -

    - {% trans "You can get back to this page using the following tracking code:" %} - {{ formdata.tracking_code }} -

    - {% endif %} -
    - {% endif %} -{% endwith %} + {% with workflow_messages=view.workflow_messages %} + {% if workflow_messages %} + {{ workflow_messages|safe }} + {% else %} +
    + {{ view.recorded_message|safe }} + {% if mine %} + {{ view.get_handling_role_info_text|safe }} + {% endif %} + {% if mine and formdata.formdef.enable_tracking_codes and formdata.tracking_code %} +

    + {% trans "You can get back to this page using the following tracking code:" %} + {{ formdata.tracking_code }} +

    + {% endif %} +
    + {% endif %} + {% endwith %} -{{ view.receipt|safe }} -{{ view.history|safe }} + {{ view.receipt|safe }} + {{ view.history|safe }} -{% with workflow_messages=view.bottom_workflow_messages %} -{% if workflow_messages or workflow_form %}{% endif %} - {{ workflow_messages|safe }} -{% endwith %} -{% if workflow_form %} - {{ view.actions_workflow_messages|safe }} - {{ workflow_form.render|safe }} -{% endif %} + {% with workflow_messages=view.bottom_workflow_messages %} + {% if workflow_messages or workflow_form %}{% endif %} + {{ workflow_messages|safe }} + {% endwith %} + {% if workflow_form %} + {{ view.actions_workflow_messages|safe }} + {{ workflow_form.render|safe }} + {% endif %}
    {% trans "Back Home" %} diff --git a/wcs/templates/wcs/formdata_steps.html b/wcs/templates/wcs/formdata_steps.html index 0a6ff6b16..f0f75dfe6 100644 --- a/wcs/templates/wcs/formdata_steps.html +++ b/wcs/templates/wcs/formdata_steps.html @@ -1,16 +1,16 @@
    -
      -{% for page_label in page_labels %} -{% spaceless %} -
    1. - {{ forloop.counter }} - {{ page_label }} -
      2. -{% endspaceless %} -{% endfor %} -
    +
      + {% for page_label in page_labels %} + {% spaceless %} +
    1. + {{ forloop.counter }} + {{ page_label }} +
      2. + {% endspaceless %} + {% endfor %} +
    diff --git a/wcs/templates/wcs/formdata_validation.html b/wcs/templates/wcs/formdata_validation.html index e1fa2ec5f..249fca870 100644 --- a/wcs/templates/wcs/formdata_validation.html +++ b/wcs/templates/wcs/formdata_validation.html @@ -1,11 +1,11 @@ {% extends template_base %} {% block body %} -
    - {{ form_side|default:"" }} -
    - {% standard_text "check-before-submit" %} -
    - {{ html_form.render|safe }} -
    +
    + {{ form_side|default:"" }} +
    + {% standard_text "check-before-submit" %} +
    + {{ html_form.render|safe }} +
    {% endblock %} diff --git a/wcs/templates/wcs/includes/drafts-recall.html b/wcs/templates/wcs/includes/drafts-recall.html index a43f7eca1..f6e318cec 100644 --- a/wcs/templates/wcs/includes/drafts-recall.html +++ b/wcs/templates/wcs/includes/drafts-recall.html @@ -2,22 +2,22 @@ {% if not view.preview_mode and view.initial_drafts %} {% with view.initial_drafts|length as drafts_length %}
    -

    - {% blocktrans %} - You already started to fill this form. You can continue it or submit a new - one. - {% endblocktrans %} -

    - {% if drafts_length == 1 %} -

    {% trans "Continue with draft" %}

    - {% elif drafts_length > 1 %} - - {% endif %} +

    + {% blocktrans %} + You already started to fill this form. You can continue it or submit a new + one. + {% endblocktrans %} +

    + {% if drafts_length == 1 %} +

    {% trans "Continue with draft" %}

    + {% elif drafts_length > 1 %} + + {% endif %}
    {% endwith %} {% endif %} -- 2.30.2