diff --git a/www/conservancy/apps/events/urls.py b/www/conservancy/apps/events/urls.py index 931dc7a5c38ec6dd36e679006d20949911d7aa2d..650d8b0cdcdd185d49609fe32d7662e0e8d8cf85 100644 --- a/www/conservancy/apps/events/urls.py +++ b/www/conservancy/apps/events/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from models import Event # relative import info_dict = { @@ -7,13 +7,18 @@ info_dict = { 'allow_future': True, } -urlpatterns = patterns('django.views.generic.date_based', - (r'^(?P\d{4})/$', 'archive_year', dict(info_dict, - make_object_list=True)), -) +# FIXME -- see blog and news for examples +# urlpatterns = patterns('django.views.generic.date_based', +# (r'^(?P\d{4})/$', 'archive_year', dict(info_dict, +# make_object_list=True)), +# ) + +# urlpatterns += patterns('conservancy.apps.events.views', +# (r'^/?$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)), +# (r'^(?P\d{4})/(?P[-\w]+)/$', 'event_detail', dict(info_dict, slug_field='slug')), +# (r'^ics/$', 'future_event_ics', info_dict), +# ) -urlpatterns += patterns('conservancy.apps.events.views', - (r'^/?$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)), - (r'^(?P\d{4})/(?P[-\w]+)/$', 'event_detail', dict(info_dict, slug_field='slug')), - (r'^ics/$', 'future_event_ics', info_dict), +urlpatterns = patterns('conservancy.apps.events.views', + (r'^.*$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)), )