fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into lqc-trunk
[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
5ec452a
..
a67d27c
--- a/
apps/explorer/views.py
+++ b/
apps/explorer/views.py
@@
-11,6
+11,8
@@
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 explorer import forms
from django.contrib.auth.decorators import login_required
from explorer import forms
@@
-32,12
+34,14
@@
def display_editor(request, path):
user = request.GET.get('user', request.user.username)
gallery_form = forms.GalleryChoiceForm()
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,
'fileid': path,
'euser': user,
- 'gallery_f
or
m': gallery_form,
-
}
)
-
+ 'gallery_f
ro
m': gallery_form,
+
}, context_instance=RequestContext(request)
)
+
#
# View all files
#
#
# View all files
#
@@
-119,3
+123,11
@@
def pull_requests(request):
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="application/xhtml+xml",
+ extra_context = {} )