projects / Portfolio.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bugfix : l'ajout de photos dans la sélection n'était plus possible pour les seuls...
[Portfolio.git] / skins / photo_layout_macros.pt
diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 82511dd..0eb67c4 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -5,12 +5,12 @@
   </head>
   <body>
     <div metal:define-macro="grid"
   </head>
   <body>
     <div metal:define-macro="grid"
-         tal:define="slide_size portal_object/slide_size;"
+         tal:define="slide_size portal_object/slide_size;
+                     mayBeDropable exists:dropable;
+                     dropable python:True if mayBeDropable and dropable else False"
          i18n:domain="portfolio">
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
       <div id="lightbox"
          i18n:domain="portfolio">
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
       <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;
            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;
@@ -18,7 +18,8 @@
                             margin_left python:(slide_size - size['width']) / 2;
                             selected info/selected|nothing"
                 tal:attributes="class info/className;
                             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,15 +86,23 @@
       </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:condition="not:dropable">
+        new Lightbox(document.getElementById('lightbox'));
+      </script>
+      <script type="text/javascript"
+              tal:condition="dropable"
+              tal:content="structure python:'''
       (function(){
         var lb = document.getElementById('lightbox');
       (function(){
         var lb = document.getElementById('lightbox');
-        var uploadUrl = absolute_url() + '/put_upload';
         new Lightbox(lb);
         new Lightbox(lb);
-        new DDFileUploader(lb, uploadUrl);
+        var uploadUrl = '%(putUrl)s';
+        var options = {'slideSize' : %(slideSize)d,
+                       'thumbnailSize' : %(thumbnailSize)d};
+        new DDImageUploader(lb, uploadUrl, options);
       })();
       })();
-      // -->
+      ''' % {'putUrl' : '%s/put_upload' % here.absolute_url(),
+             'slideSize' : portal_object.slide_size,
+             'thumbnailSize' : portal_object.thumb_size}">
       </script>
     </div>
 
       </script>
     </div>
 
@@ -101,7 +110,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;
@@ -144,7 +153,7 @@
           })();
           ''' % {'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']
                 }">
Photo / portfolio product for Plinn