X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/df318ffde3168c6166a2ef133624b78c4b67aca0..075239c730821f8acd231cd25987bb1c16031421:/sommitrealweird/bpcms/views.py?ds=inline diff --git a/sommitrealweird/bpcms/views.py b/sommitrealweird/bpcms/views.py index bde19cc..3651743 100644 --- a/sommitrealweird/bpcms/views.py +++ b/sommitrealweird/bpcms/views.py @@ -1,5 +1,6 @@ -from bpcms.models import Document, Folder +from bpcms.models import CSSDocument, Document, Folder from django.http import Http404, HttpResponse +from django.shortcuts import render from django.template import RequestContext, loader def document_view(request, slug=None, folders=None): @@ -35,7 +36,7 @@ def document_view(request, slug=None, folders=None): except: try: folder = Folder.objects.get(slug__exact=slug, parent__exact=folder) - if not request.user.isauthenticated(): + if not request.user.is_authenticated(): doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder) else: doc = Document.objects.get(slug__exact='index', folder__exact=folder) @@ -57,10 +58,17 @@ def document_view(request, slug=None, folders=None): except: raise Http404 template_name = "bpcms/%s.html" %(doc.format,) - t = loader.get_template(template_name) - c = RequestContext(request, - { + c = { "content" : doc.content, "title" : doc.title, - }) - return HttpResponse(t.render(c)) + "extracss" : doc.extracss.all(), + } + return render(request, template_name, c) + +def css_view(request, slug): + cssdoc = CSSDocument.objects.get(slug=slug) + if not cssdoc: + raise Http404() + + return HttpResponse(cssdoc.content, content_type="text/css") +