From 1940044b7a52f9c2ed09f1c61c67b8cf75a09f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 21 Dec 2019 16:50:47 +0100 Subject: [PATCH] manager: split agenda settings template (#38680) --- .../chrono/manager_agenda_settings.html | 150 +----------------- .../manager_events_agenda_settings.html | 60 +++++++ .../manager_meetings_agenda_settings.html | 91 +++++++++++ chrono/manager/views.py | 4 +- 4 files changed, 162 insertions(+), 143 deletions(-) create mode 100644 chrono/manager/templates/chrono/manager_events_agenda_settings.html create mode 100644 chrono/manager/templates/chrono/manager_meetings_agenda_settings.html diff --git a/chrono/manager/templates/chrono/manager_agenda_settings.html b/chrono/manager/templates/chrono/manager_agenda_settings.html index f9f38392..492f8c1b 100644 --- a/chrono/manager/templates/chrono/manager_agenda_settings.html +++ b/chrono/manager/templates/chrono/manager_agenda_settings.html @@ -21,155 +21,18 @@ {% if user_can_manage %} {% trans 'Export' %} {% trans 'Options' %} - {% if object.kind == "events" %} - {% trans 'Import Events' %} - {% trans 'New Event' %} - {% else %} - {% trans 'New Meeting Type' %} - {% trans 'New Desk' %} - {% endif %} + {% block agenda-extra-management-actions %} + {% endblock %} {% endif %} {% endblock %} {% block content %} -{% if object.kind == "events" %} -
-

{% trans "Events" %}

-
-{% if object.event_set.count %} - -{% else %} -
- {% blocktrans %} - This agenda doesn't have any event yet. Click on the "New Event" button in - the top right of the page to add a first one. - {% endblocktrans %} -
-{% endif %} -
-
-{% endif %} - -{% if object.kind == "meetings" %} - -
-

{% trans 'Meeting Types' %}

-
-{% if object.meetingtype_set.count %} - -{% else %} -
- {% blocktrans %} - This agenda doesn't have any meeting type yet. Click on the "New Meeting Type" button in - the top right of the page to add a first one. - {% endblocktrans %} -
-{% endif %} -
-
- -
-

{% trans 'Time Periods' %}

-
- {% if object.desk_set.count %} -
- {% for desk in object.desk_set.all %} -
- {% url 'chrono-manager-agenda-add-time-period' agenda_pk=object.pk pk=desk.pk as add_time_period_url %} - -
- {% endfor %} -
- {% else %} -
- {% blocktrans %} - This agenda doesn't have any desk yet. Click on the "New Desk" button in - the top right of the page to add a first one. - {% endblocktrans %} -
-{% endif %} -
-
- -{% endif %} - +{% block agenda-settings %} +{% endblock %} +{% block agenda-permissions %}

{% trans "Permissions" %}

@@ -179,7 +42,9 @@
+{% endblock %} +{% block agenda-booking-delays %}

{% trans "Booking Delays" %}

@@ -189,5 +54,6 @@
+{% endblock %} {% endblock %} diff --git a/chrono/manager/templates/chrono/manager_events_agenda_settings.html b/chrono/manager/templates/chrono/manager_events_agenda_settings.html new file mode 100644 index 00000000..779d450e --- /dev/null +++ b/chrono/manager/templates/chrono/manager_events_agenda_settings.html @@ -0,0 +1,60 @@ +{% extends "chrono/manager_agenda_settings.html" %} +{% load i18n %} + +{% block agenda-extra-management-actions %} + {% trans 'Import Events' %} + {% trans 'New Event' %} +{% endblock %} + +{% block agenda-settings %} + +
+

{% trans "Events" %}

+
+{% if object.event_set.count %} + +{% else %} +
+ {% blocktrans %} + This agenda doesn't have any event yet. Click on the "New Event" button in + the top right of the page to add a first one. + {% endblocktrans %} +
+{% endif %} +
+
+ +{% endblock %} diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html new file mode 100644 index 00000000..111f649e --- /dev/null +++ b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html @@ -0,0 +1,91 @@ +{% extends "chrono/manager_agenda_settings.html" %} +{% load i18n %} + +{% block agenda-extra-management-actions %} + {% trans 'New Meeting Type' %} + {% trans 'New Desk' %} +{% endblock %} + +{% block agenda-settings %} + +
+

{% trans 'Meeting Types' %}

+
+{% if object.meetingtype_set.count %} + +{% else %} +
+ {% blocktrans %} + This agenda doesn't have any meeting type yet. Click on the "New Meeting Type" button in + the top right of the page to add a first one. + {% endblocktrans %} +
+{% endif %} +
+
+ +
+

{% trans 'Time Periods' %}

+
+ {% if object.desk_set.count %} +
+ {% for desk in object.desk_set.all %} +
+ {% url 'chrono-manager-agenda-add-time-period' agenda_pk=object.pk pk=desk.pk as add_time_period_url %} + +
+ {% endfor %} +
+ {% else %} +
+ {% blocktrans %} + This agenda doesn't have any desk yet. Click on the "New Desk" button in + the top right of the page to add a first one. + {% endblocktrans %} +
+{% endif %} +
+
+ +{% endblock %} diff --git a/chrono/manager/views.py b/chrono/manager/views.py index e3888f0a..4ffdc76c 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -598,7 +598,6 @@ class ManagedDeskSubobjectMixin(object): class AgendaSettings(ManagedAgendaMixin, DetailView): - template_name = 'chrono/manager_agenda_settings.html' model = Agenda def dispatch(self, request, *args, **kwargs): @@ -619,6 +618,9 @@ class AgendaSettings(ManagedAgendaMixin, DetailView): context['user_can_manage'] = self.get_object().can_be_managed(self.request.user) return context + def get_template_names(self): + return ['chrono/manager_%s_agenda_settings.html' % self.agenda.kind] + agenda_settings = AgendaSettings.as_view()