diff options
| -rw-r--r-- | program/urls.py | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/program/urls.py b/program/urls.py index 59caa2a..328f4a1 100644 --- a/program/urls.py +++ b/program/urls.py @@ -13,7 +13,7 @@ hosts_dict = { 'template_object_name': 'host' } shows_dict = { - 'queryset': Show.objects.filter(programslots__until__gt=date.today()).exclude(id=1).distinct(), + 'queryset': Show.objects.all(), 'template_object_name': 'show' } timeslots_dict = { @@ -23,24 +23,29 @@ timeslots_dict = { recommendations_dict = {'template_name': 'boxes/recommendations.html'} urlpatterns = patterns('', - url(r'^today/?$', day_schedule), - url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', day_schedule), - url(r'^(?P<year>\d{4})/(?P<week>\d{1,2})/?$', week_schedule), - url(r'^current_box/?$', cache_page(current_show, 60)), - url(r'^hosts/?$', object_list, dict(hosts_dict, template_name='host_list.html')), - url(r'^hosts/(?P<object_id>\d+)/?$', object_detail, dict(hosts_dict, template_name='host_detail.html'), name='host-detail'), - url(r'^tips/?$', recommendations), - url(r'^tips_box/?$', recommendations, recommendations_dict), - url(r'^shows/?$', show_list), - url(r'^shows/(?P<slug>[\w-]+)/?$', object_detail, dict(shows_dict, template_name='show_detail.html'), name='show-detail'), - url(r'^(?P<object_id>\d+)/?$', object_detail, dict(timeslots_dict, template_name='timeslot_detail.html'), name='timeslot-detail'), - url(r'^week/?$', week_schedule), - url(r'^styles.css$', styles), + url(r'^today/?$', day_schedule), + url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', day_schedule), + url(r'^(?P<year>\d{4})/(?P<week>\d{1,2})/?$', week_schedule), + url(r'^current_box/?$', cache_page(current_show, 60)), + url(r'^hosts/?$', object_list, dict(hosts_dict, template_name='host_list.html')), + url(r'^hosts/(?P<object_id>\d+)/?$', object_detail, + dict(hosts_dict, template_name='host_detail.html'), name='host-detail'), + url(r'^tips/?$', recommendations), + url(r'^tips_box/?$', recommendations, recommendations_dict), + url(r'^shows/?$', show_list), + url(r'^shows/(?P<slug>[\w-]+)/?$', object_detail, dict(shows_dict, template_name='show_detail.html'), + name='show-detail'), + url(r'^(?P<object_id>\d+)/?$', object_detail, + dict(timeslots_dict, template_name='timeslot_detail.html'), name='timeslot-detail'), + url(r'^week/?$', week_schedule), + url(r'^styles.css$', styles), ) if settings.DEBUG: import os + PROGRAM_STATIC_DIR = os.path.join(os.path.dirname(__file__), '../site_media') urlpatterns += patterns('', - url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': PROGRAM_STATIC_DIR}), + url(r'^static/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': PROGRAM_STATIC_DIR}), ) |