summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authoretienne2008-12-07 19:06:22 +0000
committeretienne2008-12-07 19:06:22 +0000
commita837805ddb218af008f06adb57439949ae32582f (patch)
tree9f58533cf4c63b45b96e58f95f273dc70fb49a9b /templates
parent8c5c770d99f2d59ffe487ed0fdbe6a06139f3f49 (diff)
Modifying limits - Reordering of choices
Diffstat (limited to 'templates')
-rw-r--r--templates/createOrEdit.html8
-rw-r--r--templates/vote.html2
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/createOrEdit.html b/templates/createOrEdit.html
index 033edec..e4d9639 100644
--- a/templates/createOrEdit.html
+++ b/templates/createOrEdit.html
@@ -5,8 +5,8 @@
{% if not new and not choices %}
<p class='error'>{% trans "As long as no options were added to the poll, it will not be made available." %}</p>
{% endif %}
- <h2>{% if new %}{% trans "New poll" %}{% else %}{% trans "Edit poll" %}{% endif %}</h2>
{% if error %}<p class='error'>{{ error }}</p>{% endif %}
+ <h2>{% if new %}{% trans "New poll" %}{% else %}{% trans "Edit poll" %}{% endif %}</h2>
<table class='new_poll'>
<form action="{{admin_url}}" method="post">
@@ -104,10 +104,10 @@
<table class='new_poll'>
{% if choices %}<form action="{{admin_url}}" method="post">
<tr>
- <th>{% trans "Choices" %}</th><th>{% trans "Label" %}</th><th>{% trans "Limit" %}</th><th>{% trans "Delete?"%}</th>
+ <th>{% trans "Up/down" %}</th><th>{% trans "Label" %}</th><th>{% trans "Limit" %}</th><th>{% trans "Delete?"%}</th>
</tr>
{% for choice in choices %}<tr>
- <td>&nbsp;</td><td><input type='text' name='modify_{{choice.id}}' value="{{choice.name}}"/></td><td>{%if choice.limit%}{% blocktrans with choice.limit as choice_limit%}Limited to {{choice_limit}} vote(s){% endblocktrans %}{%endif%}</td><td><input type='checkbox' name='delete_{{choice.id}}'/></td>
+ <td><a href='?up_choice={{choice.id}}' class='arrow'>+</a> / <a href='?down_choice={{choice.id}}' class='arrow'>-</a></td><td><input type='text' name='modify_{{choice.id}}' value="{{choice.name}}"/></td><td>{% trans "Limited to"%} <input type='text' name='limit_{{choice.id}}' class='limit'{%if choice.limit%} value='{{choice.limit}}'{%endif%}/> {% trans "vote(s)" %}</td><td><input type='checkbox' name='delete_{{choice.id}}'/></td>
</tr>{% endfor %}
<tr>
<td></td>
@@ -117,7 +117,7 @@
</form>{% endif %}
<form action="{{admin_url}}" method="post">
- <tr><td><label>{% trans "New choice" %}</label></td><td><input type='text' name='new_choice'/></td><td>{%trans "Limited to"%} <input type='text' name='limit' id='limit'/> {%trans "vote(s)"%}</td><td class='form_description'>{% trans "Setting a new choice. Optionally you can set a limit of vote for this choice. This limit is usefull for limited resources allocation." %}</td></tr>
+ <tr><td><label>{% trans "New choice" %}</label></td><td><input type='text' name='new_choice'/></td><td>{%trans "Limited to"%} <input type='text' name='limit' class='limit'/> {%trans "vote(s)"%}</td><td class='form_description'>{% trans "Setting a new choice. Optionally you can set a limit of vote for this choice. This limit is usefull for limited resources allocation." %}</td></tr>
<tr>
<td></td>
<td><input type='hidden' name='add' value='1'/> <input type='submit' value='{% trans "Add" %}' /></td>
diff --git a/templates/vote.html b/templates/vote.html
index 21b8a0d..b9cfa98 100644
--- a/templates/vote.html
+++ b/templates/vote.html
@@ -77,7 +77,7 @@
{%endif%}{%endif%}
{% if not hide_vote %}<tr id='sum'>
<td class='simple'></td><th>{% trans "Sum" %}</th>
- {% for choice in choices %}<td{%if choice.highlight %} class='highlight'{%endif%}>{{choice.sum}}</td>
+ {% for choice in choices %}<td{%if choice.highlight %} class='highlight'{%endif%}>{{choice.getSum}}</td>
{% endfor %}
</tr>{%endif%}
</table>