Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
This commit is contained in:
parent
b10cf331ab
commit
0cf4191934
@ -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 %}
|
||||
|
@ -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 %}
|
||||
|
Loading…
Reference in New Issue
Block a user