diff --git a/blogapp/views.py b/blogapp/views.py index cfd11df..4ef418f 100644 --- a/blogapp/views.py +++ b/blogapp/views.py @@ -1,5 +1,5 @@ from blogapp.models import blogentry, blogcomment -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import render, get_object_or_404 from django.template import RequestContext from django import forms import datetime @@ -11,13 +11,15 @@ class BlogCommentForm(forms.Form): def listall(request): listall_entries = blogentry.objects.all().order_by('-date')[:10] - return render_to_response('blogapp/blogindex.html', {'blogentries': listall_entries}, context_instance=RequestContext(request)) + context = {'blogentries': listall_entries} + return render(request, 'blogapp/blogindex.html', context) def detail(request, blogentry_id): blogdetail = get_object_or_404(blogentry, pk=blogentry_id) form = BlogCommentForm() - return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail, 'commentform': form}, context_instance=RequestContext(request)) + context = {'blogentry': blogdetail, 'commentform': form} + return render(request, 'blogapp/blogdetail.html', context) #if request.user.is_authenticated(): # return render_to_response('blogapp/blogdetail.html', {'blogentry': blogdetail, 'commentform': form}, context_instance=RequestContext(request)) #else: diff --git a/pageapp/views.py b/pageapp/views.py index 164e06e..f22567f 100644 --- a/pageapp/views.py +++ b/pageapp/views.py @@ -1,17 +1,17 @@ from pageapp.models import page -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import render, get_object_or_404 from django.template import RequestContext def getpage(request, page_id): pagedetail = get_object_or_404(page, pk=page_id) - return render_to_response('pageapp/page.html', {'page': pagedetail}, context_instance=RequestContext(request)) + return render(request, 'pageapp/page.html', {'page': pagedetail}) def aboutpage(request): about = get_object_or_404(page, pk=1) - return render_to_response('pageapp/page.html', {'page': about}, context_instance=RequestContext(request)) + return render(request, 'pageapp/page.html', {'page': about}) def contactpage(request): contact = get_object_or_404(page, pk=2) - return render_to_response('pageapp/page.html', {'page': contact}, context_instance=RequestContext(request)) + return render(request, 'pageapp/page.html', {'page': contact})