diff --git a/www/conservancy/apps/blog/urls.py b/www/conservancy/apps/blog/urls.py index d4d11cb0eb0981ccfb7656d5aa0e85de71846edd..4b084f7bc02eace5a3c0856ab98519d7db065dee 100644 --- a/www/conservancy/apps/blog/urls.py +++ b/www/conservancy/apps/blog/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from conservancy.apps.blog.models import Entry, EntryTag # relative import from conservancy.apps.staff.models import Person from datetime import datetime -from conservancy.apps.blog.views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView +from conservancy.apps.blog.views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView, custom_index, query extra_context = {} @@ -12,23 +12,14 @@ info_dict = { 'extra_context': extra_context, } -# urlpatterns = patterns('django.views.generic.date_based', -urlpatterns = patterns('', - # (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', 'object_detail', dict(info_dict, slug_field='slug')), - # (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', 'archive_day', info_dict), - # (r'^(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', info_dict), - # (r'^(?P\d{4})/$', 'archive_year', dict(info_dict, - # make_object_list=True)), - (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', BlogDateDetailView.as_view(**info_dict)), - (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', BlogDayArchiveView.as_view(**info_dict)), - (r'^(?P\d{4})/(?P[a-z]{3})/$', BlogMonthArchiveView.as_view(**info_dict)), - (r'^(?P\d{4})/$', BlogYearArchiveView.as_view(**info_dict)), -) - -urlpatterns += patterns('conservancy.apps.blog.views', - (r'^/?$', 'custom_index', dict(info_dict, paginate_by=4)), - (r'^query/$', 'query'), -) +urlpatterns = [ + url(r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', BlogDateDetailView.as_view(**info_dict)), + url(r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', BlogDayArchiveView.as_view(**info_dict)), + url(r'^(?P\d{4})/(?P[a-z]{3})/$', BlogMonthArchiveView.as_view(**info_dict)), + url(r'^(?P\d{4})/$', BlogYearArchiveView.as_view(**info_dict)), + url(r'^/?$', custom_index, dict(info_dict, paginate_by=4)), + url(r'^query/$', query), +] # Code to display authors and tags on each blog page