Widok do edycji dokumentów w aplikacji wiki.

[redakcja.git] / apps / explorer / views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index fd99f27..150b03d 100755 (executable)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -15,7 +15,9 @@ from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 
-from api.models import PullRequest
+from explorer import forms
+# from api.models import PullRequest
+from bookthemes.models import Theme
 
 def ajax_login_required(view):
     """Similar ro @login_required, but instead of redirect, 
@@ -30,31 +32,32 @@ def ajax_login_required(view):
 @login_required
 def display_editor(request, path):
     user = request.GET.get('user', request.user.username)
-    log.info(user)
-
+    gallery_form = forms.GalleryChoiceForm()
+    
     return render_to_response('explorer/editor.html',
-        mimetype="text/html",
+        # mimetype="text/html",
         dictionary = {
             'fileid': path,
-            'euser': user
+            '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):
@@ -126,5 +129,5 @@ def pull_requests(request):
 # Testing
 #
 def renderer_test(request):
-    return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
-        extra_context = {} )
\ No newline at end of file
+    return direct_to_template(request, 'renderer.html', mimetype="text/html",
+        extra_context = {} )