From 22e6c3e999c0dbd08e6c24437a360a5acafef15e Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 23 Mar 2022 14:26:07 +0100 Subject: [PATCH 1/2] manager: make time period exception source views more generic (#52370) --- .../chrono/manager_confirm_source_delete.html | 4 +- .../chrono/manager_import_exceptions.html | 5 +- .../chrono/manager_replace_exceptions.html | 2 +- .../manager_time_period_exception_form.html | 2 +- chrono/manager/views.py | 50 +++---------------- 5 files changed, 14 insertions(+), 49 deletions(-) diff --git a/chrono/manager/templates/chrono/manager_confirm_source_delete.html b/chrono/manager/templates/chrono/manager_confirm_source_delete.html index 8eaf1b63..4ef0fc04 100644 --- a/chrono/manager/templates/chrono/manager_confirm_source_delete.html +++ b/chrono/manager/templates/chrono/manager_confirm_source_delete.html @@ -1,4 +1,4 @@ -{% extends "chrono/manager_home.html" %} +{% extends base_template %} {% load i18n %} {% block appbar %} @@ -13,7 +13,7 @@

- {% trans 'Cancel' %} + {% trans 'Cancel' %}
{% endblock %} diff --git a/chrono/manager/templates/chrono/manager_import_exceptions.html b/chrono/manager/templates/chrono/manager_import_exceptions.html index 6cfe2b15..e5004527 100644 --- a/chrono/manager/templates/chrono/manager_import_exceptions.html +++ b/chrono/manager/templates/chrono/manager_import_exceptions.html @@ -1,4 +1,4 @@ -{% extends "chrono/manager_agenda_view.html" %} +{% extends base_template %} {% load i18n %} {% block extrascripts %} @@ -8,7 +8,6 @@ {% block breadcrumb %} {{ block.super }} -{% trans 'Settings' %} {% trans "Manage exception sources" %} {% endblock %} @@ -52,7 +51,7 @@

- {% trans 'Cancel' %} + {% trans 'Cancel' %}
{% endblock %} diff --git a/chrono/manager/templates/chrono/manager_replace_exceptions.html b/chrono/manager/templates/chrono/manager_replace_exceptions.html index 6f9f8309..906591f7 100644 --- a/chrono/manager/templates/chrono/manager_replace_exceptions.html +++ b/chrono/manager/templates/chrono/manager_replace_exceptions.html @@ -14,7 +14,7 @@

- {% trans 'Cancel' %} + {% trans 'Cancel' %}
{% endblock %} diff --git a/chrono/manager/templates/chrono/manager_time_period_exception_form.html b/chrono/manager/templates/chrono/manager_time_period_exception_form.html index 1e846920..4fb663e6 100644 --- a/chrono/manager/templates/chrono/manager_time_period_exception_form.html +++ b/chrono/manager/templates/chrono/manager_time_period_exception_form.html @@ -40,7 +40,7 @@ {% endfor %}
- {% trans 'Cancel' %} + {% trans 'Cancel' %}