Prise en compte du paramètre thumb_size au moment de la fabrication.

[Portfolio.git] / skins / photo_layout_macros.pt

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 5460ee2..48b8040 100644 (file)
--- 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>
          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">
+      <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;
         <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;
             <a class="slide" tal:attributes="href info/href; title info/title">
               <img border="0" tal:attributes="src info/thumbUrl;
                                  alt info/title;


@@ -85,7 +89,10 @@
       <script type="text/javascript">
       // <!--
       (function(){
       <script type="text/javascript">
       // <!--
       (function(){

-        new Lightbox(document.getElementById('lightbox'));
+        var lb = document.getElementById('lightbox');
+        var uploadUrl = absolute_url() + '/put_upload';
+        new Lightbox(lb);
+        new DDImageUploader(lb, uploadUrl);

       })();
       // -->
       </script>
       })();
       // -->
       </script>


@@ -95,7 +102,7 @@
     <div metal:define-macro="film_bar" tal:omit-tag="">
       <div id="film_bar">
         <table cellspacing="0">
     <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;
             <td tal:repeat="info contextInfos/infos">
                 <a href="." tal:attributes="href info/href;
                                             class info/className;


@@ -131,12 +138,14 @@
                            document.getElementById('image_toolbar'),
                            document.getElementById('Breadcrumbs'));
             startSlideShow = function() {return fs.startSlideShow();};
                            document.getElementById('image_toolbar'),
                            document.getElementById('Breadcrumbs'));
             startSlideShow = function() {return fs.startSlideShow();};

-            slideShowNext = function() {return fs.slideShowNext();};

             stopSlideShow = function() {return fs.stopSlideShow();};
             stopSlideShow = function() {return fs.stopSlideShow();};

+            slideShowPrevious = function() {return fs.slideShowPrevious();};
+            slideShowNext = function() {return fs.slideShowNext();};
+            slideShowImageLoaded = function() {return fs.slideShowImageLoaded();};

           })();
           ''' % {'filmLength': len(contextInfos['infos'])
                 ,'center': index
           })();
           ''' % {'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']
                 }">
                 ,'reBaseCtxUrl':contextInfos['reBaseCtxUrl']
                 ,'canonicalUrl':contextInfos['canonicalUrl']
                 }">