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 48b80401eda86a5fa3e4b1c8270b4d087ba009db..b9f63c500144c260b87fcc50d6b6db5f72908883 100644 (file)
--- 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>
       </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);
       (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>
 
       </script>
     </div>
 

diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index f88048ec17222dffa9ebefd7a12684df06baddf7..1005ea0e9ef747e65960439467fc8bae5ce87225 100755 (executable)
--- 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;
   border-radius:3px;
   width:0;
   margin-left:11px;

-  top:208px;
+  top:<dtml-var expr="slide_size - 8">px;

 }
 
 .lightbox span.label {
 }
 
 .lightbox span.label {

diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index 7dface38c33328e07d032fb4fe635580c061823d..e675651689884df631c271da8f5e37835610ac67 100644 (file)
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -7,13 +7,13 @@ var DDImageUploader;
 var MAX_PREVIEW = 2;
 var isThumbnail = /.*\/getThumbnail$/;
 
 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();
        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;
        this.previewQueue = [];
        this._previewQueueRunning = false;
        this.previewsLoaded = 0;