From: Benoît Pin <pin@cri.ensmp.fr>
Date: Mon, 1 Jul 2013 12:24:32 +0000 (+0200)
Subject: Merge branch 'zope-2.13' of ssh://ssh.cri.ensmp.fr/~pin/gitrepositories/Portfolio... 
X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/da5eed398d4e0b1945dc81d5a2d741db12ab84d9?hp=d47c65f7a3142f2030d6567b2171660b8d4981d2

Merge branch 'zope-2.13' of ssh://ssh.cri.ensmp.fr/~pin/gitrepositories/Portfolio into zope-2.13
---

diff --git a/skins/fileupload.js b/skins/fileupload.js
index a67b3cf..980fb44 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -64,9 +64,8 @@ DDFileUploader.prototype.upload = function(slide) {
 	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
 	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
 
-	req.open("PUT", this.uploadUrl); // + '/' + file.name);
+	req.open("PUT", this.uploadUrl + '/' + file.name);
 	req.setRequestHeader("Content-Type", file.type);
-	req.setRequestHeader("X-File-Name", file.name);
 	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
 	reader.readAsBinaryString(file);
 };
diff --git a/skins/jsupload.py b/skins/jsupload.py
deleted file mode 100644
index c4af561..0000000
--- a/skins/jsupload.py
+++ /dev/null
@@ -1,12 +0,0 @@
-##parameters=REQUEST, RESPONSE
-
-from Products.Plinn.utils import makeValidId
-
-factory = context.PUT_factory
-typ = REQUEST.get_header('content-type', None)
-body = REQUEST.get('BODY', '')
-
-id = makeValidId(context, name)
-ob = factory(id, typ, body)
-
-return RESPONSE
diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index ec56985..6e1d7aa 100644
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -86,7 +86,7 @@
       // <!--
       (function(){
         var lb = document.getElementById('lightbox');
-        var uploadUrl = absolute_url() + '/jsupload';
+        var uploadUrl = absolute_url();
         new Lightbox(lb);
         new DDFileUploader(lb, uploadUrl);
       })();