From e7506405c86ed46d8ecdb600ef651dc85b3ddbea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Sep 2010 10:18:31 +0000 Subject: [PATCH] Qual: Code is now simpler using jQuery. Removed rubbish javascript. --- htdocs/langs/en_US/admin.lang | 2 +- htdocs/lib/lib_photosresize.js | 24 ++++++++++++++---------- htdocs/main.inc.php | 4 ++-- htdocs/projet/ganttchart.php | 4 ++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index db02b28314d..a2a04f469f4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -134,7 +134,7 @@ NewBackup=New backup GenerateBackup=Generate backup Backup=Backup 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 BackupResult=Backup result BackupFileSuccessfullyCreated=Backup file successfully generated diff --git a/htdocs/lib/lib_photosresize.js b/htdocs/lib/lib_photosresize.js index a02e14b04c3..969a52964c9 100644 --- a/htdocs/lib/lib_photosresize.js +++ b/htdocs/lib/lib_photosresize.js @@ -1,7 +1,12 @@ /* -* 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('#cropbox').Jcrop({ @@ -12,18 +17,17 @@ jQuery(function() { function updateCoords(c) { - $('#x').val(c.x); - $('#y').val(c.y); - $('#x2').val(c.x2); - $('#y2').val(c.y2); - $('#w').val(c.w); - $('#h').val(c.h); + jQuery('#x').val(c.x); + jQuery('#y').val(c.y); + jQuery('#x2').val(c.x2); + jQuery('#y2').val(c.y2); + jQuery('#w').val(c.w); + jQuery('#h').val(c.h); }; function checkCoords() { - if (parseInt($('#w').val())) return true; + if (parseInt(jQuery('#w').val())) return true; alert('Please select a crop region then press submit.'); return false; }; - \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0bea3b39465..fed2572cabe 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -857,10 +857,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; - // This one is required for lot of Ajax features + // This one is required for some Ajax features if (! defined('DISABLE_PROTOTYPE')) { - print ''."\n"; + print ''."\n"; print ''."\n"; } } diff --git a/htdocs/projet/ganttchart.php b/htdocs/projet/ganttchart.php index efdffeab0b7..77de86ab997 100644 --- a/htdocs/projet/ganttchart.php +++ b/htdocs/projet/ganttchart.php @@ -76,7 +76,7 @@ function reloadGraph() { g.setShowDur(booShowDurations); g.setCaptionType(barText); 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); } else