From 88a8e4a8d86ae352de3f2594ba2b80bd57afccab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 8 Jan 2023 14:46:53 +0100 Subject: [PATCH] manager: redo to be "page name | global name" (#73381) --- chrono/manager/templates/chrono/manager_agenda_view.html | 4 +--- chrono/manager/templates/chrono/manager_base.html | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/chrono/manager/templates/chrono/manager_agenda_view.html b/chrono/manager/templates/chrono/manager_agenda_view.html index 5d325448..efb9c67a 100644 --- a/chrono/manager/templates/chrono/manager_agenda_view.html +++ b/chrono/manager/templates/chrono/manager_agenda_view.html @@ -1,9 +1,7 @@ {% extends "chrono/manager_home.html" %} {% load i18n %} -{% block page-title-extra-label %} - - {% firstof agenda.label object.label %} -{% endblock %} +{% block page-title-extra-label %}{% firstof agenda.label object.label %}{% endblock %} {% block appbar %} <h2>{{ object.label }}</h2> diff --git a/chrono/manager/templates/chrono/manager_base.html b/chrono/manager/templates/chrono/manager_base.html index 35610a50..0b5ea9e1 100644 --- a/chrono/manager/templates/chrono/manager_base.html +++ b/chrono/manager/templates/chrono/manager_base.html @@ -6,12 +6,7 @@ <script src="{% static 'js/chrono.manager.js' %}"></script> {% endblock %} -{% block page-title %} - {% trans 'Agendas' as default_site_title %} - {% firstof site_title default_site_title %} - {% block page-title-extra-label %} - {% endblock %} -{% endblock %} +{% block page-title %}{% block page-title-extra-label %}{% trans 'Agendas' %}{% endblock %} | {% trans 'Agendas' as default_site_title %}{% firstof global_title default_site_title %}{% endblock %} {% block site-title %} {% trans 'Agendas' as default_site_title %} {% firstof site_title default_site_title %}