From d8e6d1cf76b854080d12327f80d20213352ce588 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Jul 2011 01:26:30 +0000 Subject: [PATCH] Qual: Move jquery plugin into plugin dir --- COPYRIGHT | 5 ++-- htdocs/core/photos_resize.php | 8 ++--- .../{ => jquery/plugins}/jcrop/.cvsignore | 0 .../{ => jquery/plugins}/jcrop/css/Jcrop.gif | Bin .../plugins}/jcrop/css/jquery.Jcrop.css | 0 .../{ => jquery/plugins}/jcrop/index.html | 0 .../plugins}/jcrop/js/jquery.Jcrop.js | 0 .../plugins}/jcrop/js/jquery.Jcrop.min.js | 0 .../plugins}/jcrop/js/jquery.min.js | 0 htdocs/main.inc.php | 28 +++++++----------- 10 files changed, 17 insertions(+), 24 deletions(-) rename htdocs/includes/{ => jquery/plugins}/jcrop/.cvsignore (100%) mode change 100644 => 100755 rename htdocs/includes/{ => jquery/plugins}/jcrop/css/Jcrop.gif (100%) mode change 100644 => 100755 rename htdocs/includes/{ => jquery/plugins}/jcrop/css/jquery.Jcrop.css (100%) mode change 100644 => 100755 rename htdocs/includes/{ => jquery/plugins}/jcrop/index.html (100%) mode change 100644 => 100755 rename htdocs/includes/{ => jquery/plugins}/jcrop/js/jquery.Jcrop.js (100%) mode change 100644 => 100755 rename htdocs/includes/{ => jquery/plugins}/jcrop/js/jquery.Jcrop.min.js (100%) mode change 100644 => 100755 rename htdocs/includes/{ => jquery/plugins}/jcrop/js/jquery.min.js (100%) mode change 100644 => 100755 diff --git a/COPYRIGHT b/COPYRIGHT index 5f7929499a8..3872a12729d 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -22,14 +22,15 @@ FPDF_TPL 1.1.5 Apache Software License 2.0 No GPL3 only PDF temp FPDI 1.3.4 Apache Software License 2.0 No GPL3 only PDF templates management FPDI_Protection 1.0.3 Apache Software License 2.0 No GPL3 only PDF encryption (8 files) GeoIP x.x Yes GeoIP Maxmind conversion -JCrop 0.9.8 MIT Licence Yes JS library (to crop images) jQuery 1.6.1 GPL and MIT Licence Yes JS library jQuery UI 1.8.14 GPL and MIT Licence Yes JS library plugin UI +jQuery JCrop 0.9.8 MIT Licence Yes JS library plugin Crop (to crop images) jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.12) jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows) jQuery jNotify 1.1.00 Apache Software License 2.0 No GPL3 only JS library plugin jNotify (to use ajax popups) jQuery Mobile 1.0b1 GPL and MIT Licence Yes JS library for smartphone (not used) -JSGantt 1.2 BSD Licence Yes JS library (ot build Gantt reports) +jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips +JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports) MagPieRss 0.72 GPL 2.0 Yes Load RSS NuSoap 0.9.5 LGPL 2.1 Yes Interfaces with third tools OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index be03bde9395..fdafeafbca2 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -1,6 +1,6 @@ - * Copyright (C) 2009 Meos +/* Copyright (C) 2010-2011 Laurent Destailleur + * Copyright (C) 2009 Meos * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -125,7 +125,7 @@ if ($_POST["action"] == 'confirm_crop') * View */ -llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jcrop/js/jquery.Jcrop.min.js','/lib/lib_photosresize.js'), array('/includes/jcrop/css/jquery.Jcrop.css')); +llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/lib/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css')); print_fiche_titre($langs->trans("ImageEditor")); @@ -201,5 +201,5 @@ print ''; } -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/02 01:26:30 $ - $Revision: 1.13 $'); ?> \ No newline at end of file diff --git a/htdocs/includes/jcrop/.cvsignore b/htdocs/includes/jquery/plugins/jcrop/.cvsignore old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/.cvsignore rename to htdocs/includes/jquery/plugins/jcrop/.cvsignore diff --git a/htdocs/includes/jcrop/css/Jcrop.gif b/htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/css/Jcrop.gif rename to htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif diff --git a/htdocs/includes/jcrop/css/jquery.Jcrop.css b/htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/css/jquery.Jcrop.css rename to htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css diff --git a/htdocs/includes/jcrop/index.html b/htdocs/includes/jquery/plugins/jcrop/index.html old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/index.html rename to htdocs/includes/jquery/plugins/jcrop/index.html diff --git a/htdocs/includes/jcrop/js/jquery.Jcrop.js b/htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/js/jquery.Jcrop.js rename to htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js diff --git a/htdocs/includes/jcrop/js/jquery.Jcrop.min.js b/htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/js/jquery.Jcrop.min.js rename to htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js diff --git a/htdocs/includes/jcrop/js/jquery.min.js b/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js old mode 100644 new mode 100755 similarity index 100% rename from htdocs/includes/jcrop/js/jquery.min.js rename to htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 927d2594811..5a4ba8cbeb0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -26,7 +26,7 @@ * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.745 2011/06/30 13:40:34 hregis Exp $ + * \version $Id: main.inc.php,v 1.746 2011/07/02 01:27:07 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @@ -905,7 +905,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $jquerytheme = 'smoothness'; if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; print ''."\n"; // JQuery - print ''."\n"; // Tooltip + print ''."\n"; // Tooltip print ''."\n"; // JNotify //print ''."\n"; // Lightbox } @@ -956,7 +956,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; //print ''."\n"; // jQuery Layout if (!empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) || defined('REQUIRE_JQUERY_LAYOUT')) @@ -1167,20 +1167,12 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // Wrapper to show tooltips print "\n".''; + '; } /* @@ -1378,7 +1370,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me if (! empty($object->hooks)) { $searchform.=''."\n"; - + foreach($object->hooks as $hook) { if ($hook['type'] == 'searchform' && ! empty($hook['modules'])) @@ -1505,7 +1497,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me if (! empty($object->hooks)) { print ''."\n"; - + foreach($object->hooks as $hook) { if ($hook['type'] == 'leftblock' && ! empty($hook['modules']))