diff options
author | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2014-02-28 19:00:45 (GMT) |
---|---|---|
committer | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2014-02-28 19:00:45 (GMT) |
commit | 0c00f412dc5d8ccba552f3633993a4696e0d6b55 (patch) | |
tree | d299cb6bcb60dfc99ad70f1d8cfb100f8aea71a6 /program/views.py | |
parent | abc439740a24c503b8756aa30c57281a4cf6ad31 (diff) | |
parent | d4c75b4893bfcb28e300ff5e10dc9cd0993f8537 (diff) |
Merge branch 'master' of https://github.com/nnrcschmdt/helsinki
Diffstat (limited to 'program/views.py')
-rw-r--r-- | program/views.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/program/views.py b/program/views.py index 0e86518..75d0df8 100644 --- a/program/views.py +++ b/program/views.py @@ -31,7 +31,7 @@ def show_list(request): return list_detail.object_list(request, queryset=queryset, template_object_name='show') -def recommendations(request, template_name='program/recommendations.html'): +def recommendations(request, template_name='recommendations.html'): now = datetime.now() end = now + timedelta(weeks=1) @@ -74,7 +74,7 @@ def day_schedule(request, year=None, month=None, day=None): else: extra_context['timeslots'] = timeslots - return simple.direct_to_template(request, extra_context=extra_context, template='program/day_schedule.html') + return simple.direct_to_template(request, extra_context=extra_context, template='day_schedule.html') def current_show(request): current = TimeSlot.objects.get_or_create_current() @@ -87,7 +87,7 @@ def current_show(request): next=next, after_next=after_next) - return simple.direct_to_template(request, template='program/boxes/current.html', extra_context=extra_context) + return simple.direct_to_template(request, template='boxes/current.html', extra_context=extra_context) def week_schedule(request, year=None, week=None): if year is None and week is None: @@ -120,7 +120,7 @@ def week_schedule(request, year=None, week=None): extra_context['next_w3'] = datetime.strftime(monday+timedelta(days=21), '%G/%V') extra_context['next_w4'] = datetime.strftime(monday+timedelta(days=28), '%G/%V') - return simple.direct_to_template(request, template='program/week_schedule.html', extra_context=extra_context) + return simple.direct_to_template(request, template='week_schedule.html', extra_context=extra_context) def styles(request): extra_context = dict() @@ -128,7 +128,7 @@ def styles(request): extra_context['musicfocus'] = MusicFocus.objects.all() extra_context['showinformation'] = ShowInformation.objects.all() extra_context['showtopic'] = ShowTopic.objects.all() - return simple.direct_to_template(request, template='program/styles.css', mimetype='text/css', extra_context=extra_context) + return simple.direct_to_template(request, template='styles.css', mimetype='text/css', extra_context=extra_context) def json_day_schedule(request, year=None, month=None, day=None): if year is None and month is None and day is None: @@ -153,4 +153,4 @@ def tofirstdayinisoweek(year, week): ret = datetime.strptime('%04d-%02d-1' % (year, week), '%Y-%W-%w') if date(year, 1, 4).isoweekday() > 4: ret -= timedelta(days=7) - return ret
\ No newline at end of file + return ret |