X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/cd282ee58b2893790d06ce40a8b02c65481abbeb..6f4e2f7cda25365c0ca9d1597270200d049daa61:/skins/photo_layout_macros.pt

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 21616da..68d9f1d 100644
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -25,7 +25,7 @@
                                    alt info/title;
                                    height size/height;
                                    width size/width;
-                                   style string:margin-top : ${margin_top}px ;;margin-left:${margin_left}px;"/>
+                                   style string:margin-top:${margin_top}px;; margin-left:${margin_left}px;"/>
             </a>
             <tal:block tal:condition="python:features.has_key('select')">
               <span class="button slide-select" tal:condition="not:selected">
@@ -108,8 +108,10 @@
               tal:content="structure python:'''
               new Lightbox(document.getElementById('lightbox'),
                            document.getElementById('lightbox_toolbar'),
-                           %s);
-                           ''' % ('true' if not batch.next else 'false')">
+                           %(complete)s,
+                           '%(container_type)s');
+                           ''' % {'complete' : 'true' if not batch.next else 'false',
+                                  'container_type' : options.get('container_type', 'portfolio')}">
       </script>
       <script type="text/javascript"
               tal:condition="dropable"
@@ -118,7 +120,8 @@
                 var lb = document.getElementById('lightbox');
                 new Lightbox(lb,
                              document.getElementById('lightbox_toolbar'),
-                             %(complete)s);
+                             %(complete)s,
+                             '%(container_type)s');
                 var uploadUrl = '%(putUrl)s';
                 var options = {'slideSize' : %(slideSize)d,
                                'thumbnailSize' : %(thumbnailSize)d};
@@ -127,7 +130,8 @@
               ''' % {'putUrl' : '%s/put_upload' % here.absolute_url(),
                      'slideSize' : portal_object.slide_size,
                      'thumbnailSize' : portal_object.thumb_size,
-                     'complete': 'true' if not batch.next else 'false'}">
+                     'complete': 'true' if not batch.next else 'false',
+                     'container_type' : options.get('container_type', 'portfolio')}">
       </script>
     </div>
     <div metal:define-macro="film_bar" tal:omit-tag="">
@@ -137,8 +141,9 @@
                           blank_img string:$portal_url/transparent.gif">
             <td tal:repeat="info contextInfos/infos">
               <a tal:attributes="href info/href;
+                                 title info/title;
                                  class info/className;
-                                 portfolio:position info/index">
+                                 portfolio:position info/index;">
                 <img tal:define="size info/thumbSize;
                                  margin_top python:(slide_size - size['height']) / 2"
                      tal:attributes="src python:info['src'] if info['displayed'] else blank_img;