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 c895466..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;
@@ -86,18 +86,22 @@
        </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" tal:condition="not:dropable">
+        new Lightbox(document.getElementById('lightbox'));
+      </script>
        <script type="text/javascript"
                tal:condition="dropable"
        <script type="text/javascript"
                tal:condition="dropable"
-              tal:content="python:'''
+              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);
+        var uploadUrl = '%(putUrl)s';
          var options = {'slideSize' : %(slideSize)d,
                         'thumbnailSize' : %(thumbnailSize)d};
          new DDImageUploader(lb, uploadUrl, options);
        })();
          var options = {'slideSize' : %(slideSize)d,
                         'thumbnailSize' : %(thumbnailSize)d};
          new DDImageUploader(lb, uploadUrl, options);
        })();
-      ''' % {'slideSize' : portal_object.slide_size,
+      ''' % {'putUrl' : '%s/put_upload' % here.absolute_url(),
+             'slideSize' : portal_object.slide_size,
               'thumbnailSize' : portal_object.thumb_size}">
        </script>
      </div>
               'thumbnailSize' : portal_object.thumb_size}">
        </script>
      </div>