From 0279c07b154e4eb84997ea9713d89c4a1ebd7c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Mon, 16 Jul 2012 00:01:26 +0200
Subject: [PATCH] Change design of application view and poll view (see #292)

---
 .../templates/application/overview.html         |  2 +-
 .../templates/application/poll_view.html        | 11 ++++++-----
 .../application/templates/application/view.html | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index d7c3e9bde..e487d55d8 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -47,7 +47,7 @@
         <tr class="{% cycle '' 'odd' %} 
             {% if application.active %}activeline{% endif %}">
             <td>{% if application.number %}{{ application.number }}{% else %}-{% endif %}</td>
-            <td><a href="{% url application_view application.id %}">{{ application }}</a></td>
+            <td><a href="{% url application_view application.id %}">{{ application.public_version.title }}</a></td>
         {% if min_supporters > 0 %}
             <td>{{ application.supporter.count }}</td>
         {% endif %}
diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html
index 479f1eb29..c4b340c54 100644
--- a/openslides/application/templates/application/poll_view.html
+++ b/openslides/application/templates/application/poll_view.html
@@ -3,13 +3,14 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} – {% trans "Application No." %} {{ application.number }} – {% trans "Vote" %}{% endblock %}
+{% block title %}
+    {{ block.super }} – {% trans "Application" %} "{{ application.public_version.title }}"
+    – {{ ballot }}. {% trans "Vote" %}
+{% endblock %}
 
 {% block content %}
-    <h1>{% trans "Application No." %} {{ application.number }} – {% trans "Vote" %}</h1>
-    <h3>{{ application.title }}</h3>
-
-    <p>{% trans "Results of" %} {{ ballot }}. {% trans "Vote" %}</p>
+    <h1>{{ application.public_version.title }} ({% trans "Application" %}
+    {{ application.number }}) – {{ ballot }}. {% trans "Vote" %}</h1>
     <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
     <form action="" method="post" class="small-form">{% csrf_token %}
         {{ pre_form }}
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index e5d1aca78..9f2e4a0f8 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -205,12 +205,15 @@
 
 <div id="main">
     <h1>
-    {% if application.number != None %}
-        {% trans "Application No." %} {{ application.number }}
-    {% else %}
-        {% trans "Application" %} <i>[{% trans "no number" %}]</i>
-    {% endif %}
+        {{ version.title }}
+        ({% trans "Application" %}
+        {% if application.number != None %}
+            {{ application.number }})
+        {% else %}
+            <i>[{% trans "no number" %}]</i>)
+        {% endif %}
     </h1>
+
     {% trans "Version" %} {{ version.aid }}
 
     {% if application.public_version != application.last_version %}
@@ -222,7 +225,7 @@
         {% endif %}
     {% endif %}
 
-    <h2>{{ version.title }}</h2>
+    <h2>{% trans "Application" %}:</h2>
 
     {{ version.text|linebreaks }}
 
@@ -231,7 +234,7 @@
     {% if version.reason %}
         {{ version.reason|linebreaks }}
     {% else %}
-        -
+        –
     {% endif %}