Moved wiki templates to subdir. Altered button template to show tooltips

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index ec43dee..685e87e 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -8,31 +8,30 @@ from django.utils import simplejson as json
 from wiki.models import storage, Document, DocumentNotFound
 from wiki.forms import DocumentForm
 
 from wiki.models import storage, Document, DocumentNotFound
 from wiki.forms import DocumentForm
 

-
-def document_list(request, template_name='wiki/document_list.html'):
-    return direct_to_template(request, template_name, extra_context={
+def document_list(request, template_name = 'wiki/document_list.html'):
+    return direct_to_template(request, template_name, extra_context = {

         'document_list': storage.all(),
     })
 
 
         'document_list': storage.all(),
     })
 
 

-def document_detail(request, name, template_name='wiki/document_details.html'):
+def document_detail(request, name, template_name = 'wiki/document_details.html'):

     try:
         document = storage.get(name)
     except DocumentNotFound:
     try:
         document = storage.get(name)
     except DocumentNotFound:

-        document = Document(storage, name=name, text='')
-    
+        document = Document(storage, name = name, text = '')
+

 
     if request.method == 'POST':
 
     if request.method == 'POST':

-        form = DocumentForm(request.POST, instance=document)
+        form = DocumentForm(request.POST, instance = document)

         if form.is_valid():
             document = form.save()
             return HttpResponse(json.dumps({'text': document.plain_text(), 'meta': document.meta(), 'revision': document.revision()}))
         else:
             return HttpResponse(json.dumps({'errors': form.errors}))
     else:
         if form.is_valid():
             document = form.save()
             return HttpResponse(json.dumps({'text': document.plain_text(), 'meta': document.meta(), 'revision': document.revision()}))
         else:
             return HttpResponse(json.dumps({'errors': form.errors}))
     else:

-        form = DocumentForm(instance=document)
-    
-    return direct_to_template(request, template_name, extra_context={
+        form = DocumentForm(instance = document)
+
+    return direct_to_template(request, template_name, extra_context = {

         'document': document,
         'form': form,
     })
         'document': document,
         'form': form,
     })


@@ -41,8 +40,11 @@ def document_detail(request, name, template_name='wiki/document_details.html'):
 def document_gallery(request, directory):
     try:
         base_dir = os.path.join(settings.MEDIA_ROOT, settings.FILEBROWSER_DIRECTORY, directory)
 def document_gallery(request, directory):
     try:
         base_dir = os.path.join(settings.MEDIA_ROOT, settings.FILEBROWSER_DIRECTORY, directory)

-        print base_dir
-        images = ['%s%s%s/%s' % (settings.MEDIA_URL, settings.FILEBROWSER_DIRECTORY, directory, f) for f in os.listdir(base_dir) if os.path.splitext(f)[1].lower() in ('.jpg', '.jpeg', '.png')]
+        images = [u'%s%s%s/%s' % (settings.MEDIA_URL, settings.FILEBROWSER_DIRECTORY, directory, f) for f in os.listdir(base_dir) if os.path.splitext(f)[1].lower() in (u'.jpg', u'.jpeg', u'.png')]
+        images.sort()

         return HttpResponse(json.dumps(images))
         return HttpResponse(json.dumps(images))

-    except (IndexError, OSError), e:
+    except (IndexError, OSError), exc:
+        import traceback
+        traceback.print_exc()
+

         raise Http404
         raise Http404