diff --git a/extras/csv-examples/participants-demo_en.csv b/extras/csv-examples/participants-demo_en.csv index 971eeaebd..5211ca108 100644 --- a/extras/csv-examples/participants-demo_en.csv +++ b/extras/csv-examples/participants-demo_en.csv @@ -1,15 +1,15 @@ -"First Name";"Last Name";"Gender";"Email";"Group id";"Structure Level";"Committee";"About me";"Comment";"Is active" -"Angramain";"Aranea";"female";;;;;;;1 -"Bastian";"Bux";"male";;;;"2. Vorsitzender";;;1 -"Emma";"Dampf";"female";;3;"Ortsverband Berlin-Mitte";"AG Frauen";;;0 -"David";"Delegierter";"male";"david@example.com";3;"Ortsverband Berlin-Mitte";"Haushaltsausschuss";"Zu meiner Person: +"Title";"First Name";"Last Name";"Gender";"Email";"Group id";"Structure Level";"Committee";"About me";"Comment";"Is active" +;"Angramain";"Aranea";"female";;;;;;;1 +;"Bastian";"Bux";"male";;;;"2. Vorsitzender";;;1 +;"Emma";"Dampf";"female";;3;"Ortsverband Berlin-Mitte";"AG Frauen";;;0 +PhD;"David";"Delegierter";"male";"david@example.com";3;"Ortsverband Berlin-Mitte";"Haushaltsausschuss";"Zu meiner Person: A B C";"Demo-Account";1 -"Marta";"Grankvist";"female";;3,4;"Ortsverband Köln";"1. Vorsitzende";;;0 -"Atréju";"Grün";"male";;4;"Ortsverband Freiburg";"Versammlungsleitung";;;1 -"Li Si";"Mandala";"female";;4;;;;;1 -"Malin";"Melchersson";"male";;;"Gastredner e.V.";;;;1 -"Molly";"Tender";"female";;3;"Ortsverband Berlin-Mitte";;;;1 -"Karl";"Tur Tur";"male";;;;;;;1 -"Volker";"Versammlungsleitung";"male";"volker@example.com";3,4;"Ortsverband Hamburg";"Versammlungsleitung";;"Demo-Account";1 +;"Marta";"Grankvist";"female";;3,4;"Ortsverband Köln";"1. Vorsitzende";;;0 +"Prof. Dr.";"Atréju";"Grün";"male";;4;"Ortsverband Freiburg";"Versammlungsleitung";;;1 +;"Li Si";"Mandala";"female";;4;;;;;1 +;"Malin";"Melchersson";"male";;;"Gastredner e.V.";;;;1 +;"Molly";"Tender";"female";;3;"Ortsverband Berlin-Mitte";;;;1 +;"Karl";"Tur Tur";"male";;;;;;;1 +;"Volker";"Versammlungsleitung";"male";"volker@example.com";3,4;"Ortsverband Hamburg";"Versammlungsleitung";;"Demo-Account";1 diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html index 4c5d86455..9d5a8065b 100644 --- a/openslides/agenda/templates/agenda/edit.html +++ b/openslides/agenda/templates/agenda/edit.html @@ -3,12 +3,12 @@ {% load i18n %} {% block title %} - {{ block.super }} – {% if item %} {{ item.title }} – {% trans "Edit item" %} {% else %} {% trans "New item" %} {% endif %} + – {{ block.super }} {% endblock %} {% block content %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index f0bddf4be..3e8ebe632 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -4,7 +4,7 @@ {% load mptt_tags %} {% load staticfiles %} -{% block title %}{{ block.super }} – {% trans "Agenda" %}{% endblock %} +{% block title %}{% trans "Agenda" %} – {{ block.super }}{% endblock %} {% block header %} diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html index d897e96e2..50848af14 100644 --- a/openslides/agenda/templates/agenda/view.html +++ b/openslides/agenda/templates/agenda/view.html @@ -4,7 +4,7 @@ {% load tags %} {% load staticfiles %} -{% block title %}{{ block.super }} – {{ item }}{% endblock %} +{% block title %}{{ item }} – {{ block.super }}{% endblock %} {% block header %} diff --git a/openslides/agenda/templates/projector/AgendaSummary.html b/openslides/agenda/templates/projector/AgendaSummary.html index a05be9af8..26eece6eb 100644 --- a/openslides/agenda/templates/projector/AgendaSummary.html +++ b/openslides/agenda/templates/projector/AgendaSummary.html @@ -2,7 +2,7 @@ {% load i18n %} -{% block title %}{{ block.super }} - +{% block title %} {% if title %} {{ title }} {% else %} {% trans "Agenda" %} {% endif %} {% endblock %} diff --git a/openslides/agenda/templates/projector/AgendaText.html b/openslides/agenda/templates/projector/AgendaText.html index 459b1f023..e7e01e01f 100644 --- a/openslides/agenda/templates/projector/AgendaText.html +++ b/openslides/agenda/templates/projector/AgendaText.html @@ -2,7 +2,7 @@ {% load i18n %} -{% block title %}{{ block.super }} - {{ item }}{% endblock %} +{% block title %}{{ item }}{% endblock %} {% block content %} {% if item.text %} diff --git a/openslides/agenda/templates/projector/agenda_list_of_speaker.html b/openslides/agenda/templates/projector/agenda_list_of_speaker.html index e4eb018e7..687a45fd4 100644 --- a/openslides/agenda/templates/projector/agenda_list_of_speaker.html +++ b/openslides/agenda/templates/projector/agenda_list_of_speaker.html @@ -2,7 +2,7 @@ {% load i18n %} -{% block title %}{{ block.super }} – {{ item }}{% endblock %} +{% block title %}{{ item }}{% endblock %} {% block header %}