Minor fix for python2.5.

Added css for "poezja_cyt".

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 2c45e17..b78959f 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -96,7 +96,7 @@ def editor_readonly(request, name, template_name='wiki/document_details_readonly
     try:
         revision = request.GET['revision']
         document = storage.get(name, revision)
     try:
         revision = request.GET['revision']
         document = storage.get(name, revision)

-    except (KeyError, DocumentNotFound) as e:
+    except (KeyError, DocumentNotFound):

         raise http.Http404
 
     access_time = datetime.now()
         raise http.Http404
 
     access_time = datetime.now()


@@ -148,23 +148,16 @@ def text(request, name):
 
     if request.method == 'POST':
         form = DocumentTextSaveForm(request.POST, prefix="textsave")
 
     if request.method == 'POST':
         form = DocumentTextSaveForm(request.POST, prefix="textsave")

-

         if form.is_valid():
             revision = form.cleaned_data['parent_revision']
         if form.is_valid():
             revision = form.cleaned_data['parent_revision']

-
-            document = storage.get_or_404(name, revision)
+            document = storage.get_or_404(name, revision)          

             document.text = form.cleaned_data['text']
             document.text = form.cleaned_data['text']

-

             comment = form.cleaned_data['comment']
             comment = form.cleaned_data['comment']

-
-            if form.cleaned_data['stage_completed']:
-                comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed']
-
-            author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email'])
-
-            storage.put(document, author=author, comment=comment, parent=revision)
-            document = storage.get(name)
-
+            if form.cleaned_data['stage_completed']:        
+                comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed']         
+            author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email'])           
+            storage.put(document, author=author, comment=comment, parent=revision)           
+            document = storage.get(name)          

             return JSONResponse({
                 'text': document.plain_text if revision != document.revision else None,
                 'meta': document.meta(),
             return JSONResponse({
                 'text': document.plain_text if revision != document.revision else None,
                 'meta': document.meta(),


@@ -234,7 +227,7 @@ def gallery(request, directory):
         images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)]
         images.sort()
         return JSONResponse(images)
         images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)]
         images.sort()
         return JSONResponse(images)

-    except (IndexError, OSError) as e:
+    except (IndexError, OSError):

         logger.exception("Unable to fetch gallery")
         raise http.Http404
 
         logger.exception("Unable to fetch gallery")
         raise http.Http404
 

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index 8d22e10..843bb6b 100644 (file)
--- a/lib/vstorage/__init__.py
+++ b/lib/vstorage/__init__.py
@@ -354,11 +354,11 @@ class VersionedStorage(object):
 
         try:
             return tree_search(tip, self._title_to_file(title))
 
         try:
             return tree_search(tip, self._title_to_file(title))

-        except (IndexError, LookupError) as e:
+        except (IndexError, LookupError):

             logging.info("XML file not found, trying plain")
             try:
                 return tree_search(tip, self._title_to_file(title, type=''))
             logging.info("XML file not found, trying plain")
             try:
                 return tree_search(tip, self._title_to_file(title, type=''))

-            except (IndexError, LookupError) as e:
+            except (IndexError, LookupError):

                 raise DocumentNotFound(title)
 
     def page_history(self, title):
                 raise DocumentNotFound(title)
 
     def page_history(self, title):

diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index 8e1d053..9e0b561 100644 (file)
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -236,7 +236,6 @@ img.tabclose {
        vertical-align: text-bottom;
 }
 
        vertical-align: text-bottom;
 }
 

-

 /*
  * HTML Editor view
  */
 /*
  * HTML Editor view
  */


@@ -260,3 +259,8 @@ img.tabclose {
        background-color: black;
        opacity: 0.4;
 }
        background-color: black;
        opacity: 0.4;
 }

+
+.poezja_cyt {
+    margin:1.5em 2em 0;
+    font-size:0.875em
+}