From 5b13731e4c899e86cabf3c6eb7e343b178d70f05 Mon Sep 17 00:00:00 2001 From: etienne Date: Sun, 24 Aug 2008 22:54:51 +0000 Subject: Few bug correction --- locale/fr/LC_MESSAGES/django.mo | Bin 3457 -> 0 bytes polls/models.py | 4 ++-- templates/base.html | 2 +- templates/vote.html | 2 +- urls.py | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 locale/fr/LC_MESSAGES/django.mo diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo deleted file mode 100644 index af982bb..0000000 Binary files a/locale/fr/LC_MESSAGES/django.mo and /dev/null differ diff --git a/polls/models.py b/polls/models.py index fd5f0a9..bf9ef15 100644 --- a/polls/models.py +++ b/polls/models.py @@ -65,7 +65,7 @@ class Choice(models.Model): poll = models.ForeignKey(Poll) name = models.CharField(maxlength=200) order = models.IntegerField() - limit = models.IntegerField() + limit = models.IntegerField(null=True) available = models.BooleanField(default=True) class Admin: pass @@ -78,4 +78,4 @@ class Vote(models.Model): VOTE = ((1, (_('Yes'), _('Yes'))), (0, (_('No'), _('Maybe')), ), (-1, (_('No'), _('No'))),) - value = models.IntegerField(choices=VOTE, null=True) \ No newline at end of file + value = models.IntegerField(choices=VOTE, null=True) diff --git a/templates/base.html b/templates/base.html index 9dcf8de..768bc74 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + {% block title %}Polls{% endblock %} diff --git a/templates/vote.html b/templates/vote.html index 566bb8e..3ca4e34 100644 --- a/templates/vote.html +++ b/templates/vote.html @@ -28,7 +28,7 @@ {% ifequal poll_type 'B' %} {% endifequal %} diff --git a/urls.py b/urls.py index 9db8686..018eb38 100644 --- a/urls.py +++ b/urls.py @@ -20,12 +20,11 @@ from django.conf.urls.defaults import * urlpatterns = patterns('', - (r'^admin/', include('django.contrib.admin.urls')), + (r'^papillon/admin/', include('django.contrib.admin.urls')), (r'^papillon/$', 'papillon.polls.views.index'), (r'^papillon/edit/(?P\w+)/$', 'papillon.polls.views.createOrEdit'), (r'^papillon/poll/(?P\w+)/$', 'papillon.polls.views.poll'), (r'^papillon/poll/(?P\w+)/vote$', 'papillon.polls.views.poll'), - (r'^static/(?P.*)$', 'django.views.static.serve', - {'document_root': 'static/'}), + (r'^papillon/static/(?P.*)$', 'django.views.static.serve', {'document_root': '/var/local/django/papillon/static/'}), ) -- cgit v1.2.3