From: Benoît Pin <pin@cri.ensmp.fr>
Date: Mon, 31 Mar 2014 12:57:19 +0000 (+0200)
Subject: Prise en charge des paramètres thumb_size et slide_size par l'uploader.
X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/a87e98b12f6de3d0f3fbf0743b5c25549966a1ad?ds=sidebyside

Prise en charge des paramètres thumb_size et slide_size par l'uploader.
---

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 48b8040..b9f63c5 100644
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -86,15 +86,17 @@
       </div>
       <br clear="all"/>
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
-      <script type="text/javascript">
-      // <!--
+      <script type="text/javascript" tal:content="python:'''
       (function(){
         var lb = document.getElementById('lightbox');
         var uploadUrl = absolute_url() + '/put_upload';
         new Lightbox(lb);
-        new DDImageUploader(lb, uploadUrl);
+        var options = {'slideSize' : %(slideSize)d,
+                       'thumbnailSize' : %(thumbnailSize)d};
+        new DDImageUploader(lb, uploadUrl, options);
       })();
-      // -->
+      ''' % {'slideSize' : portal_object.slide_size,
+             'thumbnailSize' : portal_object.thumb_size}">
       </script>
     </div>
 
diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index f88048e..1005ea0 100755
--- a/skins/portfolio_style.css.dtml
+++ b/skins/portfolio_style.css.dtml
@@ -307,7 +307,7 @@ div.lightbox {
   border-radius:3px;
   width:0;
   margin-left:11px;
-  top:208px;
+  top:<dtml-var expr="slide_size - 8">px;
 }
 
 .lightbox span.label {
diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index 7dface3..e675651 100644
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -7,13 +7,13 @@ var DDImageUploader;
 var MAX_PREVIEW = 2;
 var isThumbnail = /.*\/getThumbnail$/;
 
-DDImageUploader = function(dropbox, uploadUrl) {
+DDImageUploader = function(dropbox, uploadUrl, options) {
 	DDFileUploaderBase.apply(this, [dropbox, uploadUrl]);
 
 	this.existingSlides = this.indexExistingSlides();
-	this.slideSize = 222;
-	this.progressBarMaxSize = 200; // pixels
-	this.thumbnailSize = 180;
+	this.slideSize = options.slideSize || 222;
+	this.progressBarMaxSize = this.slideSize - 22 || 200; // pixels
+	this.thumbnailSize = options.thumbnailSize || 180;
 	this.previewQueue = [];
 	this._previewQueueRunning = false;
 	this.previewsLoaded = 0;