X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/0cfb875cbacb607734f1a3c25fffcbe028c33fed..8a525218303715fcf1b977a459947b5b899d9640:/skins/photo_layout_macros.pt?ds=inline

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index ec56985..b9f63c5 100644
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -8,14 +8,18 @@
          tal:define="slide_size portal_object/slide_size;"
          i18n:domain="portfolio">
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
-      <div id="lightbox" class="lightbox photo-drop-target">
+      <div id="lightbox"
+           tal:define="mayBeDropable exists:dropable;
+                       dropable python:True if mayBeDropable and dropable else False"
+           tal:attributes="class python:'lightbox photo-drop-target' if dropable else 'lightbox'">
         <span tal:repeat="info infos" tal:omit-tag="">
           <span tal:define="size info/thumbSize;
                             margin_top python:(slide_size - size['height']) / 2;
                             margin_left python:(slide_size - size['width']) / 2;
                             selected info/selected|nothing"
                 tal:attributes="class info/className;
-                                name info/cmf_uid">
+                                name info/cmf_uid"
+                metal:define-macro="thumbnail">
             <a class="slide" tal:attributes="href info/href; title info/title">
               <img border="0" tal:attributes="src info/thumbUrl;
                                  alt info/title;
@@ -82,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() + '/jsupload';
+        var uploadUrl = absolute_url() + '/put_upload';
         new Lightbox(lb);
-        new DDFileUploader(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>
 
@@ -98,7 +104,7 @@
     <div metal:define-macro="film_bar" tal:omit-tag="">
       <div id="film_bar">
         <table cellspacing="0">
-          <tr tal:define="slide_size python:portal_object.thumb_height/2 + 10">
+          <tr tal:define="slide_size python:portal_object.thumb_size/2 + 10">
             <td tal:repeat="info contextInfos/infos">
                 <a href="." tal:attributes="href info/href;
                                             class info/className;
@@ -141,7 +147,7 @@
           })();
           ''' % {'filmLength': len(contextInfos['infos'])
                 ,'center': index
-                ,'slideSize': portal_object.thumb_width/2 + 11
+                ,'slideSize': portal_object.thumb_size/2 + 11
                 ,'reBaseCtxUrl':contextInfos['reBaseCtxUrl']
                 ,'canonicalUrl':contextInfos['canonicalUrl']
                 }">