From 32c80caa3788209bb95541a24271e6ad03acb302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Fri, 13 Jul 2012 00:44:12 +0200
Subject: [PATCH] Clean up browsertitles (#282) in agenda and application

---
 openslides/agenda/templates/agenda/config.html         |  2 +-
 openslides/agenda/templates/agenda/edit.html           |  9 ++++++++-
 openslides/agenda/templates/agenda/overview.html       |  2 +-
 .../application/templates/application/config.html      |  2 +-
 openslides/application/templates/application/edit.html | 10 ++++++++--
 .../application/templates/application/import.html      |  2 +-
 .../application/templates/application/overview.html    |  2 +-
 .../application/templates/application/poll_view.html   |  4 ++--
 openslides/application/templates/application/view.html |  2 +-
 9 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html
index bb76b4299..205199c59 100644
--- a/openslides/agenda/templates/agenda/config.html
+++ b/openslides/agenda/templates/agenda/config.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {% trans "Agenda settings" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Agenda settings" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Agenda settings" %}</h1>
diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 6285cdcd3..231117f36 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -2,7 +2,14 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "Item" %}{% endblock %}
+{% block title %}
+    {{ block.super }} – 
+    {% if item %}
+        {{ item.title }} – {% trans "Edit item" %}
+    {%else %}
+        {% trans "New item" %}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
     {% if item %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 216c2dcd6..32ea299dc 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -5,7 +5,7 @@
 {% load mptt_tags %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {% trans "Agenda" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Agenda" %}{% endblock %}
 
 {% block header %}
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/tabledrag.css' %}" />
diff --git a/openslides/application/templates/application/config.html b/openslides/application/templates/application/config.html
index 0c7cef797..b5403f301 100644
--- a/openslides/application/templates/application/config.html
+++ b/openslides/application/templates/application/config.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {% trans "Application settings" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Application settings" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Application settings" %}</h1>
diff --git a/openslides/application/templates/application/edit.html b/openslides/application/templates/application/edit.html
index d517eda4d..4f710bb7f 100644
--- a/openslides/application/templates/application/edit.html
+++ b/openslides/application/templates/application/edit.html
@@ -2,8 +2,14 @@
 
 {% load i18n %}
 
-
-{% block title %}{{ block.super }} - {%trans "Application" %}{% endblock %}
+{% block title %}
+    {{ block.super }} – 
+    {% if application %}
+        {% trans "Edit application" %}
+    {%else %}
+        {% trans "New application" %}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
     {% if application %}
diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html
index b23693f20..9fae8ab54 100644
--- a/openslides/application/templates/application/import.html
+++ b/openslides/application/templates/application/import.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} - {%trans "Import applications" %} {% endblock %}
+{% block title %}{{ block.super }} – {% trans "Import applications" %} {% endblock %}
 
 {% block content %}
     <h1>{%trans "Import applications" %}</h1>
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index 5868570d9..d7c3e9bde 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {%trans "Applications" %}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Applications" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Applications" %}</h1>
diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html
index 3dd418213..ceebd977a 100644
--- a/openslides/application/templates/application/poll_view.html
+++ b/openslides/application/templates/application/poll_view.html
@@ -3,10 +3,10 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {{ poll }}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Application No." %} {{ application.number }} – {% trans "Vote" %}{% endblock %}
 
 {% block content %}
-    <h1>{%trans "Application No." %} {{ application.number }} - {%trans "Vote" %}</h1>
+    <h1>{%trans "Application No." %} {{ application.number }} – {%trans "Vote" %}</h1>
     <h3>{{ application.title }}</h3>
 
     <p>{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}</p>
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index 53c9b7168..8cc86c4f4 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {% trans "Application" %} "{{ version.title }}"{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Application" %} "{{ version.title }}"{% endblock %}
 
 
 {% block submenu %}