From bd9c609dc01ad778f4072d464f10b6da94fbc71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Sun, 15 Jul 2012 23:17:10 +0200
Subject: [PATCH] Change design of assignment poll view (see #292)

---
 .../assignment/templates/assignment/poll_view.html   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index f52ed9aaa..95019b983 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -2,17 +2,15 @@
 
 {% load i18n %}
 
-{% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}"{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}" – {{ ballotnumber }}. {%trans "ballot" %}{% endblock %}
 
 {% block content %}
-    <h1>{%trans "Election" %}: {{ assignment }}</h1>
-    <p>{{ ballotnumber }}. {%trans "ballot" %}: {{assignment.poll.get_options}}
-    {% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %}
-    </p>
+    <h1>{{ assignment }} – {{ ballotnumber }}. {%trans "ballot" %}</h1>
     {% if assignment.polldescription %}
-        <p><b>{% trans "Short description" %}:</b> {{ assignment.polldescription }}</p>
+        <p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
     {% endif %}
     <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
+    
     <form action="" method="post" class="small-form">{% csrf_token %}
 
     <table style="width:auto">
@@ -76,6 +74,6 @@
     </button>
     </a>
     </p>
-    
+
     </form>
 {% endblock %}