fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Przywrocenie kodu, ktory zjadla samba :((
[redakcja.git]
/
apps
/
explorer
/
views.py
diff --git
a/apps/explorer/views.py
b/apps/explorer/views.py
index
fd99f27
..
fde7aeb
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 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,
def ajax_login_required(view):
"""Similar ro @login_required, but instead of redirect,
@@
-30,15
+32,17
@@
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 render_to_response('explorer/editor.html',
return render_to_response('explorer/editor.html',
- mimetype="text/html",
+
#
mimetype="text/html",
dictionary = {
'fileid': path,
dictionary = {
'fileid': path,
- 'euser': user
+ '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))
-
+
#
# View all files
#
#
# View all files
#
@@
-126,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",
- extra_context = {} )
\ No newline at end of file
+ return direct_to_template(request, 'renderer.html', mimetype="text/html",
+ extra_context = {} )