Changeset 1649:938f932de901

Timestamp:

08/26/13 21:39:59 (12 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1604

Message:

Ticket #1604 progression

Location:

plugins/widgets

Files:

• dragdrop.js (modified) (3 diffs)
• index.php (modified) (4 diffs)
• style.css (modified) (3 diffs)

plugins/widgets/dragdrop.js

@@ -7 +7 @@
      
      // move
-     $( ".connected" ).sortable({
+     $( ".connected, .sortable-delete" ).sortable({
+          tolerance: "move",
+          cursor: "move",
           axis: "y",
-          connectWith: ".connected",
-          cursor: "move",
-          stop: function( event, ui ) {
-               $('.connected').each(function(){
-                    if( $(this).find('li').length == 0 ) {
-                         $(this).parents('.widgets').find('.empty-widgets').show();
-                    } else {
-                         $(this).parents('.widgets').find('.empty-widgets').hide();
-                    }
-               });
-          }//,
+          dropOnEmpty: true,
+          handle: ".widget-name",
+          placeholder: "ui-sortable-placeholder",
+          connectWith: ".connected, .sortable-delete",
+          start: function( event, ui ) {
+               ui.item.css('left', ui.item.position().left + 30);
+          },
+          update: function(event, ui) {
+               
+               // mes a zéro le décalage
+               ui.item.css('left', 'auto');
+               
+               if( $(this).find('li').length == 0 ) {
+                    $(this).parents('.widgets').find('.empty-widgets').show();
+               } else {
+                    $(this).parents('.widgets').find('.empty-widgets').hide();
+               }
+               
+               // réordonne
+               if( $(this).attr('id') ) {
+                    $(this).find('input[title=ordre]').each(function(i){
+                         tab = $(this).val(i);
+                    });
+               }
+               
+               // switch
+               if( $(this).attr('id') != ui.item.parents('ul').attr('id') ) {
+                    //oldname = $(this).attr('id').split('dnd').join('');
+                    var name = ui.item.parents('ul').attr('id').split('dnd').join('');
+                    ui.item.find('*[name^=w]').each(function(){
+                         tab = $(this).attr('name').split('][');
+                         tab[0] = "w["+name;
+                         $(this).attr('name', tab.join(']['));
+                    });
+               }
+               
+          } //,
           //change: function( event, ui ) {
                //ui.helper.css('height', $('#dndnav .widget-name').css('height'));
@@ -27 +55 @@
      // add
      $( "#widgets > li" ).draggable({
+          tolerance: "move",
+          cursor: "move",
           connectToSortable: ".connected",
           helper: "clone",
           revert: "invalid",
-          cursor: "move",
           start: function( event, ui ) {
                ui.helper.css({'width': $('#widgets > li').css('width')});
@@ -36 +65 @@
                //ui.helper.find('.form-note').hide();
                //ui.helper.find('.widget-name').css({'min-height': $('#dndnav .widget-name').css('height')});
-          }/*,
-          stop: function( event, ui ) {
-               $('.empty-widgets').css('display', 'none');
-          }*/
+          }
      });
      
-     $( "#widgets, .connected" ).disableSelection();
+     //$( "#widgets, .connected, .sortable-delete" ).disableSelection();
      
 });

plugins/widgets/index.php

@@ -221 +221 @@
 '<div id="sidebarNav" class="widgets fieldset">'.
 sidebarWidgets('dndnav',__('Navigation sidebar'),$widgets_nav,'nav',$__default_widgets['nav'],$j).
+'<ul class="sortable-delete"></ul>'.
 '</div>';
 
@@ -227 +228 @@
 '<div id="sidebarExtra" class="widgets fieldset">'.
 sidebarWidgets('dndextra',__('Extra sidebar'),$widgets_extra,'extra',$__default_widgets['extra'],$j).
+'<ul class="sortable-delete"></ul>'.
 '</div>';
 
@@ -233 +235 @@
 '<div id="sidebarCustom" class="widgets fieldset">'.
 sidebarWidgets('dndcustom',__('Custom sidebar'),$widgets_custom,'custom',$__default_widgets['custom'],$j).
+'<ul class="sortable-delete"></ul>'.
 '</div>';
 
@@ -333 +336 @@
           
           $res .=
-          '<li>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id())).
+          '<li>'.form::hidden(array($iname.'[id]'),html::escapeHTML($w->id()), 'blop').
           '<p class="widget-name">'.form::field(array($iname.'[order]'),2,3,(string) $i,'js-hide','',0,'title="'.__('order').'"').' '.
           $w->name().($w->desc() != '' ? ' <!-- <span class="form-note">'.__($w->desc()).'</span> -->' : '').'</p>'.

plugins/widgets/style.css

@@ -42 +42 @@
      padding: 1em 0;
 }
-#dndnav > li, #dndextra > li, #dndcustom > li {
+#dndnav > li,
+#dndextra > li,
+#dndcustom > li,
+.sortable-delete > li {
      padding: O;
      border: 1px solid #999;
@@ -48 +51 @@
      list-style: none;
 }
+
+.sortable-delete > li {
+     margin-bottom: 3px;
+}
+
+#dndnav li.ui-sortable-placeholder,
+#dndextra li.ui-sortable-placeholder,
+#dndcustom li.ui-sortable-placeholder,
+.sortable-delete li.ui-sortable-placeholder {
+     border: 1px dashed #999;
+     height: 2rem;
+     padding: 4px 6px;
+}
+
 #dndnav .form-note, #dndextra .form-note, #dndcustom .form-note {
      display: none;
@@ -79 +96 @@
      background: #f5f5f5;
 }
+
+.sortable-delete {
+    background: url("index.php?pf=pages/icon.png") no-repeat 6px 8px #FFBABA;
+    border: 1px solid #999999;
+    color: #000000;
+    font-weight: bold;
+    list-style: none outside none;
+    margin: 0 0 1em;
+    min-height: 25px;
+    padding: 4px 4px 0 24px;
+}
+
 #widgets .widgetSettings {
      display: none;