Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F785326
advanced
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Wed, Feb 12, 9:09 AM
Size
131 KB
Mime Type
text/x-diff
Expires
Fri, Feb 14, 9:09 AM (1 d, 9 h)
Engine
blob
Format
Raw Data
Handle
564363
Attached To
rTADV Themes.Advanced
advanced
View Options
Index: platform/designs/default_design.des.tpl
===================================================================
--- platform/designs/default_design.des.tpl (revision 11669)
+++ platform/designs/default_design.des.tpl (revision 11670)
@@ -1,121 +1,125 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<inp2:m_CheckSSL/>
<inp2:m_include template="platform/elements/side_boxes.elm" strip_nl="1"/>
<inp2:m_include template="platform/elements/content_boxes.elm" strip_nl="1"/>
<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<inp2:m_DefineElement name="cms_page_title">
<inp2:st_PageInfo type="htmlhead_title"/>
</inp2:m_DefineElement>
<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
<inp2:st_EditingScripts/>
<inp2:m_Include template="platform/template_manager/html_head"/>
<!--## /Include module specific HEADER template ##-->
</head>
<body>
<inp2:st_EditPage mode="start"/>
<div align="left">
<div align="left" style="width:100%">
<table class="fullwidth">
<tr>
<td>
<inp2:m_include template="platform/elements/header.elm"/>
</td>
</tr>
<tr>
<td>
<inp2:m_include template="platform/elements/menu.elm"/>
</td>
</tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt=""/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
<table class="fullwidth">
<tr>
<!-- SIDEBAR -->
<td style="width: 200px;" valign="top">
- <div class="groupWrapper">
+ <div class="movable-area">
<inp2:m_DefineElement name="cms_sidebar">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
</inp2:m_DefineElement>
<inp2:m_RenderElement name="sidebar" default_element="cms_sidebar" layout_view="1"/>
</div>
</td>
<!-- /SIDEBAR -->
<!-- SEPARATOR -->
<td width="3" class="vertical-separator" style="width: 3px;">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
</td>
<!-- /SEPARATOR -->
<!-- CONTENT -->
<td style="width: auto;" valign="top">
- <div class="groupWrapper">
+ <div class="movable-area">
<inp2:m_DefineElement name="cms_content">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:st_PageInfo type="title"/>
</inp2:m_Capture>
<inp2:st_ContentBlock num="1"/>
</inp2:m_RenderElement>
</div>
</inp2:m_DefineElement>
<inp2:m_RenderElement name="content" default_element="cms_content" layout_view="1"/>
</div>
<br />
</td>
<!-- /CONTENT -->
<!--## REMOVE THIS LINE TO UNCOMMENT
<!-- SEPARATOR -->
<td width="3" class="vertical-separator">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
</td>
<!-- /SEPARATOR -->
<!-- RIGHT-SIDEBAR WITH BANNER -->
<td style="width: 200px;" valign="top">
- <inp2:m_include template="platform/elements/banners/banner_right.elm"/>
+ <div class="movable-area">
+ <div class="movable-element">
+ <inp2:m_include template="platform/elements/banners/banner_right.elm"/>
+ </div>
+ </div>
</td>
<!-- /RIGHT-SIDEBAR WITH BANNER -->
REMOVE THIS LINE TO UNCOMMENT ##-->
</tr>
</table>
<table class="fullwidth">
<tr>
<td >
<inp2:m_include template="platform/elements/footer.elm"/>
</td>
</tr>
</table>
</div>
</div>
<inp2:st_EditPage mode="end"/>
</body>
</html>
\ No newline at end of file
Property changes on: platform/designs/default_design.des.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: platform/template_manager/html_head.tpl
===================================================================
--- platform/template_manager/html_head.tpl (revision 11669)
+++ platform/template_manager/html_head.tpl (revision 11670)
@@ -1,150 +1,82 @@
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery-ui-personalized-1.5.2.js"></script>-->
+<inp2:m_if check="m_GetConst" name="EDITING_MODE" equals_to="2">
+ <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery-ui.custom.min.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/iutil.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/idrag.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/idrop.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/isortables.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/interface/iautoscroller.js"></script>
-
-
-<style type="text/css" media="all">
- .groupWrapper {
- /*width: 32%;
- float: left;
- margin-right: 1%;*/
- /*border: 1px solid green;*/
- min-height: 200px;
- }
-
- /*.serializer {
- clear: both;
- }*/
-
- /*.groupItem {
- margin-bottom: 20px;
- }*/
+ <style type="text/css" media="all">
+ div.movable-area {
+ min-height: 200px;
+ }
- <inp2:m_if check="m_GetConst" name="EDITING_MODE" equals_to="2">
- .groupItem .itemHeader {
+ div.movable-element .movable-header {
cursor: move;
-
- /*line-height: 28px;
- background-color: #DAFF9F;
- border-top: 2px solid #B5EF59;
- color: #000;
- padding: 0 10px;
- font-weight: bold;
- font-size: 16px;
- height: 28px;
- position: relative;*/
}
- </inp2:m_if>
- /*.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;
- }*/
-</style>
+ .sortHelper {
+ border: 3px dashed #666;
+ /*width: auto !important;*/
+ }
+ </style>
+</inp2:m_if>
<inp2:m_if check="m_GetConst" name="EDITING_MODE">
<div class="extra-toolbar" style="display: none;">
<inp2:m_DefineElement name="edit_mode_element" template="" is_last="0">
<inp2:m_if check="m_GetConst" name="EDITING_MODE" equals_to="$editing_mode">
<td class="button-active" style="padding-right: 5px;">
</td>
<td class="button-active">
<img src="<inp2:m_TemplatesBase force_admin='1'/>/img/top_frame/icons/<inp2:m_Param name='image'/>.gif" alt="" border="0"/>
</td>
<td class="button-active" style="padding-right: 5px;<inp2:m_ifnot check='m_Param' name='is_last'> border-right: 1px solid #BBBBBB;</inp2:m_ifnot>">
<strong><inp2:m_Param name="title"/></strong>
</td>
<inp2:m_else/>
<td style="padding-right: 5px; height: 22px;">
</td>
<td>
<a class="kx-header-link" href="<inp2:m_Link template='$template' pass='all'/>" onclick="getFrame('main').location.href = this.href; return false;">
<img src="<inp2:m_TemplatesBase force_admin='1'/>/img/top_frame/icons/<inp2:m_Param name='image'/>.gif" alt="" border="0"/>
</a>
</td>
<td style="padding-right: 5px;<inp2:m_ifnot check='m_Param' name='is_last'> border-right: 1px solid #BBBBBB;</inp2:m_ifnot>">
<a class="kx-header-link" href="<inp2:m_Link editing_mode='$editing_mode' pass='all'/>" onclick="getFrame('main').location.href = this.href; return false;"><inp2:m_Param name="title"/></a>
</td>
</inp2:m_if>
</inp2:m_DefineElement>
<table cellpadding="0" cellspacing="0">
<tr>
<inp2:m_RenderElement name="edit_mode_element" editing_mode="1" image="show_structure" title="Browse Mode" no_editing="1" strip_nl="2"/>
<inp2:m_RenderElement name="edit_mode_element" editing_mode="4" image="content_mode" title="Content Mode" no_editing="1" strip_nl="2"/>
<inp2:m_RenderElement name="edit_mode_element" editing_mode="2" image="show_all" title="Layout Mode" no_editing="1" strip_nl="2"/>
<inp2:m_RenderElement name="edit_mode_element" editing_mode="3" image="show_all" title="Design Mode" no_editing="1" strip_nl="2" is_last="1"/>
</tr>
</table>
</div>
</inp2:m_if>
<script type="text/javascript">
$(
function () {
<inp2:m_if check="m_GetConst" name="EDITING_MODE">
getFrame('head').$('#extra_toolbar').html( $('div.extra-toolbar').html() );
</inp2:m_if>
<inp2:m_if check="m_GetConst" name="EDITING_MODE" equals_to="2">
- $('div.groupWrapper').Sortable(
- {
- accept: 'groupItem',
- helperclass: 'sortHelper',
- activeclass : 'sortableactive',
- hoverclass : 'sortablehover',
- handle: 'td.itemHeader',
- tolerance: 'pointer',
- onChange : function(ser)
- {
- },
- onStart : function()
- {
- $.iAutoscroller.start(this, document.getElementsByTagName('body'));
- },
- onStop : function()
- {
- $.iAutoscroller.stop();
- }
- }
- );
-
- /*$('div.groupWrapper').sortable(
+ $('div.movable-area').sortable(
{
placeholder: 'sortHelper',
- handle: 'td.itemHeader',
- appendTo: 'body',
- connectWith: ['div.groupWrapper'],
- revert: true,
+ handle: '.movable-header',
+ items: 'div.movable-element',
+ connectWith: ['div.movable-area'],
start: function(e, ui) {
- ui.helper.css('width', ui.item.width());
+ ui.placeholder.height( ui.item.height() );
}
}
- );*/
+ );
</inp2:m_if>
}
);
</script>
\ No newline at end of file
Property changes on: platform/template_manager/html_head.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: platform/inc/jquery/interface/isortables.js
===================================================================
--- platform/inc/jquery/interface/isortables.js (revision 11669)
+++ platform/inc/jquery/interface/isortables.js (nonexistent)
@@ -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<jQuery.iSort.changed.length; i++){
- var iEL = jQuery.iDrop.zones[jQuery.iSort.changed[i]].get(0);
- var id = jQuery.attr(iEL, 'id');
- var ser = jQuery.iSort.serialize(id);
- if (iEL.dropCfg.os != ser.hash) {
- iEL.dropCfg.os = ser.hash;
- if (fnc == false && iEL.dropCfg.onChange) {
- fnc = iEL.dropCfg.onChange;
- }
- ser.id = id;
- ts[ts.length] = ser;
- }
- }
- jQuery.iSort.changed = [];
- if (fnc != false && ts.length > 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('<div id="sortHelper"> </div>');
- 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('<li id="newitem">new item</li>')
- * .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
Property changes on: platform/inc/jquery/interface/isortables.js
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: platform/inc/jquery/interface/iutil.js
===================================================================
--- platform/inc/jquery/interface/iutil.js (revision 11669)
+++ platform/inc/jquery/interface/iutil.js (nonexistent)
@@ -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<m; i++)
- if (this[i] == v)
- return i;
- return -1;
-});
Property changes on: platform/inc/jquery/interface/iutil.js
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: platform/inc/jquery/interface/idrop.js
===================================================================
--- platform/inc/jquery/interface/idrop.js (revision 11669)
+++ platform/inc/jquery/interface/idrop.js (nonexistent)
@@ -1,323 +0,0 @@
-/**
- * Interface Elements for jQuery
- * Droppables
- *
- * http://interface.eyecon.ro
- *
- * Copyright (c) 2006 Stefan Petre
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- *
- */
-
-/**
- * With the Draggables plugin, Droppable allows you to create drop zones for draggable elements.
- *
- * @name Droppable
- * @cat Plugins/Interface
- * @param Hash options A hash of options
- * @option String accept The class name for draggables to get accepted by the droppable (mandatory)
- * @option String activeclass When an acceptable draggable is moved, the droppable gets this class
- * @option String hoverclass When an acceptable draggable is inside the droppable, the droppable gets
- * this class
- * @option String tolerance Choose from 'pointer', 'intersect', or 'fit'. The pointer options means
- * that the pointer must be inside the droppable in order for the draggable
- * to be dropped. The intersect option means that the draggable must intersect
- * the droppable. The fit option means that the entire draggable must be
- * inside the droppable.
- * @option Function onDrop When an acceptable draggable is dropped on a droppable, this callback is
- * called. It passes the draggable DOMElement as a parameter.
- * @option Function onHover When an acceptable draggable is hovered over a droppable, this callback
- * is called. It passes the draggable DOMElement as a parameter.
- * @option Function onOut When an acceptable draggable leaves a droppable, this callback is called.
- * It passes the draggable DOMElement as a parameter.
- * @example $('#dropzone1').Droppable(
- * {
- * accept : 'dropaccept',
- * activeclass: 'dropzoneactive',
- * hoverclass: 'dropzonehover',
- * ondrop: function (drag) {
- * alert(this); //the droppable
- * alert(drag); //the draggable
- * },
- * fit: true
- * }
- * )
- */
-
-jQuery.iDrop = {
- fit : function (zonex, zoney, zonew, zoneh)
- {
- return zonex <= jQuery.iDrag.dragged.dragCfg.nx &&
- (zonex + zonew) >= (jQuery.iDrag.dragged.dragCfg.nx + jQuery.iDrag.dragged.dragCfg.oC.w) &&
- zoney <= jQuery.iDrag.dragged.dragCfg.ny &&
- (zoney + zoneh) >= (jQuery.iDrag.dragged.dragCfg.ny + jQuery.iDrag.dragged.dragCfg.oC.h) ? true :false;
- },
- intersect : function (zonex, zoney, zonew, zoneh)
- {
- return ! ( zonex > (jQuery.iDrag.dragged.dragCfg.nx + jQuery.iDrag.dragged.dragCfg.oC.w)
- || (zonex + zonew) < jQuery.iDrag.dragged.dragCfg.nx
- || zoney > (jQuery.iDrag.dragged.dragCfg.ny + jQuery.iDrag.dragged.dragCfg.oC.h)
- || (zoney + zoneh) < jQuery.iDrag.dragged.dragCfg.ny
- ) ? true :false;
- },
- pointer : function (zonex, zoney, zonew, zoneh)
- {
- return zonex < jQuery.iDrag.dragged.dragCfg.currentPointer.x
- && (zonex + zonew) > jQuery.iDrag.dragged.dragCfg.currentPointer.x
- && zoney < jQuery.iDrag.dragged.dragCfg.currentPointer.y
- && (zoney + zoneh) > jQuery.iDrag.dragged.dragCfg.currentPointer.y
- ? true :false;
- },
- overzone : false,
- highlighted : {},
- count : 0,
- zones : {},
-
- highlight : function (elm)
- {
- if (jQuery.iDrag.dragged == null) {
- return;
- }
- var i;
- jQuery.iDrop.highlighted = {};
- var oneIsSortable = false;
- for (i in jQuery.iDrop.zones) {
- if (jQuery.iDrop.zones[i] != null) {
- var iEL = jQuery.iDrop.zones[i].get(0);
- if (jQuery(jQuery.iDrag.dragged).is('.' + iEL.dropCfg.a)) {
- if (iEL.dropCfg.m == false) {
- iEL.dropCfg.p = jQuery.extend(
- jQuery.iUtil.getPositionLite(iEL),
- jQuery.iUtil.getSizeLite(iEL)
- );//jQuery.iUtil.getPos(iEL);
- iEL.dropCfg.m = true;
- }
- if (iEL.dropCfg.ac) {
- jQuery.iDrop.zones[i].addClass(iEL.dropCfg.ac);
- }
- jQuery.iDrop.highlighted[i] = jQuery.iDrop.zones[i];
- //if (jQuery.iSort && jQuery.iDrag.dragged.dragCfg.so) {
- if (jQuery.iSort && iEL.dropCfg.s && jQuery.iDrag.dragged.dragCfg.so) {
- iEL.dropCfg.el = jQuery('.' + iEL.dropCfg.a, iEL);
- elm.style.display = 'none';
- jQuery.iSort.measure(iEL);
- iEL.dropCfg.os = jQuery.iSort.serialize(jQuery.attr(iEL, 'id')).hash;
- elm.style.display = elm.dragCfg.oD;
- oneIsSortable = true;
- }
- if (iEL.dropCfg.onActivate) {
- iEL.dropCfg.onActivate.apply(jQuery.iDrop.zones[i].get(0), [jQuery.iDrag.dragged]);
- }
- }
- }
- }
- //if (jQuery.iSort && jQuery.iDrag.dragged.dragCfg.so) {
- if (oneIsSortable) {
- jQuery.iSort.start();
- }
- },
- /**
- * remeasure the droppable
- *
- * useful when the positions/dimensions for droppables
- * are changed while dragging a element
- *
- * this works for sortables too but with a greate processor
- * penality because remeasures each sort items too
- */
- remeasure : function()
- {
- jQuery.iDrop.highlighted = {};
- for (i in jQuery.iDrop.zones) {
- if (jQuery.iDrop.zones[i] != null) {
- var iEL = jQuery.iDrop.zones[i].get(0);
- if (jQuery(jQuery.iDrag.dragged).is('.' + iEL.dropCfg.a)) {
- iEL.dropCfg.p = jQuery.extend(
- jQuery.iUtil.getPositionLite(iEL),
- jQuery.iUtil.getSizeLite(iEL)
- );
- if (iEL.dropCfg.ac) {
- jQuery.iDrop.zones[i].addClass(iEL.dropCfg.ac);
- }
- jQuery.iDrop.highlighted[i] = jQuery.iDrop.zones[i];
-
- if (jQuery.iSort && iEL.dropCfg.s && jQuery.iDrag.dragged.dragCfg.so) {
- iEL.dropCfg.el = jQuery('.' + iEL.dropCfg.a, iEL);
- elm.style.display = 'none';
- jQuery.iSort.measure(iEL);
- elm.style.display = elm.dragCfg.oD;
- }
- }
- }
- }
- },
-
- checkhover : function (e)
- {
- if (jQuery.iDrag.dragged == null) {
- return;
- }
- jQuery.iDrop.overzone = false;
- var i;
- var applyOnHover = false;
- var hlt = 0;
- for (i in jQuery.iDrop.highlighted)
- {
- var iEL = jQuery.iDrop.highlighted[i].get(0);
- if (
- jQuery.iDrop.overzone == false
- &&
- jQuery.iDrop[iEL.dropCfg.t](
- iEL.dropCfg.p.x,
- iEL.dropCfg.p.y,
- iEL.dropCfg.p.wb,
- iEL.dropCfg.p.hb
- )
-
- ) {
- if (iEL.dropCfg.hc && iEL.dropCfg.h == false) {
- jQuery.iDrop.highlighted[i].addClass(iEL.dropCfg.hc);
- }
- //chec if onHover function has to be called
- if (iEL.dropCfg.h == false &&iEL.dropCfg.onHover) {
- applyOnHover = true;
- }
- iEL.dropCfg.h = true;
- jQuery.iDrop.overzone = iEL;
- //if(jQuery.iSort && jQuery.iDrag.dragged.dragCfg.so) {
- if(jQuery.iSort && iEL.dropCfg.s && jQuery.iDrag.dragged.dragCfg.so) {
- jQuery.iSort.helper.get(0).className = iEL.dropCfg.shc;
- jQuery.iSort.checkhover(iEL);
- }
- hlt ++;
- } else if(iEL.dropCfg.h == true) {
- //onOut function
- if (iEL.dropCfg.onOut) {
- iEL.dropCfg.onOut.apply(iEL, [e, jQuery.iDrag.helper.get(0).firstChild, iEL.dropCfg.fx]);
- }
- if (iEL.dropCfg.hc) {
- jQuery.iDrop.highlighted[i].removeClass(iEL.dropCfg.hc);
- }
- iEL.dropCfg.h = false;
- }
- }
- if (jQuery.iSort && !jQuery.iDrop.overzone && jQuery.iDrag.dragged.so) {
- jQuery.iSort.helper.get(0).style.display = 'none';
- //jQuery('body').append(jQuery.iSort.helper.get(0));
- }
- //call onhover
- if(applyOnHover) {
- jQuery.iDrop.overzone.dropCfg.onHover.apply(jQuery.iDrop.overzone, [e, jQuery.iDrag.helper.get(0).firstChild]);
- }
- },
- checkdrop : function (e)
- {
- var i;
- for (i in jQuery.iDrop.highlighted) {
- var iEL = jQuery.iDrop.highlighted[i].get(0);
- if (iEL.dropCfg.ac) {
- jQuery.iDrop.highlighted[i].removeClass(iEL.dropCfg.ac);
- }
- if (iEL.dropCfg.hc) {
- jQuery.iDrop.highlighted[i].removeClass(iEL.dropCfg.hc);
- }
- if(iEL.dropCfg.s) {
- jQuery.iSort.changed[jQuery.iSort.changed.length] = i;
- }
- if (iEL.dropCfg.onDrop && iEL.dropCfg.h == true) {
- iEL.dropCfg.h = false;
- iEL.dropCfg.onDrop.apply(iEL, [e, iEL.dropCfg.fx]);
- }
- iEL.dropCfg.m = false;
- iEL.dropCfg.h = false;
- }
- jQuery.iDrop.highlighted = {};
- },
- destroy : function()
- {
- return this.each(
- function()
- {
- if (this.isDroppable) {
- if (this.dropCfg.s) {
- id = jQuery.attr(this,'id');
- jQuery.iSort.collected[id] = null;
- jQuery('.' + this.dropCfg.a, this).DraggableDestroy();
- }
- jQuery.iDrop.zones['d' + this.idsa] = null;
- this.isDroppable = false;
- this.f = null;
- }
- }
- );
- },
- build : function (o)
- {
- return this.each(
- function()
- {
- if (this.isDroppable == true || !o.accept || !jQuery.iUtil || !jQuery.iDrag){
- return;
- }
- this.dropCfg = {
- a : o.accept,
- ac: o.activeclass||false,
- hc: o.hoverclass||false,
- shc: o.helperclass||false,
- onDrop: o.ondrop||o.onDrop||false,
- onHover: o.onHover||o.onhover||false,
- onOut: o.onOut||o.onout||false,
- onActivate: o.onActivate||false,
- t: o.tolerance && ( o.tolerance == 'fit' || o.tolerance == 'intersect') ? o.tolerance : 'pointer',
- fx: o.fx ? o.fx : false,
- m: false,
- h: false
- };
- if (o.sortable == true && jQuery.iSort) {
- id = jQuery.attr(this,'id');
- jQuery.iSort.collected[id] = this.dropCfg.a;
- this.dropCfg.s = true;
- if(o.onChange) {
- this.dropCfg.onChange = o.onChange;
- this.dropCfg.os = jQuery.iSort.serialize(id).hash;
- }
- }
- this.isDroppable = true;
- this.idsa = parseInt(Math.random() * 10000);
- jQuery.iDrop.zones['d' + this.idsa] = jQuery(this);
- jQuery.iDrop.count ++;
- }
- );
- }
-};
-
-/**
- * Destroy an existing droppable on a collection of elements
- *
- * @name DroppableDestroy
- * @descr Destroy a droppable
- * @type jQuery
- * @cat Plugins/Interface
- * @example $('#drag2').DroppableDestroy();
- */
-
-jQuery.fn.extend(
- {
- DroppableDestroy : jQuery.iDrop.destroy,
- Droppable : jQuery.iDrop.build
- }
-);
-
-
-/**
- * Recalculate all Droppables
- *
- * @name $.recallDroppables
- * @type jQuery
- * @cat Plugins/Interface
- * @example $.recallDroppable();
- */
-
-jQuery.recallDroppables = jQuery.iDrop.remeasure;
\ No newline at end of file
Property changes on: platform/inc/jquery/interface/idrop.js
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: platform/inc/jquery/interface/idrag.js
===================================================================
--- platform/inc/jquery/interface/idrag.js (revision 11669)
+++ platform/inc/jquery/interface/idrag.js (nonexistent)
@@ -1,591 +0,0 @@
-/**
- * Interface Elements for jQuery
- * Draggable
- *
- * http://interface.eyecon.ro
- *
- * Copyright (c) 2006 Stefan Petre
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- */
-
-/**
- * Create a draggable element with a number of advanced options including callback, Google Maps type draggables,
- * reversion, ghosting, and grid dragging.
- *
- * @name Draggable
- * @descr Creates draggable elements that can be moved across the page.
- * @param Hash hash A hash of parameters. All parameters are optional.
- * @option String handle (optional) The jQuery selector matching the handle that starts the draggable
- * @option DOMElement handle (optional) The DOM Element of the handle that starts the draggable
- * @option Boolean revert (optional) When true, on stop-drag the element returns to initial position
- * @option Boolean ghosting (optional) When true, a copy of the element is moved
- * @option Integer zIndex (optional) zIndex depth for the element while it is being dragged
- * @option Float opacity (optional) A number between 0 and 1 that indicates the opacity of the element while being dragged
- * @option Integer grid (optional) (optional) A number of pixels indicating the grid that the element should snap to
- * @option Array grid (optional) A number of x-pixels and y-pixels indicating the grid that the element should snap to
- * @option Integer fx (optional) Duration for the effect (like ghosting or revert) applied to the draggable
- * @option String containment (optional) Define the zone where the draggable can be moved. 'parent' moves it inside parent
- * element, while 'document' prevents it from leaving the document and forcing additional
- * scrolling
- * @option Array containment An 4-element array (left, top, width, height) indicating the containment of the element
- * @option String axis (optional) Set an axis: vertical (with 'vertically') or horizontal (with 'horizontally')
- * @option Function onStart (optional) Callback function triggered when the dragging starts
- * @option Function onStop (optional) Callback function triggered when the dragging stops
- * @option Function onChange (optional) Callback function triggered when the dragging stop *and* the element was moved at least
- * one pixel
- * @option Function onDrag (optional) Callback function triggered while the element is dragged. Receives two parameters: x and y
- * coordinates. You can return an object with new coordinates {x: x, y: y} so this way you can
- * interact with the dragging process (for instance, build your containment)
- * @option Boolean insideParent Forces the element to remain inside its parent when being dragged (like Google Maps)
- * @option Integer snapDistance (optional) The element is not moved unless it is dragged more than snapDistance. You can prevent
- * accidental dragging and keep regular clicking enabled (for links or form elements,
- * for instance)
- * @option Object cursorAt (optional) The dragged element is moved to the cursor position with the offset specified. Accepts value
- * for top, left, right and bottom offset. Basically, this forces the cursor to a particular
- * position during the entire drag operation.
- * @option Boolean autoSize (optional) When true, the drag helper is resized to its content, instead of the dragged element's sizes
- * @option String frameClass (optional) When is set the cloned element is hidden so only a frame is dragged
- * @type jQuery
- * @cat Plugins/Interface
- * @author Stefan Petre
- */
-
-jQuery.iDrag = {
- helper : null,
- dragged: null,
- destroy : function()
- {
- return this.each(
- function ()
- {
- if (this.isDraggable) {
- this.dragCfg.dhe.unbind('mousedown', jQuery.iDrag.draginit);
- this.dragCfg = null;
- this.isDraggable = false;
- if(jQuery.browser.msie) {
- this.unselectable = "off";
- } else {
- this.style.MozUserSelect = '';
- this.style.KhtmlUserSelect = '';
- this.style.userSelect = '';
- }
- }
- }
- );
- },
- draginit : function (e)
- {
-// alert('initing drag operation');
- if (jQuery.iDrag.dragged != null) {
- jQuery.iDrag.dragstop(e);
- return false;
- }
- var elm = this.dragElem;
- jQuery(document)
- .bind('mousemove', jQuery.iDrag.dragmove)
- .bind('mouseup', jQuery.iDrag.dragstop);
- elm.dragCfg.pointer = jQuery.iUtil.getPointer(e);
- elm.dragCfg.currentPointer = elm.dragCfg.pointer;
- elm.dragCfg.init = false;
- elm.dragCfg.fromHandler = this != this.dragElem;
- jQuery.iDrag.dragged = elm;
- if (elm.dragCfg.si && this != this.dragElem) {
- parentPos = jQuery.iUtil.getPosition(elm.parentNode);
- sliderSize = jQuery.iUtil.getSize(elm);
- sliderPos = {
- x : parseInt(jQuery.css(elm,'left')) || 0,
- y : parseInt(jQuery.css(elm,'top')) || 0
- };
- dx = elm.dragCfg.currentPointer.x - parentPos.x - sliderSize.wb/2 - sliderPos.x;
- dy = elm.dragCfg.currentPointer.y - parentPos.y - sliderSize.hb/2 - sliderPos.y;
- jQuery.iSlider.dragmoveBy(elm, [dx, dy]);
- }
- return jQuery.selectKeyHelper||false;
- },
-
- dragstart : function(e)
- {
- var elm = jQuery.iDrag.dragged;
- elm.dragCfg.init = true;
-
- var dEs = elm.style;
-
- elm.dragCfg.oD = jQuery.css(elm,'display');
- elm.dragCfg.oP = jQuery.css(elm,'position');
- if (!elm.dragCfg.initialPosition)
- elm.dragCfg.initialPosition = elm.dragCfg.oP;
-
- elm.dragCfg.oR = {
- x : parseInt(jQuery.css(elm,'left')) || 0,
- y : parseInt(jQuery.css(elm,'top')) || 0
- };
- elm.dragCfg.diffX = 0;
- elm.dragCfg.diffY = 0;
- if (jQuery.browser.msie) {
- var oldBorder = jQuery.iUtil.getBorder(elm, true);
- elm.dragCfg.diffX = oldBorder.l||0;
- elm.dragCfg.diffY = oldBorder.t||0;
- }
-
- elm.dragCfg.oC = jQuery.extend(
- jQuery.iUtil.getPosition(elm),
- jQuery.iUtil.getSize(elm)
- );
- if (elm.dragCfg.oP != 'relative' && elm.dragCfg.oP != 'absolute') {
- dEs.position = 'relative';
- }
-
- jQuery.iDrag.helper.empty();
- var clonedEl = elm.cloneNode(true);
-
- jQuery(clonedEl).css(
- {
- display: 'block',
- left: '0px',
- top: '0px'
- }
- );
- clonedEl.style.marginTop = '0';
- clonedEl.style.marginRight = '0';
- clonedEl.style.marginBottom = '0';
- clonedEl.style.marginLeft = '0';
- jQuery.iDrag.helper.append(clonedEl);
-
- var dhs = jQuery.iDrag.helper.get(0).style;
-
- if (elm.dragCfg.autoSize) {
- dhs.width = 'auto';
- dhs.height = 'auto';
- } else {
- dhs.height = elm.dragCfg.oC.hb + 'px';
- dhs.width = elm.dragCfg.oC.wb + 'px';
- }
-
- dhs.display = 'block';
- dhs.marginTop = '0px';
- dhs.marginRight = '0px';
- dhs.marginBottom = '0px';
- dhs.marginLeft = '0px';
-
- //remeasure the clone to check if the size was changed by user's functions
- jQuery.extend(
- elm.dragCfg.oC,
- jQuery.iUtil.getSize(clonedEl)
- );
-
- if (elm.dragCfg.cursorAt) {
- if (elm.dragCfg.cursorAt.left) {
- elm.dragCfg.oR.x += elm.dragCfg.pointer.x - elm.dragCfg.oC.x - elm.dragCfg.cursorAt.left;
- elm.dragCfg.oC.x = elm.dragCfg.pointer.x - elm.dragCfg.cursorAt.left;
- }
- if (elm.dragCfg.cursorAt.top) {
- elm.dragCfg.oR.y += elm.dragCfg.pointer.y - elm.dragCfg.oC.y - elm.dragCfg.cursorAt.top;
- elm.dragCfg.oC.y = elm.dragCfg.pointer.y - elm.dragCfg.cursorAt.top;
- }
- if (elm.dragCfg.cursorAt.right) {
- elm.dragCfg.oR.x += elm.dragCfg.pointer.x - elm.dragCfg.oC.x -elm.dragCfg.oC.hb + elm.dragCfg.cursorAt.right;
- elm.dragCfg.oC.x = elm.dragCfg.pointer.x - elm.dragCfg.oC.wb + elm.dragCfg.cursorAt.right;
- }
- if (elm.dragCfg.cursorAt.bottom) {
- elm.dragCfg.oR.y += elm.dragCfg.pointer.y - elm.dragCfg.oC.y - elm.dragCfg.oC.hb + elm.dragCfg.cursorAt.bottom;
- elm.dragCfg.oC.y = elm.dragCfg.pointer.y - elm.dragCfg.oC.hb + elm.dragCfg.cursorAt.bottom;
- }
- }
- elm.dragCfg.nx = elm.dragCfg.oR.x;
- elm.dragCfg.ny = elm.dragCfg.oR.y;
-
- if (elm.dragCfg.insideParent || elm.dragCfg.containment == 'parent') {
- parentBorders = jQuery.iUtil.getBorder(elm.parentNode, true);
- elm.dragCfg.oC.x = elm.offsetLeft + (jQuery.browser.msie ? 0 : jQuery.browser.opera ? -parentBorders.l : parentBorders.l);
- elm.dragCfg.oC.y = elm.offsetTop + (jQuery.browser.msie ? 0 : jQuery.browser.opera ? -parentBorders.t : parentBorders.t);
- jQuery(elm.parentNode).append(jQuery.iDrag.helper.get(0));
- }
- if (elm.dragCfg.containment) {
- jQuery.iDrag.getContainment(elm);
- elm.dragCfg.onDragModifier.containment = jQuery.iDrag.fitToContainer;
- }
-
- if (elm.dragCfg.si) {
- jQuery.iSlider.modifyContainer(elm);
- }
-
- dhs.left = elm.dragCfg.oC.x - elm.dragCfg.diffX + 'px';
- dhs.top = elm.dragCfg.oC.y - elm.dragCfg.diffY + 'px';
- //resize the helper to fit the clone
- dhs.width = elm.dragCfg.oC.wb + 'px';
- dhs.height = elm.dragCfg.oC.hb + 'px';
-
- jQuery.iDrag.dragged.dragCfg.prot = false;
-
- if (elm.dragCfg.gx) {
- elm.dragCfg.onDragModifier.grid = jQuery.iDrag.snapToGrid;
- }
- if (elm.dragCfg.zIndex != false) {
- jQuery.iDrag.helper.css('zIndex', elm.dragCfg.zIndex);
- }
- if (elm.dragCfg.opacity) {
- jQuery.iDrag.helper.css('opacity', elm.dragCfg.opacity);
- if (window.ActiveXObject) {
- jQuery.iDrag.helper.css('filter', 'alpha(opacity=' + elm.dragCfg.opacity * 100 + ')');
- }
- }
-
- if(elm.dragCfg.frameClass) {
- jQuery.iDrag.helper.addClass(elm.dragCfg.frameClass);
- jQuery.iDrag.helper.get(0).firstChild.style.display = 'none';
- }
- if (elm.dragCfg.onStart)
- elm.dragCfg.onStart.apply(elm, [clonedEl, elm.dragCfg.oR.x, elm.dragCfg.oR.y]);
- if (jQuery.iDrop && jQuery.iDrop.count > 0 ){
- jQuery.iDrop.highlight(elm);
- }
- if (elm.dragCfg.ghosting == false) {
- dEs.display = 'none';
- }
- return false;
- },
-
- getContainment : function(elm)
- {
- if (elm.dragCfg.containment.constructor == String) {
- if (elm.dragCfg.containment == 'parent') {
- elm.dragCfg.cont = jQuery.extend(
- {x:0,y:0},
- jQuery.iUtil.getSize(elm.parentNode)
- );
- var contBorders = jQuery.iUtil.getBorder(elm.parentNode, true);
- elm.dragCfg.cont.w = elm.dragCfg.cont.wb - contBorders.l - contBorders.r;
- elm.dragCfg.cont.h = elm.dragCfg.cont.hb - contBorders.t - contBorders.b;
- } else if (elm.dragCfg.containment == 'document') {
- var clnt = jQuery.iUtil.getClient();
- elm.dragCfg.cont = {
- x : 0,
- y : 0,
- w : clnt.w,
- h : clnt.h
- };
- }
- } else if (elm.dragCfg.containment.constructor == Array) {
- elm.dragCfg.cont = {
- x : parseInt(elm.dragCfg.containment[0])||0,
- y : parseInt(elm.dragCfg.containment[1])||0,
- w : parseInt(elm.dragCfg.containment[2])||0,
- h : parseInt(elm.dragCfg.containment[3])||0
- };
- }
- elm.dragCfg.cont.dx = elm.dragCfg.cont.x - elm.dragCfg.oC.x;
- elm.dragCfg.cont.dy = elm.dragCfg.cont.y - elm.dragCfg.oC.y;
- },
-
- hidehelper : function(dragged)
- {
- if (dragged.dragCfg.insideParent || dragged.dragCfg.containment == 'parent') {
- jQuery('body', document).append(jQuery.iDrag.helper.get(0));
- }
- jQuery.iDrag.helper.empty().hide().css('opacity', 1);
- if (window.ActiveXObject) {
- jQuery.iDrag.helper.css('filter', 'alpha(opacity=100)');
- }
- },
-
- dragstop : function(e)
- {
-
- jQuery(document)
- .unbind('mousemove', jQuery.iDrag.dragmove)
- .unbind('mouseup', jQuery.iDrag.dragstop);
-
- if (jQuery.iDrag.dragged == null) {
- return;
- }
- var dragged = jQuery.iDrag.dragged;
-
- jQuery.iDrag.dragged = null;
-
- if (dragged.dragCfg.init == false) {
- return false;
- }
- if (dragged.dragCfg.so == true) {
- jQuery(dragged).css('position', dragged.dragCfg.oP);
- }
- var dEs = dragged.style;
-
- if (dragged.si) {
- jQuery.iDrag.helper.css('cursor', 'move');
- }
- if(dragged.dragCfg.frameClass) {
- jQuery.iDrag.helper.removeClass(dragged.dragCfg.frameClass);
- }
-
- if (dragged.dragCfg.revert == false) {
- if (dragged.dragCfg.fx > 0) {
- if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'horizontally') {
- var x = new jQuery.fx(dragged,{duration:dragged.dragCfg.fx}, 'left');
- x.custom(dragged.dragCfg.oR.x,dragged.dragCfg.nRx);
- }
- if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'vertically') {
- var y = new jQuery.fx(dragged,{duration:dragged.dragCfg.fx}, 'top');
- y.custom(dragged.dragCfg.oR.y,dragged.dragCfg.nRy);
- }
- } else {
- if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'horizontally')
- dragged.style.left = dragged.dragCfg.nRx + 'px';
- if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'vertically')
- dragged.style.top = dragged.dragCfg.nRy + 'px';
- }
- jQuery.iDrag.hidehelper(dragged);
- if (dragged.dragCfg.ghosting == false) {
- jQuery(dragged).css('display', dragged.dragCfg.oD);
- }
- } else if (dragged.dragCfg.fx > 0) {
- dragged.dragCfg.prot = true;
- var dh = false;
- if(jQuery.iDrop && jQuery.iSort && dragged.dragCfg.so) {
- dh = jQuery.iUtil.getPosition(jQuery.iSort.helper.get(0));
- }
- jQuery.iDrag.helper.animate(
- {
- left : dh ? dh.x : dragged.dragCfg.oC.x,
- top : dh ? dh.y : dragged.dragCfg.oC.y
- },
- dragged.dragCfg.fx,
- function()
- {
- dragged.dragCfg.prot = false;
- if (dragged.dragCfg.ghosting == false) {
- dragged.style.display = dragged.dragCfg.oD;
- }
- jQuery.iDrag.hidehelper(dragged);
- }
- );
- } else {
- jQuery.iDrag.hidehelper(dragged);
- if (dragged.dragCfg.ghosting == false) {
- jQuery(dragged).css('display', dragged.dragCfg.oD);
- }
- }
-
- if (jQuery.iDrop && jQuery.iDrop.count > 0 ){
- jQuery.iDrop.checkdrop(dragged);
- }
- if (jQuery.iSort && dragged.dragCfg.so) {
- jQuery.iSort.check(dragged);
- }
- if (dragged.dragCfg.onChange && (dragged.dragCfg.nRx != dragged.dragCfg.oR.x || dragged.dragCfg.nRy != dragged.dragCfg.oR.y)){
- dragged.dragCfg.onChange.apply(dragged, dragged.dragCfg.lastSi||[0,0,dragged.dragCfg.nRx,dragged.dragCfg.nRy]);
- }
- if (dragged.dragCfg.onStop)
- dragged.dragCfg.onStop.apply(dragged);
- return false;
- },
-
- snapToGrid : function(x, y, dx, dy)
- {
- if (dx != 0)
- dx = parseInt((dx + (this.dragCfg.gx * dx/Math.abs(dx))/2)/this.dragCfg.gx) * this.dragCfg.gx;
- if (dy != 0)
- dy = parseInt((dy + (this.dragCfg.gy * dy/Math.abs(dy))/2)/this.dragCfg.gy) * this.dragCfg.gy;
- return {
- dx : dx,
- dy : dy,
- x: 0,
- y: 0
- };
- },
-
- fitToContainer : function(x, y, dx, dy)
- {
- dx = Math.min(
- Math.max(dx,this.dragCfg.cont.dx),
- this.dragCfg.cont.w + this.dragCfg.cont.dx - this.dragCfg.oC.wb
- );
- dy = Math.min(
- Math.max(dy,this.dragCfg.cont.dy),
- this.dragCfg.cont.h + this.dragCfg.cont.dy - this.dragCfg.oC.hb
- );
-
- return {
- dx : dx,
- dy : dy,
- x: 0,
- y: 0
- }
- },
-
- dragmove : function(e)
- {
- if (jQuery.iDrag.dragged == null || jQuery.iDrag.dragged.dragCfg.prot == true) {
- return;
- }
-
- var dragged = jQuery.iDrag.dragged;
-
- dragged.dragCfg.currentPointer = jQuery.iUtil.getPointer(e);
- if (dragged.dragCfg.init == false) {
- distance = Math.sqrt(Math.pow(dragged.dragCfg.pointer.x - dragged.dragCfg.currentPointer.x, 2) + Math.pow(dragged.dragCfg.pointer.y - dragged.dragCfg.currentPointer.y, 2));
- if (distance < dragged.dragCfg.snapDistance){
- return;
- } else {
- jQuery.iDrag.dragstart(e);
- }
- }
-
- var dx = dragged.dragCfg.currentPointer.x - dragged.dragCfg.pointer.x;
- var dy = dragged.dragCfg.currentPointer.y - dragged.dragCfg.pointer.y;
-
- for (var i in dragged.dragCfg.onDragModifier) {
- var newCoords = dragged.dragCfg.onDragModifier[i].apply(dragged, [dragged.dragCfg.oR.x + dx, dragged.dragCfg.oR.y + dy, dx, dy]);
- if (newCoords && newCoords.constructor == Object) {
- dx = i != 'user' ? newCoords.dx : (newCoords.x - dragged.dragCfg.oR.x);
- dy = i != 'user' ? newCoords.dy : (newCoords.y - dragged.dragCfg.oR.y);
- }
- }
-
- dragged.dragCfg.nx = dragged.dragCfg.oC.x + dx - dragged.dragCfg.diffX;
- dragged.dragCfg.ny = dragged.dragCfg.oC.y + dy - dragged.dragCfg.diffY;
-
- if (dragged.dragCfg.si && (dragged.dragCfg.onSlide || dragged.dragCfg.onChange)) {
- jQuery.iSlider.onSlide(dragged, dragged.dragCfg.nx, dragged.dragCfg.ny);
- }
-
- if(dragged.dragCfg.onDrag)
- dragged.dragCfg.onDrag.apply(dragged, [dragged.dragCfg.oR.x + dx, dragged.dragCfg.oR.y + dy]);
-
- if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'horizontally') {
- dragged.dragCfg.nRx = dragged.dragCfg.oR.x + dx;
- jQuery.iDrag.helper.get(0).style.left = dragged.dragCfg.nx + 'px';
- }
- if (!dragged.dragCfg.axis || dragged.dragCfg.axis == 'vertically') {
- dragged.dragCfg.nRy = dragged.dragCfg.oR.y + dy;
- jQuery.iDrag.helper.get(0).style.top = dragged.dragCfg.ny + 'px';
- }
-
- if (jQuery.iDrop && jQuery.iDrop.count > 0 ){
- jQuery.iDrop.checkhover(dragged);
- }
- return false;
- },
-
- build : function(o)
- {
- if (!jQuery.iDrag.helper) {
- jQuery('body',document).append('<div id="dragHelper"></div>');
- jQuery.iDrag.helper = jQuery('#dragHelper');
- var el = jQuery.iDrag.helper.get(0);
- var els = el.style;
- els.position = 'absolute';
- els.display = 'none';
- els.cursor = 'move';
- els.listStyle = 'none';
- els.overflow = 'hidden';
- if (window.ActiveXObject) {
- el.unselectable = "on";
- } else {
- els.mozUserSelect = 'none';
- els.userSelect = 'none';
- els.KhtmlUserSelect = 'none';
- }
- }
- if (!o) {
- o = {};
- }
- return this.each(
- function()
- {
- if (this.isDraggable || !jQuery.iUtil)
- return;
- if (window.ActiveXObject) {
- this.onselectstart = function(){return false;};
- this.ondragstart = function(){return false;};
- }
- var el = this;
- var dhe = o.handle ? jQuery(this).find(o.handle) : jQuery(this);
- if(jQuery.browser.msie) {
- dhe.each(
- function()
- {
- this.unselectable = "on";
- }
- );
- } else {
- dhe.css('-moz-user-select', 'none');
- dhe.css('user-select', 'none');
- dhe.css('-khtml-user-select', 'none');
- }
- this.dragCfg = {
- dhe: dhe,
- revert : o.revert ? true : false,
- ghosting : o.ghosting ? true : false,
- so : o.so ? o.so : false,
- si : o.si ? o.si : false,
- insideParent : o.insideParent ? o.insideParent : false,
- zIndex : o.zIndex ? parseInt(o.zIndex)||0 : false,
- opacity : o.opacity ? parseFloat(o.opacity) : false,
- fx : parseInt(o.fx)||null,
- hpc : o.hpc ? o.hpc : false,
- onDragModifier : {},
- pointer : {},
- onStart : o.onStart && o.onStart.constructor == Function ? o.onStart : false,
- onStop : o.onStop && o.onStop.constructor == Function ? o.onStop : false,
- onChange : o.onChange && o.onChange.constructor == Function ? o.onChange : false,
- axis : /vertically|horizontally/.test(o.axis) ? o.axis : false,
- snapDistance : o.snapDistance ? parseInt(o.snapDistance)||0 : 0,
- cursorAt: o.cursorAt ? o.cursorAt : false,
- autoSize : o.autoSize ? true : false,
- frameClass : o.frameClass || false
-
- };
- if (o.onDragModifier && o.onDragModifier.constructor == Function)
- this.dragCfg.onDragModifier.user = o.onDragModifier;
- if (o.onDrag && o.onDrag.constructor == Function)
- this.dragCfg.onDrag = o.onDrag;
- if (o.containment && ((o.containment.constructor == String && (o.containment == 'parent' || o.containment == 'document')) || (o.containment.constructor == Array && o.containment.length == 4) )) {
- this.dragCfg.containment = o.containment;
- }
- if(o.fractions) {
- this.dragCfg.fractions = o.fractions;
- }
- if(o.grid){
- if(typeof o.grid == 'number'){
- this.dragCfg.gx = parseInt(o.grid)||1;
- this.dragCfg.gy = parseInt(o.grid)||1;
- } else if (o.grid.length == 2) {
- this.dragCfg.gx = parseInt(o.grid[0])||1;
- this.dragCfg.gy = parseInt(o.grid[1])||1;
- }
- }
- if (o.onSlide && o.onSlide.constructor == Function) {
- this.dragCfg.onSlide = o.onSlide;
- }
-
- this.isDraggable = true;
- dhe.each(
- function(){
- this.dragElem = el;
- }
- );
-
-// alert('binding mouse down');
- dhe.bind('mousedown', jQuery.iDrag.draginit);
- }
- )
- }
-};
-
-/**
- * Destroy an existing draggable on a collection of elements
- *
- * @name DraggableDestroy
- * @descr Destroy a draggable
- * @type jQuery
- * @cat Plugins/Interface
- * @example $('#drag2').DraggableDestroy();
- */
-
-jQuery.fn.extend(
- {
- DraggableDestroy : jQuery.iDrag.destroy,
- Draggable : jQuery.iDrag.build
- }
-);
\ No newline at end of file
Property changes on: platform/inc/jquery/interface/idrag.js
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: platform/inc/jquery/interface/iautoscroller.js
===================================================================
--- platform/inc/jquery/interface/iautoscroller.js (revision 11669)
+++ platform/inc/jquery/interface/iautoscroller.js (nonexistent)
@@ -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<jQuery.iAutoscroller.elsToScroll.length; i++) {
- if(!jQuery.iAutoscroller.elsToScroll[i].parentData) {
- jQuery.iAutoscroller.elsToScroll[i].parentData = jQuery.extend(
- jQuery.iUtil.getPositionLite(jQuery.iAutoscroller.elsToScroll[i]),
- jQuery.iUtil.getSizeLite(jQuery.iAutoscroller.elsToScroll[i]),
- jQuery.iUtil.getScroll(jQuery.iAutoscroller.elsToScroll[i])
- );
- } else {
- jQuery.iAutoscroller.elsToScroll[i].parentData.t = jQuery.iAutoscroller.elsToScroll[i].scrollTop;
- jQuery.iAutoscroller.elsToScroll[i].parentData.l = jQuery.iAutoscroller.elsToScroll[i].scrollLeft;
- }
-
- if (jQuery.iAutoscroller.elToScroll.dragCfg && jQuery.iAutoscroller.elToScroll.dragCfg.init == true) {
- elementData = {
- x : jQuery.iAutoscroller.elToScroll.dragCfg.nx,
- y : jQuery.iAutoscroller.elToScroll.dragCfg.ny,
- wb : jQuery.iAutoscroller.elToScroll.dragCfg.oC.wb,
- hb : jQuery.iAutoscroller.elToScroll.dragCfg.oC.hb
- };
- } else {
- elementData = jQuery.extend(
- jQuery.iUtil.getPositionLite(jQuery.iAutoscroller.elToScroll),
- jQuery.iUtil.getSizeLite(jQuery.iAutoscroller.elToScroll)
- );
- }
- if (
- jQuery.iAutoscroller.elsToScroll[i].parentData.t > 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
Property changes on: platform/inc/jquery/interface/iautoscroller.js
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: platform/inc/jquery/jquery-ui.custom.min.js
===================================================================
--- platform/inc/jquery/jquery-ui.custom.min.js (nonexistent)
+++ 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;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){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.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>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.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");if(this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},_trigger:function(b,c,d){d=d||this._uiHash();a.ui.plugin.call(this,b,[c,d]);if(b=="drag"){this.positionAbs=this._convertPositionTo("absolute")}return a.widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(b){return{helper:this.helper,position:this.position,absolutePosition:this.positionAbs,offset:this.positionAbs}}}));a.extend(a.ui.draggable,{version:"1.7.1",eventPrefix:"drag",defaults:{addClasses:true,appendTo:"parent",axis:false,cancel:":input,option",connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,delay:0,distance:1,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false}});a.ui.plugin.add("draggable","connectToSortable",{start:function(c,e){var d=a(this).data("draggable"),f=d.options,b=a.extend({},e,{item:d.element});d.sortables=[];a(f.connectToSortable).each(function(){var g=a.data(this,"sortable");if(g&&!g.options.disabled){d.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",c,b)}})},stop:function(c,e){var d=a(this).data("draggable"),b=a.extend({},e,{item:d.element});a.each(d.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;d.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance._mouseStop(c);this.instance.options.helper=this.instance.options._helper;if(d.options.helper=="original"){this.instance.currentItem.css({top:"auto",left:"auto"})}}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",c,b)}})},drag:function(c,f){var e=a(this).data("draggable"),b=this;var d=function(i){var n=this.offset.click.top,m=this.offset.click.left;var g=this.positionAbs.top,k=this.positionAbs.left;var j=i.height,l=i.width;var p=i.top,h=i.left;return a.ui.isOver(g+n,k+m,p,h,j,l)};a.each(e.sortables,function(g){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(b).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return f.helper[0]};c.target=this.instance.currentItem[0];this.instance._mouseCapture(c,true);this.instance._mouseStart(c,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;e._trigger("toSortable",c);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}if(this.instance.currentItem){this.instance._mouseDrag(c)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",c,this.instance._uiHash(this.instance));this.instance._mouseStop(c,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}e._trigger("fromSortable",c);e.dropped=false}}})}});a.ui.plugin.add("draggable","cursor",{start:function(c,d){var b=a("body"),e=a(this).data("draggable").options;if(b.css("cursor")){e._cursor=b.css("cursor")}b.css("cursor",e.cursor)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._cursor){a("body").css("cursor",d._cursor)}}});a.ui.plugin.add("draggable","iframeFix",{start:function(b,c){var d=a(this).data("draggable").options;a(d.iframeFix===true?"iframe":d.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').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<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop+f.scrollSpeed}else{if(d.pageY-c.overflowOffset.top<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop-f.scrollSpeed}}}if(!f.axis||f.axis!="y"){if((c.overflowOffset.left+c.scrollParent[0].offsetWidth)-d.pageX<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft+f.scrollSpeed}else{if(d.pageX-c.overflowOffset.left<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft-f.scrollSpeed}}}}else{if(!f.axis||f.axis!="x"){if(d.pageY-a(document).scrollTop()<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-f.scrollSpeed)}else{if(a(window).height()-(d.pageY-a(document).scrollTop())<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+f.scrollSpeed)}}}if(!f.axis||f.axis!="y"){if(d.pageX-a(document).scrollLeft()<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-f.scrollSpeed)}else{if(a(window).width()-(d.pageX-a(document).scrollLeft())<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+f.scrollSpeed)}}}}if(b!==false&&a.ui.ddmanager&&!f.dropBehaviour){a.ui.ddmanager.prepareOffsets(c,d)}}});a.ui.plugin.add("draggable","snap",{start:function(c,d){var b=a(this).data("draggable"),e=b.options;b.snapElements=[];a(e.snap.constructor!=String?(e.snap.items||":data(draggable)"):e.snap).each(function(){var g=a(this);var f=g.offset();if(this!=b.element[0]){b.snapElements.push({item:this,width:g.outerWidth(),height:g.outerHeight(),top:f.top,left:f.left})}})},drag:function(u,p){var g=a(this).data("draggable"),q=g.options;var y=q.snapTolerance;var x=p.offset.left,w=x+g.helperProportions.width,f=p.offset.top,e=f+g.helperProportions.height;for(var v=g.snapElements.length-1;v>=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<x&&x<n+y&&m-y<f&&f<A+y)||(s-y<x&&x<n+y&&m-y<e&&e<A+y)||(s-y<w&&w<n+y&&m-y<f&&f<A+y)||(s-y<w&&w<n+y&&m-y<e&&e<A+y))){if(g.snapElements[v].snapping){(g.options.snap.release&&g.options.snap.release.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=false;continue}if(q.snapMode!="inner"){var c=Math.abs(m-e)<=y;var z=Math.abs(A-f)<=y;var j=Math.abs(s-w)<=y;var k=Math.abs(n-x)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m-g.helperProportions.height,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s-g.helperProportions.width}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n}).left-g.margins.left}}var h=(c||z||j||k);if(q.snapMode!="outer"){var c=Math.abs(m-f)<=y;var z=Math.abs(A-e)<=y;var j=Math.abs(s-x)<=y;var k=Math.abs(n-w)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A-g.helperProportions.height,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n-g.helperProportions.width}).left-g.margins.left}}if(!g.snapElements[v].snapping&&(c||z||j||k||h)){(g.options.snap.snap&&g.options.snap.snap.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=(c||z||j||k||h)}}});a.ui.plugin.add("draggable","stack",{start:function(b,c){var e=a(this).data("draggable").options;var d=a.makeArray(a(e.stack.group)).sort(function(g,f){return(parseInt(a(g).css("zIndex"),10)||e.stack.min)-(parseInt(a(f).css("zIndex"),10)||e.stack.min)});a(d).each(function(f){this.style.zIndex=e.stack.min+f});this[0].style.zIndex=e.stack.min+d.length}});a.ui.plugin.add("draggable","zIndex",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("zIndex")){e._zIndex=b.css("zIndex")}b.css("zIndex",e.zIndex)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._zIndex){a(c.helper).css("zIndex",d._zIndex)}}})})(jQuery);;/*
+ * jQuery UI Sortable 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/Sortables
+ *
+ * Depends:
+ * ui.core.js
+ */
+(function(a){a.widget("ui.sortable",a.extend({},a.ui.mouse,{_init:function(){var b=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var b=this.items.length-1;b>=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<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop+g.scrollSpeed}else{if(f.pageY-this.overflowOffset.top<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop-g.scrollSpeed}}if((this.overflowOffset.left+this.scrollParent[0].offsetWidth)-f.pageX<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft+g.scrollSpeed}else{if(f.pageX-this.overflowOffset.left<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft-g.scrollSpeed}}}else{if(f.pageY-a(document).scrollTop()<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed)}else{if(a(window).height()-(f.pageY-a(document).scrollTop())<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)}}if(f.pageX-a(document).scrollLeft()<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed)}else{if(a(window).width()-(f.pageX-a(document).scrollLeft())<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed)}}}if(b!==false&&a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,f)}}this.positionAbs=this._convertPositionTo("absolute");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"}for(var d=this.items.length-1;d>=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)<i&&(e+h)>f&&(e+h)<c;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>m[this.floating?"width":"height"])){return g}else{return(f<e+(this.helperProportions.width/2)&&d-(this.helperProportions.width/2)<c&&n<k+(this.helperProportions.height/2)&&j-(this.helperProportions.height/2)<i)}},_intersectsWithPointer:function(d){var e=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),g=e&&c,b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(!g){return false}return this.floating?(((f&&f=="right")||b=="down")?2:1):(b&&(b=="down"?2:1))},_intersectsWithSides:function(e){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+(e.height/2),e.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+(e.width/2),e.width),b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(this.floating&&f){return((f=="right"&&d)||(f=="left"&&!d))}else{return b&&((b=="down"&&c)||(b=="up"&&!c))}},_getDragVerticalDirection:function(){var b=this.positionAbs.top-this.lastPositionAbs.top;return b!=0&&(b>0?"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<this.items.length;c++){for(var b=0;b<d.length;b++){if(d[b]==this.items[c].item[0]){this.items.splice(c,1)}}}},_refreshItems:function(b){this.items=[];this.containers=[this];var h=this.items;var p=this;var f=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]];var l=this._connectWith();if(l){for(var e=l.length-1;e>=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<n;d++){var o=a(c[d]);o.data("sortable-item",k);h.push({item:o,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){if(this.offsetParent&&this.helper){this.offset.parent=this._getParentOffset()}for(var d=this.items.length-1;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)<h){h=Math.abs(f-e);g=this.items[b]}}if(!g&&!this.options.dropOnEmpty){continue}this.currentContainer=this.containers[c];g?this._rearrange(d,g,null,true):this._rearrange(d,null,this.containers[c].element,true);this._trigger("change",d,this._uiHash());this.containers[c]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder)}this.containers[c]._trigger("over",d,this._uiHash(this));this.containers[c].containerCache.over=1}}else{if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",d,this._uiHash(this));this.containers[c].containerCache.over=0}}}},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c,this.currentItem])):(d.helper=="clone"?this.currentItem.clone():this.currentItem);if(!b.parents("body").length){a(d.appendTo!="parent"?d.appendTo:this.currentItem[0].parentNode)[0].appendChild(b[0])}if(b[0]==this.currentItem[0]){this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}}if(b[0].style.width==""||d.forceHelperSize){b.width(this.currentItem.width())}if(b[0].style.height==""||d.forceHelperSize){b.height(this.currentItem.height())}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.currentItem.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.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.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)){var c=a(e.containment)[0];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]}},_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.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>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.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_rearrange:function(g,f,c,e){c?c[0].appendChild(this.placeholder[0]):f.item[0].parentNode.insertBefore(this.placeholder[0],(this.direction=="down"?f.item[0]:f.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var d=this,b=this.counter;window.setTimeout(function(){if(b==d.counter){d.refreshPositions(!e)}},0)},_clear:function(d,e){this.reverting=false;var f=[],b=this;if(!this._noFinalSort&&this.currentItem[0].parentNode){this.placeholder.before(this.currentItem)}this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var c in this._storedCSS){if(this._storedCSS[c]=="auto"||this._storedCSS[c]=="static"){this._storedCSS[c]=""}}this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}if(this.fromOutside&&!e){f.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))})}if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!e){f.push(function(g){this._trigger("update",g,this._uiHash())})}if(!a.ui.contains(this.element[0],this.currentItem[0])){if(!e){f.push(function(g){this._trigger("remove",g,this._uiHash())})}for(var c=this.containers.length-1;c>=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<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}return false}if(!e){this._trigger("beforeStop",d,this._uiHash())}this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(this.helper[0]!=this.currentItem[0]){this.helper.remove()}this.helper=null;if(!e){for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){if(a.widget.prototype._trigger.apply(this,arguments)===false){this.cancel()}},_uiHash:function(c){var b=c||this;return{helper:b.helper,placeholder:b.placeholder||a([]),position:b.position,absolutePosition:b.positionAbs,offset:b.positionAbs,item:b.currentItem,sender:c?c.element:null}}}));a.extend(a.ui.sortable,{getter:"serialize toArray",version:"1.7.1",eventPrefix:"sort",defaults:{appendTo:"parent",axis:false,cancel:":input,option",connectWith:false,containment:false,cursor:"auto",cursorAt:false,delay:0,distance:1,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",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
Property changes on: platform/inc/jquery/jquery-ui.custom.min.js
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Index: platform/elements/content_boxes.elm.tpl
===================================================================
--- platform/elements/content_boxes.elm.tpl (revision 11669)
+++ platform/elements/content_boxes.elm.tpl (revision 11670)
@@ -1,175 +1,175 @@
<!--## MAIN CONTENT BOX ELEMENT DESIGN ##-->
<inp2:m_DefineElement name="content_box">
- <table class="fullwidth groupItem">
+ <table class="fullwidth">
<tr>
<td colspan="3">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="20" alt=""/><br />
</td>
</tr>
- <tr>
+ <tr class="movable-header">
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
- <td class="content-box-header table-border itemHeader">
+ <td class="content-box-header table-border">
<div class="content-box-title"><inp2:m_param name="header"/></div>
</td>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
</tr>
<tr>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
<td class="content-box-content">
<inp2:m_param name="content"/>
</td>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
</tr>
</table>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT BOX ELEMENT DESIGN ##-->
<!--## DESIGN OF CONTENT BOX SUB-SECTION ELEMENT##-->
<inp2:m_DefineElement name="content_box_subsection">
- <table class="fullwidth groupItem">
+ <table class="fullwidth">
<tr>
<td colspan="3">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="20" alt=""/><br />
</td>
</tr>
- <tr>
+ <tr class="movable-header">
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
- <td class="content-box-header table-border itemHeader">
+ <td class="content-box-header table-border">
<div class="content-box-title"><inp2:m_param name="subsection_header"/></div>
</td>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
</tr>
<tr>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
<td class="content-box-content">
<inp2:m_param name="content"/>
</td>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
</tr>
</table>
</inp2:m_DefineElement>
<!--## //DESIGN OF CONTENT BOX SUB-SECTION ELEMENT##-->
<!--## CONTENT BOX NO-HEADER ELEMENT DESIGN ##-->
<inp2:m_DefineElement name="content_box_noheader">
- <table class="fullwidth groupItem">
- <tr>
+ <table class="fullwidth">
+ <tr class="movable-header">
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
- <td class="content-box-content itemHeader">
+ <td class="content-box-content">
<inp2:m_param name="content"/>
</td>
<td width="13">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
</td>
</tr>
</table>
</inp2:m_DefineElement>
<!--## /CONTENT BOX NO-HEADER ELEMENT DESIGN ##-->
<inp2:m_DefineElement name="menu_element" current="">
<inp2:m_if check="m_Param" name="current">
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
</td>
<td class="menu-top-active-icon top-menu-padding">
<a href="<inp2:m_param name="menu_href" no_editing="1"/>"><inp2:m_if check="m_Param" name="menu_icon_src"><img src="<inp2:m_Param name="menu_icon_src"/>"/><inp2:m_else/><inp2:m_param name="menu_icon" no_editing="1"/></inp2:m_if></a>
</td>
<td class="menu-top-active-text top-menu-padding">
<a href="<inp2:m_param name="menu_href" no_editing="1"/>" class="top-menu-link"><inp2:m_param name="menu_title" no_editing="1"/></a>
</td>
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
</td>
<inp2:m_else/>
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
</td>
<td class="menu-top-noactive-icon top-menu-padding">
<a href="<inp2:m_param name="menu_href" no_editing="1"/>"><inp2:m_if check="m_Param" name="menu_icon_src"><img src="<inp2:m_Param name="menu_icon_src"/>"/><inp2:m_else/><inp2:m_param name="menu_icon" no_editing="1"/></inp2:m_if></a>
</td>
<td class="menu-top-noactive-text top-menu-padding">
<a href="<inp2:m_param name="menu_href" no_editing="1"/>" class="top-menu-link"><inp2:m_param name="menu_title" no_editing="1"/></a>
</td>
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
</td>
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="box_element" prefix="">
<tr>
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
</td>
<td>
<inp2:m_if check="m_Param" name="prefix">
<a href="<inp2:{$prefix}_SuggestItemLink template="$template"/>"><inp2:m_Phrase label="$title"/></a>
<inp2:m_else/>
<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="$title"/></a>
</inp2:m_if>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="review_element">
<tr>
<td>
<strong><inp2:m_Phrase name="lu_fld_ReviewBy"/>:</strong> <inp2:Field name="ReviewedBy"/> [<inp2:Field name="CreatedOn" format="_regional_DateFormat"/>]<br />
<strong><inp2:m_Phrase name="lu_fld_ReviewText"/>:</strong> <inp2:Field name="ReviewText"/>
<br /><br />
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="rating_element">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/star<inp2:m_if check="m_Param" name="active">_rate</inp2:m_if>.gif" width="10" height="11" alt=""/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="category_path_element">
<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
<inp2:m_param name="separator"/>
</inp2:m_ifnot>
<inp2:m_param name="cat_name"/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="image_element">
<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" align="<inp2:m_param name="align"/>" />
</inp2:m_DefineElement>
<inp2:m_DefineElement name="tab">
<td class="<inp2:m_if check="m_IsActive" template="$template">active-tab<inp2:m_else/>inactive-tab</inp2:m_if>">
<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_phrase name="$title"/></a>
</td>
<td width="8">
</td>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="file_element">
<tr>
<td class="file-list-icon">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/file_icons/<inp2:FileIcon default="icon_file.gif"/>" alt="<inp2:Field name="FileName"/>" border="0" /><br />
</td>
<td class="file-list-label">
<a href="<inp2:DownloadFileLink />"><inp2:Field name="FileName"/></a>
</td>
<tr>
</inp2:m_DefineElement>
\ No newline at end of file
Property changes on: platform/elements/content_boxes.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.2
\ No newline at end of property
+1.1.2.3
\ No newline at end of property
Index: platform/elements/banners/banner_right.elm.tpl
===================================================================
--- platform/elements/banners/banner_right.elm.tpl (revision 11669)
+++ platform/elements/banners/banner_right.elm.tpl (revision 11670)
@@ -1,14 +1,14 @@
<table style="width: 100%;">
- <tr>
+ <tr class="movable-header">
<td class="side-box-header">
<span class="side-box-title"><inp2:m_Phrase label="lu_title_Advertisements"/></span>
</td>
</tr>
<tr>
<td class="content-box-content">
<!-- Right side Banner code goes here -->
Right-side Banner
<!-- /Right side Banner code goes here -->
</td>
</tr>
</table>
\ No newline at end of file
Property changes on: platform/elements/banners/banner_right.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: platform/elements/navigation_bar.elm.tpl
===================================================================
--- platform/elements/navigation_bar.elm.tpl (revision 11669)
+++ platform/elements/navigation_bar.elm.tpl (revision 11670)
@@ -1,38 +1,38 @@
<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
<inp2:m_DefineElement name="root_category">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="module_root">
<inp2:m_param name="separator"/>
<a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="nav_link">
<inp2:m_param name="separator"/>
<inp2:m_if check="m_Param" name="category">
<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
<inp2:m_else/>
<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="module_item">
<inp2:m_param name="separator"/>
<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="current_item">
<inp2:m_param name="separator"/>
<span> <inp2:m_param name="title"/></span>
</inp2:m_DefineElement>
<table class="fullwidth groupItem">
- <tr>
- <td class="navigation-bar itemHeader">
+ <tr class="movable-header">
+ <td class="navigation-bar">
<!-- module_root_render_as="module_root" -->
<inp2:c_CategoryPath separator=">" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/>
</td>
</tr>
</table>
\ No newline at end of file
Property changes on: platform/elements/navigation_bar.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: platform/elements/side_boxes.elm.tpl
===================================================================
--- platform/elements/side_boxes.elm.tpl (revision 11669)
+++ platform/elements/side_boxes.elm.tpl (revision 11670)
@@ -1,14 +1,14 @@
<inp2:m_DefineElement name="blue_box">
- <table style="width: 100%;" class="groupItem">
- <tr>
- <td class="side-box-header itemHeader">
+ <table style="width: 100%;">
+ <tr class="movable-header">
+ <td class="side-box-header">
<div class="side-box-title"><inp2:m_param name="header"/></div>
</td>
</tr>
<tr>
<td class="side-box-content">
<inp2:m_param name="content"/>
</td>
</tr>
</table>
</inp2:m_DefineElement>
\ No newline at end of file
Property changes on: platform/elements/side_boxes.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Index: index.tpl
===================================================================
--- index.tpl (revision 11669)
+++ index.tpl (revision 11670)
@@ -1,56 +1,56 @@
<!--##
<NAME>Home</NAME>
<DESC>Welcome page</DESC>
<SECTION></SECTION>
##-->
<!--## 0PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_WelcomeTitle"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm"/>
</div>
- <inp2:m_RenderElement design="content_box">
- <inp2:m_Capture to_var="header">
- <inp2:m_phrase name="lu_title_WelcomeTitle"/>
- </inp2:m_Capture>
+ <div class="movable-element">
+ <inp2:m_RenderElement design="content_box">
+ <inp2:m_Capture to_var="header">
+ <inp2:m_phrase name="lu_title_WelcomeTitle"/>
+ </inp2:m_Capture>
- <div class="movable-element">
<inp2:st_ContentBlock num="1"/>
- </div>
- </inp2:m_RenderElement>
+ </inp2:m_RenderElement>
+ </div>
<div class="movable-element">
<!--## INCLUDE HOME PAGE ELEMENTS FOR EACH MODULE ##-->
<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items.elm" data_exists="1"/>
<!--## /HOME PAGE ELEMENTS ##-->
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: index.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.13
\ No newline at end of property
+1.1.2.14
\ No newline at end of property
Event Timeline
Log In to Comment