From e99e5ab290bffcb20c17e572e5b462c40bd2a389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Fri, 13 Jul 2012 01:10:58 +0200
Subject: [PATCH] Clean up browsertitles (#282) in assignment and participant
 tab

---
 openslides/agenda/templates/agenda/edit.html           |  2 +-
 openslides/application/templates/application/edit.html |  2 +-
 openslides/assignment/templates/assignment/config.html |  2 +-
 openslides/assignment/templates/assignment/edit.html   | 10 +++++++++-
 .../assignment/templates/assignment/overview.html      |  2 +-
 .../assignment/templates/assignment/poll_view.html     |  2 +-
 openslides/assignment/templates/assignment/view.html   |  2 +-
 .../participant/templates/participant/config.html      |  2 +-
 openslides/participant/templates/participant/edit.html | 10 +++++++++-
 .../participant/templates/participant/group_edit.html  |  9 ++++++++-
 .../templates/participant/group_overview.html          |  2 +-
 .../participant/templates/participant/import.html      |  2 +-
 .../participant/templates/participant/overview.html    |  2 +-
 13 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 231117f36..57b03fb89 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -6,7 +6,7 @@
     {{ block.super }} – 
     {% if item %}
         {{ item.title }} – {% trans "Edit item" %}
-    {%else %}
+    {% else %}
         {% trans "New item" %}
     {% endif %}
 {% endblock %}
diff --git a/openslides/application/templates/application/edit.html b/openslides/application/templates/application/edit.html
index 4f710bb7f..5701c9b8a 100644
--- a/openslides/application/templates/application/edit.html
+++ b/openslides/application/templates/application/edit.html
@@ -6,7 +6,7 @@
     {{ block.super }} – 
     {% if application %}
         {% trans "Edit application" %}
-    {%else %}
+    {% else %}
         {% trans "New application" %}
     {% endif %}
 {% endblock %}
diff --git a/openslides/assignment/templates/assignment/config.html b/openslides/assignment/templates/assignment/config.html
index 4db8cee13..1b65c4320 100644
--- a/openslides/assignment/templates/assignment/config.html
+++ b/openslides/assignment/templates/assignment/config.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {% trans "Election settings" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Election settings" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Election settings" %}</h1>
diff --git a/openslides/assignment/templates/assignment/edit.html b/openslides/assignment/templates/assignment/edit.html
index e9b3cb2c8..cd90fd019 100644
--- a/openslides/assignment/templates/assignment/edit.html
+++ b/openslides/assignment/templates/assignment/edit.html
@@ -2,7 +2,15 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "Election" %}{% endblock %}
+{% block title %}
+    {{ block.super }} – 
+    {% if assignment %}
+        {% trans "Edit election" %}
+    {% else %}
+        {% trans "New election" %}
+    {% endif %}
+{% endblock %}
+
 
 {% block content %}
     {% if assignment %}
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index c8ef40eca..0b4e8095a 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {%trans "Elections" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Elections" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Elections" %}</h1>
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index a55f5265e..f52ed9aaa 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "Election" %} "{{ assignment }}"{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}"{% endblock %}
 
 {% block content %}
     <h1>{%trans "Election" %}: {{ assignment }}</h1>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index f138d98ca..38620c80e 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {% trans "Assignment" %} "{{ assignment }}"{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}"{% endblock %}
 
 {% block content %}
 <div id="sidebar">
diff --git a/openslides/participant/templates/participant/config.html b/openslides/participant/templates/participant/config.html
index e354473f7..bd5ac4870 100644
--- a/openslides/participant/templates/participant/config.html
+++ b/openslides/participant/templates/participant/config.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {% trans "Participant settings" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Participant settings" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Participant settings" %}</h1>
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index 1dbc31e0e..60f96f21e 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -2,7 +2,15 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "Participant" %} {% endblock %}
+{% block title %}
+    {{ block.super }} – 
+    {% if edituser %}
+        {% trans "Edit participant" %}
+    {% else %}
+        {% trans "New participant" %}
+    {% endif %}
+{% endblock %}
+
 
 {% block content %}
     {% if edituser %}
diff --git a/openslides/participant/templates/participant/group_edit.html b/openslides/participant/templates/participant/group_edit.html
index 933cec716..a9285e96e 100644
--- a/openslides/participant/templates/participant/group_edit.html
+++ b/openslides/participant/templates/participant/group_edit.html
@@ -2,7 +2,14 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "User Group" %} {% endblock %}
+{% block title %}
+    {{ block.super }} – 
+    {% if group %}
+        {% trans "Edit user group" %}
+    {% else %}
+        {% trans "New user group" %}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
     {% if group %}
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 517286514..7f006d358 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {%trans "User groups" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "User groups" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "User groups" %}</h1>
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index 34aa0c959..87530a70f 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "Import participants" %} {% endblock %}
+{% block title %}{{ block.super }} – {% trans "Import participants" %} {% endblock %}
 
 {% block content %}
     <h1>{% trans 'Import participants' %}</h1>
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 9dbf40965..a0d5d91a0 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -4,7 +4,7 @@
 {% load staticfiles %}
 {% load tags %}
 
-{% block title %}{{ block.super }} - {%trans "Participants" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Participants" %}{% endblock %}
 
 {% block header %}
     {% if perms.agenda.can_manage_agenda %}