diff options
| author | etienne <etienne@07715635-78ed-41b0-aaf1-0afda6c37f35> | 2008-08-24 22:54:51 +0000 |
|---|---|---|
| committer | etienne <etienne@07715635-78ed-41b0-aaf1-0afda6c37f35> | 2008-08-24 22:54:51 +0000 |
| commit | 5b13731e4c899e86cabf3c6eb7e343b178d70f05 (patch) | |
| tree | f54640fbf21ab705e86dc4532c54f760812b16e0 | |
| parent | 897033260fbfcf7c3dd0bc0dcc7e1624a2672878 (diff) | |
| download | Papillon-5b13731e4c899e86cabf3c6eb7e343b178d70f05.tar.bz2 Papillon-5b13731e4c899e86cabf3c6eb7e343b178d70f05.zip | |
Few bug correction
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.mo | bin | 3457 -> 0 bytes | |||
| -rw-r--r-- | polls/models.py | 4 | ||||
| -rw-r--r-- | templates/base.html | 2 | ||||
| -rw-r--r-- | templates/vote.html | 2 | ||||
| -rw-r--r-- | urls.py | 5 |
5 files changed, 6 insertions, 7 deletions
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo Binary files differdeleted file mode 100644 index af982bb..0000000 --- a/locale/fr/LC_MESSAGES/django.mo +++ /dev/null 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"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="stylesheet" href="/static/styles.css" /> + <link rel="stylesheet" href="/papillon/static/styles.css" /> <title>{% block title %}Polls{% endblock %}</title> </head> 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' %} <select name='vote_{{vote.id}}'> {% for vote_choice in VOTE %} - <option value='{{vote_choice.0}}'{%ifequal vote.value vote_choice.0%} selected='selected'{%endifequal%}>{{vote_choice.1}}</option> + <option value='{{vote_choice.0}}'{%ifequal vote.value vote_choice.0%} selected='selected'{%endifequal%}>{{vote_choice.1.1}}</option> {% endfor %} </select> {% endifequal %} @@ -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<admin_url>\w+)/$', 'papillon.polls.views.createOrEdit'), (r'^papillon/poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll'), (r'^papillon/poll/(?P<poll_url>\w+)/vote$', 'papillon.polls.views.poll'), - (r'^static/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': 'static/'}), + (r'^papillon/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/var/local/django/papillon/static/'}), ) |