diff --git a/passerelle/apps/api_particulier/templates/api_particulier/apiparticulier_detail.html b/passerelle/apps/api_particulier/templates/api_particulier/apiparticulier_detail.html index e003485c..9644c2e4 100644 --- a/passerelle/apps/api_particulier/templates/api_particulier/apiparticulier_detail.html +++ b/passerelle/apps/api_particulier/templates/api_particulier/apiparticulier_detail.html @@ -2,13 +2,13 @@ {% load i18n passerelle %} {% block description %} -{{ block.super }} + {{ block.super }} -{% trans 'Accessible scopes list' %}: - + {% trans 'Accessible scopes list' %}: + {% endblock %} diff --git a/passerelle/apps/base_adresse/templates/base_adresse/baseadresse_detail.html b/passerelle/apps/base_adresse/templates/base_adresse/baseadresse_detail.html index 8b955d89..86762856 100644 --- a/passerelle/apps/base_adresse/templates/base_adresse/baseadresse_detail.html +++ b/passerelle/apps/base_adresse/templates/base_adresse/baseadresse_detail.html @@ -2,21 +2,21 @@ {% load i18n passerelle %} {% block description %} -{{ block.super }} -{% if object.get_zipcodes and not object.get_streets_queryset.exists %} -
-{% trans "Street data is not available yet, it should soon be downloaded." %} -
-{% endif %} -{% if object.api_geo_url and not object.cities_exist %} -
-{% trans "API Géo data is not available yet, it should soon be downloaded." %} -
-{% endif %} + {{ block.super }} + {% if object.get_zipcodes and not object.get_streets_queryset.exists %} +
+ {% trans "Street data is not available yet, it should soon be downloaded." %} +
+ {% endif %} + {% if object.api_geo_url and not object.cities_exist %} +
+ {% trans "API Géo data is not available yet, it should soon be downloaded." %} +
+ {% endif %} {% endblock %} {% block security %} -

-{% trans 'Accessing the listings is open.' %} -

+

+ {% trans 'Accessing the listings is open.' %} +

{% endblock %} diff --git a/passerelle/apps/bdp/templates/bdp/bdp_detail.html b/passerelle/apps/bdp/templates/bdp/bdp_detail.html index 27e975bb..18c1618f 100644 --- a/passerelle/apps/bdp/templates/bdp/bdp_detail.html +++ b/passerelle/apps/bdp/templates/bdp/bdp_detail.html @@ -2,55 +2,55 @@ {% load i18n passerelle %} {% block description %} -

-Service URL : {{ object.service_url }} -

+

+ Service URL : {{ object.service_url }} +

{% endblock %} {% block endpoints %} - + -

{% trans 'Examples' %}

- +

{% trans 'Examples' %}

+ {% endblock %} {% block security %} -

-{% trans 'Accessing is limited to the following API users:' %} -

-{% access_rights_table resource=object permission='can_access' %} +

+ {% trans 'Accessing is limited to the following API users:' %} +

+ {% access_rights_table resource=object permission='can_access' %} {% endblock %} diff --git a/passerelle/apps/clicrdv/templates/clicrdv/clicrdv_detail.html b/passerelle/apps/clicrdv/templates/clicrdv/clicrdv_detail.html index 217d34e6..c0784fc0 100644 --- a/passerelle/apps/clicrdv/templates/clicrdv/clicrdv_detail.html +++ b/passerelle/apps/clicrdv/templates/clicrdv/clicrdv_detail.html @@ -2,52 +2,52 @@ {% load i18n passerelle %} {% block description %} -

-Server: {{ object.server }} -

+

+ Server: {{ object.server }} +

{% endblock %} {% block endpoints %} - {% endblock %} {% block security %} -

-{% trans 'Accessing the listings is open, but creation and cancellation of appointments requests is limited to the following API users:' %} -

+

+ {% trans 'Accessing the listings is open, but creation and cancellation of appointments requests is limited to the following API users:' %} +

-{% access_rights_table resource=object permission='can_manage_appointment' %} + {% access_rights_table resource=object permission='can_manage_appointment' %} {% endblock %} diff --git a/passerelle/apps/cmis/templates/cmis/cmis_type.html b/passerelle/apps/cmis/templates/cmis/cmis_type.html index 20e2e173..35560204 100644 --- a/passerelle/apps/cmis/templates/cmis/cmis_type.html +++ b/passerelle/apps/cmis/templates/cmis/cmis_type.html @@ -2,48 +2,48 @@ {% load i18n passerelle %} {% block breadcrumb %} -{{ block.super }} -{% trans "CMIS Types" %} + {{ block.super }} + {% trans "CMIS Types" %} {% endblock %} {% block content %} -{% if current_type %} - - {% trans "Back to base types list" %} - -{% endif %} + {% if current_type %} + + {% trans "Back to base types list" %} + + {% endif %} -

-{% if current_type %} -

{% trans "Current type" %} :

-{{ current_type.id }} : {{ current_type.description }} -

+

+ {% if current_type %} +

{% trans "Current type" %} :

+ {{ current_type.id }} : {{ current_type.description }} +

-

-

Properties :

- -

+

+

Properties :

+ +

-

-

{% trans "Children" %} :

-{% endif %} +

+

{% trans "Children" %} :

+ {% endif %} -{% if children_types %} - -{% else %} -{% trans "No more children." %} -{% endif %} -

+ {% if children_types %} + + {% else %} + {% trans "No more children." %} + {% endif %} +

