summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/urls.py8
-rw-r--r--program/views.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/program/urls.py b/program/urls.py
index 2bc3ae2..59caa2a 100644
--- a/program/urls.py
+++ b/program/urls.py
@@ -27,13 +27,13 @@ urlpatterns = patterns('',
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, hosts_dict),
- url(r'^hosts/(?P<object_id>\d+)/?$', object_detail, hosts_dict, name='host-detail'),
+ 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, shows_dict, name='show-detail'),
- url(r'^(?P<object_id>\d+)/?$', object_detail, timeslots_dict, name='timeslot-detail'),
+ 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),
)
diff --git a/program/views.py b/program/views.py
index 75d0df8..200d641 100644
--- a/program/views.py
+++ b/program/views.py
@@ -29,7 +29,7 @@ def show_list(request):
queryset = queryset.filter(showtopic=showtopic)
- return list_detail.object_list(request, queryset=queryset, template_object_name='show')
+ return list_detail.object_list(request, queryset=queryset, template_object_name='show', template_name='show_list.html')
def recommendations(request, template_name='recommendations.html'):
now = datetime.now()