X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/3940d117b095679f682c973f0bdc83e877b214e6..7343423f34790513dad5305d4a9cf9aba8d216e8:/skins/photo_layout_macros.pt?ds=sidebyside diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt index 0dccaa0..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,20 +130,23 @@ ''' % {'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=""> <div id="film_bar"> <table cellspacing="0"> - <tr tal:define="slide_size python:portal_object.thumb_size/2 + 10"> + <tr tal:define="slide_size python:portal_object.thumb_size/2 + 10; + 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 info/src; + tal:attributes="src python:info['src'] if info['displayed'] else blank_img; alt info/title; height size/height; width size/width;