{% endblock %} diff --git a/passerelle/apps/cmis/templates/cmis/cmisconnector_detail.html b/passerelle/apps/cmis/templates/cmis/cmisconnector_detail.html index b9b5d616..8ab8040f 100644 --- a/passerelle/apps/cmis/templates/cmis/cmisconnector_detail.html +++ b/passerelle/apps/cmis/templates/cmis/cmisconnector_detail.html @@ -2,8 +2,8 @@ {% load i18n passerelle %} {% block description %} -{{ block.super }} -

-{% trans 'Explore available object types' %} -

+ {{ block.super }} +

+ {% trans 'Explore available object types' %} +

{% endblock %} diff --git a/passerelle/apps/csvdatasource/templates/csvdatasource/csvdatasource_detail.html b/passerelle/apps/csvdatasource/templates/csvdatasource/csvdatasource_detail.html index 56d7061b..ad13cbb6 100644 --- a/passerelle/apps/csvdatasource/templates/csvdatasource/csvdatasource_detail.html +++ b/passerelle/apps/csvdatasource/templates/csvdatasource/csvdatasource_detail.html @@ -2,42 +2,42 @@ {% load i18n passerelle %} {% block description %} -{% if object.description %}{{object.description|linebreaks}}{% endif %} + {% if object.description %}{{object.description|linebreaks}}{% endif %} -

- {% trans "File:" %} - {% if object|can_edit:request.user %}{{object.csv_file}} - — {% trans "added on" %} {{object.csv_file_datetime}} - {% else %}{{object.csv_file}}{% endif %} -

+

+ {% trans "File:" %} + {% if object|can_edit:request.user %}{{object.csv_file}} + — {% trans "added on" %} {{object.csv_file_datetime}} + {% else %}{{object.csv_file}}{% endif %} +

{% endblock %} {% block endpoints %} -

{% trans "Access" %}

- -

{% trans "Management" %}

- +

{% trans "Access" %}

+ +

{% trans "Management" %}

+ {% endblock %} diff --git a/passerelle/apps/csvdatasource/templates/csvdatasource/query_confirm_delete.html b/passerelle/apps/csvdatasource/templates/csvdatasource/query_confirm_delete.html index d478f6a0..76b4036c 100644 --- a/passerelle/apps/csvdatasource/templates/csvdatasource/query_confirm_delete.html +++ b/passerelle/apps/csvdatasource/templates/csvdatasource/query_confirm_delete.html @@ -2,24 +2,24 @@ {% load i18n %} {% block breadcrumb %} -{{ block.super }} -{{ resource.title }} -{{ object.slug }} + {{ block.super }} + {{ resource.title }} + {{ object.slug }} {% endblock %} {% block appbar %} -

{% trans 'Query:' %} {{ object.slug }}

+

{% trans 'Query:' %} {{ object.slug }}

{% endblock %} {% block content %} -
- {% csrf_token %} -

{% blocktrans %}Are you sure you want to delete this query?{% endblocktrans %}

-
- - {% trans 'Cancel' %} -
-
+
+ {% csrf_token %} +

{% blocktrans %}Are you sure you want to delete this query?{% endblocktrans %}

+
+ + {% trans 'Cancel' %} +
+
{% endblock %} diff --git a/passerelle/apps/csvdatasource/templates/csvdatasource/query_form.html b/passerelle/apps/csvdatasource/templates/csvdatasource/query_form.html index 3997d949..1575dc0c 100644 --- a/passerelle/apps/csvdatasource/templates/csvdatasource/query_form.html +++ b/passerelle/apps/csvdatasource/templates/csvdatasource/query_form.html @@ -2,32 +2,32 @@ {% load i18n gadjo %} {% block breadcrumb %} -{{ block.super }} -{{ resource.title }} -{% if object.id %} -{{ object.slug }} -{% else %} -{% trans 'Add Query' %} -{% endif %} + {{ block.super }} + {{ resource.title }} + {% if object.id %} + {{ object.slug }} + {% else %} + {% trans 'Add Query' %} + {% endif %} {% endblock %} {% block appbar %} -

{% if object.id %}{% trans 'Query:' %} {{ object.slug }}{% else %}{% trans 'New Query' %}{% endif %}

+

{% if object.id %}{% trans 'Query:' %} {{ object.slug }}{% else %}{% trans 'New Query' %}{% endif %}

{% endblock %} {% block content %} -
-
- {% csrf_token %} - {{ form|with_template }} -
- {% block buttons %} -
- - {% trans 'Cancel' %} -
- {% endblock %} -
+
+
+ {% csrf_token %} + {{ form|with_template }} +
+ {% block buttons %} +
+ + {% trans 'Cancel' %} +
+ {% endblock %} +
{% endblock %} diff --git a/passerelle/apps/family/templates/family/genericfamily_detail.html b/passerelle/apps/family/templates/family/genericfamily_detail.html index 5129b95c..b0b6b63d 100644 --- a/passerelle/apps/family/templates/family/genericfamily_detail.html +++ b/passerelle/apps/family/templates/family/genericfamily_detail.html @@ -2,60 +2,60 @@ {% load i18n passerelle %} {% block endpoints %} -

{% trans "Family" %}

- -

{% trans "Invoices" %}

- +

{% trans "Family" %}

+ +

{% trans "Invoices" %}

+ {% endblock %} diff --git a/passerelle/apps/franceconnect_data/templates/franceconnect_data/callback.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/callback.html index 04910b9f..426ccab9 100644 --- a/passerelle/apps/franceconnect_data/templates/franceconnect_data/callback.html +++ b/passerelle/apps/franceconnect_data/templates/franceconnect_data/callback.html @@ -1,45 +1,45 @@ - - - - - - - {% if test %} -

