Przeniesienie stylów i javascriptu do osobnych plików.

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
old mode 100644 (file)
new mode 100755 (executable)
index eff1b04..150b03d
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -11,9 +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.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 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, 
 
 def ajax_login_required(view):
     """Similar ro @login_required, but instead of redirect, 


@@ -28,32 +32,35 @@ def ajax_login_required(view):
 @login_required
 def display_editor(request, path):
     user = request.GET.get('user', request.user.username)
 @login_required
 def display_editor(request, path):
     user = request.GET.get('user', request.user.username)

-    log.info(user)
+    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,
             '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):   
 #
 # 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
 
     # short-circut the api document list

-    doctree = library_resource.handler.read(request)
+    # doctree = library_resource.handler.read(request)

     # print "DOCTREE:", doctree['documents']
         
     # 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')
 
 @permission_required('api.document.can_add')

-def file_upload(request, repo):
+def file_upload(request):

     from api.resources import library_resource
     from api.forms import DocumentUploadForm
     from django.http import HttpRequest, HttpResponseRedirect
     from api.resources import library_resource
     from api.forms import DocumentUploadForm
     from django.http import HttpRequest, HttpResponseRedirect


@@ -109,11 +116,18 @@ def _get_issues_for_file(fileid):
 # = Pull requests =
 # =================
 def pull_requests(request):    
 # = Pull requests =
 # =================
 def pull_requests(request):    

-    objects = PullRequest.objects.order_by('status')
+    objects = PullRequest.objects.order_by('-status', 'timestamp')

 
     if not request.user.has_perm('explorer.book.can_share'):
         objects = objects.filter(comitter=request.user)
 
 
     if not request.user.has_perm('explorer.book.can_share'):
         objects = objects.filter(comitter=request.user)
 

-    

     return direct_to_template(request, 'manager/pull_request.html', 
         extra_context = {'objects': objects} )
     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 = {} )