lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed scriptaculous drag and drop, replaced by jquery.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-24 22:18:50 +00:00
parent eb33a6f30a
commit cf6680194e
2 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/boxes.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

62
htdocs/imports/import.php
View File

@ -787,7 +787,7 @@ if ($step == 4 && $datatoimport)
} }
print "\n<!-- Box left container -->\n"; print "\n<!-- Box left container -->\n";
print '<div id="left">'."\n"; print '<div id="left" class="connectedSortable">'."\n";
// List of source fields // List of source fields
$var=true; $var=true;
@ -907,7 +907,7 @@ if ($step == 4 && $datatoimport)
print '<tr valign="top"><td width="50%">'; print '<tr valign="top"><td width="50%">';
print "\n<!-- Box ignore container -->\n"; print "\n<!-- Box ignore container -->\n";
print '<div id="right">'."\n"; print '<div id="right" class="connectedSortable">'."\n";
$nbofnotimportedfields=0; $nbofnotimportedfields=0;
foreach ($fieldssource as $key => $val) foreach ($fieldssource as $key => $val)
@ -950,46 +950,38 @@ if ($step == 4 && $datatoimport)
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
print '<script type="text/javascript" language="javascript">';
print 'jQuery(function() {
jQuery("#left, #right").sortable({
/* placeholder: \'ui-state-highlight\', */
handle: \'.boxhandle\',
revert: \'invalid\',
items: \'.box\',
containment: \'.fiche\',
connectWith: \'.connectedSortable\',
stop: function(event, ui) {
updateOrder();
}
});
});
';
print "\n"; print "\n";
print '<script type="text/javascript" language="javascript">'."\n";
print 'function updateOrder(){'."\n"; print 'function updateOrder(){'."\n";
print 'var left_list = cleanSerialize(Sortable.serialize(\'left\'));'."\n"; print 'var left_list = cleanSerialize(jQuery("#left").sortable( "serialize" ));'."\n";
//print 'var right_list = cleanSerialize(Sortable.serialize(\'right\'));'."\n"; //print 'var right_list = cleanSerialize(jQuery("#right").sortable( "serialize" ));'."\n";
print 'var boxorder = \'A:\' + left_list;'."\n"; print 'var boxorder = \'A:\' + left_list;'."\n";
//print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n"; //print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
//alert( \'boxorder=\' + boxorder )."\n"; //print 'alert( \'boxorder=\' + boxorder );';
//print 'var userid = \''.$user->id.'\';'."\n"; //print 'var userid = \''.$user->id.'\';'."\n";
//print 'var url = "ajaximport.php";'."\n";
//print 'var datatoimport = "'.$datatoimport.'";'."\n"; //print 'var datatoimport = "'.$datatoimport.'";'."\n";
print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&filetoimport='.urlencode($filetoimport).'&action=saveorder&boxorder=\' + boxorder;'."\n"; // print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,
//print 'alert(newlocation);'; // async: false
//print 'o_options = new Object();'."\n"; // });'."\n";
//print 'o_options = {asynchronous:false,method: \'get\',parameters: \'step=4&boxorder=\' + boxorder + \'&userid=\' + userid + \'&datatoimport=\' + datatoimport};'."\n";
//print 'var myAjax = new Ajax.Request(url, o_options);'."\n";
// Now reload page // Now reload page
print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&boxorder=\' + boxorder;'."\n";
//print 'alert(newlocation);';
print 'window.location.href=newlocation;'."\n"; print 'window.location.href=newlocation;'."\n";
print '}'."\n"; print '}'."\n";
print "\n";
print '// <![CDATA['."\n";
print 'Sortable.create(\'left\', {'."\n";
print 'tag:\'div\', '."\n";
print 'containment:["left","right"], '."\n";
print 'constraint:false, '."\n";
print "handle: 'boxhandle',"."\n";
print 'onUpdate:updateOrder';
print "});\n";
print 'Sortable.create(\'right\', {'."\n";
print 'tag:\'div\', '."\n";
print 'containment:["right","left"], '."\n";
print 'constraint:false, '."\n";
print "handle: 'boxhandle',"."\n";
print 'onUpdate:updateOrder';
print "});\n";
print '// ]]>'."\n";
print '</script>'."\n"; print '</script>'."\n";
} }
@ -1885,8 +1877,8 @@ function show_elem($fieldssource,$i,$pos,$key,$var,$nostyle='')
{ {
global $langs,$bc; global $langs,$bc;
print "\n\n<!-- Box start -->\n"; print "\n\n<!-- Box ".$pos." start -->\n";
print '<div style="padding: 0px 0px 0px 0px;" id="boxto_'.$pos.'">'."\n"; print '<div class="box" style="padding: 0px 0px 0px 0px;" id="boxto_'.$pos.'">'."\n";
print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n"; print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
if ($pos && $pos > sizeof($fieldssource)) // No fields if ($pos && $pos > sizeof($fieldssource)) // No fields