redirect_uri: 

{{ redirect_uri|pprint }}

-

correlation_id: 

{{ franceconnect.correlation_id }}

- {% if error %} -

{{ error }}

- {% if error.data %} -

- {% for key, value in error.data %} -
{{ key }} - 
{{ value|pprint }}
- {% endfor %} -
- {% endif %} - {% endif %} - + {% endif %} + + diff --git a/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html index cd8ca479..f186e0bd 100644 --- a/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html +++ b/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html @@ -2,61 +2,61 @@ {% load i18n %} {% block breadcrumb %} -{{ block.super }} -{{ resource.title }} -{% trans "Demo view" %} + {{ block.super }} + {{ resource.title }} + {% trans "Demo view" %} {% endblock %} {% block appbar %} {% endblock %} {% block content %} -

{% trans "Demo view" %}

-

- -

-

- - -

- - + $('#start').on('click', function () { + $('#user-info').hide(); + if (popup) { popup.close(); popup = null; }; + var url = 'init_request?test=1&origin={{ origin }}'; + var checkbox = document.getElementById('dgfip'); + if (checkbox && checkbox.checked) { + url += '&mode=dgfip'; + }; + popup = popupwindow(url, 'FranceConnect', 1000, 670); + if (window.focus) { + popup.focus(); + } + }); + $(window).on('message', function(event) { + var data = event.originalEvent.data; + var origin = event.originalEvent.origin; + if (origin != window.location.origin) { + return; + } + $.getJSON("data_source?id=" + data.id, function(result) { + $('#user-info').show(); + $('#user-info-preview').text(JSON.stringify(result, null, 2)); + }); + popup.close(); + }); + + {% endblock %} diff --git a/passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html index eac77859..e25ec080 100644 --- a/passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html +++ b/passerelle/apps/franceconnect_data/templates/franceconnect_data/resource_detail.html @@ -2,7 +2,7 @@ {% load i18n passerelle %} {% block description %} -{{ block.super }} -{% url "generic-endpoint" connector="franceconnect-data" slug=object.slug endpoint="callback" as callback_url %} -

URL de callback pour FranceConnect: {{ request.scheme }}://{{ request.get_host }}{{ callback_url }}

+ {{ block.super }} + {% url "generic-endpoint" connector="franceconnect-data" slug=object.slug endpoint="callback" as callback_url %} +

URL de callback pour FranceConnect: {{ request.scheme }}://{{ request.get_host }}{{ callback_url }}

{% endblock %} diff --git a/passerelle/apps/gdc/templates/gdc/gdc_detail.html b/passerelle/apps/gdc/templates/gdc/gdc_detail.html index 841940a5..2ec70859 100644 --- a/passerelle/apps/gdc/templates/gdc/gdc_detail.html +++ b/passerelle/apps/gdc/templates/gdc/gdc_detail.html @@ -2,33 +2,33 @@ {% load i18n passerelle %} {% block description %} -{{ block.super }} + {{ block.super }} -{% if missing_phpserialize %} -
-

{% trans 'Missing runtime dependencies:' %} -{% if missing_phpserialize %}phpserialize{% endif %} -

-
-{% endif %} + {% if missing_phpserialize %} +
+

{% trans 'Missing runtime dependencies:' %} + {% if missing_phpserialize %}phpserialize{% endif %} +

+
+ {% endif %} {% endblock %} {% block endpoints %} - + {% endblock %} {% block security %} -

-{% trans 'Accessing the listings is open, but posting requests is limited to the following API users:' %} -

-{% access_rights_table resource=object permission='can_post_request' %} +

+ {% trans 'Accessing the listings is open, but posting requests is limited to the following API users:' %} +

+ {% access_rights_table resource=object permission='can_post_request' %} {% endblock %} diff --git a/passerelle/apps/mdel/templates/mdel/mdel_detail.html b/passerelle/apps/mdel/templates/mdel/mdel_detail.html index c95364c4..905e09c7 100644 --- a/passerelle/apps/mdel/templates/mdel/mdel_detail.html +++ b/passerelle/apps/mdel/templates/mdel/mdel_detail.html @@ -2,149 +2,149 @@ {% load i18n passerelle %} {% block endpoints %} - {% endblock %} diff --git a/passerelle/apps/okina/templates/okina/okina_detail.html b/passerelle/apps/okina/templates/okina/okina_detail.html index 67b03200..4e49836f 100644 --- a/passerelle/apps/okina/templates/okina/okina_detail.html +++ b/passerelle/apps/okina/templates/okina/okina_detail.html @@ -2,99 +2,99 @@ {% load i18n passerelle %} {% block description %} -

-{% blocktrans %} -This API provides an access to Okina API. -{% endblocktrans %} -

-

+

+ {% blocktrans %} + This API provides an access to Okina API. + {% endblocktrans %} +

+

{% endblock %} {% block endpoints %} -

{% trans 'General' %}

- +

{% trans 'General' %}

+ -

{% trans 'Journeys' %}

- -

{% trans 'Subscriptions' %}

- +

{% trans 'Subscriptions' %}

+ -

{% trans 'Topology' %}

- +

{% trans 'Topology' %}

+ {% endblock %} {% block security %} -

- {% trans 'Access to subscription endpoints is limited to the following API users:' %} -

-{% access_rights_table resource=object permission='can_access' %} +

+ {% trans 'Access to subscription endpoints is limited to the following API users:' %} +

