X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e26ca139f24101d2e5578cb278b7a47b54f542f0..084544e4f7c9269b1445a9e5109fa641a3e1aaac:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py old mode 100644 new mode 100755 index 5ec452ae..150b03d1 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -11,11 +11,13 @@ from django.core.urlresolvers import reverse from django.http import HttpResponse from django.utils import simplejson as json from django.views.generic.simple import direct_to_template +from django.shortcuts import render_to_response +from django.template import RequestContext from django.contrib.auth.decorators import login_required from explorer import forms -from api.models import PullRequest - +# from api.models import PullRequest +from bookthemes.models import Theme def ajax_login_required(view): """Similar ro @login_required, but instead of redirect, @@ -32,28 +34,30 @@ def display_editor(request, path): user = request.GET.get('user', request.user.username) gallery_form = forms.GalleryChoiceForm() - return direct_to_template(request, 'explorer/editor.html', extra_context={ + return render_to_response('explorer/editor.html', + # mimetype="text/html", + dictionary = { 'fileid': path, 'euser': user, 'gallery_form': gallery_form, - }) - + 'available_themes': ({'first_letter': t.name[0].upper(), 'name': t.name} for t in Theme.objects.order_by('name')), + }, context_instance=RequestContext(request)) + # # View all files # def file_list(request): - import api.forms - from api.resources import library_resource - - bookform = api.forms.DocumentUploadForm() + from wiki.views import document_list # short-circut the api document list - doctree = library_resource.handler.read(request) + # doctree = library_resource.handler.read(request) # print "DOCTREE:", doctree['documents'] - return direct_to_template(request, 'explorer/file_list.html', extra_context={ - 'filetree': doctree['documents'], 'bookform': bookform, - }) + return document_list(request, 'explorer/file_list.html') + + # return direct_to_template(request, 'explorer/file_list.html', extra_context={ + # 'files': files, 'bookform': bookform, + # }) @permission_required('api.document.can_add') def file_upload(request): @@ -119,3 +123,11 @@ def pull_requests(request): return direct_to_template(request, 'manager/pull_request.html', extra_context = {'objects': objects} ) + + +# +# Testing +# +def renderer_test(request): + return direct_to_template(request, 'renderer.html', mimetype="text/html", + extra_context = {} )