2 files changed, 14 insertions, 16 deletions

diff --git a/program/urls.py b/program/urls.py
index 0a9fd5b..128f95f 100644
--- a/program/urls.py
+++ b/program/urls.py
@@ -3,14 +3,14 @@ from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView
 
 from models import Host, Show, TimeSlot
-from views import RecommendationsView, RecommendationsBoxView, ShowListView
+from views import RecommendationsView, ShowListView
 
 urlpatterns = patterns('',
-    url('^hosts/$', ListView.as_view(model=Host,context_object_name='host_list')),
+    ('^hosts/$', ListView.as_view(model=Host, context_object_name='host_list')),
     url('^host/(?P<pk>\d+)/$', DetailView.as_view(model=Host), name='host-detail'),
-    url('^recommendations/$', RecommendationsView.as_view()),
-    url('^recommendations_box/$', RecommendationsBoxView.as_view()),
-    url('^shows/$', ShowListView.as_view()),
+    ('^recommendations/$', RecommendationsView.as_view()),
+    ('^recommendations_box/$', RecommendationsView.as_view(template_name='program/recommendations_box.html')),
+    ('^shows/$', ShowListView.as_view()),
     url('^show/(?P<slug>[\w-]+)/$', DetailView.as_view(model=Show), name='show-detail'),
-    url('^timeslot/(?P<pk>\d+)/$', DetailView.as_view(model=TimeSlot, context_object_name='timeslot'), name='timeslot-detail'),
+    url('^timeslot/(?P<pk>\d+)/$', DetailView.as_view(model=TimeSlot), name='timeslot-detail'),
 )
\ No newline at end of file
diff --git a/program/views.py b/program/views.py
index a3d1807..b9f476b 100644
--- a/program/views.py
+++ b/program/views.py
@@ -1,4 +1,4 @@
-from django.views.generic import ListView
+from django.views.generic.list import ListView
 
 from models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic
 
@@ -17,15 +17,13 @@ class ShowListView(ListView):
         context['showtopic_list'] = ShowTopic.objects.all()
 
         return context
-
+    
 class RecommendationsView(ListView):
-    now = datetime.now()
-    in_one_week = now + timedelta(weeks=1)
-    context_object_name = 'recommendation_list'
+    context_object_name = 'recommendations'
     template_name = 'program/recommendations.html'
-    queryset = Note.objects.filter(status=1, timeslot__start__range=(now, in_one_week))[:10]
 
-class RecommendationsBoxView(RecommendationsView):
-    now = datetime.now()
-    in_one_week = now + timedelta(weeks=1)
-    queryset = Note.objects.filter(status=1, timeslot__start__range=(now, in_one_week))[:3]
+    def get_queryset(self):
+        now = datetime.now()
+        in_one_week = now + timedelta(weeks=1)
+
+        return Note.objects.filter(status=1, timeslot__start__range=(now, in_one_week))[:10]
\ No newline at end of file