diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c7f0901a2dcbc533d5921ef86dd1fc72671b6457..9c52c177321dabde9257b64bff0e31a0723f9464 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,6 +20,7 @@ Changed ~~~~~~~ * Beautify event information card +* Use consistent page and browser title Fixed ~~~~~ diff --git a/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html b/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html index 8e3d8a191b132efd426fda25aadd04738821ea7c..56653fc39c34f04352abdf6752b5bfbb63db5f98 100644 --- a/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html +++ b/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html @@ -1,8 +1,8 @@ {% extends "core/base.html" %} {% load material_form i18n %} -{% block browser_title %}{{ browser_title }}{% endblock %} -{% block page_title %}{{ page_title }}{% endblock %} +{% block browser_title %}{% trans "Registration" %}: {{ event.display_name }}{% endblock %} +{% block page_title %}{% trans "Registration" %}: {{ event.display_name }}{% endblock %} {% block content %} <div class="row"> diff --git a/aleksis/apps/paweljong/views.py b/aleksis/apps/paweljong/views.py index e10cd3b04e7ee4813fcf13adc68a311121b7c3e3..6b3d6fca43e779fd75d36d41d697fe3eb18cdea6 100644 --- a/aleksis/apps/paweljong/views.py +++ b/aleksis/apps/paweljong/views.py @@ -296,8 +296,6 @@ class RegisterEventWizardView(SessionWizardView): context["event"] = Event.objects.get(slug=self.kwargs["slug"]) if self.steps.current == "email": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Create e-mail address") context["info_text"] = _( "All participants need a personal e-mail address, which they check and read " @@ -307,16 +305,12 @@ class RegisterEventWizardView(SessionWizardView): "<a href='https://leopard.institute/pages/services.html'>https://leopard.institute/pages/services.html</a>." # noqa ) elif self.steps.current == "register": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Event registration") context["info_text"] = _( "First, please enter some basic information about yourself, and check " "whether all information is correct." ) elif self.steps.current == "contact_details": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Contact information") context["info_text"] = _( "Tell us how we can contact you. You will receive information about " @@ -326,8 +320,6 @@ class RegisterEventWizardView(SessionWizardView): "and you will enter their e-mail address on the next page." ) elif self.steps.current == "guardians": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Legal guardians / parents") context["info_text"] = _( "Tell us how we can reach your parents or other legal guardians. " @@ -336,16 +328,12 @@ class RegisterEventWizardView(SessionWizardView): "later as a comment." ) elif self.steps.current == "additional": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Additional registration information") context["info_text"] = _( "Please answer the following questions as precisely as you can, so " "we can make sure your event attendance will be organised as wel las possible." ) elif self.steps.current == "financial": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Payment") context["info_text"] = _( "By default, we will send you an invoice, which you or your parents " @@ -353,8 +341,6 @@ class RegisterEventWizardView(SessionWizardView): "please make sure to enter exactly what your parents tell you." ) elif self.steps.current == "consent": - context["page_title"] = "" - context["browser_title"] = "" context["info_title"] = _("Consent") context["info_text"] = _( "Lastly, please read the terms and conditions carefully, together "