Maintient toujours visible de la barre d'outils.

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index f6003ba..1ab636a 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -104,14 +104,16 @@
       <br clear="all"/>
       <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
       <script type="text/javascript" tal:condition="not:dropable">
       <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'));
+        new Lightbox(document.getElementById('lightbox'),
+                     document.getElementById('lightbox_toolbar'));

       </script>
       <script type="text/javascript"
               tal:condition="dropable"
               tal:content="structure python:'''
               (function(){
                 var lb = document.getElementById('lightbox');
       </script>
       <script type="text/javascript"
               tal:condition="dropable"
               tal:content="structure python:'''
               (function(){
                 var lb = document.getElementById('lightbox');

-                new Lightbox(lb);
+                new Lightbox(lb,
+                             document.getElementById('lightbox_toolbar'));

                 var uploadUrl = '%(putUrl)s';
                 var options = {'slideSize' : %(slideSize)d,
                                'thumbnailSize' : %(thumbnailSize)d};
                 var uploadUrl = '%(putUrl)s';
                 var options = {'slideSize' : %(slideSize)d,
                                'thumbnailSize' : %(thumbnailSize)d};

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index dbea64c..d8e3f7a 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,8 +11,14 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
 
 var reSelected = /.*selected.*/;
 

-Lightbox = function(grid) {
+Lightbox = function(grid, toolbar) {
+       var self = this;

        this.grid = grid;
        this.grid = grid;

+       this.toolbar = toolbar;
+       if (toolbar) {
+               this.toolbarFixed = false;
+               addListener(window, 'scroll', function(evt){self.windowScrollHandler(evt);});
+       }

        this.lastCBChecked = undefined;
        this.form = undefined;
        var parent = this.grid.parentNode;
        this.lastCBChecked = undefined;
        this.form = undefined;
        var parent = this.grid.parentNode;


@@ -26,12 +32,24 @@ Lightbox = function(grid) {
                        break;
                }
        }
                        break;
                }
        }

-       thisLightbox = this;
-       addListener(this.grid, 'click', function(evt){thisLightbox.mouseClickHandler(evt);});
+       addListener(this.grid, 'click', function(evt){self.mouseClickHandler(evt);});

        if (this.form) {
                var fm = new FormManager(this.form);
        if (this.form) {
                var fm = new FormManager(this.form);

-               fm.onBeforeSubmit = function(fm_, evt) {return thisLightbox.onBeforeSubmit(fm_, evt);};
-               fm.onResponseLoad = function(req) {return thisLightbox.onResponseLoad(req);};
+               fm.onBeforeSubmit = function(fm_, evt) {return self.onBeforeSubmit(fm_, evt);};
+               fm.onResponseLoad = function(req) {return self.onResponseLoad(req);};
+       }
+};
+
+Lightbox.prototype.windowScrollHandler = function(evt) {
+       if (this.toolbar.offsetTop < window.scrollY && !this.toolbarFixed) {
+               console.log('this.toolbar.offsetTop', this.toolbar.offsetTop);
+               this.toolbarFixed = true;
+               this.backThreshold = this.toolbar.offsetTop;
+               this.switchToolBarPositioning(true);
+       }
+       else if (this.toolbarFixed && window.scrollY < this.backThreshold) {
+               this.toolbarFixed = false;
+               this.switchToolBarPositioning(false);

        }
 };
 
        }
 };
 


@@ -144,6 +162,27 @@ Lightbox.prototype.onResponseLoad = function(req) {
        }
 };
 
        }
 };
 

+Lightbox.prototype.switchToolBarPositioning = function(fixed) {
+       var tbs = this.toolbar.style;
+       if (fixed) {
+               this.toolbar.defaultCssText = this.toolbar.style.cssText;
+               tbs.width = String(this.toolbar.offsetWidth) + 'px';
+               tbs.height = String(this.toolbar.offsetHeight) + 'px';
+               tbs.position = 'fixed';
+               tbs.top = '0';
+               this.toolbarPlaceholder = document.createElement('div');
+               var phs = this.toolbarPlaceholder.style;
+               phs.cssText = tbs.cssText;
+               phs.position = 'relative';
+               this.toolbar.parentNode.insertBefore(this.toolbarPlaceholder, this.toolbar);
+       }
+       else {
+               this.toolbarPlaceholder.parentNode.removeChild(this.toolbarPlaceholder);
+               tbs.cssText = this.toolbar.defaultCssText;
+       }
+};
+
+

 Lightbox.prototype.hideSelection = function() {
        var i, e, slide;
        for (i=0 ; i<this.form.elements.length ; i++) {
 Lightbox.prototype.hideSelection = function() {
        var i, e, slide;
        for (i=0 ; i<this.form.elements.length ; i++) {