From 0cf4191934a61f6998707dd3608bec034b4a427f Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 17 Nov 2012 23:44:41 +0100
Subject: [PATCH] Hide vote results if status is 'searching for candidates'.
 Hide blocked candidates title if empty.

---
 .../assignment/templates/assignment/view.html     | 15 ++++++---------
 .../templates/projector/Assignment.html           |  2 --
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 0cf5ec548..a900a28fc 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -89,6 +89,7 @@
     {% endif %}
     {% endif %}
 
+{% if assignment.elected %}
     <h3>{% trans "Elected Candidates" %}</h3>
     <ul>
     {% for person in assignment.elected %}
@@ -104,8 +105,9 @@
         <li>{% trans "No elected candidates available." %}</li>
     {% endfor %}
     </ul>
+{% endif %}
 
-{% if perms.assignment.can_manage_assignments %}
+{% if perms.assignment.can_manage_assignments and blocked_candidates %}
     <h3>{% trans "Blocked Candidates" %}</h3>
     <ul>
     {% for person in blocked_candidates %}
@@ -118,6 +120,7 @@
     </ul>
 {% endif %}
 
+{% if assignment.status != "sea" %}
     <h3>{% trans "Election results" %}</h3>
 
 {% if polls.exists %}
@@ -215,7 +218,6 @@
             <td></td>
         {% endif %}
     </tr>
-
     <tr class="total">
         <td><strong>{% trans 'Votes cast' %}</strong></td>
         {% for poll in polls %}
@@ -233,11 +235,8 @@
         {% endif %}
     </tr>
     </table>
-
 {% else %}
-
-    <i>{% trans "No ballots available." %}</i>
-
+    <i>{% trans "No results available." %}</i>
     {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
         <p><a href='{% url assignment_gen_poll assignment.id %}'>
         <span class="button">
@@ -245,9 +244,7 @@
         </span>
         </a></p>
     {% endif %}
-
 {% endif %}
-
+{% endif %}
 </div>
-
 {% endblock %}
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 8cf59860c..6a2a59b3c 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -124,8 +124,6 @@
         </table>
     {% elif some_polls_available %}
         <i>{% trans "Vote results are not published yet." %}</i>
-    {% elif assignment.candidates %}
-        <i>{% trans "No ballots available." %}</i>
     {% endif %}
     <br>
 {% endblock %}