Correct hard link in templates and views (closes #309)

1 files changed, 18 insertions, 15 deletions

diff --git a/papillon/urls.py b/papillon/urls.py
index 9d1d8a3..30f95be 100644
--- a/papillon/urls.py
+++ b/papillon/urls.py
@@ -35,22 +35,25 @@ if not base.endswith('/'):
 
 urlpatterns = patterns('',
      (base + r'admin/doc/', include('django.contrib.admindocs.urls')),
-     (base + r'admin/jsi18n/$', 'django.views.i18n.javascript_catalog'),
+     url(base + r'admin/jsi18n/$', 'django.views.i18n.javascript_catalog',
+             name='admin_i18n'),
      (base + r'admin/(.*)', admin.site.root),
-     (base + r'$', 'papillon.polls.views.index'),
-     (base + r'create$', 'papillon.polls.views.create'),
-     (base + r'edit/(?P<admin_url>\w+)/$',
-            'papillon.polls.views.edit'),
-     (base + r'editChoicesAdmin/(?P<admin_url>\w+)/$',
-            'papillon.polls.views.editChoicesAdmin'),
-     (base + r'editChoicesUser/(?P<poll_url>\w+)/$',
-            'papillon.polls.views.editChoicesUser'),
-     (base + r'category/(?P<category_id>\w+)/$',
-            'papillon.polls.views.category'),
-     (base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll'),
-     (base + r'poll/(?P<poll_url>\w+)/vote$', 'papillon.polls.views.poll'),
-     (base + r'feeds/(?P<url>.*)$',
-                 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+     url(base + r'$', 'papillon.polls.views.index', name='index'),
+     url(base + r'create/$', 'papillon.polls.views.create', name='create'),
+     url(base + r'edit/(?P<admin_url>\w+)/$',
+            'papillon.polls.views.edit', name='edit'),
+     url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$',
+            'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'),
+     url(base + r'editChoicesUser/(?P<poll_url>\w+)/$',
+            'papillon.polls.views.editChoicesUser', name='edit_choices_user'),
+     url(base + r'category/(?P<category_id>\w+)/$',
+            'papillon.polls.views.category', name='category'),
+     url(base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll',
+            name='poll'),
+     url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'papillon.polls.views.poll',
+            name='vote'),
+     url(base + r'feeds/(?P<url>.*)$', 'django.contrib.syndication.views.feed',
+            {'feed_dict': feeds}, name='feed'),
      (base + r'static/(?P<path>.*)$', 'django.views.static.serve',
                           {'document_root': settings.PROJECT_PATH + '/static'}),
      (base + r'media/(?P<path>.*)$', 'django.views.static.serve',