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

Qual: Move jquery plugin into plugin dir

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-02 01:26:30 +00:00
parent fc8bfcd7fe
commit d8e6d1cf76
10 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
COPYRIGHT
View File

@ -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

8
htdocs/core/photos_resize.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Meos
/* Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* 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 '</fieldset>';
}
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/02 01:26:30 $ - $Revision: 1.13 $');
?>

0
htdocs/includes/jcrop/.cvsignore → htdocs/includes/jquery/plugins/jcrop/.cvsignore Normal file → Executable file
View File

0
htdocs/includes/jcrop/css/Jcrop.gif → htdocs/includes/jquery/plugins/jcrop/css/Jcrop.gif Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 329 B

0
htdocs/includes/jcrop/css/jquery.Jcrop.css → htdocs/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css Normal file → Executable file
View File

0
htdocs/includes/jcrop/index.html → htdocs/includes/jquery/plugins/jcrop/index.html Normal file → Executable file
View File

0
htdocs/includes/jcrop/js/jquery.Jcrop.js → htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js Normal file → Executable file
View File

0
htdocs/includes/jcrop/js/jquery.Jcrop.min.js → htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js vendored Normal file → Executable file
View File

0
htdocs/includes/jcrop/js/jquery.min.js → htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js vendored Normal file → Executable file
View File

28
htdocs/main.inc.php
View File

@ -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 '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" type="text/css" />'."\n"; // JQuery
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.css" type="text/css" />'."\n"; // Tooltip
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css" type="text/css" />'."\n"; // Tooltip
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css" type="text/css" />'."\n"; // JNotify
//print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/lightbox/css/jquery.lightbox-0.5.css" media="screen" />'."\n"; // Lightbox
}
@ -956,7 +956,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-latest.custom.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd_0_5'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/jquery.tipTip'.$ext.'"></script>'."\n";
//print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/lightbox/js/jquery.lightbox-0.5.min'.$ext.'"></script>'."\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".'<script type="text/javascript">
jQuery(function() {
jQuery(".classfortooltip").tooltip({
track: true,
delay: 0,
showURL: false,
//extraClass: "pretty fancy",
//fixPNG: true,
positionLeft: false,
bodyHandler: function() {
//console.log(jQuery(this).attr("tooltipText"));
return jQuery(this).attr("tooltipText"); }
jQuery(document).ready(function () {
jQuery(function() {
$(".classfortooltip").tipTip({maxWidth: "600px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
});
});
});
</script>';
</script>';
}
/*
@ -1378,7 +1370,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
if (! empty($object->hooks))
{
$searchform.='<!-- Begin search form hook area -->'."\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 '<!-- Begin left block hook area -->'."\n";
foreach($object->hooks as $hook)
{
if ($hook['type'] == 'leftblock' && ! empty($hook['modules']))