Wiking branch, master, updated. c0ff5dd4a2b1f53ab5e4dfab8aadb80b0a2fbb34

Hynek Hanke hanke at devel.brailcom.org
Fri Nov 11 17:47:51 CET 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Wiking".

The branch, master has been updated
       via  c0ff5dd4a2b1f53ab5e4dfab8aadb80b0a2fbb34 (commit)
       via  30988bd1a94b497c283bc39efc6bdd54c54002fa (commit)
      from  ac604f1d44bb7a487b9e8300c16684832867cd55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0ff5dd4a2b1f53ab5e4dfab8aadb80b0a2fbb34
Author: Hynek Hanke <hanke at brailcom.org>
Date:   Fri Nov 11 16:33:59 2011 +0100

    Fix delete action on Attachments

commit 30988bd1a94b497c283bc39efc6bdd54c54002fa
Author: Hynek Hanke <hanke at brailcom.org>
Date:   Fri Nov 11 16:53:30 2011 +0100

    Own prev/next/close buttons for LightBox

-----------------------------------------------------------------------

Summary of changes:
 lib/wiking/cms/cms.py               |    7 +++----
 resources/css/lightbox.css          |    8 ++++----
 resources/images/lightbox/close.png |  Bin 372 -> 624 bytes
 resources/images/lightbox/next.png  |  Bin 615 -> 649 bytes
 resources/images/lightbox/prev.png  |  Bin 635 -> 640 bytes
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/wiking/cms/cms.py b/lib/wiking/cms/cms.py
index 297120a..6c56fa5 100644
--- a/lib/wiking/cms/cms.py
+++ b/lib/wiking/cms/cms.py
@@ -1834,10 +1834,9 @@ class Attachments(ContentManagementModule):
     
     def _delete(self, req, record, transaction):
         super(Attachments, self)._delete(req, record, transaction)
-        for id, filename_id in self._STORED_FIELDS:
-            fname = record[filename_id].value()
-            if os.path.exists(fname):
-                os.unlink(fname)
+        fname = record['_filename'].value()
+        if os.path.exists(fname):
+            os.unlink(fname)
 
     def _redirect_after_update_uri(self, req, record, **kwargs):
         return super(Attachments, self)._redirect_after_update_uri(req, record,
diff --git a/resources/css/lightbox.css b/resources/css/lightbox.css
index 2ed39f5..461717f 100644
--- a/resources/css/lightbox.css
+++ b/resources/css/lightbox.css
@@ -13,15 +13,15 @@
 #prevLink, #nextLink{ width: 49%; height: 100%; background-image: url(data:image/gif;base64,AAAA); /* Trick IE into showing hover */ display: block; }
 #prevLink { left: 0; float: left;}
 #nextLink { right: 0; float: right;}
-#prevLink:hover, #prevLink:visited:hover { background: url(/_resources/images/lightbox/prev2.png) left 15% no-repeat; }
-#nextLink:hover, #nextLink:visited:hover { background: url(/_resources/images/lightbox/next2.png) right 15% no-repeat; }
+#prevLink:hover, #prevLink:visited:hover { background: url(/_resources/images/lightbox/prev.png) left 15% no-repeat; }
+#nextLink:hover, #nextLink:visited:hover { background: url(/_resources/images/lightbox/next.png) right 15% no-repeat; }
 
 #imageDataContainer{ font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; margin: 0 auto; line-height: 1.4em; overflow: auto; width: 100%	; }
 
 #imageData{	padding:0 10px; color: #666; }
 #imageData #imageDetails{ width: 70%; float: left; text-align: left; }	
 #imageData #caption{ font-weight: bold;	}
-#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}			
-#imageData #bottomNavClose{ width: 26px; float: right;  padding-bottom: 0.7em; outline: none;}	 	
+#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}
+#imageData #bottomNavClose{ width: 48px; float: right;  padding-bottom: 0.7em; outline: non2e;}
 
 #overlay{ position: absolute; top: 0; left: 0; z-index: 90; width: 100%; height: 500px; background-color: #000; }
diff --git a/resources/images/lightbox/close.png b/resources/images/lightbox/close.png
index afb9afb..ecf4868 100644
Binary files a/resources/images/lightbox/close.png and b/resources/images/lightbox/close.png differ
diff --git a/resources/images/lightbox/next.png b/resources/images/lightbox/next.png
index e9d2151..21641fa 100644
Binary files a/resources/images/lightbox/next.png and b/resources/images/lightbox/next.png differ
diff --git a/resources/images/lightbox/prev.png b/resources/images/lightbox/prev.png
index 00fe4ff..6e1aff5 100644
Binary files a/resources/images/lightbox/prev.png and b/resources/images/lightbox/prev.png differ


hooks/post-receive
-- 
Wiking



More information about the Wiking-cvs mailing list