summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authoretienne2009-12-03 11:33:27 +0000
committeretienne2009-12-03 11:33:27 +0000
commite8784c0d1b75bb66739267e5f05161d210b3e199 (patch)
treef3d1a77b08c5dcffd13665058d44142fdb38bc15 /templates
parent7789bff7cb978d475157e815a636f351c9955837 (diff)
Refactoring of the code - Using newforms - Change from ReST to markdown
Diffstat (limited to 'templates')
-rw-r--r--templates/create.html51
-rw-r--r--templates/edit.html75
2 files changed, 86 insertions, 40 deletions
diff --git a/templates/create.html b/templates/create.html
index c9c2b95..0b779db 100644
--- a/templates/create.html
+++ b/templates/create.html
@@ -4,49 +4,20 @@
{% block content %}
<h2>{% trans "New poll" %}</h2>
-<form action="http://{{root_url}}create" method="post">
+<form action="" method="post">
<table class='new_poll'>
- <tr><td colspan='3'>{{form.author_name.errors}}</td></tr>
+ {% for field in form %}
+ {% if field.is_hidden %}
+ {{field}}
+ {% else %}
+ <tr><td colspan='3'>{{field.errors}}</td></tr>
<tr>
- <td><label for='author_name'>{{form.author_name.label}}</label></td>
- <td>{{form.author_name}}</td>
- <td class='form_description'>{{form.author_name.help_text}}</td>
- </tr>
-
- <tr><td colspan='3'>{{form.name.errors}}</td></tr>
- <tr>
- <td><label for='name'>{{form.name.label}}</label></td>
- <td>{{form.name}}</td>
- <td class='form_description'>{{form.name.help_text}}</td>
- </tr>
-
- <tr><td colspan='3'>{{form.description.errors}}</td></tr>
- <tr>
- <td><label for='description'>{{form.description.label}}</label></td>
- <td>{{form.description}}</td>
- <td class='form_description'>{{form.description.help_text}}</td>
- </tr>
-{% if form.category %}
- <tr><td colspan='3'>{{form.category.errors}}</td></tr>
- <tr>
- <td><label for='category'>{{form.category.label}}</label></td>
- <td>{{form.category}}</td>
- <td class='form_description'>{{form.category.help_text}}</td>
- </tr>
-{% endif %}
- <tr><td colspan='3'>{{form.public.errors}}</td></tr>
- <tr>
- <td><label for='public'>{{form.public.label}}</label></td>
- <td>{{form.public}}</td>
- <td class='form_description'>{{form.public.help_text}}</td>
- </tr>
-
- <tr><td colspan='3'>{{form.poll_type.errors}}</td></tr>
- <tr>
- <td><label for='poll_type'>{{form.poll_type.label}}</label></td>
- <td>{{form.poll_type}}</td>
- <td class='form_description'>{{form.poll_type.help_text|markdown}}</td>
+ <td>{{field.label_tag}}</td>
+ <td>{{field}}</td>
+ <td class='form_description'>{{field.help_text|markdown}}</td>
</tr>
+ {% endif %}
+ {% endfor %}
<tr>
<td></td>
<td><input type='submit' value='{% trans "Create" %}' class='submit'/></td>
diff --git a/templates/edit.html b/templates/edit.html
new file mode 100644
index 0000000..9ddf138
--- /dev/null
+++ b/templates/edit.html
@@ -0,0 +1,75 @@
+{% extends "base.html" %}
+{% load markup %}
+{% load i18n %}
+
+{% block content %}
+ {% if not choices %}
+ <p class='error'>{% blocktrans %}As long as no options were added to the poll,
+it will not be made available.{% endblocktrans %}</p>
+ {% endif %}
+
+ <h2>{% trans "Edit poll" %}</h2>
+<form action="" method="post">
+<table class='new_poll'>
+ <tr>
+ <td><label>{% trans "Poll url" %}</label></td>
+ <td>
+<a href='http://{{root_url}}edit/{{poll.base_url}}'>http://{{root_url}}edit/{{poll.base_url}}</a>
+ </td>
+ <td class='form_description'>
+{% trans "Copy this address and send it to voters who want to participate to this poll" %}
+ </td>
+ </tr>
+ <tr>
+ <td><label>{% trans "Administration url" %}</label></td>
+ <td>
+<a href='http://{{root_url}}poll/{{poll.admin_url}}'>http://{{root_url}}poll/{{poll.admin_url}}</a>
+ <td class='form_description'>{% trans "Address to modify the current poll" %}</td>
+ </tr>
+ {% for field in form %}
+ {% if field.is_hidden %}
+ {{field}}
+ {% else %}
+ <tr><td colspan='3'>{{field.errors}}</td></tr>
+ <tr>
+ <td>{{field.label_tag}}</td>
+ <td>{{field}}</td>
+ {% if field.help_text %}<td class='form_description'>{{field.help_text|markdown}}</td>{%endif%}
+ </tr>
+ {% endif %}
+ {% endfor %}
+ <tr>
+ <td></td>
+ <td><input type='submit' value='{% trans "Edit" %}' class='submit'/></td>
+ </tr>
+</table>
+</form>
+
+<h2>{% trans "Choices" %}</h2>
+{% if choices %}<form action="{{admin_url}}" method="post">
+<table class='new_poll'>
+ <tr>
+ <th>{% trans "Up/down" %}</th><th>{% trans "Label" %}</th><th>{% trans "Limit" %}</th><th>{% trans "Delete?"%}</th>
+ </tr>
+ {% for choice in choices %}<tr>
+ <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>
+ <td><input type='hidden' name='edit' value='1'/>
+ <input type='submit' value='{% trans "Edit" %}' class='submit'/></td>
+ </tr>
+</table>
+</form>{% endif %}
+
+<form action="{{admin_url}}" method="post">
+<table class='new_poll'>
+ <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" %}' class='submit'/></td>
+ </tr>
+</table>
+</form>
+
+{% endblock %}