+ {% access_rights_table resource=object permission='can_access' %} {% endblock %} diff --git a/passerelle/apps/opengis/templates/opengis/query_form.html b/passerelle/apps/opengis/templates/opengis/query_form.html index 4706645d..d93b36f4 100644 --- a/passerelle/apps/opengis/templates/opengis/query_form.html +++ b/passerelle/apps/opengis/templates/opengis/query_form.html @@ -2,47 +2,47 @@ {% load i18n gadjo %} {% block form %} - {{ block.super }} -

{% trans "Computed properties" %}

- {{ formset.management_form }} - - - - {% for field in formset.0 %} - - {% endfor %} - - - - {% for sub_form in formset %} - - {% for field in sub_form %} - - {% endfor %} - + {{ block.super }} +

{% trans "Computed properties" %}

+ {{ formset.management_form }} +
{{ field.label }}
- {{ field.errors.as_ul }} - {{ field }} -
+ + + {% for field in formset.0 %} + {% endfor %} - -
{{ field.label }}
- - {% if object.pk %} + + + + {% for sub_form in formset %} + + {% for field in sub_form %} + + {{ field.errors.as_ul }} + {{ field }} + + {% endfor %} + + {% endfor %} + + + + {% if object.pk %} - {% endif %} + {% endif %} {% endblock %} diff --git a/passerelle/apps/opengis/templates/opengis/widgets/indexing_template_widget.html b/passerelle/apps/opengis/templates/opengis/widgets/indexing_template_widget.html index 47e12662..80a57161 100644 --- a/passerelle/apps/opengis/templates/opengis/widgets/indexing_template_widget.html +++ b/passerelle/apps/opengis/templates/opengis/widgets/indexing_template_widget.html @@ -1,7 +1,7 @@ {% load i18n %} + {% if widget.value %}{{ widget.value }}{% endif %}
{% trans 'Template used to generate contents used in fulltext search.' %}
diff --git a/passerelle/apps/ovh/templates/ovh/credit_alert_body.html b/passerelle/apps/ovh/templates/ovh/credit_alert_body.html index 1b5fa129..d140102e 100644 --- a/passerelle/apps/ovh/templates/ovh/credit_alert_body.html +++ b/passerelle/apps/ovh/templates/ovh/credit_alert_body.html @@ -2,21 +2,21 @@ {% load i18n %} {% block content %} -

{% trans "Hi," %}

+

{% trans "Hi," %}

-

-{% blocktrans trimmed with name=connector.title credit_left=connector.credit_left %} -There are only {{ credit_left }} credits left for connector {{ name }}. -{% endblocktrans %} -

+

+ {% blocktrans trimmed with name=connector.title credit_left=connector.credit_left %} + There are only {{ credit_left }} credits left for connector {{ name }}. + {% endblocktrans %} +

-

-{% blocktrans trimmed with account=connector.account %} -Please add more credit as soon as possible for OVH account {{ account }}. -{% endblocktrans %} -

+

+ {% blocktrans trimmed with account=connector.account %} + Please add more credit as soon as possible for OVH account {{ account }}. + {% endblocktrans %} +

-{% with _("View connector page") as button_label %} -{% include "emails/button-link.html" with url=connector_url label=button_label %} -{% endwith %} + {% with _("View connector page") as button_label %} + {% include "emails/button-link.html" with url=connector_url label=button_label %} + {% endwith %} {% endblock %} diff --git a/passerelle/apps/ovh/templates/ovh/ovhsmsgateway_detail.html b/passerelle/apps/ovh/templates/ovh/ovhsmsgateway_detail.html index 54ac82db..c6788246 100644 --- a/passerelle/apps/ovh/templates/ovh/ovhsmsgateway_detail.html +++ b/passerelle/apps/ovh/templates/ovh/ovhsmsgateway_detail.html @@ -2,19 +2,19 @@ {% load i18n passerelle %} {% block description %} -{% if object.uses_new_api and not object.consumer_key %} -
{% trans "Connector is not operational yet, as access needs to be obtained from OVH for the specified account." %} -{% trans "Click here to request access." %} -
-{% endif %} + {% if object.uses_new_api and not object.consumer_key %} +
{% trans "Connector is not operational yet, as access needs to be obtained from OVH for the specified account." %} + {% trans "Click here to request access." %} +
+ {% endif %} -{% if object.uses_new_api and object.consumer_key and not object.credit_left %} -

{% trans "There is no credit left." %}

-{% endif %} + {% if object.uses_new_api and object.consumer_key and not object.credit_left %} +

{% trans "There is no credit left." %}

+ {% endif %} -{{ block.super }} + {{ block.super }} -{% if object.uses_new_api and object.consumer_key %} -

{% trans "Credit left:" %} {{ object.credit_left }}

-{% endif %} + {% if object.uses_new_api and object.consumer_key %} +

{% trans "Credit left:" %} {{ object.credit_left }}

+ {% endif %} {% endblock %} diff --git a/passerelle/apps/phonecalls/templates/phonecalls/start_call_newtab.html b/passerelle/apps/phonecalls/templates/phonecalls/start_call_newtab.html index b90f6d1e..cf2efc1c 100644 --- a/passerelle/apps/phonecalls/templates/phonecalls/start_call_newtab.html +++ b/passerelle/apps/phonecalls/templates/phonecalls/start_call_newtab.html @@ -3,9 +3,9 @@ diff --git a/passerelle/base/templates/base/index.html b/passerelle/base/templates/base/index.html index da498969..79387ba2 100644 --- a/passerelle/base/templates/base/index.html +++ b/passerelle/base/templates/base/index.html @@ -7,11 +7,11 @@ {% block content %} -
-{% for o in object_list %} -
{{ o.title }}
-
{{ o.description }}
-{% endfor %} -
+
+ {% for o in object_list %} +
{{ o.title }}
+
{{ o.description }}
+ {% endfor %} +
{% endblock %} diff --git a/passerelle/base/templates/base/view.html b/passerelle/base/templates/base/view.html index 6fee01f8..0e2408d2 100644 --- a/passerelle/base/templates/base/view.html +++ b/passerelle/base/templates/base/view.html @@ -7,26 +7,26 @@ {% block content %} -

