Template cleaning - Simplification - Use of newforms

9 files changed, 280 insertions, 357 deletions

diff --git a/polls/forms.py b/polls/forms.py
index f55db73..6ac97a1 100644
--- a/polls/forms.py
+++ b/polls/forms.py
@@ -21,10 +21,13 @@
 Forms management
 '''
 
+from datetime import datetime
+
 from django import forms
 from django.contrib.admin import widgets as adminwidgets
+from django.utils.translation import gettext_lazy as _
 
-from papillon.polls.models import Poll, Category
+from papillon.polls.models import Poll, Category, Choice
 from papillon import settings
 
 class TextareaWidget(forms.Textarea):
@@ -35,7 +38,6 @@ class TextareaWidget(forms.Textarea):
         js = ["%stiny_mce.js" % settings.TINYMCE_URL,
               "%stextareas.js" % settings.MEDIA_URL,]
 
-
 class PollForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(PollForm, self).__init__(*args, **kwargs)
@@ -59,3 +61,57 @@ class AdminPollForm(PollForm):
     def __init__(self, *args, **kwargs):
         super(AdminPollForm, self).__init__(*args, **kwargs)
         self.fields['enddate'].widget = adminwidgets.AdminSplitDateTime()
+
+class ChoiceForm(forms.ModelForm):
+    class Meta:
+        model = Choice
+        fields = ('name', 'limit', 'poll', 'order')
+    def __init__(self, *args, **kwargs):
+        super(ChoiceForm, self).__init__(*args, **kwargs)
+        self.fields['poll'].widget = forms.HiddenInput()
+        self.fields['order'].widget = forms.HiddenInput()
+
+class DatedChoiceForm(ChoiceForm):
+    def __init__(self, *args, **kwargs):
+        super(DatedChoiceForm, self).__init__(*args, **kwargs)
+        self.fields['name'].widget = adminwidgets.AdminSplitDateTime()
+
+    def clean_name(self):
+        try:
+            poll_id = self.data['poll']
+            poll = Poll.objects.get(id=int(poll_id))
+        except (ValueError, Poll.DoesNotExist):
+            raise forms.ValidationError(_('Invalid poll'))
+        data = self.cleaned_data['name']
+        if poll.dated_choices:
+            # management of dates fields
+            if data.startswith('[') and data.endswith(']') and "'" in data:
+                datas = data.split("'")
+                try:
+                    assert len(datas) == 5
+                    time = datas[3]
+                    if not time:
+                        time = '00:00:00'
+                    date = "%s %s" % (datas[1], time)
+                    datetime.strptime(date, '%Y-%m-%d %H:%M:%S') 
+                    data = date
+                except (ValueError, AssertionError):
+                    raise forms.ValidationError(_('Invalid date format: \
+YYYY-MM-DD HH:MM:SS'))
+        return data
+
+    def clean_limit(self):
+        """
+        data = eval(self.cleaned_data['name'])
+        
+                            new_limit = int(request.POST[key])
+                            sum = choice.getSum()
+                            if new_limit < sum:
+                                response_dct['error'] = _("You cannot lower \
+%(name)s's limit to this number : there is currently %(sum)d votes for this \
+choice.") % {'name':choice.name, 'sum':sum}
+                            else:
+                                choice.limit = new_limit
+                                choice.save()
+"""
+        pass
diff --git a/polls/models.py b/polls/models.py
index 82981f7..f5b9cbb 100644
--- a/polls/models.py
+++ b/polls/models.py
@@ -56,7 +56,8 @@ modify the current poll"))
     category = models.ForeignKey(Category, null=True, blank=True)
     TYPE = (('P', _('Yes/No poll')),
             ('B', _('Yes/No/Maybe poll')),
-            ('O', _('One choice poll')),)
+            ('O', _('One choice poll')),
+            ('V', _('Valuable choice poll')),)
     type = models.CharField(max_length=1, choices=TYPE,
                       verbose_name=_("Type of the poll"),
                       help_text=_("""Type of the poll:
@@ -64,6 +65,8 @@ modify the current poll"))
  - "Yes/No poll" is the appropriate type for a simple multi-choice poll
  - "Yes/No/Maybe poll" allows voters to stay undecided
  - "One choice poll" gives only one option to choose from
+ - "Valuable choice poll" permit users to give a note between 0 to 10 to \
+different choices
 """))
     dated_choices = models.BooleanField(verbose_name=_("Choices are dates"),
         default=False, help_text=_("Check this option to choose between dates"))
@@ -113,6 +116,19 @@ the poll/check the poll to reopen it"))
         Get choices associated to this vote"""
         return Choice.objects.filter(poll=self)
 
+    def reorder(self):
+        """
+        Reorder choices of the poll"""
+        if not self.dated_choices:
+            return
+        choices = self.getChoices()
+        sort_fct = lambda x:datetime.datetime.strptime(x.name,
+                                                       '%Y-%m-%d %H:%M:%S')
+        choices = sorted(choices, key=sort_fct)
+        for idx, choice in enumerate(choices):
+            choice.order = idx
+            choice.save()
+
     class Admin:
         pass
     class Meta:
diff --git a/polls/views.py b/polls/views.py
index 8f5b2c1..7abd3a3 100644
--- a/polls/views.py
+++ b/polls/views.py
@@ -33,7 +33,8 @@ from django.http import HttpResponseRedirect
 from papillon.settings import LANGUAGES, BASE_SITE
 from papillon.polls.models import Poll, PollUser, Choice, Voter, Vote, \
                                   Category, Comment
-from papillon.polls.forms import CreatePollForm, AdminPollForm
+from papillon.polls.forms import CreatePollForm, AdminPollForm, ChoiceForm, \
+                                 DatedChoiceForm
 
 def getBaseResponse(request):
     """Manage basic fields for the template
@@ -98,7 +99,7 @@ def create(request):
             poll.admin_url = genRandomURL()
             poll.base_url = genRandomURL()
             poll.save()
-            return HttpResponseRedirect('http://%sedit/%s/' % (
+            return HttpResponseRedirect('http://%seditChoicesAdmin/%s/' % (
                             response_dct['root_url'], poll.admin_url))
     else:
         form = CreatePollForm()
@@ -113,8 +114,9 @@ def edit(request, admin_url):
         poll = Poll.objects.filter(admin_url=admin_url)[0]
     except IndexError:
         # if the poll don't exist redirect to the creation page
-        url = response_dct['admin_url']
-        return response_dct, HttpResponseRedirect(url)
+        url = response_dct['root_url']
+        return HttpResponseRedirect('http://%screate' % (
+                            response_dct['root_url']))
     Form = AdminPollForm
 
     if request.method == 'POST':
@@ -129,210 +131,115 @@ def edit(request, admin_url):
     response_dct['poll'] = poll
     return render_to_response('edit.html', response_dct)
 
-def createOrEdit(request, admin_url):
-    '''Creation or edition of a poll.
-    admin_url is given to identify a particular poll
-    admin_url is equal to 0 for a new poll
-    response_dct is given to the template with some particular keys:
-     - error is an error message
-     - new is set to true if it is a new poll
-     - admin_url is the url of the current page
-    '''
-    def genRandomURL():
-        "Generation of a random url"
-        chars = string.letters + string.digits
-        url = ''
-        for i in xrange(6):
-            url += random_choice(chars)
-        url += str(int(time.time()))
-        return url
-
-    def submitNewPoll(request, response_dct):
-        "A new poll is submited"
-        # verify if all the mandatory_fields are set
-        mandatory_fields = (('author_name', _("Author name")),
-                            ('poll_name', _("Poll name")),
-                            ('poll_desc', _("Poll description")),
-                            ('poll_type', _("Poll type")),
-                            )
-        error = ""
-        for key, label in mandatory_fields:
-            if key not in request.POST or not request.POST[key]:
-                # only the first error is reported
-                if not error:
-                    error = _("%s is a mandatory field") % label
-            else:
-                response_dct[key] = request.POST[key]
-        if error:
-            response_dct['new'] = True
-            response_dct['error'] = error
-            response_dct['admin_url'] += '/0/'
-            return response_dct, None
-        author = PollUser(name=request.POST['author_name'])
-        author.save()
-        base_url = 'b' + genRandomURL()
-        admin_url = 'a' + genRandomURL()
-        category = None
-        if 'poll_category' in request.POST and request.POST['poll_category']:
-            category = \
-                     Category.objects.get(id=int(request.POST['poll_category']))
-        public = False
-        if 'poll_public' in request.POST and request.POST['poll_public']:
-            value = False
-            if request.POST['poll_public'] == '1':
-                value = True
-            public = value
-        poll = Poll(name=request.POST['poll_name'],
-description=request.POST['poll_desc'], author=author, base_url=base_url,
-admin_url=admin_url, type=request.POST['poll_type'], category=category,
-public=public)
-        poll.save()
-        url = response_dct['admin_url'] + '/%s/' % poll.admin_url
+def editChoicesAdmin(request, admin_url):
+    response_dct, redirect = getBaseResponse(request)
+    if redirect:
+        return redirect
+    try:
+        poll = Poll.objects.filter(admin_url=admin_url)[0]
+    except IndexError:
+        # if the poll don't exist redirect to the main page
+        url = "/".join(request.path.split('/')[:-2])
         return response_dct, HttpResponseRedirect(url)
+    response_dct['poll'] = poll
+    return editChoices(request, response_dct, admin=True)
 
-    def getAndUpdateExistingPoll(request, response_dct, admin_url):
-        "Get an existing poll"
-        try:
-            poll = Poll.objects.filter(admin_url=admin_url)[0]
-        except IndexError:
-            # if the poll don't exist redirect to the creation page
-            url = response_dct['admin_url'] + '/0/'
-            return response_dct, HttpResponseRedirect(url)
-        # update the poll
-        updated = None
-        if 'poll_name' in request.POST and request.POST['poll_name']:
-            updated = True
-            poll.name = request.POST['poll_name']
-        if 'poll_desc' in request.POST and request.POST['poll_desc']:
-            updated = True
-            poll.description = request.POST['poll_desc']
-        if 'poll_open' in request.POST and request.POST['poll_open']:
-            updated = True
-            value = False
-            if request.POST['poll_open'] == '1':
-                value = True
-            poll.open = value
-        if 'poll_public' in request.POST and request.POST['poll_public']:
-            updated = True
-            value = False
-            if request.POST['poll_public'] == '1':
-                value = True
-            poll.public = value
-        if updated:
-            poll.save()
-        # base feed of the template
-        new_dct = {'poll':poll,
-          'choices':Choice.objects.filter(poll=poll).order_by('order'),
-          'type_name':poll.getTypeLabel()}
-        response_dct.update(new_dct)
+def editChoicesUser(request, poll_url):
+    response_dct, redirect = getBaseResponse(request)
+    if redirect:
+        return redirect
+    try:
+        poll = Poll.objects.filter(poll_url=poll_url)[0]
+    except IndexError:
+        poll = None
+    if not poll or not poll.opened_admin:
+        # if the poll don't exist redirect to the main page
+        url = "/".join(request.path.split('/')[:-2])
+        return HttpResponseRedirect(url)
+    response_dct['poll'] = poll
+    return editChoices(request, response_dct)
 
-        # urls
-        base_path = request.META['HTTP_HOST'] + \
-                    "/".join(request.path.split('/')[:-3])
-        response_dct['base_url'] = poll.base_url
-        response_dct['full_base_url'] = base_path + "/poll/" \
-                                   + poll.base_url + "/"
-        response_dct['admin_url'] += '/%s/' % poll.admin_url
-        response_dct['full_admin_url'] = base_path + "/edit/" \
-                                         + admin_url + "/"
+def editChoices(request, response_dct, admin=False):
+    '''Edition of choices.
+    '''
+    poll = response_dct['poll']
+    tpl = 'editChoicesAdmin.html'
+    if not admin:
+        tpl = 'editChoicesUser.html'
+    Form = ChoiceForm
+    if poll.dated_choices:
+        Form = DatedChoiceForm
+    try:
+        order = Choice.objects.order_by('-order')[0].order
+        order += 1
+    except IndexError:
+        order = 0
+    form = Form(initial={'poll':poll.id, 'order':str(order)})
 
+    if request.method == 'POST':
         # if a new choice is submitted
-        if 'new_choice' in request.POST and request.POST['new_choice']:
+        if 'add' in request.POST and request.POST['poll'] == str(poll.id):
+            f = Form(request.POST)
+            if f.is_valid():
+                choice = f.save()
+                poll.reorder()
+            else:
+                form = f
+        if admin and 'edit' in request.POST \
+           and request.POST['poll'] == str(poll.id):
             try:
-                order = Choice.objects.order_by('-order')[0].order
-                order += 1
-            except IndexError:
-                order = 0
-            limit = None
-            if 'limit' in request.POST:
-                try:
-                    limit = int(request.POST['limit'])
-                except ValueError:
-                    # non numeric limit given : no limit set
-                    pass
-            choice = Choice(poll=poll, name=request.POST['new_choice'],
-                            order=order, limit=limit)
-            choice.save()
-        # check if the order of a choice has to be changed
+                choice = Choice.objects.get(id=int(request.POST['edit']))
+                if choice.poll != poll:
+                    raise ValueError
+                f = Form(request.POST, instance=choice)
+                if f.is_valid():
+                    choice = f.save()
+                    poll.reorder()
+            except (Choice.DoesNotExist, ValueError):
+                pass
+        if admin:
+            # check if a choice has been choosen for deletion
+            for key in request.POST:
+                if key.startswith('delete_') and request.POST[key]:
+                    try:
+                        choice = Choice.objects.get(id=int(key[len('delete_'):]))
+                        if choice.poll != poll:
+                            raise ValueError
+                        Vote.objects.filter(choice=choice).delete()
+                        choice.delete()
+                    except (Choice.DoesNotExist, ValueError):
+                        pass
+    # check if the order of a choice has to be changed
+    if admin and request.method == 'GET':
         for key in request.GET:
             try:
+                current_url = request.path.split('?')[0]
                 if 'up_choice' in key:
                     choice = Choice.objects.get(id=int(request.GET[key]))
+                    if choice.poll != poll:
+                        raise ValueError
                     choice.changeOrder(-1)
+                    poll.reorder()
                     # redirect in order to avoid a change with a refresh
-                    url = response_dct['admin_url']
-                    return response_dct, HttpResponseRedirect(url)
+                    return HttpResponseRedirect(current_url)
                 if 'down_choice' in key:
                     choice = Choice.objects.get(id=int(request.GET[key]))
+                    if choice.poll != poll:
+                        raise ValueError
                     choice.changeOrder(1)
+                    poll.reorder()
                     # redirect in order to avoid a change with a refresh
-                    url = response_dct['admin_url']
-                    return response_dct, HttpResponseRedirect(url)
+                    return HttpResponseRedirect(current_url)
             except (ValueError, Choice.DoesNotExist):
                 pass
-        # check if a choice has been choosen for deletion or for modification
-        for key in request.POST:
-            if key.startswith('delete_') and request.POST[key]:
-                choice = Choice.objects.get(id=int(key[len('delete_'):]))
-                Vote.objects.filter(choice=choice).delete()
-                choice.delete()
-            if key.startswith('modify_') and request.POST[key]:
-                try:
-                    choice = Choice.objects.get(id=int(key[len('modify_'):]))
-                    choice.name = request.POST[key]
-                    choice.save()
-                except Choice.DoesNotExist:
-                    # throw when want to modify a deleted choice
-                    pass
-
-            if key.startswith('limit_'):
-                try:
-                    choice = Choice.objects.get(id=int(key[len('limit_'):]))
-                    if not request.POST[key]:
-                        choice.limit = None
-                        choice.save()
-                    else:
-                        try:
-                            new_limit = int(request.POST[key])
-                            sum = choice.getSum()
-                            if new_limit < sum:
-                                response_dct['error'] = _("You cannot lower \
-%(name)s's limit to this number : there is currently %(sum)d votes for this \
-choice.") % {'name':choice.name, 'sum':sum}
-                            else:
-                                choice.limit = new_limit
-                                choice.save()
-                        except ValueError:
-                            response_dct['error'] = _("Non-numeric value for \
-limit")
-                except Choice.DoesNotExist:
-                    # throw when want to modify a deleted choice
-                    pass
-        return response_dct, None
-
-    response_dct, redirect = getBaseResponse(request)
-    if redirect:
-        return redirect
-    response_dct['TYPES'] = Poll.TYPE
-    response_dct['categories'] = Category.objects.all()
-    response_dct['admin_url'] = \
-                         "/".join(request.path.split('/')[:-2])
-    redirection = None
-    if 'new' in request.POST:
-        # new poll is submited
-        response_dct, redirection = submitNewPoll(request, response_dct)
-    elif admin_url == '0':
-        # new empty poll
-        response_dct['new'] = True
-        response_dct['admin_url'] += '/0/'
-    else:
-        # existing poll
-        response_dct, redirection = getAndUpdateExistingPoll(request,
-                                               response_dct, admin_url)
-    if redirection:
-        return redirection
-    return render_to_response('createOrEdit.html', response_dct)
-
+    choices = Choice.objects.filter(poll=poll).order_by('order')
+    for choice in choices:
+        if poll.dated_choices:
+            choice.name = datetime.strptime(choice.name, '%Y-%m-%d %H:%M:%S')
+        choice.form = Form(instance=choice)
+    response_dct['choices'] = choices
+    response_dct['form_new_choice'] = form
+    return render_to_response(tpl, response_dct)
 
 def poll(request, poll_url):
     """Display a poll
diff --git a/templates/createOrEdit.html b/templates/createOrEdit.html
deleted file mode 100644
index 1e52ee1..0000000
--- a/templates/createOrEdit.html
+++ /dev/null
@@ -1,129 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
- {% 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 %}
-{% if error %}<p class='error'>{{ error }}</p>{% endif %}
- <h2>{% if new %}{% trans "New poll" %}{% else %}{% trans "Edit poll" %}{% endif %}</h2>
-<form action="{{admin_url}}" method="post">
-<table class='new_poll'>
-
-  {% if not new %}<tr>
-   <td><label>{% trans "Poll url" %}</label></td>
-   <td colspan='2'><a href='http://{{full_base_url}}'>http://{{full_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 colspan='2'><a href='http://{{full_admin_url}}'>http://{{full_admin_url}}</a></td>
-   <td class='form_description'>{% trans "Address to modify the current poll" %}</td>
-  </tr>
-  {% endif %}
-
-  <tr>
-   <td><label{% if new %} for='author_name'{%endif%}>{% trans "Author name" %}</label></td>
-   <td colspan='2'>{% if new %}<input type='text' name='author_name' id='author_name' value='{{poll.author.name}}'/>{% else %}{{poll.author.name}}{% endif %}</td>
-   <td class='form_description'>{% trans "Name, firstname or nickname of the author" %}</td>
-  </tr>
-
-  <tr>
-   <td><label for='poll_name'>{% trans "Poll name" %}</label></td>
-   <td colspan='2'><input type='text' name='poll_name' id='poll_name' value='{{poll.name}}'/></td>
-   <td class='form_description'>{% trans "Global name to present the poll" %}</td>
-  </tr>
-
-  <tr>
-   <td><label for='poll_desc'>{% trans "Poll description" %}</label></td>
-   <td colspan='2'><textarea name='poll_desc' id='poll_desc' rows='' cols=''>{{poll.description}}</textarea></td>
-   <td class='form_description'>{% trans "Precise description of the poll" %}</td>
-  </tr>
-
-  {% if not new %}<tr>
-   <td><label for='poll_open'>{% trans "Poll status" %}</label></td>
-   <td colspan='2'>
-    <select name='poll_open' id='poll_open'>
-     <option value='1'{%if poll.open %} selected='selected'{%endif%}>{%trans "Open"%}</option>
-     <option value='0'{%if not poll.open %} selected='selected'{%endif%}>{%trans "Closed"%}</option>
-    </select>
-   </td>
-   <td class='form_description'>{% trans "Status of the poll. When closed no vote add or modification are allowed" %}</td>
-  </tr>{% endif %}
-
-  <tr>
-   <td><label for='poll_public'>{% trans "Visibility" %}</label></td>
-   <td colspan='2'>
-    <select name='poll_public' id='poll_public'>
-     <option value='0'{%if not poll.public %} selected='selected'{%endif%}>{%trans "Private"%}</option>
-     <option value='1'{%if poll.public %} selected='selected'{%endif%}>{%trans "Public"%}</option>
-    </select>
-   </td>
-   <td class='form_description'>{% trans "If the poll is public it is available on the main page" %}</td>
-  </tr>
-
-  {% if categories %}<tr>
-   <td><label{% if new %} for='poll_category'{%endif%}>{% trans "Poll category" %}</label></td>
-   <td colspan='2'>{% if new %}
-    <select name='poll_category' id='poll_category'>
-     <option value=''>---</option>
-     {% for category in categories %}<option value='{{category.id}}'>{{category.name}}</option>{% endfor %}
-    </select>{%else%}{{poll.category.name}}
-   {% endif %}</td>
-   <td class='form_description'>{% trans "Category of the poll" %}</td>
-  </tr>{% endif %}
-
-  <tr>
-   <td><label{% if new %} for='poll_type'{%endif%}>{% trans "Poll type" %}</label></td>
-   <td colspan='2'>{% if new %}<select name='poll_type' id='poll_type'>
-    {% for typ in TYPES %}<option value='{{typ.0}}'{% ifequal poll_type typ.0%} selected='selected'{% endifequal %}>{{typ.1}}</option>{% endfor %}
-   </select>{% else %}{{type_name}}{% endif %}</td>
-   <td class='form_description'>{% trans "Type of the poll:" %}
-   <ul>
-    <!--<li>{% trans "Meeting is the appropriate type to set a date for a meeting."%}</li>!-->
-    <li>{% trans '"Poll" is the appropriate type for a simple multi-choice poll' %}</li>
-    <li>{% trans '"Balanced poll" lets voters setting negative vote for some choices' %}</li>
-    <li>{% trans '"One choice poll"' %}</li>
-   </ul>
-   </td>
-  </tr>
-
-  <tr>
-   <td></td>
-   <td>{% if new %}<input type='hidden' name='new' value='1'/>
-   <input type='submit' value='{% trans "Create" %}' class='submit'/>
-   {% else %}<input type='hidden' name='edit' value='1'/>
-   <input type='submit' value='{% trans "Edit" %}' class='submit'/>
-   {% endif %}</td>
-  </tr>
-</table>
-</form>
-{% if not new %}
-<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>
- {% endif %}
-{% endblock %}
diff --git a/templates/edit.html b/templates/edit.html
index c8b7d75..f24395f 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -10,18 +10,13 @@
 {% endblock %}
 
 {% 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>
+<a href='http://{{root_url}}poll/{{poll.base_url}}'>http://{{root_url}}poll/{{poll.base_url}}</a>
    </td>
    <td class='form_description'><p>
 {% trans "Copy this address and send it to voters who want to participate to this poll" %}
@@ -30,12 +25,21 @@ it will not be made available.{% endblocktrans %}</p>
   <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>
+<a href='http://{{root_url}}edit/{{poll.admin_url}}'>http://{{root_url}}edit/{{poll.admin_url}}</a>
    </td>
    <td class='form_description'><p>
    {% trans "Address to modify the current poll" %}
    </p></td>
   </tr>
+  <tr>
+   <td><label>{% trans "Choices administration url" %}</label></td>
+   <td>
+<a href='http://{{root_url}}editChoicesAdmin/{{poll.admin_url}}'>http://{{root_url}}editChoicesAdmin/{{poll.admin_url}}</a>
+   </td>
+   <td class='form_description'><p>
+   {% trans "Address to modify choices of the current poll." %}
+   </p></td>
+  </tr>
   {% for field in form %}
   {% if field.is_hidden %}
   {{field}}
@@ -55,31 +59,4 @@ it will not be made available.{% endblocktrans %}</p>
 </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 %}
diff --git a/templates/editChoices.html b/templates/editChoices.html
new file mode 100644
index 0000000..1082d30
--- /dev/null
+++ b/templates/editChoices.html
@@ -0,0 +1,19 @@
+{% load markup %}
+{% load i18n %}
+
+<h2>{% trans "New choice" %}</h2>
+{%if form_new_choice.errors %} <p class='error'>{{form_new_choice.errors}}</p>{%endif%}
+<form action="{{admin_url}}" method="post">
+{{form_new_choice.poll}}
+{{form_new_choice.order}}
+<table class='new_poll'>
+ <tr>
+  <td class='form_description' colspan='3'><p>{% trans "Setting a new choice. Optionally you can set a limit of vote for this choice. This limit is usefull for limited resources allocation." %}</p></td>
+ </tr>
+ <tr>
+  <td>{{form_new_choice.name}}</td>
+  <td>{%trans "Limited to"%} {{form_new_choice.limit}} {%trans "vote(s)"%}</td>
+  <td><input type='hidden' name='add' value='1'/> <input type='submit' value='{% trans "Add" %}' class='submit'/></td>
+ </tr>
+</table>
+</form>
diff --git a/templates/editChoicesAdmin.html b/templates/editChoicesAdmin.html
new file mode 100644
index 0000000..a668319
--- /dev/null
+++ b/templates/editChoicesAdmin.html
@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% load markup %}
+{% load i18n %}
+
+{% block fullscript %}
+<script type="text/javascript" src="http://{{root_url}}admin/jsi18n/"></script>
+<script type="text/javascript" src="http://{{root_url}}media/js/core.js"></script>
+<script type="text/javascript" src="http://{{root_url}}media/js/admin/RelatedObjectLookups.js"></script>
+{{ form_new_choice.media }}
+{% endblock %}
+
+{% block content %}
+{% if not choices %}<p class='error'>
+{% blocktrans %}As long as no options were added to the poll, it will not be available.{% endblocktrans %}
+</p>{% else %}
+<h2>{% trans "Complete/Finalise the poll" %}</h2>
+<p><a href='http://{{root_url}}edit/{{poll.admin_url}}'><button>{% trans "Next"%}</button></p>
+{% endif %}
+{% include 'editChoices.html' %}
+{% if choices %}
+<h2>{% trans "Available choices" %}</h2>
+<form action="" method="post">
+<table class='new_poll'>
+  <tr>
+   {%if not poll.dated_choices%}<th>{% trans "Up/down" %}</th>{%endif%}
+   <th>{% trans "Label" %}</th>
+   <th>{% trans "Limit" %}</th>
+   <th>{% trans "Delete?"%}</th>
+  </tr>
+  {% for choice in choices %}{{choice.form.poll}}{{choice.form.order}}<tr>
+   {%if not poll.dated_choices%}<td><a href='?up_choice={{choice.id}}' class='arrow'>+</a>
+   / <a href='?down_choice={{choice.id}}' class='arrow'>-</a></td>{%endif%}
+   <td>{{choice.form.name}}</td>
+   <td>{% trans "Limited to"%} {{choice.form.limit}} {% trans "vote(s)" %}</td>
+   <td><input type='checkbox' name='delete_{{choice.id}}'/></td>
+   <td><input type='hidden' name='edit' value='{{choice.id}}'/></td>
+   <td><input type='submit' value='{% trans "Edit" %}' class='submit'/></td>
+  </tr>{% endfor %}
+</table>
+</form>{% endif %}
+
+{% endblock %}
diff --git a/templates/editChoicesUser.html b/templates/editChoicesUser.html
new file mode 100644
index 0000000..bec7384
--- /dev/null
+++ b/templates/editChoicesUser.html
@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+{% load markup %}
+{% load i18n %}
+
+{% block fullscript %}
+<script type="text/javascript" src="http://{{root_url}}admin/jsi18n/"></script>
+<script type="text/javascript" src="http://{{root_url}}media/js/core.js"></script>
+<script type="text/javascript" src="http://{{root_url}}media/js/admin/RelatedObjectLookups.js"></script>
+{{ form_new_choice.media }}
+{% endblock %}
+
+{% block content %}
+<h2>{% trans "Choices" %}</h2>
+{% if choices %}<table class='new_poll'>
+  <tr>
+   <th>{% trans "Label" %}</th>
+   <th>{% trans "Limit" %}</th>
+  </tr>
+  {% for choice in choices %}<tr>
+   <td>{{choice.name}}</td>
+   <td>{% if choice.limit %}{% trans "Limited to"%} {{choice.limit}} {% trans "vote(s)" %}{% endif %}</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 %}
+{% include 'editChoices.html' %}
+{% endblock %}
diff --git a/urls.py b/urls.py
index cc2852e..1e35a7b 100644
--- a/urls.py
+++ b/urls.py
@@ -28,13 +28,17 @@ feeds = {
 }
 
 urlpatterns = patterns('',
-     (r'^papillon/admin/(.*)', admin.site.root),
      (r'^papillon/admin/doc/', include('django.contrib.admindocs.urls')),
      (r'^papillon/admin/jsi18n/$', 'django.views.i18n.javascript_catalog'),
+     (r'^papillon/admin/(.*)', admin.site.root),
      (r'^papillon/$', 'papillon.polls.views.index'),
      (r'^papillon/create$', 'papillon.polls.views.create'),
      (r'^papillon/edit/(?P<admin_url>\w+)/$',
             'papillon.polls.views.edit'),
+     (r'^papillon/editChoicesAdmin/(?P<admin_url>\w+)/$',
+            'papillon.polls.views.editChoicesAdmin'),
+     (r'^papillon/editChoicesUser/(?P<poll_url>\w+)/$',
+            'papillon.polls.views.editChoicesUser'),
      (r'^papillon/category/(?P<category_id>\w+)/$',
             'papillon.polls.views.category'),
      (r'^papillon/poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll'),