Cleaning forms/models

2 files changed, 31 insertions, 43 deletions

diff --git a/polls/forms.py b/polls/forms.py
index 518e38d..732d206 100644
--- a/polls/forms.py
+++ b/polls/forms.py
@@ -30,11 +30,9 @@ from django.forms.util import flatatt
 from papillon.polls.models import Poll, Category
 
 class PollForm(forms.ModelForm):
-    name = forms.CharField(label=_("Poll name"), max_length=200,
-                  help_text=_("Global name to present the poll"))
-    description = forms.CharField(label=_("Poll description"), max_length=200,
-                  help_text=_("Precise description of the poll"), 
-                  widget=forms.widgets.Textarea())
+    def __init__(self, *args, **kwargs):
+        super(PollForm, self).__init__(*args, **kwargs)
+        self.fields['description'].widget = forms.widgets.Textarea()
 
 class CreatePollForm(PollForm):
     class Meta:
@@ -43,20 +41,6 @@ class CreatePollForm(PollForm):
                     'public', 'opened_admin', 'hide_choices']
         if not Category.objects.all():
             exclude.append('category')
-    type = forms.ChoiceField(label=_("Type of the poll"),
-               choices=Poll.TYPE, help_text=_("""Type of the 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
-"""))
-    """
-    dated_choices = forms.BooleanField(
-             required=False, help_text=_("Check this option to choose between \
-dates"))"""
-    if Category.objects.all():
-        category = forms.ChoiceField(label="", help_text="Category of the poll",
-               choices=[(cat.id, cat.name) for cat in Category.objects.all()])
 
 class AdminPollForm(PollForm):
     class Meta:
@@ -65,18 +49,3 @@ class AdminPollForm(PollForm):
                    'dated_choices', 'type']
         if not Category.objects.all():
             exclude.append('category')
-    open = forms.BooleanField(label=_("State of the poll"), 
-             required=False, help_text=_("Uncheck this option to close the \
-poll/check the poll to reopen it"))
-    public = forms.BooleanField(label=_("Display the poll on main page"), 
-             required=False, help_text=_("Check this option to make the poll \
-public"))
-    opened_admin = forms.BooleanField(label=_("Allow users to add choices"), 
-             required=False, help_text=_("Check this option to open the poll to\
- new choices submitted by users"))
-    hide_choices = forms.BooleanField(label=_("Hide votes to new voters"), 
-             required=False, help_text=_("Check this option to hide poll \
-results to new users"))
-    enddate = forms.DateField(label=_("Closing date"), 
-required=False, help_text=_("Closing date for participating to the poll"))
-
diff --git a/polls/models.py b/polls/models.py
index c05d6eb..82981f7 100644
--- a/polls/models.py
+++ b/polls/models.py
@@ -48,22 +48,41 @@ modify the current poll"))
     author_name = models.CharField(verbose_name=_("Author name"), 
        max_length=100, help_text=_("Name, firstname or nickname of the author"))
     author = models.ForeignKey(PollUser, null=True, blank=True)
-    name = models.CharField(max_length=200)
-    description = models.CharField(max_length=1000)
+    name = models.CharField(max_length=200, verbose_name=_("Poll name"),
+                            help_text=_("Global name to present the poll"))
+    description = models.CharField(max_length=1000,
+                            verbose_name=_("Poll description"), 
+                            help_text=_("Precise description of the poll"))
     category = models.ForeignKey(Category, null=True, blank=True)
     TYPE = (('P', _('Yes/No poll')),
             ('B', _('Yes/No/Maybe poll')),
             ('O', _('One choice poll')),)
-    #        ('M', _('Meeting')),)
-    type = models.CharField(max_length=1, choices=TYPE)
+    type = models.CharField(max_length=1, choices=TYPE,
+                      verbose_name=_("Type of the poll"),
+                      help_text=_("""Type of the 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
+"""))
     dated_choices = models.BooleanField(verbose_name=_("Choices are dates"),
         default=False, help_text=_("Check this option to choose between dates"))
-    enddate = models.DateTimeField(null=True, blank=True)
+    enddate = models.DateTimeField(null=True, blank=True,
+verbose_name=_("Closing date"), help_text=_("Closing date for participating to \
+the poll"))
     modification_date = models.DateTimeField(auto_now=True)
-    public = models.BooleanField(default=False)
-    opened_admin = models.BooleanField(default=False)
-    hide_choices = models.BooleanField(default=False)
-    open = models.BooleanField(default=True)
+    public = models.BooleanField(default=False,
+verbose_name=_("Display the poll on main page"), help_text=_("Check this \
+option to make the poll public"))
+    opened_admin = models.BooleanField(default=False,
+verbose_name=_("Allow users to add choices"), help_text=_("Check this option \
+to open the poll to new choices submitted by users"))
+    hide_choices = models.BooleanField(default=False,
+verbose_name=_("Hide votes to new voters"), help_text=_("Check this option to \
+hide poll results to new users"))
+    open = models.BooleanField(default=True,
+verbose_name=_("State of the poll"), help_text=_("Uncheck this option to close \
+the poll/check the poll to reopen it"))
 
     def getTypeLabel(self):
         idx = [type[0] for type in self.TYPE].index(self.type)