Index: branches/RC/themes/default2009/platform/inc/jquery/jquery-ui.custom.min.js =================================================================== diff -u -N --- branches/RC/themes/default2009/platform/inc/jquery/jquery-ui.custom.min.js (revision 0) +++ branches/RC/themes/default2009/platform/inc/jquery/jquery-ui.custom.min.js (revision 11670) @@ -0,0 +1,34 @@ +/* + * jQuery UI 1.7.1 + * + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI + */ +jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.1",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;/* + * jQuery UI Draggable 1.7.1 + * + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI/Draggables + * + * Depends: + * ui.core.js + */ +(function(a){a.widget("ui.draggable",a.extend({},a.ui.mouse,{_init:function(){if(this.options.helper=="original"&&!(/^(?:r|a|f)/).test(this.element.css("position"))){this.element[0].style.position="relative"}(this.options.addClasses&&this.element.addClass("ui-draggable"));(this.options.disabled&&this.element.addClass("ui-draggable-disabled"));this._mouseInit()},destroy:function(){if(!this.element.data("draggable")){return}this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy()},_mouseCapture:function(b){var c=this.options;if(this.helper||c.disabled||a(b.target).is(".ui-resizable-handle")){return false}this.handle=this._getHandle(b);if(!this.handle){return false}return true},_mouseStart:function(b){var c=this.options;this.helper=this._createHelper(b);this._cacheHelperProportions();if(a.ui.ddmanager){a.ui.ddmanager.current=this}this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(b);this.originalPageX=b.pageX;this.originalPageY=b.pageY;if(c.cursorAt){this._adjustOffsetFromHelper(c.cursorAt)}if(c.containment){this._setContainment()}this._trigger("start",b);this._cacheHelperProportions();if(a.ui.ddmanager&&!c.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,b)}this.helper.addClass("ui-draggable-dragging");this._mouseDrag(b,true);return true},_mouseDrag:function(b,d){this.position=this._generatePosition(b);this.positionAbs=this._convertPositionTo("absolute");if(!d){var c=this._uiHash();this._trigger("drag",b,c);this.position=c.position}if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(a.ui.ddmanager){a.ui.ddmanager.drag(this,b)}return false},_mouseStop:function(c){var d=false;if(a.ui.ddmanager&&!this.options.dropBehaviour){d=a.ui.ddmanager.drop(this,c)}if(this.dropped){d=this.dropped;this.dropped=false}if((this.options.revert=="invalid"&&!d)||(this.options.revert=="valid"&&d)||this.options.revert===true||(a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d))){var b=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){b._trigger("stop",c);b._clear()})}else{this._trigger("stop",c);this._clear()}return false},_getHandle:function(b){var c=!this.options.handle||!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==b.target){c=true}});return c},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c])):(d.helper=="clone"?this.element.clone():this.element);if(!b.parents("body").length){b.appendTo((d.appendTo=="parent"?this.element[0].parentNode:d.appendTo))}if(b[0]!=this.element[0]&&!(/(fixed|absolute)/).test(b.css("position"))){b.css("position","absolute")}return b},_adjustOffsetFromHelper:function(b){if(b.left!=undefined){this.offset.click.left=b.left+this.margins.left}if(b.right!=undefined){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if(b.top!=undefined){this.offset.click.top=b.top+this.margins.top}if(b.bottom!=undefined){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.element.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)&&e.containment.constructor!=Array){var c=a(e.containment)[0];if(!c){return}var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}else{if(e.containment.constructor==Array){this.containment=e.containment}}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c)),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c))}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.leftthis.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.topthis.containment[3])?g:(!(g-this.offset.click.topthis.containment[2])?f:(!(f-this.offset.click.left').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(a(this).offset()).appendTo("body")})},stop:function(b,c){a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});a.ui.plugin.add("draggable","opacity",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("opacity")){e._opacity=b.css("opacity")}b.css("opacity",e.opacity)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._opacity){a(c.helper).css("opacity",d._opacity)}}});a.ui.plugin.add("draggable","scroll",{start:function(c,d){var b=a(this).data("draggable");if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){b.overflowOffset=b.scrollParent.offset()}},drag:function(d,e){var c=a(this).data("draggable"),f=c.options,b=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!f.axis||f.axis!="x"){if((c.overflowOffset.top+c.scrollParent[0].offsetHeight)-d.pageY=0;v--){var s=g.snapElements[v].left,n=s+g.snapElements[v].width,m=g.snapElements[v].top,A=m+g.snapElements[v].height;if(!((s-y=0;b--){this.items[b].item.removeData("sortable-item")}},_mouseCapture:function(e,f){if(this.reverting){return false}if(this.options.disabled||this.options.type=="static"){return false}this._refreshItems(e);var d=null,c=this,b=a(e.target).parents().each(function(){if(a.data(this,"sortable-item")==c){d=a(this);return false}});if(a.data(e.target,"sortable-item")==c){d=a(e.target)}if(!d){return false}if(this.options.handle&&!f){var g=false;a(this.options.handle,d).find("*").andSelf().each(function(){if(this==e.target){g=true}});if(!g){return false}}this.currentItem=d;this._removeCurrentsFromItems();return true},_mouseStart:function(e,f,b){var g=this.options,c=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(e);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(e);this.originalPageX=e.pageX;this.originalPageY=e.pageY;if(g.cursorAt){this._adjustOffsetFromHelper(g.cursorAt)}this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};if(this.helper[0]!=this.currentItem[0]){this.currentItem.hide()}this._createPlaceholder();if(g.containment){this._setContainment()}if(g.cursor){if(a("body").css("cursor")){this._storedCursor=a("body").css("cursor")}a("body").css("cursor",g.cursor)}if(g.opacity){if(this.helper.css("opacity")){this._storedOpacity=this.helper.css("opacity")}this.helper.css("opacity",g.opacity)}if(g.zIndex){if(this.helper.css("zIndex")){this._storedZIndex=this.helper.css("zIndex")}this.helper.css("zIndex",g.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){this.overflowOffset=this.scrollParent.offset()}this._trigger("start",e,this._uiHash());if(!this._preserveHelperProportions){this._cacheHelperProportions()}if(!b){for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("activate",e,c._uiHash(this))}}if(a.ui.ddmanager){a.ui.ddmanager.current=this}if(a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,e)}this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(e);return true},_mouseDrag:function(f){this.position=this._generatePosition(f);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs){this.lastPositionAbs=this.positionAbs}if(this.options.scroll){var g=this.options,b=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if((this.overflowOffset.top+this.scrollParent[0].offsetHeight)-f.pageY=0;d--){var e=this.items[d],c=e.item[0],h=this._intersectsWithPointer(e);if(!h){continue}if(c!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=c&&!a.ui.contains(this.placeholder[0],c)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],c):true)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e)){this._rearrange(f,e)}else{break}this._trigger("change",f,this._uiHash());break}}this._contactContainers(f);if(a.ui.ddmanager){a.ui.ddmanager.drag(this,f)}this._trigger("sort",f,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(c,d){if(!c){return}if(a.ui.ddmanager&&!this.options.dropBehaviour){a.ui.ddmanager.drop(this,c)}if(this.options.revert){var b=this;var e=b.placeholder.offset();b.reverting=true;a(this.helper).animate({left:e.left-this.offset.parent.left-b.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-b.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){b._clear(c)})}else{this._clear(c,d)}return false},cancel:function(){var b=this;if(this.dragging){this._mouseUp();if(this.options.helper=="original"){this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,b._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,b._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder[0].parentNode){this.placeholder[0].parentNode.removeChild(this.placeholder[0])}if(this.options.helper!="original"&&this.helper&&this.helper[0].parentNode){this.helper.remove()}a.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});if(this.domPosition.prev){a(this.domPosition.prev).after(this.currentItem)}else{a(this.domPosition.parent).prepend(this.currentItem)}return true},serialize:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};a(b).each(function(){var e=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||(/(.+)[-=_](.+)/));if(e){c.push((d.key||e[1]+"[]")+"="+(d.key&&d.expression?e[1]:e[2]))}});return c.join("&")},toArray:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};b.each(function(){c.push(a(d.item||this).attr(d.attribute||"id")||"")});return c},_intersectsWith:function(m){var e=this.positionAbs.left,d=e+this.helperProportions.width,k=this.positionAbs.top,j=k+this.helperProportions.height;var f=m.left,c=f+m.width,n=m.top,i=n+m.height;var o=this.offset.click.top,h=this.offset.click.left;var g=(k+o)>n&&(k+o)f&&(e+h)m[this.floating?"width":"height"])){return g}else{return(f0?"down":"up")},_getDragHorizontalDirection:function(){var b=this.positionAbs.left-this.lastPositionAbs.left;return b!=0&&(b>0?"right":"left")},refresh:function(b){this._refreshItems(b);this.refreshPositions()},_connectWith:function(){var b=this.options;return b.connectWith.constructor==String?[b.connectWith]:b.connectWith},_getItemsAsjQuery:function(b){var l=this;var g=[];var e=[];var h=this._connectWith();if(h&&b){for(var d=h.length-1;d>=0;d--){var k=a(h[d]);for(var c=k.length-1;c>=0;c--){var f=a.data(k[c],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element):a(f.options.items,f.element).not(".ui-sortable-helper"),f])}}}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper"),this]);for(var d=e.length-1;d>=0;d--){e[d][0].each(function(){g.push(this)})}return a(g)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data(sortable-item)");for(var c=0;c=0;e--){var m=a(l[e]);for(var d=m.length-1;d>=0;d--){var g=a.data(m[d],"sortable");if(g&&g!=this&&!g.options.disabled){f.push([a.isFunction(g.options.items)?g.options.items.call(g.element[0],b,{item:this.currentItem}):a(g.options.items,g.element),g]);this.containers.push(g)}}}}for(var e=f.length-1;e>=0;e--){var k=f[e][1];var c=f[e][0];for(var d=0,n=c.length;d=0;d--){var e=this.items[d];if(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0]){continue}var c=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!b){e.width=c.outerWidth();e.height=c.outerHeight()}var f=c.offset();e.left=f.left;e.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var d=this.containers.length-1;d>=0;d--){var f=this.containers[d].element.offset();this.containers[d].containerCache.left=f.left;this.containers[d].containerCache.top=f.top;this.containers[d].containerCache.width=this.containers[d].element.outerWidth();this.containers[d].containerCache.height=this.containers[d].element.outerHeight()}}},_createPlaceholder:function(d){var b=d||this,e=b.options;if(!e.placeholder||e.placeholder.constructor==String){var c=e.placeholder;e.placeholder={element:function(){var f=a(document.createElement(b.currentItem[0].nodeName)).addClass(c||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!c){f.style.visibility="hidden"}return f},update:function(f,g){if(c&&!e.forcePlaceholderSize){return}if(!g.height()){g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10))}if(!g.width()){g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=a(e.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);e.placeholder.update(b,b.placeholder)},_contactContainers:function(d){for(var c=this.containers.length-1;c>=0;c--){if(this._intersectsWith(this.containers[c].containerCache)){if(!this.containers[c].containerCache.over){if(this.currentContainer!=this.containers[c]){var h=10000;var g=null;var e=this.positionAbs[this.containers[c].floating?"left":"top"];for(var b=this.items.length-1;b>=0;b--){if(!a.ui.contains(this.containers[c].element[0],this.items[b].item[0])){continue}var f=this.items[b][this.containers[c].floating?"left":"top"];if(Math.abs(f-e)this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.topthis.containment[3])?g:(!(g-this.offset.click.topthis.containment[2])?f:(!(f-this.offset.click.left=0;c--){if(a.ui.contains(this.containers[c].element[0],this.currentItem[0])&&!e){f.push((function(g){return function(h){g._trigger("receive",h,this._uiHash(this))}}).call(this,this.containers[c]));f.push((function(g){return function(h){g._trigger("update",h,this._uiHash(this))}}).call(this,this.containers[c]))}}}for(var c=this.containers.length-1;c>=0;c--){if(!e){f.push((function(g){return function(h){g._trigger("deactivate",h,this._uiHash(this))}}).call(this,this.containers[c]))}if(this.containers[c].containerCache.over){f.push((function(g){return function(h){g._trigger("out",h,this._uiHash(this))}}).call(this,this.containers[c]));this.containers[c].containerCache.over=0}}if(this._storedCursor){a("body").css("cursor",this._storedCursor)}if(this._storedOpacity){this.helper.css("opacity",this._storedOpacity)}if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex)}this.dragging=false;if(this.cancelHelperRemoval){if(!e){this._trigger("beforeStop",d,this._uiHash());for(var c=0;c *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1000}})})(jQuery);; \ No newline at end of file Index: branches/RC/themes/default2009/index.tpl =================================================================== diff -u -N -r11610 -r11670 --- branches/RC/themes/default2009/index.tpl (.../index.tpl) (revision 11610) +++ branches/RC/themes/default2009/index.tpl (.../index.tpl) (revision 11670) @@ -33,15 +33,15 @@ - - - - +
+ + + + -
-
- + +
Index: branches/RC/themes/default2009/platform/elements/navigation_bar.elm.tpl =================================================================== diff -u -N -r11456 -r11670 --- branches/RC/themes/default2009/platform/elements/navigation_bar.elm.tpl (.../navigation_bar.elm.tpl) (revision 11456) +++ branches/RC/themes/default2009/platform/elements/navigation_bar.elm.tpl (.../navigation_bar.elm.tpl) (revision 11670) @@ -29,8 +29,8 @@ - - + Index: branches/RC/themes/default2009/platform/inc/jquery/interface/iautoscroller.js =================================================================== diff -u -N --- branches/RC/themes/default2009/platform/inc/jquery/interface/iautoscroller.js (revision 11427) +++ branches/RC/themes/default2009/platform/inc/jquery/interface/iautoscroller.js (revision 0) @@ -1,112 +0,0 @@ -/** - * Interface Elements for jQuery - * Autoscroller - * - * http://interface.eyecon.ro - * - * Copyright (c) 2006 Stefan Petre - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * - */ - -/** - * Utility object that helps to make custom autoscrollers. - * - * @example - * $('div.dragMe').Draggable( - * { - * onStart : function() - * { - * $.iAutoscroller.start(this, document.getElementsByTagName('body')); - * }, - * onStop : function() - * { - * $.iAutoscroller.stop(); - * } - * } - * ); - * - * @description Utility object that helps to make custom autoscrollers - * @type jQuery - * @cat Plugins/Interface - * @author Stefan Petre - */ - -jQuery.iAutoscroller = { - timer: null, - elToScroll: null, - elsToScroll: null, - step: 10, - /** - * This is called to start autoscrolling - * @param DOMElement el the element used as reference - * @param Array els collection of elements to scroll - * @param Integer step the pixels scroll on each step - * @param Integer interval miliseconds between each step - */ - start: function(el, els, step, interval) - { - jQuery.iAutoscroller.elToScroll = el; - jQuery.iAutoscroller.elsToScroll = els; - jQuery.iAutoscroller.step = parseInt(step)||10; - jQuery.iAutoscroller.timer = window.setInterval(jQuery.iAutoscroller.doScroll, parseInt(interval)||40); - }, - - //private function - doScroll : function() - { - for (i=0;i 0 - && - jQuery.iAutoscroller.elsToScroll[i].parentData.y + jQuery.iAutoscroller.elsToScroll[i].parentData.t > elementData.y) { - jQuery.iAutoscroller.elsToScroll[i].scrollTop -= jQuery.iAutoscroller.step; - } else if (jQuery.iAutoscroller.elsToScroll[i].parentData.t <= jQuery.iAutoscroller.elsToScroll[i].parentData.h && jQuery.iAutoscroller.elsToScroll[i].parentData.t + jQuery.iAutoscroller.elsToScroll[i].parentData.hb < elementData.y + elementData.hb) { - jQuery.iAutoscroller.elsToScroll[i].scrollTop += jQuery.iAutoscroller.step; - } - if (jQuery.iAutoscroller.elsToScroll[i].parentData.l > 0 && jQuery.iAutoscroller.elsToScroll[i].parentData.x + jQuery.iAutoscroller.elsToScroll[i].parentData.l > elementData.x) { - jQuery.iAutoscroller.elsToScroll[i].scrollLeft -= jQuery.iAutoscroller.step; - } else if (jQuery.iAutoscroller.elsToScroll[i].parentData.l <= jQuery.iAutoscroller.elsToScroll[i].parentData.wh && jQuery.iAutoscroller.elsToScroll[i].parentData.l + jQuery.iAutoscroller.elsToScroll[i].parentData.wb < elementData.x + elementData.wb) { - jQuery.iAutoscroller.elsToScroll[i].scrollLeft += jQuery.iAutoscroller.step; - } - } - }, - /** - * This is called to stop autoscrolling - */ - stop: function() - { - window.clearInterval(jQuery.iAutoscroller.timer); - jQuery.iAutoscroller.elToScroll = null; - jQuery.iAutoscroller.elsToScroll = null; - for (i in jQuery.iAutoscroller.elsToScroll) { - jQuery.iAutoscroller.elsToScroll[i].parentData = null; - } - } -}; \ No newline at end of file Index: branches/RC/themes/default2009/platform/inc/jquery/interface/isortables.js =================================================================== diff -u -N --- branches/RC/themes/default2009/platform/inc/jquery/interface/isortables.js (revision 11427) +++ branches/RC/themes/default2009/platform/inc/jquery/interface/isortables.js (revision 0) @@ -1,393 +0,0 @@ -/** - * Interface Elements for jQuery - * Sortables - * - * http://interface.eyecon.ro - * - * Copyright (c) 2006 Stefan Petre - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * - */ - -/** - * Allows you to resort elements within a container by dragging and dropping. Requires - * the Draggables and Droppables plugins. The container and each item inside the container - * must have an ID. Sortables are especially useful for lists. - * - * @see Plugins/Interface/Draggable - * @see Plugins/Interface/Droppable - * @author Stefan Petre - * @name Sortable - * @cat Plugins/Interface - * @param Hash options A hash of options - * @option String accept The class name for items inside the container (mandatory) - * @option String activeclass The class for the container when one of its items has started to move - * @option String hoverclass The class for the container when an acceptable item is inside it - * @option String helperclass The helper is used to point to the place where the item will be - * moved. This is the class for the helper. - * @option Float opacity Opacity (between 0 and 1) of the item while being dragged - * @option Boolean ghosting When true, the sortable is ghosted when dragged - * @option String tolerance Either 'pointer', 'intersect', or 'fit'. See Droppable for more details - * @option Boolean fit When true, sortable must be inside the container in order to drop - * @option Integer fx Duration for the effect applied to the sortable - * @option Function onchange Callback that gets called when the sortable list changed. It takes - * an array of serialized elements - * @option Boolean floats True if the sorted elements are floated - * @option String containment Use 'parent' to constrain the drag to the container - * @option String axis Use 'horizontally' or 'vertically' to constrain dragging to an axis - * @option String handle The jQuery selector that indicates the draggable handle - * @option DOMElement handle The node that indicates the draggable handle - * @option Function onHover Callback that is called when an acceptable item is dragged over the - * container. Gets the hovering DOMElement as a parameter - * @option Function onOut Callback that is called when an acceptable item leaves the container. - * Gets the leaving DOMElement as a parameter - * @option Object cursorAt The mouse cursor will be moved to the offset on the dragged item - * indicated by the object, which takes "top", "bottom", "left", and - * "right" keys - * @option Function onStart Callback function triggered when the dragging starts - * @option Function onStop Callback function triggered when the dragging stops - * @example $('ul').Sortable( - * { - * accept : 'sortableitem', - * activeclass : 'sortableactive', - * hoverclass : 'sortablehover', - * helperclass : 'sorthelper', - * opacity: 0.5, - * fit : false - * } - * ) - */ - -jQuery.iSort = { - changed : [], - collected : {}, - helper : false, - inFrontOf: null, - - start : function () - { - if (jQuery.iDrag.dragged == null) { - return; - } - var shs, margins,c, cs; - - jQuery.iSort.helper.get(0).className = jQuery.iDrag.dragged.dragCfg.hpc; - shs = jQuery.iSort.helper.get(0).style; - shs.display = 'block'; - jQuery.iSort.helper.oC = jQuery.extend( - jQuery.iUtil.getPosition(jQuery.iSort.helper.get(0)), - jQuery.iUtil.getSize(jQuery.iSort.helper.get(0)) - ); - - shs.width = jQuery.iDrag.dragged.dragCfg.oC.wb + 'px'; - shs.height = jQuery.iDrag.dragged.dragCfg.oC.hb + 'px'; - //shs.cssFloat = jQuery.iDrag.dragged.dragCfg.oF; - margins = jQuery.iUtil.getMargins(jQuery.iDrag.dragged); - shs.marginTop = margins.t; - shs.marginRight = margins.r; - shs.marginBottom = margins.b; - shs.marginLeft = margins.l; - if (jQuery.iDrag.dragged.dragCfg.ghosting == true) { - c = jQuery.iDrag.dragged.cloneNode(true); - cs = c.style; - cs.marginTop = '0px'; - cs.marginRight = '0px'; - cs.marginBottom = '0px'; - cs.marginLeft = '0px'; - cs.display = 'block'; - jQuery.iSort.helper.empty().append(c); - } - jQuery(jQuery.iDrag.dragged).after(jQuery.iSort.helper.get(0)); - jQuery.iDrag.dragged.style.display = 'none'; - }, - - check : function (e) - { - if (!e.dragCfg.so && jQuery.iDrop.overzone.sortable) { - if (e.dragCfg.onStop) - e.dragCfg.onStop.apply(dragged); - jQuery(e).css('position', e.dragCfg.initialPosition || e.dragCfg.oP); - jQuery(e).DraggableDestroy(); - jQuery(jQuery.iDrop.overzone).SortableAddItem(e); - } - jQuery.iSort.helper.removeClass(e.dragCfg.hpc).html(' '); - jQuery.iSort.inFrontOf = null; - var shs = jQuery.iSort.helper.get(0).style; - shs.display = 'none'; - jQuery.iSort.helper.after(e); - if (e.dragCfg.fx > 0) { - jQuery(e).fadeIn(e.dragCfg.fx); - } - jQuery('body').append(jQuery.iSort.helper.get(0)); - var ts = []; - var fnc = false; - for(var i=0; i 0) { - fnc(ts); - } - }, - - checkhover : function(e,o) - { - if (!jQuery.iDrag.dragged) - return; - var cur = false; - var i = 0; - if ( e.dropCfg.el.size() > 0) { - for (i = e.dropCfg.el.size(); i >0; i--) { - if (e.dropCfg.el.get(i-1) != jQuery.iDrag.dragged) { - if (!e.sortCfg.floats) { - if ( - (e.dropCfg.el.get(i-1).pos.y + e.dropCfg.el.get(i-1).pos.hb/2) > jQuery.iDrag.dragged.dragCfg.ny - ) { - cur = e.dropCfg.el.get(i-1); - } else { - break; - } - } else { - if ( - (e.dropCfg.el.get(i-1).pos.x + e.dropCfg.el.get(i-1).pos.wb/2) > jQuery.iDrag.dragged.dragCfg.nx && - (e.dropCfg.el.get(i-1).pos.y + e.dropCfg.el.get(i-1).pos.hb/2) > jQuery.iDrag.dragged.dragCfg.ny - ) { - cur = e.dropCfg.el.get(i-1); - } - } - } - } - } - //helpos = jQuery.iUtil.getPos(jQuery.iSort.helper.get(0)); - if (cur && jQuery.iSort.inFrontOf != cur) { - jQuery.iSort.inFrontOf = cur; - jQuery(cur).before(jQuery.iSort.helper.get(0)); - } else if(!cur && (jQuery.iSort.inFrontOf != null || jQuery.iSort.helper.get(0).parentNode != e) ) { - jQuery.iSort.inFrontOf = null; - jQuery(e).append(jQuery.iSort.helper.get(0)); - } - jQuery.iSort.helper.get(0).style.display = 'block'; - }, - - measure : function (e) - { - if (jQuery.iDrag.dragged == null) { - return; - } - e.dropCfg.el.each ( - function () - { - this.pos = jQuery.extend( - jQuery.iUtil.getSizeLite(this), - jQuery.iUtil.getPositionLite(this) - ); - } - ); - }, - - serialize : function(s) - { - var i; - var h = ''; - var o = {}; - if (s) { - if (jQuery.iSort.collected[s] ) { - o[s] = []; - jQuery('#' + s + ' .' + jQuery.iSort.collected[s]).each( - function () - { - if (h.length > 0) { - h += '&'; - } - h += s + '[]=' + jQuery.attr(this,'id'); - o[s][o[s].length] = jQuery.attr(this,'id'); - } - ); - } else { - for ( a in s) { - if (jQuery.iSort.collected[s[a]] ) { - o[s[a]] = []; - jQuery('#' + s[a] + ' .' + jQuery.iSort.collected[s[a]]).each( - function () - { - if (h.length > 0) { - h += '&'; - } - h += s[a] + '[]=' + jQuery.attr(this,'id'); - o[s[a]][o[s[a]].length] = jQuery.attr(this,'id'); - } - ); - } - } - } - } else { - for ( i in jQuery.iSort.collected){ - o[i] = []; - jQuery('#' + i + ' .' + jQuery.iSort.collected[i]).each( - function () - { - if (h.length > 0) { - h += '&'; - } - h += i + '[]=' + jQuery.attr(this,'id'); - o[i][o[i].length] = jQuery.attr(this,'id'); - } - ); - } - } - return {hash:h, o:o}; - }, - - addItem : function (e) - { - if ( !e.childNodes ) { - return; - } - return this.each( - function () - { - if(!this.sortCfg || !jQuery(e).is('.' + this.sortCfg.accept)) - jQuery(e).addClass(this.sortCfg.accept); - jQuery(e).Draggable(this.sortCfg.dragCfg); - } - ); - }, - - destroy: function() - { - return this.each( - function() - { - jQuery('.' + this.sortCfg.accept).DraggableDestroy(); - jQuery(this).DroppableDestroy(); - this.sortCfg = null; - this.isSortable = null; - } - ); - }, - - build : function (o) - { - if (o.accept && jQuery.iUtil && jQuery.iDrag && jQuery.iDrop) { - if (!jQuery.iSort.helper) { - jQuery('body',document).append('
 
'); - jQuery.iSort.helper = jQuery('#sortHelper'); - jQuery.iSort.helper.get(0).style.display = 'none'; - } - this.Droppable( - { - accept : o.accept, - activeclass : o.activeclass ? o.activeclass : false, - hoverclass : o.hoverclass ? o.hoverclass : false, - helperclass : o.helperclass ? o.helperclass : false, - /*onDrop: function (drag, fx) - { - jQuery.iSort.helper.after(drag); - if (fx > 0) { - jQuery(drag).fadeIn(fx); - } - },*/ - onHover: o.onHover||o.onhover, - onOut: o.onOut||o.onout, - sortable : true, - onChange : o.onChange||o.onchange, - fx : o.fx ? o.fx : false, - ghosting : o.ghosting ? true : false, - tolerance: o.tolerance ? o.tolerance : 'intersect' - } - ); - - return this.each( - function() - { - var dragCfg = { - revert : o.revert? true : false, - zindex : 3000, - opacity : o.opacity ? parseFloat(o.opacity) : false, - hpc : o.helperclass ? o.helperclass : false, - fx : o.fx ? o.fx : false, - so : true, - ghosting : o.ghosting ? true : false, - handle: o.handle ? o.handle : null, - containment: o.containment ? o.containment : null, - onStart : o.onStart && o.onStart.constructor == Function ? o.onStart : false, - onDrag : o.onDrag && o.onDrag.constructor == Function ? o.onDrag : false, - onStop : o.onStop && o.onStop.constructor == Function ? o.onStop : false, - axis : /vertically|horizontally/.test(o.axis) ? o.axis : false, - snapDistance : o.snapDistance ? parseInt(o.snapDistance)||0 : false, - cursorAt: o.cursorAt ? o.cursorAt : false - }; - - jQuery('.' + o.accept, this).Draggable(dragCfg); - this.isSortable = true; - this.sortCfg = { - accept : o.accept, - revert : o.revert? true : false, - zindex : 3000, - opacity : o.opacity ? parseFloat(o.opacity) : false, - hpc : o.helperclass ? o.helperclass : false, - fx : o.fx ? o.fx : false, - so : true, - ghosting : o.ghosting ? true : false, - handle: o.handle ? o.handle : null, - containment: o.containment ? o.containment : null, - floats: o.floats ? true : false, - dragCfg : dragCfg - } - } - ); - } - } -}; - -jQuery.fn.extend( - { - Sortable : jQuery.iSort.build, - /** - * A new item can be added to a sortable by adding it to the DOM and then adding it via - * SortableAddItem. - * - * @name SortableAddItem - * @param DOMElement elem A DOM Element to add to the sortable list - * @example $('#sortable1').append('
  • new item
    • ') - * .SortableAddItem($("#new_item")[0]) - * @type jQuery - * @cat Plugins/Interface - */ - SortableAddItem : jQuery.iSort.addItem, - /** - * Destroy a sortable - * - * @name SortableDestroy - * @example $('#sortable1').SortableDestroy(); - * @type jQuery - * @cat Plugins/Interface - */ - SortableDestroy: jQuery.iSort.destroy - } -); - -/** - * This function returns the hash and an object (can be used as arguments for $.post) for every - * sortable in the page or specific sortables. The hash is based on the 'id' attributes of - * container and items. - * - * @params String sortable The id of the sortable to serialize - * @name $.SortSerialize - * @type String - * @cat Plugins/Interface - */ - -jQuery.SortSerialize = jQuery.iSort.serialize; \ No newline at end of file Index: branches/RC/themes/default2009/platform/inc/jquery/interface/iutil.js =================================================================== diff -u -N --- branches/RC/themes/default2009/platform/inc/jquery/interface/iutil.js (revision 11427) +++ branches/RC/themes/default2009/platform/inc/jquery/interface/iutil.js (revision 0) @@ -1,245 +0,0 @@ -/** - * Interface Elements for jQuery - * utility function - * - * http://interface.eyecon.ro - * - * Copyright (c) 2006 Stefan Petre - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * - */ - -jQuery.iUtil = { - getPosition : function(e) - { - var x = 0; - var y = 0; - var es = e.style; - var restoreStyles = false; - if (jQuery(e).css('display') == 'none') { - var oldVisibility = es.visibility; - var oldPosition = es.position; - restoreStyles = true; - es.visibility = 'hidden'; - es.display = 'block'; - es.position = 'absolute'; - } - var el = e; - while (el){ - x += el.offsetLeft + (el.currentStyle && !jQuery.browser.opera ?parseInt(el.currentStyle.borderLeftWidth)||0:0); - y += el.offsetTop + (el.currentStyle && !jQuery.browser.opera ?parseInt(el.currentStyle.borderTopWidth)||0:0); - el = el.offsetParent; - } - el = e; - while (el && el.tagName && el.tagName.toLowerCase() != 'body') - { - x -= el.scrollLeft||0; - y -= el.scrollTop||0; - el = el.parentNode; - } - if (restoreStyles == true) { - es.display = 'none'; - es.position = oldPosition; - es.visibility = oldVisibility; - } - return {x:x, y:y}; - }, - getPositionLite : function(el) - { - var x = 0, y = 0; - while(el) { - x += el.offsetLeft || 0; - y += el.offsetTop || 0; - el = el.offsetParent; - } - return {x:x, y:y}; - }, - getSize : function(e) - { - var w = jQuery.css(e,'width'); - var h = jQuery.css(e,'height'); - var wb = 0; - var hb = 0; - var es = e.style; - if (jQuery(e).css('display') != 'none') { - wb = e.offsetWidth; - hb = e.offsetHeight; - } else { - var oldVisibility = es.visibility; - var oldPosition = es.position; - es.visibility = 'hidden'; - es.display = 'block'; - es.position = 'absolute'; - wb = e.offsetWidth; - hb = e.offsetHeight; - es.display = 'none'; - es.position = oldPosition; - es.visibility = oldVisibility; - } - return {w:w, h:h, wb:wb, hb:hb}; - }, - getSizeLite : function(el) - { - return { - wb:el.offsetWidth||0, - hb:el.offsetHeight||0 - }; - }, - getClient : function(e) - { - var h, w, de; - if (e) { - w = e.clientWidth; - h = e.clientHeight; - } else { - de = document.documentElement; - w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth; - h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight; - } - return {w:w,h:h}; - }, - getScroll : function (e) - { - var t=0, l=0, w=0, h=0, iw=0, ih=0; - if (e && e.nodeName.toLowerCase() != 'body') { - t = e.scrollTop; - l = e.scrollLeft; - w = e.scrollWidth; - h = e.scrollHeight; - iw = 0; - ih = 0; - } else { - if (document.documentElement) { - t = document.documentElement.scrollTop; - l = document.documentElement.scrollLeft; - w = document.documentElement.scrollWidth; - h = document.documentElement.scrollHeight; - } else if (document.body) { - t = document.body.scrollTop; - l = document.body.scrollLeft; - w = document.body.scrollWidth; - h = document.body.scrollHeight; - } - iw = self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth||0; - ih = self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight||0; - } - return { t: t, l: l, w: w, h: h, iw: iw, ih: ih }; - }, - getMargins : function(e, toInteger) - { - var el = jQuery(e); - var t = el.css('marginTop') || ''; - var r = el.css('marginRight') || ''; - var b = el.css('marginBottom') || ''; - var l = el.css('marginLeft') || ''; - if (toInteger) - return { - t: parseInt(t)||0, - r: parseInt(r)||0, - b: parseInt(b)||0, - l: parseInt(l) - }; - else - return {t: t, r: r, b: b, l: l}; - }, - getPadding : function(e, toInteger) - { - var el = jQuery(e); - var t = el.css('paddingTop') || ''; - var r = el.css('paddingRight') || ''; - var b = el.css('paddingBottom') || ''; - var l = el.css('paddingLeft') || ''; - if (toInteger) - return { - t: parseInt(t)||0, - r: parseInt(r)||0, - b: parseInt(b)||0, - l: parseInt(l) - }; - else - return {t: t, r: r, b: b, l: l}; - }, - getBorder : function(e, toInteger) - { - var el = jQuery(e); - var t = el.css('borderTopWidth') || ''; - var r = el.css('borderRightWidth') || ''; - var b = el.css('borderBottomWidth') || ''; - var l = el.css('borderLeftWidth') || ''; - if (toInteger) - return { - t: parseInt(t)||0, - r: parseInt(r)||0, - b: parseInt(b)||0, - l: parseInt(l)||0 - }; - else - return {t: t, r: r, b: b, l: l}; - }, - getPointer : function(event) - { - var x = event.pageX || (event.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft)) || 0; - var y = event.pageY || (event.clientY + (document.documentElement.scrollTop || document.body.scrollTop)) || 0; - return {x:x, y:y}; - }, - traverseDOM : function(nodeEl, func) - { - func(nodeEl); - nodeEl = nodeEl.firstChild; - while(nodeEl){ - jQuery.iUtil.traverseDOM(nodeEl, func); - nodeEl = nodeEl.nextSibling; - } - }, - purgeEvents : function(nodeEl) - { - jQuery.iUtil.traverseDOM( - nodeEl, - function(el) - { - for(var attr in el){ - if(typeof el[attr] === 'function') { - el[attr] = null; - } - } - } - ); - }, - centerEl : function(el, axis) - { - var clientScroll = jQuery.iUtil.getScroll(); - var windowSize = jQuery.iUtil.getSize(el); - if (!axis || axis == 'vertically') - jQuery(el).css( - { - top: clientScroll.t + ((Math.max(clientScroll.h,clientScroll.ih) - clientScroll.t - windowSize.hb)/2) + 'px' - } - ); - if (!axis || axis == 'horizontally') - jQuery(el).css( - { - left: clientScroll.l + ((Math.max(clientScroll.w,clientScroll.iw) - clientScroll.l - windowSize.wb)/2) + 'px' - } - ); - }, - fixPNG : function (el, emptyGIF) { - var images = jQuery('img[@src*="png"]', el||document), png; - images.each( function() { - png = this.src; - this.src = emptyGIF; - this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + png + "')"; - }); - } -}; - -// Helper function to support older browsers! -[].indexOf || (Array.prototype.indexOf = function(v, n){ - n = (n == null) ? 0 : n; - var m = this.length; - for (var i=n; i     REMOVE THIS LINE TO UNCOMMENT ##--> Index: branches/RC/themes/default2009/platform/template_manager/html_head.tpl =================================================================== diff -u -N -r11661 -r11670 --- branches/RC/themes/default2009/platform/template_manager/html_head.tpl (.../html_head.tpl) (revision 11661) +++ branches/RC/themes/default2009/platform/template_manager/html_head.tpl (.../html_head.tpl) (revision 11670) @@ -1,67 +1,22 @@ - + + - - - - - + + - /*.groupItem .itemHeader a { - position: absolute; - right: 10px; - top: 0px; - font-weight: normal; - font-size: 11px; - text-decoration: none; - }*/ - - .sortHelper { - border: 3px dashed #666; - width: auto !important; - } - - /*.groupWrapper p { - height: 1px; - overflow: hidden; - margin: 0; - padding: 0; - }*/ - -
    +
    -
    +
    @@ -68,7 +68,7 @@
    		-
    +
    @@ -100,7 +100,11 @@
    		- +
    +
    + +
    +
    - -
    + + + Index: branches/RC/themes/default2009/platform/elements/banners/banner_right.elm.tpl =================================================================== diff -u -N -r11456 -r11670 --- branches/RC/themes/default2009/platform/elements/banners/banner_right.elm.tpl (.../banner_right.elm.tpl) (revision 11456) +++ branches/RC/themes/default2009/platform/elements/banners/banner_right.elm.tpl (.../banner_right.elm.tpl) (revision 11670) @@ -1,5 +1,5 @@
    - + Index: branches/RC/themes/default2009/platform/elements/content_boxes.elm.tpl =================================================================== diff -u -N -r11538 -r11670 --- branches/RC/themes/default2009/platform/elements/content_boxes.elm.tpl (.../content_boxes.elm.tpl) (revision 11538) +++ branches/RC/themes/default2009/platform/elements/content_boxes.elm.tpl (.../content_boxes.elm.tpl) (revision 11670) @@ -1,16 +1,16 @@ -
    +
    - + -
    img/s.gif" width="1" height="20" alt=""/>
    img/s.gif" width="13" height="1" alt=""/>
    		 +
    		@@ -34,17 +34,17 @@ - +
    - + -
    img/s.gif" width="1" height="20" alt=""/>
    img/s.gif" width="13" height="1" alt=""/>
    		 +
    		@@ -68,12 +68,12 @@ - - +
    + -
    img/s.gif" width="13" height="1" alt=""/>
    		 +