-{{ object.description }} -

+

+ {{ object.description }} +

- + -{% if sample %} -

{% trans 'Sample' %}

-
{{ sample }}
-{% endif %} + {% if sample %} +

{% trans 'Sample' %}

+ 
{{ sample }}
+ {% endif %} -{% block example %}{% endblock %} + {% block example %}{% endblock %} {% endblock %} diff --git a/passerelle/base/templates/passerelle/base/view.html b/passerelle/base/templates/passerelle/base/view.html index 6fee01f8..0e2408d2 100644 --- a/passerelle/base/templates/passerelle/base/view.html +++ b/passerelle/base/templates/passerelle/base/view.html @@ -7,26 +7,26 @@ {% block content %} -

-{{ object.description }} -

+

+ {{ object.description }} +

- + -{% if sample %} -

{% trans 'Sample' %}

-
{{ sample }}
-{% endif %} + {% if sample %} +

{% trans 'Sample' %}

+ 
{{ sample }}
+ {% endif %} -{% block example %}{% endblock %} + {% block example %}{% endblock %} {% endblock %} diff --git a/passerelle/base/templates/passerelle/widgets/sftp.html b/passerelle/base/templates/passerelle/widgets/sftp.html index b7c57888..3d3f204b 100644 --- a/passerelle/base/templates/passerelle/widgets/sftp.html +++ b/passerelle/base/templates/passerelle/widgets/sftp.html @@ -1,18 +1,18 @@ {% load i18n %}
-
+
{% include widget.subwidgets.0.template_name with widget=widget.subwidgets.0 %} -
-
+
+
{% include widget.subwidgets.1.template_name with widget=widget.subwidgets.1 %} -
-
+
+
{% include widget.subwidgets.2.template_name with widget=widget.subwidgets.2 %} -
-
+
+
{% include widget.subwidgets.3.template_name with widget=widget.subwidgets.3 %} -
+
diff --git a/passerelle/contrib/fake_family/templates/passerelle/contrib/fake_family/detail.html b/passerelle/contrib/fake_family/templates/passerelle/contrib/fake_family/detail.html index 4f11f928..5c3cc01c 100644 --- a/passerelle/contrib/fake_family/templates/passerelle/contrib/fake_family/detail.html +++ b/passerelle/contrib/fake_family/templates/passerelle/contrib/fake_family/detail.html @@ -5,72 +5,72 @@ {% endblock %} {% block endpoints %} - + -
-

{% trans "Contents" %}

+
+

{% trans "Contents" %}

-

{% trans "Adults" %}

