Make election display consistent with previous commit

This commit is contained in:
Yingtong Li 2018-01-05 17:26:37 +08:00
parent f01b236554
commit 60cd69bb1b
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 24 additions and 2 deletions

View File

@ -16,7 +16,18 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
<p><small>Approval voting. Vote for between {{ question.min_choices }} and {{ question.max_choices }} choices.{% if question.randomise_choices %} Order of choices is randomised.{% endif %}</small></p>
<p><small>
Approval voting. Vote for
{% if question.min_choices == question.max_choices %}
exactly {{ question.min_choices }}
{% else %}
between {{ question.min_choices }} and {{ question.max_choices }}
{% endif %}
choices.
{% if question.randomise_choices %}
Order of choices is randomised.
{% endif %}
</small></p>
<ul class="ui list">
{% for choice in question.choices %}

View File

@ -16,7 +16,18 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
<p><small>Preferential voting. Vote for between {{ question.min_choices }} and {{ question.max_choices }} choices.{% if question.randomise_choices %} Order of choices is randomised.{% endif %}</small></p>
<p><small>
Preferential voting. Vote for
{% if question.min_choices == question.max_choices %}
exactly {{ question.min_choices }}
{% else %}
between {{ question.min_choices }} and {{ question.max_choices }}
{% endif %}
choices.
{% if question.randomise_choices %}
Order of choices is randomised.
{% endif %}
</small></p>
<ul class="ui list">
{% for choice in question.choices %}