From 0f57345fb4d5bdbb66feac54ccdfff250fdac21e Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Tue, 11 Aug 2020 16:10:21 +0200
Subject: [PATCH 2/3] templates: change scope of actions blocks (#44157)

It will allow adding extra-actions buttons in child templates.
---
 chrono/manager/templates/chrono/manager_agenda_month_view.html | 3 ++-
 .../manager/templates/chrono/manager_agenda_open_events.html   | 1 +
 chrono/manager/templates/chrono/manager_agenda_view.html       | 3 ++-
 .../templates/chrono/manager_meetings_agenda_month_view.html   | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/chrono/manager/templates/chrono/manager_agenda_month_view.html b/chrono/manager/templates/chrono/manager_agenda_month_view.html
index f532f4b..124ae5f 100644
--- a/chrono/manager/templates/chrono/manager_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_month_view.html
@@ -22,10 +22,11 @@
   <a href="{{ view.get_next_month_url }}">→</a>
 </h2>
 <span class="actions">
+{% block actions %}
 {% if user_can_manage %}
   <a href="{% url 'chrono-manager-agenda-settings' pk=agenda.id %}">{% trans 'Settings' %}</a>
 {% endif %}
 <a href="" onclick="window.print()">{% trans 'Print' %}</a>
-{% block actions %}{% endblock %}
+{% endblock %}
 </span>
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_agenda_open_events.html b/chrono/manager/templates/chrono/manager_agenda_open_events.html
index 235d550..fe55bb3 100644
--- a/chrono/manager/templates/chrono/manager_agenda_open_events.html
+++ b/chrono/manager/templates/chrono/manager_agenda_open_events.html
@@ -9,6 +9,7 @@
 {% endblock %}
 
 {% block actions %}
+{{ block.super }}
 <a href="{% url 'chrono-manager-agenda-month-redirect-view' pk=agenda.pk %}">{% trans 'Month view' %}</a>
 {% endblock %}
 
diff --git a/chrono/manager/templates/chrono/manager_agenda_view.html b/chrono/manager/templates/chrono/manager_agenda_view.html
index e1d33ea..c135f68 100644
--- a/chrono/manager/templates/chrono/manager_agenda_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_view.html
@@ -9,8 +9,9 @@
 <h2>{{ object.label }}</h2>
 {% if user_can_manage %}
   <span class="actions">
+    {% block actions %}
     <a href="{% url 'chrono-manager-agenda-settings' pk=object.id %}">{% trans 'Settings' %}</a>
-    {% block actions %}{% endblock %}
+    {% endblock %}
   </span>
 {% endif %}
 {% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
index 4fd6a50..2135374 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block actions %}
+{{ block.super }}
 <a href="{% url 'chrono-manager-agenda-day-view' pk=agenda.id year=view.date|date:"Y" month=view.date|date:"m" day=view.date|date:"d" %}">{% trans 'Day view' %}</a>
 {% endblock %}
 
-- 
2.20.1