Activation de l'ordonnancement par drag and drop que quand c'est possible (permission...

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 7960516a8a3be240046f6b1c19bbfb0219fa4169..f68f193594b286e8f6ec2a173d96e03abe07b278 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -9,7 +9,9 @@
     <div metal:define-macro="grid"
          tal:define="slide_size portal_object/slide_size;
                      mayBeDropable exists:dropable;
     <div metal:define-macro="grid"
          tal:define="slide_size portal_object/slide_size;
                      mayBeDropable exists:dropable;

-                     dropable python:True if mayBeDropable and dropable else False"
+                     dropable python:True if mayBeDropable and dropable else False;
+                     mayBeOrderable exists:orderable;
+                     orderable python:True if mayBeOrderable and orderable else False"

          i18n:domain="portfolio">
       <div id="lightbox" tal:attributes="class python:'lightbox photo-drop-target' if dropable else 'lightbox'">
         <span metal:define-macro="thumbnails" tal:repeat="info infos" tal:omit-tag="">
          i18n:domain="portfolio">
       <div id="lightbox" tal:attributes="class python:'lightbox photo-drop-target' if dropable else 'lightbox'">
         <span metal:define-macro="thumbnails" tal:repeat="info infos" tal:omit-tag="">


@@ -122,7 +124,8 @@
                 new Lightbox(lb,
                              document.getElementById('lightbox_toolbar'),
                              %(complete)s,
                 new Lightbox(lb,
                              document.getElementById('lightbox_toolbar'),
                              %(complete)s,

-                             '%(container_type)s');
+                             '%(container_type)s',
+                             %(orderable)s);

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


@@ -132,7 +135,8 @@
                      'slideSize' : portal_object.slide_size,
                      'thumbnailSize' : portal_object.thumb_size,
                      'complete': 'true' if not batch.next else 'false',
                      'slideSize' : portal_object.slide_size,
                      'thumbnailSize' : portal_object.thumb_size,
                      'complete': 'true' if not batch.next else 'false',

-                     'container_type' : options.get('container_type', 'portfolio')}">
+                     'container_type' : options.get('container_type', 'portfolio'),
+                     'orderable' : 'true' if orderable else 'false'}">

       </script>
     </div>
     <div metal:define-macro="film_bar" tal:omit-tag="">
       </script>
     </div>
     <div metal:define-macro="film_bar" tal:omit-tag="">

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index e0f304d26701a3584509b9e1cbea64f8bd4f6bc9..ba3ecf18ad9d4cd3470fa4bd7094a53babc77cda 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,7 +11,7 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
 
 var reSelected = /.*selected.*/;
 

-Lightbox = function(grid, toolbar, complete, container_type) {
+Lightbox = function(grid, toolbar, complete, container_type, orderable) {

        var self = this;
        this.grid = grid;
        this._buildSlidesIndex(); // set this.slides and this.lastSlide;
        var self = this;
        this.grid = grid;
        this._buildSlidesIndex(); // set this.slides and this.lastSlide;


@@ -48,9 +48,11 @@ Lightbox = function(grid, toolbar, complete, container_type) {
 
        // drag and drop
        this.disableDefaultDragging();
 
        // drag and drop
        this.disableDefaultDragging();

-       addListener(this.grid, 'dragstart', function(evt){self.onDragStart(evt);});
-       addListener(this.grid, 'dragover', function(evt){self.onDragOver(evt);});
-       addListener(this.grid, 'dragend', function(evt){self.onDragEnd(evt);});
+       this._DDOrderingListeners = {'dragstart' : function(evt){self.onDragStart(evt);},
+                                                                'dragover' : function(evt){self.onDragOver(evt);},
+                                                                'dragend' : function(evt){self.onDragEnd(evt);}
+                                                                };
+       if(orderable) {this.enableDDOrdering();}

 };
 
 Lightbox.prototype._buildSlidesIndex = function() {
 };
 
 Lightbox.prototype._buildSlidesIndex = function() {


@@ -76,6 +78,7 @@ Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
                this.switchToolBarPositioning(false);
        }
 };
                this.switchToolBarPositioning(false);
        }
 };

+

 Lightbox.prototype.windowScrollGridHandler = function(evt) {
        if (!this.complete &&
                !this.fetchingDisabled &&
 Lightbox.prototype.windowScrollGridHandler = function(evt) {
        if (!this.complete &&
                !this.fetchingDisabled &&


@@ -180,6 +183,8 @@ Lightbox.prototype.mouseClickHandler = function(evt) {
 Lightbox.prototype.onChangeHandler = function(evt) {
        var target = getTargetedObject(evt);
        if (target.name === 'sort_on') {
 Lightbox.prototype.onChangeHandler = function(evt) {
        var target = getTargetedObject(evt);
        if (target.name === 'sort_on') {

+               if (target.value === 'position') {this.enableDDOrdering();}
+               else {this.disableDDOrdering();}

                this.fm.submitButton = {'name' : 'set_sorting', 'value' : 'ok'};
                this.fm.submit(evt);
        }
                this.fm.submitButton = {'name' : 'set_sorting', 'value' : 'ok'};
                this.fm.submit(evt);
        }


@@ -464,6 +469,19 @@ Lightbox.prototype.getSelectedSlides = function() {
        return slides;
 };
 
        return slides;
 };
 

+
+Lightbox.prototype.enableDDOrdering = function() {
+       addListener(this.grid, 'dragstart', this._DDOrderingListeners.dragstart);
+       addListener(this.grid, 'dragover', this._DDOrderingListeners.dragover);
+       addListener(this.grid, 'dragend', this._DDOrderingListeners.dragend);
+};
+
+Lightbox.prototype.disableDDOrdering = function() {
+       removeListener(this.grid, 'dragstart', this._DDOrderingListeners.dragstart);
+       removeListener(this.grid, 'dragover', this._DDOrderingListeners.dragover);
+       removeListener(this.grid, 'dragend', this._DDOrderingListeners.dragend);
+};
+

 Lightbox.prototype.onDragStart = function(evt) {
        var target = getTargetedObject(evt);
        this.dragged = target;
 Lightbox.prototype.onDragStart = function(evt) {
        var target = getTargetedObject(evt);
        this.dragged = target;

diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index 06de5c39de2140cdfee976b1ec0359ce3af8a630..a194d6f4f387285f1955117f3b8028ec20395bb0 100644 (file)
--- a/skins/portfolio_view.pt
+++ b/skins/portfolio_view.pt
@@ -28,7 +28,9 @@
 
     <div metal:fill-slot="main" tal:omit-tag=""
          tal:define="AddPortalContent modules/Products/CMFCore/permissions/AddPortalContent;
 
     <div metal:fill-slot="main" tal:omit-tag=""
          tal:define="AddPortalContent modules/Products/CMFCore/permissions/AddPortalContent;

+                     ManageProperties modules/Products/CMFCore/permissions/ManageProperties;

                      dropable python:mtool.checkPermission(AddPortalContent, here);
                      dropable python:mtool.checkPermission(AddPortalContent, here);

+                     orderable python:mtool.checkPermission(ManageProperties, here) and here.getDefaultSorting()[0] == 'position';

                      Batch python:modules['Products.Plinn'].Batch;
                      pho_start python:request.get('pho_start', 0);
                      port_start python:request.get('port_start', 0);
                      Batch python:modules['Products.Plinn'].Batch;
                      pho_start python:request.get('pho_start', 0);
                      port_start python:request.get('port_start', 0);