+
{'Position'|@translate} : diff --git a/admin/template/goto/default-layout.css b/admin/template/goto/default-layout.css index 585614382..1bd58aa5d 100644 --- a/admin/template/goto/default-layout.css +++ b/admin/template/goto/default-layout.css @@ -60,6 +60,7 @@ UL.categoryUl { } LI.categoryLi { + width: 100%; border: 1px solid gray; padding: 0px 5px; margin-bottom: 5px; diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css index 4fb0b20c6..46c1378d1 100644 --- a/admin/template/goto/theme/roma/theme.css +++ b/admin/template/goto/theme/roma/theme.css @@ -67,7 +67,8 @@ INPUT[type="submit"]:hover , INPUT[type="reset"]:hover { color:#f33; cursor: po INPUT.bigbutton:hover { background-color: #222; color:#f33; border: 0; } .throw { font-size: 120%; line-height: 26px; padding-top: 10px; font-weight: bold; } label { cursor:pointer } -.virtual_cat { background: #222 !important; } +.categoryLi { background: #222 } +.virtual_cat { background: #333 !important; } a.Piwigo { font-family: verdana, arial, helvetica, sans-serif !important; font-size: 11px; font-weight: normal; letter-spacing: 0; diff --git a/template-common/lib/ui/ui.sortable.js b/template-common/lib/ui/ui.sortable.js new file mode 100644 index 000000000..6d33bf98c --- /dev/null +++ b/template-common/lib/ui/ui.sortable.js @@ -0,0 +1,743 @@ +/* + * jQuery UI Sortable + * + * Copyright (c) 2008 Paul Bakaus + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Sortables + * + * Depends: + * ui.core.js + */ +(function($) { + +function contains(a, b) { + var safari2 = $.browser.safari && $.browser.version < 522; + if (a.contains && !safari2) { + return a.contains(b); + } + if (a.compareDocumentPosition) + return !!(a.compareDocumentPosition(b) & 16); + while (b = b.parentNode) + if (b == a) return true; + return false; +}; + +$.widget("ui.sortable", $.extend({}, $.ui.mouse, { + init: function() { + + var o = this.options; + this.containerCache = {}; + this.element.addClass("ui-sortable"); + + //Get the items + this.refresh(); + + //Let's determine if the items are floating + this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false; + + //Let's determine the parent's offset + if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative'); + this.offset = this.element.offset(); + + //Initialize mouse events for interaction + this.mouseInit(); + + }, + plugins: {}, + ui: function(inst) { + return { + helper: (inst || this)["helper"], + placeholder: (inst || this)["placeholder"] || $([]), + position: (inst || this)["position"], + absolutePosition: (inst || this)["positionAbs"], + options: this.options, + element: this.element, + item: (inst || this)["currentItem"], + sender: inst ? inst.element : null + }; + }, + propagate: function(n,e,inst, noPropagation) { + $.ui.plugin.call(this, n, [e, this.ui(inst)]); + if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]); + }, + serialize: function(o) { + + var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself + var str = []; o = o || {}; + + items.each(function() { + var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/)); + if(res) str.push((o.key || res[1])+'[]='+(o.key && o.expression ? res[1] : res[2])); + }); + + return str.join('&'); + + }, + toArray: function(attr) { + + var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself + var ret = []; + + items.each(function() { ret.push($(this).attr(attr || 'id')); }); + return ret; + + }, + /* Be careful with the following core functions */ + intersectsWith: function(item) { + + var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width, + y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height; + var l = item.left, r = l + item.width, + t = item.top, b = t + item.height; + + if(this.options.tolerance == "pointer" || this.options.forcePointerForContainers || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) { + return (y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r); + } else { + + return (l < x1 + (this.helperProportions.width / 2) // Right Half + && x2 - (this.helperProportions.width / 2) < r // Left Half + && t < y1 + (this.helperProportions.height / 2) // Bottom Half + && y2 - (this.helperProportions.height / 2) < b ); // Top Half + + } + + }, + intersectsWithEdge: function(item) { + var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width, + y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height; + var l = item.left, r = l + item.width, + t = item.top, b = t + item.height; + + if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) { + + if(!(y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r)) return false; + + if(this.floating) { + if(x1 + this.offset.click.left > l && x1 + this.offset.click.left < l + item.width/2) return 2; + if(x1 + this.offset.click.left > l+item.width/2 && x1 + this.offset.click.left < r) return 1; + } else { + if(y1 + this.offset.click.top > t && y1 + this.offset.click.top < t + item.height/2) return 2; + if(y1 + this.offset.click.top > t+item.height/2 && y1 + this.offset.click.top < b) return 1; + } + + } else { + + if (!(l < x1 + (this.helperProportions.width / 2) // Right Half + && x2 - (this.helperProportions.width / 2) < r // Left Half + && t < y1 + (this.helperProportions.height / 2) // Bottom Half + && y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half + + if(this.floating) { + if(x2 > l && x1 < l) return 2; //Crosses left edge + if(x1 < r && x2 > r) return 1; //Crosses right edge + } else { + if(y2 > t && y1 < t) return 1; //Crosses top edge + if(y1 < b && y2 > b) return 2; //Crosses bottom edge + } + + } + + return false; + + }, + refresh: function() { + this.refreshItems(); + this.refreshPositions(); + }, + refreshItems: function() { + + this.items = []; + this.containers = [this]; + var items = this.items; + var self = this; + var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element), this]]; + + if(this.options.connectWith) { + for (var i = this.options.connectWith.length - 1; i >= 0; i--){ + var cur = $(this.options.connectWith[i]); + for (var j = cur.length - 1; j >= 0; j--){ + var inst = $.data(cur[j], 'sortable'); + if(inst && !inst.options.disabled) { + queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element), inst]); + this.containers.push(inst); + } + }; + }; + } + + for (var i = queries.length - 1; i >= 0; i--){ + queries[i][0].each(function() { + $.data(this, 'sortable-item', queries[i][1]); // Data for target checking (mouse manager) + items.push({ + item: $(this), + instance: queries[i][1], + width: 0, height: 0, + left: 0, top: 0 + }); + }); + }; + + }, + refreshPositions: function(fast) { + + //This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change + if(this.offsetParent) { + var po = this.offsetParent.offset(); + this.offset.parent = { top: po.top + this.offsetParentBorders.top, left: po.left + this.offsetParentBorders.left }; + } + + for (var i = this.items.length - 1; i >= 0; i--){ + + //We ignore calculating positions of all connected containers when we're not over them + if(this.items[i].instance != this.currentContainer && this.currentContainer && this.items[i].item[0] != this.currentItem[0]) + continue; + + var t = this.options.toleranceElement ? $(this.options.toleranceElement, this.items[i].item) : this.items[i].item; + + if(!fast) { + this.items[i].width = t[0].offsetWidth; + this.items[i].height = t[0].offsetHeight; + } + + var p = t.offset(); + this.items[i].left = p.left; + this.items[i].top = p.top; + + }; + + if(this.options.custom && this.options.custom.refreshContainers) { + this.options.custom.refreshContainers.call(this); + } else { + for (var i = this.containers.length - 1; i >= 0; i--){ + var p =this.containers[i].element.offset(); + this.containers[i].containerCache.left = p.left; + this.containers[i].containerCache.top = p.top; + this.containers[i].containerCache.width = this.containers[i].element.outerWidth(); + this.containers[i].containerCache.height = this.containers[i].element.outerHeight(); + }; + } + + }, + destroy: function() { + this.element + .removeClass("ui-sortable ui-sortable-disabled") + .removeData("sortable") + .unbind(".sortable"); + this.mouseDestroy(); + + for ( var i = this.items.length - 1; i >= 0; i-- ) + this.items[i].item.removeData("sortable-item"); + }, + createPlaceholder: function(that) { + + var self = that || this, o = self.options; + + if(o.placeholder.constructor == String) { + var className = o.placeholder; + o.placeholder = { + element: function() { + return $('').addClass(className)[0]; + }, + update: function(i, p) { + p.css(i.offset()).css({ width: i.outerWidth(), height: i.outerHeight() }); + } + }; + } + + self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem)).appendTo('body').css({ position: 'absolute' }); + o.placeholder.update.call(self.element, self.currentItem, self.placeholder); + }, + contactContainers: function(e) { + for (var i = this.containers.length - 1; i >= 0; i--){ + + if(this.intersectsWith(this.containers[i].containerCache)) { + if(!this.containers[i].containerCache.over) { + + + if(this.currentContainer != this.containers[i]) { + + //When entering a new container, we will find the item with the least distance and append our item near it + var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[i].floating ? 'left' : 'top']; + for (var j = this.items.length - 1; j >= 0; j--) { + if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue; + var cur = this.items[j][this.containers[i].floating ? 'left' : 'top']; + if(Math.abs(cur - base) < dist) { + dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j]; + } + } + + if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled + continue; + + //We also need to exchange the placeholder + if(this.placeholder) this.placeholder.remove(); + if(this.containers[i].options.placeholder) { + this.containers[i].createPlaceholder(this); + } else { + this.placeholder = null;; + } + + this.currentContainer = this.containers[i]; + itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance, null, true) : this.rearrange(e, null, this.containers[i].element, true); + this.propagate("change", e); //Call plugins and callbacks + this.containers[i].propagate("change", e, this); //Call plugins and callbacks + + } + + this.containers[i].propagate("over", e, this); + this.containers[i].containerCache.over = 1; + } + } else { + if(this.containers[i].containerCache.over) { + this.containers[i].propagate("out", e, this); + this.containers[i].containerCache.over = 0; + } + } + + }; + }, + mouseCapture: function(e, overrideHandle) { + + if(this.options.disabled || this.options.type == 'static') return false; + + //We have to refresh the items data once first + this.refreshItems(); + + //Find out if the clicked node (or one of its parents) is a actual item in this.items + var currentItem = null, self = this, nodes = $(e.target).parents().each(function() { + if($.data(this, 'sortable-item') == self) { + currentItem = $(this); + return false; + } + }); + if($.data(e.target, 'sortable-item') == self) currentItem = $(e.target); + + if(!currentItem) return false; + if(this.options.handle && !overrideHandle) { + var validHandle = false; + + $(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == e.target) validHandle = true; }); + if(!validHandle) return false; + } + + this.currentItem = currentItem; + return true; + + }, + mouseStart: function(e, overrideHandle, noActivation) { + + var o = this.options; + this.currentContainer = this; + + //We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture + this.refreshPositions(); + + //Create and append the visible helper + this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone(); + if (!this.helper.parents('body').length) $(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(this.helper[0]); //Add the helper to the DOM if that didn't happen already + this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class + + /* + * - Position generation - + * This block generates everything position related - it's the core of draggables. + */ + + this.margins = { //Cache the margins + left: (parseInt(this.currentItem.css("marginLeft"),10) || 0), + top: (parseInt(this.currentItem.css("marginTop"),10) || 0) + }; + + this.offset = this.currentItem.offset(); //The element's absolute position on the page + this.offset = { //Substract the margins from the element's absolute offset + top: this.offset.top - this.margins.top, + left: this.offset.left - this.margins.left + }; + + this.offset.click = { //Where the click happened, relative to the element + left: e.pageX - this.offset.left, + top: e.pageY - this.offset.top + }; + + this.offsetParent = this.helper.offsetParent(); //Get the offsetParent and cache its position + var po = this.offsetParent.offset(); + + this.offsetParentBorders = { + top: (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0), + left: (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0) + }; + this.offset.parent = { //Store its position plus border + top: po.top + this.offsetParentBorders.top, + left: po.left + this.offsetParentBorders.left + }; + + this.originalPosition = this.generatePosition(e); //Generate the original position + this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] }; //Cache the former DOM position + + //If o.placeholder is used, create a new element at the given position with the class + this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size + if(o.placeholder) this.createPlaceholder(); + + //Call plugins and callbacks + this.propagate("start", e); + this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size + + if(o.cursorAt) { + if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left; + if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right; + if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top; + if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom; + } + + /* + * - Position constraining - + * Here we prepare position constraining like grid and containment. + */ + + if(o.containment) { + if(o.containment == 'parent') o.containment = this.helper[0].parentNode; + if(o.containment == 'document' || o.containment == 'window') this.containment = [ + 0 - this.offset.parent.left, + 0 - this.offset.parent.top, + $(o.containment == 'document' ? document : window).width() - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0), + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0) + ]; + + if(!(/^(document|window|parent)$/).test(o.containment)) { + var ce = $(o.containment)[0]; + var co = $(o.containment).offset(); + + this.containment = [ + co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left, + co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top, + co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0), + co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0) + ]; + } + } + + //Set the original element visibility to hidden to still fill out the white space + if(this.options.placeholder != 'clone') + this.currentItem.css('visibility', 'hidden'); + + //Post 'activate' events to possible containers + if(!noActivation) { + for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); } + } + + //Prepare possible droppables + if($.ui.ddmanager) $.ui.ddmanager.current = this; + if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e); + + this.dragging = true; + + this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position + return true; + + + }, + convertPositionTo: function(d, pos) { + if(!pos) pos = this.position; + var mod = d == "absolute" ? 1 : -1; + return { + top: ( + pos.top // the calculated relative position + + this.offset.parent.top * mod // The offsetParent's offset without borders (offset + border) + - (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) * mod // The offsetParent's scroll position + + this.margins.top * mod //Add the margin (you don't want the margin counting in intersection methods) + ), + left: ( + pos.left // the calculated relative position + + this.offset.parent.left * mod // The offsetParent's offset without borders (offset + border) + - (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) * mod // The offsetParent's scroll position + + this.margins.left * mod //Add the margin (you don't want the margin counting in intersection methods) + ) + }; + }, + generatePosition: function(e) { + + var o = this.options; + var position = { + top: ( + e.pageY // The absolute mouse position + - this.offset.click.top // Click offset (relative to the element) + - this.offset.parent.top // The offsetParent's offset without borders (offset + border) + + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) // The offsetParent's scroll position, not if the element is fixed + ), + left: ( + e.pageX // The absolute mouse position + - this.offset.click.left // Click offset (relative to the element) + - this.offset.parent.left // The offsetParent's offset without borders (offset + border) + + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) // The offsetParent's scroll position, not if the element is fixed + ) + }; + + if(!this.originalPosition) return position; //If we are not dragging yet, we won't check for options + + /* + * - Position constraining - + * Constrain the position to a mix of grid, containment. + */ + if(this.containment) { + if(position.left < this.containment[0]) position.left = this.containment[0]; + if(position.top < this.containment[1]) position.top = this.containment[1]; + if(position.left > this.containment[2]) position.left = this.containment[2]; + if(position.top > this.containment[3]) position.top = this.containment[3]; + } + + if(o.grid) { + var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1]; + position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top; + + var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0]; + position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left; + } + + return position; + }, + mouseDrag: function(e) { + + //Compute the helpers position + this.position = this.generatePosition(e); + this.positionAbs = this.convertPositionTo("absolute"); + + //Call the internal plugins + $.ui.plugin.call(this, "sort", [e, this.ui()]); + + //Regenerate the absolute position used for position checks + this.positionAbs = this.convertPositionTo("absolute"); + + //Set the helper's position + this.helper[0].style.left = this.position.left+'px'; + this.helper[0].style.top = this.position.top+'px'; + + //Rearrange + for (var i = this.items.length - 1; i >= 0; i--) { + var intersection = this.intersectsWithEdge(this.items[i]); + if(!intersection) continue; + + if(this.items[i].item[0] != this.currentItem[0] //cannot intersect with itself + && this.currentItem[intersection == 1 ? "next" : "prev"]()[0] != this.items[i].item[0] //no useless actions that have been done before + && !contains(this.currentItem[0], this.items[i].item[0]) //no action if the item moved is the parent of the item checked + && (this.options.type == 'semi-dynamic' ? !contains(this.element[0], this.items[i].item[0]) : true) + ) { + + this.direction = intersection == 1 ? "down" : "up"; + this.rearrange(e, this.items[i]); + this.propagate("change", e); //Call plugins and callbacks + break; + } + } + + //Post events to containers + this.contactContainers(e); + + //Interconnect with droppables + if($.ui.ddmanager) $.ui.ddmanager.drag(this, e); + + //Call callbacks + this.element.triggerHandler("sort", [e, this.ui()], this.options["sort"]); + + return false; + + }, + rearrange: function(e, i, a, hardRefresh) { + a ? a[0].appendChild(this.currentItem[0]) : i.item[0].parentNode.insertBefore(this.currentItem[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling)); + + //Various things done here to improve the performance: + // 1. we create a setTimeout, that calls refreshPositions + // 2. on the instance, we have a counter variable, that get's higher after every append + // 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same + // 4. this lets only the last addition to the timeout stack through + this.counter = this.counter ? ++this.counter : 1; + var self = this, counter = this.counter; + + window.setTimeout(function() { + if(counter == self.counter) self.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove + },0); + + if(this.options.placeholder) + this.options.placeholder.update.call(this.element, this.currentItem, this.placeholder); + }, + mouseStop: function(e, noPropagation) { + + //If we are using droppables, inform the manager about the drop + if ($.ui.ddmanager && !this.options.dropBehaviour) + $.ui.ddmanager.drop(this, e); + + if(this.options.revert) { + var self = this; + var cur = self.currentItem.offset(); + + //Also animate the placeholder if we have one + if(self.placeholder) self.placeholder.animate({ opacity: 'hide' }, (parseInt(this.options.revert, 10) || 500)-50); + + $(this.helper).animate({ + left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft), + top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) + }, parseInt(this.options.revert, 10) || 500, function() { + self.clear(e); + }); + } else { + this.clear(e, noPropagation); + } + + return false; + + }, + clear: function(e, noPropagation) { + + if(this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) this.propagate("update", e, null, noPropagation); //Trigger update callback if the DOM position has changed + if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element + this.propagate("remove", e, null, noPropagation); + for (var i = this.containers.length - 1; i >= 0; i--){ + if(contains(this.containers[i].element[0], this.currentItem[0])) { + this.containers[i].propagate("update", e, this, noPropagation); + this.containers[i].propagate("receive", e, this, noPropagation); + } + }; + }; + + //Post events to containers + for (var i = this.containers.length - 1; i >= 0; i--){ + this.containers[i].propagate("deactivate", e, this, noPropagation); + if(this.containers[i].containerCache.over) { + this.containers[i].propagate("out", e, this); + this.containers[i].containerCache.over = 0; + } + } + + this.dragging = false; + if(this.cancelHelperRemoval) { + this.propagate("stop", e, null, noPropagation); + return false; + } + + $(this.currentItem).css('visibility', ''); + if(this.placeholder) this.placeholder.remove(); + this.helper.remove(); this.helper = null; + this.propagate("stop", e, null, noPropagation); + + return true; + + } +})); + +$.extend($.ui.sortable, { + getter: "serialize toArray", + defaults: { + helper: "clone", + tolerance: "guess", + distance: 1, + delay: 0, + scroll: true, + scrollSensitivity: 20, + scrollSpeed: 20, + cancel: ":input", + items: '> *', + zIndex: 1000, + dropOnEmpty: true, + appendTo: "parent" + } +}); + +/* + * Sortable Extensions + */ + +$.ui.plugin.add("sortable", "cursor", { + start: function(e, ui) { + var t = $('body'); + if (t.css("cursor")) ui.options._cursor = t.css("cursor"); + t.css("cursor", ui.options.cursor); + }, + stop: function(e, ui) { + if (ui.options._cursor) $('body').css("cursor", ui.options._cursor); + } +}); + +$.ui.plugin.add("sortable", "zIndex", { + start: function(e, ui) { + var t = ui.helper; + if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex"); + t.css('zIndex', ui.options.zIndex); + }, + stop: function(e, ui) { + if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex); + } +}); + +$.ui.plugin.add("sortable", "opacity", { + start: function(e, ui) { + var t = ui.helper; + if(t.css("opacity")) ui.options._opacity = t.css("opacity"); + t.css('opacity', ui.options.opacity); + }, + stop: function(e, ui) { + if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity); + } +}); + +$.ui.plugin.add("sortable", "scroll", { + start: function(e, ui) { + var o = ui.options; + var i = $(this).data("sortable"); + + i.overflowY = function(el) { + do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode); + return $(document); + }(i.currentItem); + i.overflowX = function(el) { + do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode); + return $(document); + }(i.currentItem); + + if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset(); + if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset(); + + }, + sort: function(e, ui) { + + var o = ui.options; + var i = $(this).data("sortable"); + + if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') { + if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity) + i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed; + if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity) + i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed; + } else { + if(e.pageY - $(document).scrollTop() < o.scrollSensitivity) + $(document).scrollTop($(document).scrollTop() - o.scrollSpeed); + if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity) + $(document).scrollTop($(document).scrollTop() + o.scrollSpeed); + } + + if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') { + if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity) + i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed; + if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity) + i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed; + } else { + if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity) + $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed); + if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity) + $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed); + } + + } +}); + +$.ui.plugin.add("sortable", "axis", { + sort: function(e, ui) { + + var i = $(this).data("sortable"); + + if(ui.options.axis == "y") i.position.left = i.originalPosition.left; + if(ui.options.axis == "x") i.position.top = i.originalPosition.top; + + } +}); + +})(jQuery); diff --git a/template-common/lib/ui/ui.sortable.packed.js b/template-common/lib/ui/ui.sortable.packed.js new file mode 100644 index 000000000..9ccec8ab1 --- /dev/null +++ b/template-common/lib/ui/ui.sortable.packed.js @@ -0,0 +1,2 @@ +eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(b(B){b A(E,D){9 C=B.2Y.3Z&&B.2Y.3Y<3X;5(E.2X&&!C){d E.2X(D)}5(E.2W){d!!(E.2W(D)&16)}1T(D=D.1d){5(D==E){d V}}d w}B.3W("j.p",B.2j({},B.j.3V,{3U:b(){9 C=4.8;4.Q={};4.g.2a("j-p");4.2P();4.14=4.c.z?(/6|28/).1e(4.c[0].t.f("3T")):w;5(!(/(2V|1m|3S)/).1e(4.g.f("O"))){4.g.f("O","2V")}4.a=4.g.a();4.3R()},3Q:{},j:b(C){d{l:(C||4)["l"],r:(C||4)["r"]||B([]),O:(C||4)["O"],3P:(C||4)["18"],8:4.8,g:4.g,t:(C||4)["i"],3O:C?C.g:P}},v:b(F,E,C,D){B.j.1b.Y(4,F,[E,4.j(C)]);5(!D){4.g.2t(F=="1a"?F:"1a"+F,[E,4.j(C)],4.8[F])}},2i:b(E){9 C=(B.1N(4.8.c)?4.8.c.Y(4.g):B(4.8.c,4.g)).21(".j-p-l");9 D=[];E=E||{};C.1x(b(){9 F=(B(4).2S(E.3N||"2R")||"").3M(E.2T||(/(.+)[-=3L](.+)/));5(F){D.1y((E.2U||F[1])+"[]="+(E.2U&&E.2T?F[1]:F[2]))}});d D.3K("&")},2h:b(C){9 D=(B.1N(4.8.c)?4.8.c.Y(4.g):B(4.8.c,4.g)).21(".j-p-l");9 E=[];D.1x(b(){E.1y(B(4).2S(C||"2R"))});d E},2J:b(J){9 E=4.18.6,D=E+4.s.n,I=4.18.7,H=I+4.s.o;9 F=J.6,C=F+J.n,K=J.7,G=K+J.o;5(4.8.1r=="2Q"||4.8.3J||(4.8.1r=="1X"&&4.s[4.14?"n":"o"]>J[4.14?"n":"o"])){d(I+4.a.q.7>K&&I+4.a.q.7F&&E+4.a.q.6J[4.14?"n":"o"])){5(!(I+4.a.q.7>K&&I+4.a.q.7F&&E+4.a.q.6F&&E+4.a.q.6F+J.n/2&&E+4.a.q.6K&&I+4.a.q.7K+J.o/2&&I+4.a.q.7F&&EC){d 1}}X{5(H>K&&IG){d 2}}}d w},2P:b(){4.2b();4.1G()},2b:b(){4.c=[];4.e=[4];9 D=4.c;9 C=4;9 F=[[B.1N(4.8.c)?4.8.c.Y(4.g,P,{8:4.8,t:4.i}):B(4.8.c,4.g),4]];5(4.8.2e){R(9 G=4.8.2e.z-1;G>=0;G--){9 I=B(4.8.2e[G]);R(9 E=I.z-1;E>=0;E--){9 H=B.19(I[E],"p");5(H&&!H.8.2c){F.1y([B.1N(H.8.c)?H.8.c.Y(H.g):B(H.8.c,H.g),H]);4.e.1y(H)}}}}R(9 G=F.z-1;G>=0;G--){F[G][0].1x(b(){B.19(4,"p-t",F[G][1]);D.1y({t:B(4),2O:F[G][1],n:0,o:0,6:0,7:0})})}},1G:b(D){5(4.u){9 C=4.u.a();4.a.m={7:C.7+4.1v.7,6:C.6+4.1v.6}}R(9 F=4.c.z-1;F>=0;F--){5(4.c[F].2O!=4.1w&&4.1w&&4.c[F].t[0]!=4.i[0]){1I}9 E=4.8.2N?B(4.8.2N,4.c[F].t):4.c[F].t;5(!D){4.c[F].n=E[0].1Q;4.c[F].o=E[0].1S}9 G=E.a();4.c[F].6=G.6;4.c[F].7=G.7}5(4.8.2d&&4.8.2d.2M){4.8.2d.2M.Y(4)}X{R(9 F=4.e.z-1;F>=0;F--){9 G=4.e[F].g.a();4.e[F].Q.6=G.6;4.e[F].Q.7=G.7;4.e[F].Q.n=4.e[F].g.1L();4.e[F].Q.o=4.e[F].g.1K()}}},3I:b(){4.g.3H("j-p j-p-2c").2L("p").3G(".p");4.3F();R(9 C=4.c.z-1;C>=0;C--){4.c[C].t.2L("p-t")}},29:b(E){9 C=E||4,F=C.8;5(F.r.3E==3D){9 D=F.r;F.r={g:b(){d B("<2K>").2a(D)[0]},1s:b(G,H){H.f(G.a()).f({n:G.1L(),o:G.1K()})}}}C.r=B(F.r.g.Y(C.g,C.i)).1D("U").f({O:"1m"});F.r.1s.Y(C.g,C.i,C.r)},2u:b(F){R(9 D=4.e.z-1;D>=0;D--){5(4.2J(4.e[D].Q)){5(!4.e[D].Q.1h){5(4.1w!=4.e[D]){9 I=3C;9 H=P;9 E=4.18[4.e[D].14?"6":"7"];R(9 C=4.c.z-1;C>=0;C--){5(!A(4.e[D].g[0],4.c[C].t[0])){1I}9 G=4.c[C][4.e[D].14?"6":"7"];5(1n.2I(G-E)=0;E--){4.e[E].v("3p",H,4)}}5(B.j.17){B.j.17.3o=4}5(B.j.17&&!J.2p){B.j.17.3n(4,H)}4.2l=V;4.2z(H);d V},24:b(D,E){5(!E){E=4.O}9 C=D=="1m"?1:-1;d{7:(E.7+4.a.m.7*C-(4.u[0]==h.U?0:4.u[0].N)*C+4.W.7*C),6:(E.6+4.a.m.6*C-(4.u[0]==h.U?0:4.u[0].M)*C+4.W.6*C)}},25:b(F){9 G=4.8;9 C={7:(F.1j-4.a.q.7-4.a.m.7+(4.u[0]==h.U?0:4.u[0].N)),6:(F.1i-4.a.q.6-4.a.m.6+(4.u[0]==h.U?0:4.u[0].M))};5(!4.15){d C}5(4.k){5(C.6<4.k[0]){C.6=4.k[0]}5(C.7<4.k[1]){C.7=4.k[1]}5(C.6>4.k[2]){C.6=4.k[2]}5(C.7>4.k[3]){C.7=4.k[3]}}5(G.12){9 E=4.15.7+1n.2A((C.7-4.15.7)/G.12[1])*G.12[1];C.7=4.k?(!(E<4.k[1]||E>4.k[3])?E:(!(E<4.k[1])?E-G.12[1]:E+G.12[1])):E;9 D=4.15.6+1n.2A((C.6-4.15.6)/G.12[0])*G.12[0];C.6=4.k?(!(D<4.k[0]||D>4.k[2])?D:(!(D<4.k[0])?D-G.12[0]:D+G.12[0])):D}d C},2z:b(D){4.O=4.25(D);4.18=4.24("1m");B.j.1b.Y(4,"1a",[D,4.j()]);4.18=4.24("1m");4.l[0].2y.6=4.O.6+"2x";4.l[0].2y.7=4.O.7+"2x";R(9 C=4.c.z-1;C>=0;C--){9 E=4.2w(4.c[C]);5(!E){1I}5(4.c[C].t[0]!=4.i[0]&&4.i[E==1?"3m":"1t"]()[0]!=4.c[C].t[0]&&!A(4.i[0],4.c[C].t[0])&&(4.8.2v=="3l-3k"?!A(4.g[0],4.c[C].t[0]):V)){4.2r=E==1?"2q":"3j";4.1H(D,4.c[C]);4.v("23",D);3i}}4.2u(D);5(B.j.17){B.j.17.3h(4,D)}4.g.2t("1a",[D,4.j()],4.8["1a"]);d w},1H:b(H,G,D,F){D?D[0].2s(4.i[0]):G.t[0].1d.3g(4.i[0],(4.2r=="2q"?G.t[0]:G.t[0].3f));4.1u=4.1u?++4.1u:1;9 E=4,C=4.1u;1c.3e(b(){5(C==E.1u){E.1G(!F)}},0);5(4.8.r){4.8.r.1s.Y(4.g,4.i,4.r)}},3d:b(E,D){5(B.j.17&&!4.8.2p){B.j.17.3c(4,E)}5(4.8.22){9 C=4;9 F=C.i.a();5(C.r){C.r.2o({1f:"3b"},(L(4.8.22,10)||2n)-3a)}B(4.l).2o({6:F.6-4.a.m.6-C.W.6+(4.u[0]==h.U?0:4.u[0].M),7:F.7-4.a.m.7-C.W.7+(4.u[0]==h.U?0:4.u[0].N)},L(4.8.22,10)||2n,b(){C.1F(E)})}X{4.1F(E,D)}d w},1F:b(E,D){5(4.1Z.1t!=4.i.1t().21(".j-p-l")[0]||4.1Z.m!=4.i.m()[0]){4.v("1s",E,P,D)}5(!A(4.g[0],4.i[0])){4.v("1E",E,P,D);R(9 C=4.e.z-1;C>=0;C--){5(A(4.e[C].g[0],4.i[0])){4.e[C].v("1s",E,4,D);4.e[C].v("39",E,4,D)}}}R(9 C=4.e.z-1;C>=0;C--){4.e[C].v("38",E,4,D);5(4.e[C].Q.1h){4.e[C].v("2m",E,4);4.e[C].Q.1h=0}}4.2l=w;5(4.37){4.v("1q",E,P,D);d w}B(4.i).f("2k","");5(4.r){4.r.1E()}4.l.1E();4.l=P;4.v("1q",E,P,D);d V}}));B.2j(B.j.p,{36:"2i 2h",35:{l:"1Y",1r:"1X",34:1,33:0,1k:V,11:20,Z:20,32:":31",c:"> *",1g:30,2g:V,1D:"m"}});B.j.1b.1o("p","1l",{1p:b(E,D){9 C=B("U");5(C.f("1l")){D.8.1W=C.f("1l")}C.f("1l",D.8.1l)},1q:b(D,C){5(C.8.1W){B("U").f("1l",C.8.1W)}}});B.j.1b.1o("p","1g",{1p:b(E,D){9 C=D.l;5(C.f("1g")){D.8.1V=C.f("1g")}C.f("1g",D.8.1g)},1q:b(D,C){5(C.8.1V){B(C.l).f("1g",C.8.1V)}}});B.j.1b.1o("p","1f",{1p:b(E,D){9 C=D.l;5(C.f("1f")){D.8.1U=C.f("1f")}C.f("1f",D.8.1f)},1q:b(D,C){5(C.8.1U){B(C.l).f("1f",C.8.1U)}}});B.j.1b.1o("p","1k",{1p:b(E,D){9 F=D.8;9 C=B(4).19("p");C.T=b(G){2f{5(/1C|1k/.1e(G.f("1B"))||(/1C|1k/).1e(G.f("1B-y"))){d G}G=G.m()}1T(G[0].1d);d B(h)}(C.i);C.S=b(G){2f{5(/1C|1k/.1e(G.f("1B"))||(/1C|1k/).1e(G.f("1B-x"))){d G}G=G.m()}1T(G[0].1d);d B(h)}(C.i);5(C.T[0]!=h&&C.T[0].1A!="1z"){C.1R=C.T.a()}5(C.S[0]!=h&&C.S[0].1A!="1z"){C.1P=C.S.a()}},1a:b(E,D){9 F=D.8;9 C=B(4).19("p");5(C.T[0]!=h&&C.T[0].1A!="1z"){5((C.1R.7+C.T[0].1S)-E.1j
