Mise à jour des contextes de sélection et de table lumineuse pour le chargement après...

diff --git a/skins/getPhotoContextInfos.py b/skins/getPhotoContextInfos.py
index b070a83..b241808 100755 (executable)
--- a/skins/getPhotoContextInfos.py
+++ b/skins/getPhotoContextInfos.py
@@ -36,7 +36,7 @@ for i, p in enumerate(portfolio.listNearestFolderContents(contentFilter={'portal
        d = {'src': '%s/getThumbnail' % purl
                ,'href': purl
                ,'thumbSize':size
        d = {'src': '%s/getThumbnail' % purl
                ,'href': purl
                ,'thumbSize':size

-               ,'title' : p.Title()
+               ,'title' : p.Description()

                ,'displayed' : p == context
                ,'className': (selected and 'selected' or '') + ((p == context) and ' displayed' or '')
                , 'index': i
                ,'displayed' : p == context
                ,'className': (selected and 'selected' or '') + ((p == context) and ' displayed' or '')
                , 'index': i

diff --git a/skins/lightboxcontext.py b/skins/lightboxcontext.py
index 9458974..fcc86f6 100644 (file)
--- a/skins/lightboxcontext.py
+++ b/skins/lightboxcontext.py
@@ -71,8 +71,9 @@ for i, uid in enumerate(lightboxUids) :
     d = {'src': '%s/getThumbnail' % b.getURL()
         ,'href': href
         ,'thumbSize': size
     d = {'src': '%s/getThumbnail' % b.getURL()
         ,'href': href
         ,'thumbSize': size

-        ,'title' : b.Title
+        ,'title' : b.Description

         ,'className': className
         ,'className': className

+        ,'displayed' : uid == photouid

         , 'index': i
         }
     infos.append(d)
         , 'index': i
         }
     infos.append(d)

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index 3140763..884dac0 100644 (file)
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -5,7 +5,6 @@ Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/
 */
 
 var FilmSlider;
 */
 
 var FilmSlider;

-var s;

 
 (function(){
 
 
 (function(){
 


@@ -17,7 +16,6 @@ var DEFAULT_IMAGE_SIZES = [500, 600, 800];
 
 FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
        var thisSlider = this;
 
 FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
        var thisSlider = this;

-       s = this;

        this.filmBar = filmBar;
        this.filmBarWidth = getObjectWidth(this.filmBar);
        var film = filmBar.firstChild;
        this.filmBar = filmBar;
        this.filmBarWidth = getObjectWidth(this.filmBar);
        var film = filmBar.firstChild;


@@ -357,6 +355,18 @@ FilmSlider.prototype.mouseOutHandler = function(evt) {
        }
 };
 
        }
 };
 

+FilmSlider.prototype.translateImgUrl = function(url) {
+       var canonicalImgUrl;
+       if (this.ctxUrlTranslation[0]) {
+               canonicalImgUrl = url.replace(this.ctxUrlTranslation[0],
+                                                                         this.ctxUrlTranslation[1]);
+       }
+       else {
+               canonicalImgUrl = url;
+       }
+       return canonicalImgUrl;
+};
+

 FilmSlider.prototype.thumbnailClickHandler = function(evt) {
        var target = getTargetedObject(evt);
        while (target.tagName !== 'A' && target !== this.filmBar) { target = target.parentNode; }
 FilmSlider.prototype.thumbnailClickHandler = function(evt) {
        var target = getTargetedObject(evt);
        while (target.tagName !== 'A' && target !== this.filmBar) { target = target.parentNode; }


@@ -373,12 +383,7 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
                history.pushState(target.href, '', target.href);
                
                var imgBaseUrl = target.href;
                history.pushState(target.href, '', target.href);
                
                var imgBaseUrl = target.href;

-               var canonicalImgUrl;
-               if (this.ctxUrlTranslation[0]) {
-                       canonicalImgUrl = imgBaseUrl.replace(this.ctxUrlTranslation[0],
-                                                                                                this.ctxUrlTranslation[1]);
-               }
-               else { canonicalImgUrl = imgBaseUrl; }
+               var canonicalImgUrl = this.translateImgUrl(imgBaseUrl);

                
                var ajaxUrl = imgBaseUrl + '/photo_view_ajax';
                var thisFS = this;
                
                var ajaxUrl = imgBaseUrl + '/photo_view_ajax';
                var thisFS = this;


@@ -732,6 +737,7 @@ FilmSlider.prototype.updateBreadcrumbs = function(url, title) {
 
 FilmSlider.prototype.startThumbnailsLoadQueue = function(evt) {
        var thumbnails = this.film.getElementsByTagName('img');
 
 FilmSlider.prototype.startThumbnailsLoadQueue = function(evt) {
        var thumbnails = this.film.getElementsByTagName('img');

+       if (thumbnails.length === 1) { return; }

        this.thumbnailsLoadingOrder = [];
        var leftSize = this.center;
        var rightSize = thumbnails.length - this.center - 1;
        this.thumbnailsLoadingOrder = [];
        var leftSize = this.center;
        var rightSize = thumbnails.length - this.center - 1;


@@ -754,7 +760,7 @@ FilmSlider.prototype.startThumbnailsLoadQueue = function(evt) {
        var next = this.thumbnailsLoadingOrder.shift();
        var self = this;
        addListener(next, 'load', function(evt){self._loadNextThumb(evt);});
        var next = this.thumbnailsLoadingOrder.shift();
        var self = this;
        addListener(next, 'load', function(evt){self._loadNextThumb(evt);});

-       next.src = next.parentNode.href + '/getThumbnail';
+       next.src = this.translateImgUrl(next.parentNode.href) + '/getThumbnail';

 };
 
 FilmSlider.prototype._loadNextThumb = function(evt) {
 };
 
 FilmSlider.prototype._loadNextThumb = function(evt) {


@@ -762,7 +768,7 @@ FilmSlider.prototype._loadNextThumb = function(evt) {
        if (!next) {return;}
        var self = this;
        addListener(next, 'load', function(evt){self._loadNextThumb(evt);});
        if (!next) {return;}
        var self = this;
        addListener(next, 'load', function(evt){self._loadNextThumb(evt);});

-       next.src = next.parentNode.href + '/getThumbnail';
+       next.src = this.translateImgUrl(next.parentNode.href) + '/getThumbnail';

 };
 
 
 };
 
 

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 21616da..82d3d11 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -137,8 +137,9 @@
                           blank_img string:$portal_url/transparent.gif">
             <td tal:repeat="info contextInfos/infos">
               <a tal:attributes="href info/href;
                           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;
                                  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;
                 <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;

diff --git a/skins/selectioncontext.py b/skins/selectioncontext.py
index df3e63b..fa7c090 100644 (file)
--- a/skins/selectioncontext.py
+++ b/skins/selectioncontext.py
@@ -82,8 +82,9 @@ for i, uid in enumerate(selection) :
     d = {'src': '%s/getThumbnail' % b.getURL()
         ,'href': toUrl(path)
         ,'thumbSize': size
     d = {'src': '%s/getThumbnail' % b.getURL()
         ,'href': toUrl(path)
         ,'thumbSize': size

-        ,'title' : b.Title
-        ,'className': className
+        ,'title' : b.Description
+        ,'className' : className
+        ,'displayed' : uid == photouid

         , 'index': i
         }
     infos.append(d)
         , 'index': i
         }
     infos.append(d)