diff options
Diffstat (limited to 'helsinki.program')
| -rw-r--r-- | helsinki.program/settings.py | 2 | ||||
| -rw-r--r-- | helsinki.program/urls_program.py | 6 | ||||
| -rw-r--r-- | helsinki.program/views.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/helsinki.program/settings.py b/helsinki.program/settings.py index ac4ad72..c5173a5 100644 --- a/helsinki.program/settings.py +++ b/helsinki.program/settings.py @@ -64,7 +64,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', ) -ROOT_URLCONF = 'helsinki.urls' +ROOT_URLCONF = 'helsinki.program.urls' TEMPLATE_DIRS = ( os.path.join(os.path.dirname(__file__), "templates"), diff --git a/helsinki.program/urls_program.py b/helsinki.program/urls_program.py index 637ad97..caa302b 100644 --- a/helsinki.program/urls_program.py +++ b/helsinki.program/urls_program.py @@ -2,8 +2,8 @@ from django.conf.urls.defaults import * from django.views.generic.detail import DetailView from django.views.generic.list import ListView -from models import Host, Show, TimeSlot -from views import CurrentShowView, DayScheduleView, RecommendationsView, ShowListView, TodayScheduleView, WeekScheduleView +from helsinki.program.models import Host, Show, TimeSlot +from helsinki.program.views import CurrentShowView, DayScheduleView, RecommendationsView, ShowListView, TodayScheduleView, WeekScheduleView urlpatterns = patterns('', ('^$', TodayScheduleView.as_view()), @@ -17,4 +17,4 @@ urlpatterns = patterns('', ('^shows/$', ShowListView.as_view()), url('^show/(?P<slug>[\w-]+)/$', DetailView.as_view(model=Show), name='show-detail'), url('^(?P<pk>\d+)/$', DetailView.as_view(model=TimeSlot), name='timeslot-detail'), -)
\ No newline at end of file +) diff --git a/helsinki.program/views.py b/helsinki.program/views.py index 23c1483..b118161 100644 --- a/helsinki.program/views.py +++ b/helsinki.program/views.py @@ -2,7 +2,7 @@ from django.views.generic.list import ListView from django.views.generic.base import TemplateView from django.shortcuts import get_object_or_404 -from models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic, TimeSlot +from helsinki.program.models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic, TimeSlot from datetime import date, datetime, time, timedelta |