Merge branch 'lqc-trunk' of git@stigma:platforma into lqc-trunk

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

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index a67d27c..fde7aeb 100755 (executable)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -17,7 +17,7 @@ from django.contrib.auth.decorators import login_required
 
 from explorer import forms
 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, 


@@ -40,6 +40,7 @@ def display_editor(request, path):
             'fileid': path,
             'euser': user,
             'gallery_from': gallery_form,
             'fileid': path,
             'euser': user,
             'gallery_from': gallery_form,

+            'availble_themes': ({'first_letter': t.name[0].upper(), 'name': t.name} for t in Theme.objects.order_by('name')),

         }, context_instance=RequestContext(request))
 
 #
         }, context_instance=RequestContext(request))
 
 #


@@ -129,5 +130,5 @@ def pull_requests(request):
 # Testing
 #
 def renderer_test(request):
 # Testing
 #
 def renderer_test(request):

-    return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml",
+    return direct_to_template(request, 'renderer.html', mimetype="text/html",

         extra_context = {} )
         extra_context = {} )