diff --git a/www/conservancy/frontpage.py b/www/conservancy/frontpage.py index 7b4096b59e773f314e08e0edf20b7d95fd5491d9..e78386b8ae502a3aa32d56578f922f3c078d2ff8 100644 --- a/www/conservancy/frontpage.py +++ b/www/conservancy/frontpage.py @@ -1,10 +1,8 @@ -from django.shortcuts import render_to_response -from conservancy import context_processors as context_processors -from django.template import RequestContext +from conservancy import render_template_with_context from conservancy.apps.supporters.models import Supporter as Supporter from conservancy.apps.news.models import PressRelease from conservancy.apps.blog.models import Entry as BlogEntry -from datetime import datetime, timedelta +from datetime import datetime def view(request): """Conservancy front page view @@ -12,13 +10,10 @@ def view(request): Performs all object queries necessary to render the front page. """ - supporters_count = len(Supporter.objects.all().filter(display_until_date__gte=datetime.now())) - press_releases = PressRelease.objects.all().filter(pub_date__lte=datetime.now(), sites=2)[:5] - blog = BlogEntry.objects.all().filter(pub_date__lte=datetime.now())[:5] - - c = { - 'press_releases': press_releases, - 'supporters_count': supporters_count, - 'blog' : blog + now = datetime.now() + context = { + 'press_releases': PressRelease.objects.all().filter(pub_date__lte=now, sites=2)[:5], + 'supporters_count': len(Supporter.objects.all().filter(display_until_date__gte=now)), + 'blog': BlogEntry.objects.all().filter(pub_date__lte=now)[:5], } - return render_to_response("frontpage.html", c, context_instance=RequestContext(request)) + return render_template_with_context(request, "frontpage.html", context)