diff options
| author | Johannes Raggam <raggam-nl@adm.at> | 2011-07-07 14:15:26 (GMT) |
|---|---|---|
| committer | Johannes Raggam <raggam-nl@adm.at> | 2011-07-07 14:15:26 (GMT) |
| commit | 7fedd9d25afc2267c23121770d7aef17e9141f0d (patch) | |
| tree | 13b6455d004067b8e365fde9a2f9f1ad30a5e6fa /program/urls.py | |
| parent | b8192f77d559684825af175dd31ce18c6c38096c (diff) | |
| parent | f77ca392735c58e12f3fa5e4f7badf4c6e13f7ae (diff) | |
Merge branch 'master' of github.com:nnrcschmdt/helsinki
Diffstat (limited to 'program/urls.py')
| -rw-r--r-- | program/urls.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/program/urls.py b/program/urls.py index 60d81a7..7176382 100644 --- a/program/urls.py +++ b/program/urls.py @@ -5,9 +5,6 @@ from django.views.generic.list_detail import object_detail, object_list from models import Host, Show, TimeSlot from views import current_show, day_schedule, recommendations, show_list, week_schedule -import os -PROGRAM_STATIC_DIR = os.path.join(os.path.dirname(__file__), '../site_media') - hosts_dict = { 'queryset': Host.objects.all(), 'template_object_name': 'host' @@ -35,5 +32,4 @@ urlpatterns = patterns('', 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'^week/?$', week_schedule), - url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': PROGRAM_STATIC_DIR}), ) |