- - - - {% for adult in object.jsondatabase.adults.values|dictsort:"id" %} - - - - -{% endfor %} - -
{% trans "id" %}{% trans "text" %}{% trans "birthdate" %}{% trans "keywords" %}
{{ adult.id }}{{ adult.text }}{{ adult.birthdate }}{{ adult.keywords|join:'
' }}
+

{% trans "Adults" %}

+ + + + {% for adult in object.jsondatabase.adults.values|dictsort:"id" %} + + + + + {% endfor %} + +
{% trans "id" %}{% trans "text" %}{% trans "birthdate" %}{% trans "keywords" %}
{{ adult.id }}{{ adult.text }}{{ adult.birthdate }}{{ adult.keywords|join:'
' }}
-

{% trans "Children" %}

- - - - {% for child in object.jsondatabase.children.values|dictsort:"id" %} - - - - -{% endfor %} - -
{% trans "id" %}{% trans "text" %}{% trans "birthdate" %}{% trans "keywords" %}
{{ child.id }}{{ child.text }}{{ child.birthdate }}{{ child.keywords|join:'
' }}
+

{% trans "Children" %}

+ + + + {% for child in object.jsondatabase.children.values|dictsort:"id" %} + + + + + {% endfor %} + +
{% trans "id" %}{% trans "text" %}{% trans "birthdate" %}{% trans "keywords" %}
{{ child.id }}{{ child.text }}{{ child.birthdate }}{{ child.keywords|join:'
' }}
-

{% trans "Families" %}

- - - - - {% for family in object.jsondatabase.families.values|dictsort:"id" %} - - - - - - - -{% endfor %} - -
{% trans "id" %}{% trans "adults" %}{% trans "children" %}{% trans "contacts" %}{% trans "keywords" %}
{{ family.id }}{{ family.adults|join:', ' }}{{ family.children|join:', ' }}{{ family.contacts|join:', ' }}{{ family.keywords|join:'
' }}
-
+

{% trans "Families" %}

+ + + + + {% for family in object.jsondatabase.families.values|dictsort:"id" %} + + + + + + + + {% endfor %} + +
{% trans "id" %}{% trans "adults" %}{% trans "children" %}{% trans "contacts" %}{% trans "keywords" %}
{{ family.id }}{{ family.adults|join:', ' }}{{ family.children|join:', ' }}{{ family.contacts|join:', ' }}{{ family.keywords|join:'
' }}
+
{% endblock %} {% block security %} -

-{% trans 'Access is limited to the following API users:' %} -

-{% access_rights_table resource=object permission='can_access' %} +

+ {% trans 'Access is limited to the following API users:' %} +

+ {% access_rights_table resource=object permission='can_access' %} {% endblock %} diff --git a/passerelle/contrib/nancypoll/templates/nancypoll/nancypoll_detail.html b/passerelle/contrib/nancypoll/templates/nancypoll/nancypoll_detail.html index 53609016..cce47ccc 100644 --- a/passerelle/contrib/nancypoll/templates/nancypoll/nancypoll_detail.html +++ b/passerelle/contrib/nancypoll/templates/nancypoll/nancypoll_detail.html @@ -2,52 +2,52 @@ {% load i18n passerelle %} {% block description %} -

+

{%trans "CSV Columns keyname : "%}

-

+

{% endblock %} {% block endpoints %} - {% endblock %} diff --git a/passerelle/contrib/solis_apa/templates/passerelle/contrib/solis_apa/detail.html b/passerelle/contrib/solis_apa/templates/passerelle/contrib/solis_apa/detail.html index f3e5ebfe..c8305c99 100644 --- a/passerelle/contrib/solis_apa/templates/passerelle/contrib/solis_apa/detail.html +++ b/passerelle/contrib/solis_apa/templates/passerelle/contrib/solis_apa/detail.html @@ -5,68 +5,68 @@ {% endblock %} {% block endpoints %} - {% endblock %} {% block security %} -

-{% trans 'Access is limited to the following API users:' %} -

-{% access_rights_table resource=object permission='can_access' %} +

+ {% trans 'Access is limited to the following API users:' %} +

+ {% access_rights_table resource=object permission='can_access' %} {% endblock %} diff --git a/passerelle/contrib/teamnet_axel/templates/teamnet_axel/teamnetaxel_detail.html b/passerelle/contrib/teamnet_axel/templates/teamnet_axel/teamnetaxel_detail.html index 49cfc746..5cf88833 100644 --- a/passerelle/contrib/teamnet_axel/templates/teamnet_axel/teamnetaxel_detail.html +++ b/passerelle/contrib/teamnet_axel/templates/teamnet_axel/teamnetaxel_detail.html @@ -2,8 +2,8 @@ {% load i18n passerelle %} {% block endpoints %} -

{% trans "Family related" %}

- -

{% trans "Invoices related" %}

- {% endblock %} diff --git a/passerelle/contrib/toulouse_foederis/templates/toulouse_foederis/resource_detail.html b/passerelle/contrib/toulouse_foederis/templates/toulouse_foederis/resource_detail.html index 38f96cfc..1e2e56d2 100644 --- a/passerelle/contrib/toulouse_foederis/templates/toulouse_foederis/resource_detail.html +++ b/passerelle/contrib/toulouse_foederis/templates/toulouse_foederis/resource_detail.html @@ -2,8 +2,8 @@ {% load i18n passerelle %} {% block description %} -{{ block.super }} -{% trans "Never" as default_updated %} -

{% trans "Last update of announces:" %} {{ object.last_update_announces|default:default_updated }}

-

{% trans "Last update of referentials:" %} {{ object.last_update_referentiels|default:default_updated }}

+ {{ block.super }} + {% trans "Never" as default_updated %} +

{% trans "Last update of announces:" %} {{ object.last_update_announces|default:default_updated }}

+

{% trans "Last update of referentials:" %} {{ object.last_update_referentiels|default:default_updated }}

{% endblock %} diff --git a/passerelle/contrib/toulouse_smart/templates/toulouse_smart/toulousesmartresource_detail.html b/passerelle/contrib/toulouse_smart/templates/toulouse_smart/toulousesmartresource_detail.html index 91b54376..c5fcc1d6 100644 --- a/passerelle/contrib/toulouse_smart/templates/toulouse_smart/toulousesmartresource_detail.html +++ b/passerelle/contrib/toulouse_smart/templates/toulouse_smart/toulousesmartresource_detail.html @@ -2,13 +2,13 @@ {% load i18n passerelle %} {% block extra-tab-buttons %} - + {% endblock %} {% block extra-sections %} - + {% endblock %} diff --git a/passerelle/contrib/toulouse_smart/templates/toulouse_smart/type-intervention.html b/passerelle/contrib/toulouse_smart/templates/toulouse_smart/type-intervention.html index f671790b..6eb4fc4b 100644 --- a/passerelle/contrib/toulouse_smart/templates/toulouse_smart/type-intervention.html +++ b/passerelle/contrib/toulouse_smart/templates/toulouse_smart/type-intervention.html @@ -2,47 +2,47 @@ {% load i18n gadjo %} {% block breadcrumb %} -{{ block.super }} -{{ toulousesmartresource.title }} -{% trans 'Intervention types' %} + {{ block.super }} + {{ toulousesmartresource.title }} + {% trans 'Intervention types' %} {% endblock %} {% block appbar %} -

{% trans 'Intervention types' %}

- +

{% trans 'Intervention types' %}

+ {% trans "Export to blocks" %} - + {% endblock %} {% block content %} - +
- - - - - - - + + + + + + + - {% for intervention_type in toulousesmartresource.get_intervention_types %} + {% for intervention_type in toulousesmartresource.get_intervention_types %} - {% for property in intervention_type.properties %} - - - - - - - - {% endfor %} + {% for property in intervention_type.properties %} + + + + + + + {% endfor %} + {% endfor %} -
Nom du type d'interventionNomTypeRequisValeur par défaut
Nom du type d'interventionNomTypeRequisValeur par défaut
{{ intervention_type.order }} - {{ intervention_type.name }}
{{ property.name }}{{ property.type }}{% if property.type == 'item' %} ({% for value in property.restrictedValues %}{% if not forloop.first %}, {% endif %}«{{ value }}»{% endfor %}){% endif %}{{ property.required|yesno:"✔,✘" }}{{ property.defaultValue }}
{{ property.name }}{{ property.type }}{% if property.type == 'item' %} ({% for value in property.restrictedValues %}{% if not forloop.first %}, {% endif %}«{{ value }}»{% endfor %}){% endif %}{{ property.required|yesno:"✔,✘" }}{{ property.defaultValue }}
+ - + --> {% endblock %} diff --git a/passerelle/sms/templates/passerelle/manage/messages_service_test_send.html b/passerelle/sms/templates/passerelle/manage/messages_service_test_send.html index 010d8f96..d4d3f6ed 100644 --- a/passerelle/sms/templates/passerelle/manage/messages_service_test_send.html +++ b/passerelle/sms/templates/passerelle/manage/messages_service_test_send.html @@ -2,17 +2,17 @@ {% load i18n %} {% block appbar %} -

{% trans "Sending a test SMS" %}

+

{% trans "Sending a test SMS" %}

{% endblock %} {% block content %} -
- {% csrf_token %} - {{ form.as_p }} -
- - {% trans 'Cancel' %} -
-
+
+ {% csrf_token %} + {{ form.as_p }} +
+ + {% trans 'Cancel' %} +
+
{% endblock %} diff --git a/passerelle/sms/templates/passerelle/manage/messages_service_view.html b/passerelle/sms/templates/passerelle/manage/messages_service_view.html index 32b3e054..559aae83 100644 --- a/passerelle/sms/templates/passerelle/manage/messages_service_view.html +++ b/passerelle/sms/templates/passerelle/manage/messages_service_view.html @@ -2,7 +2,7 @@ {% load i18n passerelle %} {% block actions %} -{% if perms.base.see_accessright %} -{% trans 'Send a test message' %} -{% endif %} + {% if perms.base.see_accessright %} + {% trans 'Send a test message' %} + {% endif %} {% endblock %} diff --git a/passerelle/templates/emails/body_base.html b/passerelle/templates/emails/body_base.html index 9705c361..0705591b 100644 --- a/passerelle/templates/emails/body_base.html +++ b/passerelle/templates/emails/body_base.html @@ -1,15 +1,15 @@ - - - - -
-
- {% block content %} - {{ content }} - {% endblock %} + + + + +
+
+ {% block content %} + {{ content }} + {% endblock %} +
-
- + diff --git a/passerelle/templates/passerelle/base.html b/passerelle/templates/passerelle/base.html index cb6b9360..3e60c1a1 100644 --- a/passerelle/templates/passerelle/base.html +++ b/passerelle/templates/passerelle/base.html @@ -5,13 +5,13 @@ {% block footer %}Passerelle — Copyright © Entr'ouvert{% endblock %} {% block extrascripts %} -{{ block.super }} - + {{ block.super }} + {% endblock %} {% block logout-url %}{% url 'auth_logout' %}{% endblock %} {% block breadcrumb %} - {% if portal_agent_url %}{{ block.super }}{% endif %} - {% trans 'Web Services' %} + {% if portal_agent_url %}{{ block.super }}{% endif %} + {% trans 'Web Services' %} {% endblock %} diff --git a/passerelle/templates/passerelle/includes/access-rights-table.html b/passerelle/templates/passerelle/includes/access-rights-table.html index 5c41442e..d2691ec3 100644 --- a/passerelle/templates/passerelle/includes/access-rights-table.html +++ b/passerelle/templates/passerelle/includes/access-rights-table.html @@ -1,41 +1,41 @@ {% load i18n %} - - - - - - {% if perms.base.delete_accessright %}{% endif %} - - - -{% for object in access_rights_list %} - - {% if perms.base.change_apiuser %} - - {% else %} - - {% endif %} - - - {% if perms.base.delete_accessright %} - - {% endif %} - -{% endfor %} -{% for trusted_service in trusted_services %} - - - - - {% if perms.base.delete_accessright %}{% endif %} - -{% endfor %} - + + + + + + {% if perms.base.delete_accessright %}{% endif %} + + + + {% for object in access_rights_list %} + + {% if perms.base.change_apiuser %} + + {% else %} + + {% endif %} + + + {% if perms.base.delete_accessright %} + + {% endif %} + + {% endfor %} + {% for trusted_service in trusted_services %} + + + + + {% if perms.base.delete_accessright %}{% endif %} + + {% endfor %} +
{% trans 'Name' %}{% trans 'Key Type' %}{% trans 'IP Restriction' %}
{{ object.apiuser.fullname }}{{ object.apiuser.fullname }}{% if object.apiuser.keytype %}{{ object.apiuser.keytype }}{% else %} - {% endif %}{% if object.apiuser.ipsource %}{{ object.apiuser.ipsource }}{% else %} - {% endif %}
{{ trusted_service.title }} ({{ trusted_service.verif_orig }})SIGN - {% trans 'trusted service' %}
{% trans 'Name' %}{% trans 'Key Type' %}{% trans 'IP Restriction' %}
{{ object.apiuser.fullname }}{{ object.apiuser.fullname }}{% if object.apiuser.keytype %}{{ object.apiuser.keytype }}{% else %} - {% endif %}{% if object.apiuser.ipsource %}{{ object.apiuser.ipsource }}{% else %} - {% endif %}
{{ trusted_service.title }} ({{ trusted_service.verif_orig }})SIGN - {% trans 'trusted service' %}
{% if perms.base.add_accessright %} -

-{% trans 'Add' %} -

+

+ {% trans 'Add' %} +

{% endif %} diff --git a/passerelle/templates/passerelle/includes/resource-jobs-table.html b/passerelle/templates/passerelle/includes/resource-jobs-table.html index fd732652..45bb5b3f 100644 --- a/passerelle/templates/passerelle/includes/resource-jobs-table.html +++ b/passerelle/templates/passerelle/includes/resource-jobs-table.html @@ -2,29 +2,29 @@ {% load tz %} {% if jobs %} - +
- - - - - + + + + + - {% for job in jobs %} - - - - - - - - {% endfor %} + {% for job in jobs %} + + + + + + + + {% endfor %} -
{% trans 'Creation Timestamp' %}{% trans 'Update Timestamp' %}{% trans 'Done Timestamp' %}{% trans 'Type' %}{% trans 'Status' %}{% trans 'Creation Timestamp' %}{% trans 'Update Timestamp' %}{% trans 'Done Timestamp' %}{% trans 'Type' %}{% trans 'Status' %}
{{ job.creation_timestamp|localtime }}{{ job.update_timestamp|localtime }}{{ job.done_timestamp|localtime }}{{ job.method_name }}{{ job.get_status_display }}
{{ job.creation_timestamp|localtime }}{{ job.update_timestamp|localtime }}{{ job.done_timestamp|localtime }}{{ job.method_name }}{{ job.get_status_display }}
+ -{% with page_obj=jobs %} - {% include "gadjo/pagination.html" with anchor="#jobs" without_key="job_id" %} -{% endwith %} + {% with page_obj=jobs %} + {% include "gadjo/pagination.html" with anchor="#jobs" without_key="job_id" %} + {% endwith %} {% endif %} diff --git a/passerelle/templates/passerelle/includes/resource-logs-table.html b/passerelle/templates/passerelle/includes/resource-logs-table.html index b6cae60c..ba5bfbfb 100644 --- a/passerelle/templates/passerelle/includes/resource-logs-table.html +++ b/passerelle/templates/passerelle/includes/resource-logs-table.html @@ -1,52 +1,52 @@ {% load i18n passerelle tz gadjo %} {% if logrecords %} - +
- - - + + + - {% for record in logrecords %} - - - - - - {% endfor %} + {% for record in logrecords %} + + + + + + {% endfor %} -
{% trans 'Timestamp' %}{% trans 'Source IP' %}{% trans 'Message' %}{% trans 'Timestamp' %}{% trans 'Source IP' %}{% trans 'Message' %}
- {{ record.timestamp|localtime|date:'DATE_FORMAT' }} - {{ record.timestamp|localtime|time:"H:i:s" }} - {{ record.sourceip|default:"-" }}{{ record.message|censor }}
+ {{ record.timestamp|localtime|date:'DATE_FORMAT' }} + {{ record.timestamp|localtime|time:"H:i:s" }} + {{ record.sourceip|default:"-" }}{{ record.message|censor }}
+ -{% with page_obj=logrecords anchor="#table-logs" without_key="log_id" page_key=page_key|default:"page" %} - {% if page_obj.has_next or page_obj.has_previous %} - {% spaceless %} -

- {% if page_obj.number > 1 %} - {% if page_obj.previous_page_number != 1 %} - 1 - … - {% endif %} + {% with page_obj=logrecords anchor="#table-logs" without_key="log_id" page_key=page_key|default:"page" %} + {% if page_obj.has_next or page_obj.has_previous %} + {% spaceless %} +

+ {% if page_obj.number > 1 %} + {% if page_obj.previous_page_number != 1 %} + 1 + … + {% endif %} + {% endif %} + + {% if page_obj.has_previous %} + {{ page_obj.previous_page_number }} + {% endif %} + + {{ page_obj.number }} + + {% if page_obj.has_next %} + {{ page_obj.next_page_number }} + … + {% endif %} +

+ {% endspaceless %} {% endif %} - - {% if page_obj.has_previous %} - {{ page_obj.previous_page_number }} - {% endif %} - - {{ page_obj.number }} - - {% if page_obj.has_next %} - {{ page_obj.next_page_number }} - … - {% endif %} -

- {% endspaceless %} - {% endif %} -{% endwith %} + {% endwith %} {% else %} -

{% trans 'No records found' %}

+

{% trans 'No records found' %}

{% endif %} diff --git a/passerelle/templates/passerelle/legacy.html b/passerelle/templates/passerelle/legacy.html index d9226783..1864416b 100644 --- a/passerelle/templates/passerelle/legacy.html +++ b/passerelle/templates/passerelle/legacy.html @@ -2,17 +2,17 @@ {% load i18n %} {% block breadcrumb %} -{{ block.super }} -{% trans 'Legacy' %} + {{ block.super }} + {% trans 'Legacy' %} {% endblock %} {% block content %} -

{% trans 'Legacy data sources and services' %}

- +

{% trans 'Legacy data sources and services' %}

+ {% endblock %} diff --git a/passerelle/templates/passerelle/manage.html b/passerelle/templates/passerelle/manage.html index 09e85aff..70dadda9 100644 --- a/passerelle/templates/passerelle/manage.html +++ b/passerelle/templates/passerelle/manage.html @@ -4,9 +4,9 @@ {% block appbar %}

{% trans 'Web Services' %}

- - {% trans 'Access Management' %} - {% trans 'Add Connector' %} + + {% trans 'Access Management' %} + {% trans 'Add Connector' %}