diff --git a/chrono/manager/templates/chrono/manager_agenda_open_events.html b/chrono/manager/templates/chrono/manager_agenda_open_events.html
index 0e81cd09..f6ce37d4 100644
--- a/chrono/manager/templates/chrono/manager_agenda_open_events.html
+++ b/chrono/manager/templates/chrono/manager_agenda_open_events.html
@@ -16,7 +16,7 @@
{% endif %}
{{ block.super }}
- {% trans 'Month view' %}
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with no_today=True no_opened=True %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html b/chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html
new file mode 100644
index 00000000..a94e4283
--- /dev/null
+++ b/chrono/manager/templates/chrono/manager_agenda_view_buttons_fragment.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+{% now "Y" as today_year %}
+{% now "m" as today_month %}
+{% now "j" as today_day %}
+{% if not no_opened and agenda.kind == 'events' %}
+ {% trans 'Open events' %}
+{% endif %}
+{% if not no_today %}
+ {% trans 'Today' %}
+{% endif %}
+
+ {% trans 'Day' %}
+ {% trans 'Week' %}
+ {% trans 'Month' %}
+
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_day_view.html b/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
index e4c4d5f0..f27698a0 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_day_view.html
@@ -10,13 +10,7 @@
{% endif %}
{{ block.super }}
- {% trans 'Open events' %}
-
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='day' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_month_view.html b/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
index e29757a0..1b2888dc 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_month_view.html
@@ -10,13 +10,7 @@
{% endif %}
{{ block.super }}
- {% trans 'Open events' %}
-
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='month' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
index bcdb8e44..f9a6fcd2 100644
--- a/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_events_agenda_week_view.html
@@ -10,13 +10,7 @@
{% endif %}
{{ block.super }}
- {% trans 'Open events' %}
-
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='week' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
index 2a8352fa..bd49bdf4 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
@@ -3,11 +3,7 @@
{% block actions %}
{{ block.super }}
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='day' %}
{% endblock %}
{% block content %}
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 02fe611f..b977c14d 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_month_view.html
@@ -3,11 +3,7 @@
{% block actions %}
{{ block.super }}
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='month' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html b/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
index f48ce9a3..d1f34fd0 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_week_view.html
@@ -3,11 +3,7 @@
{% block actions %}
{{ block.super }}
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_agenda_view_buttons_fragment.html" with active='week' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_resource_day_view.html b/chrono/manager/templates/chrono/manager_resource_day_view.html
index ea73cf3c..0c904421 100644
--- a/chrono/manager/templates/chrono/manager_resource_day_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_day_view.html
@@ -25,11 +25,7 @@
{% endblock %}
{% block appbar-extras %}
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_resource_view_buttons_fragment.html" with active='day' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_resource_detail.html b/chrono/manager/templates/chrono/manager_resource_detail.html
index dc452d79..6004a293 100644
--- a/chrono/manager/templates/chrono/manager_resource_detail.html
+++ b/chrono/manager/templates/chrono/manager_resource_detail.html
@@ -20,12 +20,7 @@
{% trans 'Edit' %}
{% trans 'Delete' %}
{% endif %}
- {% now "Y" as today_year %}
- {% now "m" as today_month %}
- {% now "j" as today_day %}
- {% trans 'Month view' %}
- {% trans 'Week view' %}
- {% trans 'Day view' %}
+ {% include "chrono/manager_resource_view_buttons_fragment.html" with no_today=True no_opened=True %}
{% endblock %}
{% endblock %}
diff --git a/chrono/manager/templates/chrono/manager_resource_month_view.html b/chrono/manager/templates/chrono/manager_resource_month_view.html
index aa940239..52095a80 100644
--- a/chrono/manager/templates/chrono/manager_resource_month_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_month_view.html
@@ -26,11 +26,7 @@
{% endblock %}
{% block appbar-extras %}
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_resource_view_buttons_fragment.html" with active='month' %}
{% endblock %}
{% block content %}
diff --git a/chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html b/chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html
new file mode 100644
index 00000000..16b64496
--- /dev/null
+++ b/chrono/manager/templates/chrono/manager_resource_view_buttons_fragment.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% now "Y" as today_year %}
+{% now "m" as today_month %}
+{% now "j" as today_day %}
+{% if not no_today %}
+ {% trans 'Today' %}
+{% endif %}
+
+ {% trans 'Day' %}
+ {% trans 'Week' %}
+ {% trans 'Month' %}
+
diff --git a/chrono/manager/templates/chrono/manager_resource_week_view.html b/chrono/manager/templates/chrono/manager_resource_week_view.html
index 59453aeb..5b5df434 100644
--- a/chrono/manager/templates/chrono/manager_resource_week_view.html
+++ b/chrono/manager/templates/chrono/manager_resource_week_view.html
@@ -53,11 +53,7 @@
{% endblock %}
{% block appbar-extras %}
-
- {% trans 'Day' %}
- {% trans 'Week' %}
- {% trans 'Month' %}
-
+ {% include "chrono/manager_resource_view_buttons_fragment.html" with active='week' %}
{% endblock %}
{% block content %}
diff --git a/tests/manager/test_all.py b/tests/manager/test_all.py
index 39033bbf..63d6afa1 100644
--- a/tests/manager/test_all.py
+++ b/tests/manager/test_all.py
@@ -1453,7 +1453,9 @@ def test_agenda_open_events_view(app, admin_user, manager_user):
assert 'Open events' in resp.text
resp = app.get('/manage/agendas/%s/events/open/' % agenda.pk)
- assert 'Month view' in resp.text
+ assert '>Month<' in resp.text
+ assert '>Week<' in resp.text
+ assert '>Day<' in resp.text
assert "This agenda doesn't have any open event configured." in resp.text
# create some events