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

Qual: Code is now simpler using jQuery. Removed rubbish javascript.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-06 10:18:31 +00:00
parent 7a65ee7cb3
commit e7506405c8
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/admin.lang
View File

@ -134,7 +134,7 @@ NewBackup=New backup
GenerateBackup=Generate backup GenerateBackup=Generate backup
Backup=Backup Backup=Backup
Restore=Restore Restore=Restore
RunCommandSummary=Backup will be done through the following command RunCommandSummary=Backup has been launched with the following command
WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands
BackupResult=Backup result BackupResult=Backup result
BackupFileSuccessfullyCreated=Backup file successfully generated BackupFileSuccessfullyCreated=Backup file successfully generated

20
htdocs/lib/lib_photosresize.js
View File

@ -2,6 +2,11 @@
* http://deepliquid.com/content/Jcrop.html * http://deepliquid.com/content/Jcrop.html
*/ */
//
// \file htdocs/lib/lib_photoresize.js
// \brief File that include javascript functions for croping feature
// \version $Id$
//
jQuery(function() { jQuery(function() {
jQuery('#cropbox').Jcrop({ jQuery('#cropbox').Jcrop({
@ -12,18 +17,17 @@ jQuery(function() {
function updateCoords(c) function updateCoords(c)
{ {
$('#x').val(c.x); jQuery('#x').val(c.x);
$('#y').val(c.y); jQuery('#y').val(c.y);
$('#x2').val(c.x2); jQuery('#x2').val(c.x2);
$('#y2').val(c.y2); jQuery('#y2').val(c.y2);
$('#w').val(c.w); jQuery('#w').val(c.w);
$('#h').val(c.h); jQuery('#h').val(c.h);
}; };
function checkCoords() function checkCoords()
{ {
if (parseInt($('#w').val())) return true; if (parseInt(jQuery('#w').val())) return true;
alert('Please select a crop region then press submit.'); alert('Please select a crop region then press submit.');
return false; return false;
}; };

4
htdocs/main.inc.php
View File

@ -857,10 +857,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-1.4.2.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-1.4.2.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-1.8.4.custom.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-1.8.4.custom.min'.$ext.'"></script>'."\n";
// This one is required for lot of Ajax features // This one is required for some Ajax features
if (! defined('DISABLE_PROTOTYPE')) if (! defined('DISABLE_PROTOTYPE'))
{ {
print '<!-- Includes for Prototype (Used by Scriptaculous) -->'."\n"; print '<!-- Includes for Prototype -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype'.$mini.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype'.$mini.$ext.'"></script>'."\n";
} }
} }

4
htdocs/projet/ganttchart.php
View File

@ -76,7 +76,7 @@ function reloadGraph() {
g.setShowDur(booShowDurations); g.setShowDur(booShowDurations);
g.setCaptionType(barText); g.setCaptionType(barText);
g.setFormat(graphFormat); g.setFormat(graphFormat);
g.Draw($("#tabs").width()-40); g.Draw(jQuery("#tabs").width()-40);
} }
@ -108,7 +108,7 @@ for ($tcursor=0; $tcursor < $tnums; $tcursor++) {
} }
} }
?> ?>
g.Draw($("#tabs").width()-40); g.Draw(jQuery("#tabs").width()-40);
setTimeout('g.DrawDependencies()',100); setTimeout('g.DrawDependencies()',100);
} }
else else