diff --git a/build/debian/control b/build/debian/control index 1fd7a60d98f..198e93ce8c0 100755 --- a/build/debian/control +++ b/build/debian/control @@ -15,7 +15,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | libfpdf-tpl-php, libnusoap-php, libphp-pclzip, - ckeditor, + libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor, ttf-dejavu-core, xdg-utils, mysql-server, diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install index 5344a4be9e0..18f05d90749 100755 --- a/build/debian/install.forced.php.install +++ b/build/debian/install.forced.php.install @@ -33,6 +33,8 @@ $force_dolibarr_lib_TCPDF_PATH=''; $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; $force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; +$force_dolibarr_js_JQUERY='/javascript/jquery'; +$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/debian/rules b/build/debian/rules index 8adc43d021c..02af430a9c0 100755 --- a/build/debian/rules +++ b/build/debian/rules @@ -39,6 +39,7 @@ clean: rm -fr .project rm -fr .settings rm -f build.xml + rm -f quickbuild.xml rm -f pom.xml rm -f README.md @@ -63,6 +64,7 @@ clean: rm -fr dev/xdebug rm -f dev/dolibarr_changes.txt rm -f dev/README + rm -f doc/images/dolibarr_screenshot2.png rm -f doc/images/dolibarr_screenshot3.png rm -f doc/images/dolibarr_screenshot4.png @@ -77,19 +79,6 @@ clean: rm -fr test - # Licence files are included into copyright file. - rm -f htdocs/includes/jquery/plugins/flot/LICENSE.txt - rm -fr htdocs/includes/phpexcel/license.txt - rm -f htdocs/includes/tcpdf/LICENSE.TXT - - rm -fr htdocs/includes/jquery/plugins/lightbox - rm -fr htdocs/includes/jquery/plugins/jstree - rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF - rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip - rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33 - rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919 - rm -fr htdocs/includes/tcpdf/fonts/utils - rm -fr build/aps rm -fr build/dmg rm -fr build/doap @@ -100,12 +89,30 @@ clean: rm -fr build/perl rm -fr build/rpm rm -fr build/zip + + # clean from all embedded libraries (we use package dependencies instead) + rm -fr htdocs/includes/adodbtime rm -fr htdocs/includes/ckeditor rm -fr htdocs/includes/fpdfi rm -fr htdocs/includes/fonts rm -fr htdocs/includes/geoip rm -fr htdocs/includes/nusoap rm -fr htdocs/includes/odtphp/zip/pclzip + rm -fr htdocs/includes/jquery/css + rm -fr htdocs/includes/jquery/js + rm -fr htdocs/includes/jquery/plugins/flot + rm -fr htdocs/includes/jquery/plugins/jstree + rm -fr htdocs/includes/jquery/plugins/lightbox + rm -fr htdocs/includes/jquery/plugins/mobile + rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF + rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip + rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33 + rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919 + rm -fr htdocs/includes/tcpdf/fonts/utils + + # Licence files are included into copyright file. + rm -fr htdocs/includes/phpexcel/license.txt + rm -f htdocs/includes/tcpdf/LICENSE.TXT dh $@ diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 34fa4023c1a..d6dd90b1e4d 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -323,7 +323,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/lightbox`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jstree`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`; diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora index 8847a85d826..6efba6da5cd 100755 --- a/build/rpm/install.forced.php.fedora +++ b/build/rpm/install.forced.php.fedora @@ -24,6 +24,9 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; #$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; +#$force_dolibarr_js_JQUERY='/javascript/jquery'; +#$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; +#$force_dolibarr_js_JQUERY_FLOT='/javascript/flot'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/rpm/install.forced.php.mandriva b/build/rpm/install.forced.php.mandriva index 64908a87d72..f527394e7f2 100755 --- a/build/rpm/install.forced.php.mandriva +++ b/build/rpm/install.forced.php.mandriva @@ -24,6 +24,9 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; #$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; +#$force_dolibarr_js_JQUERY='/javascript/jquery'; +#$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; +#$force_dolibarr_js_JQUERY_FLOT='/javascript/flot'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse index ece47981e0c..4ee45d1dbf9 100755 --- a/build/rpm/install.forced.php.opensuse +++ b/build/rpm/install.forced.php.opensuse @@ -24,6 +24,9 @@ $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; #$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; +#$force_dolibarr_js_JQUERY='/javascript/jquery'; +#$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; +#$force_dolibarr_js_JQUERY_FLOT='/javascript/flot'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype'; ?> \ No newline at end of file diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index 49badc2c3ef..243b3846232 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -81,7 +81,10 @@ $configfileparameters=array( '?dolibarr_lib_ODTPHP_PATH', '?dolibarr_lib_ODTPHP_PATHTOPCLZIP', '?dolibarr_js_CKEDITOR', - '?dolibarr_font_DOL_DEFAULT_TTF', + '?dolibarr_js_JQUERY', + '?dolibarr_js_JQUERY_UI', + '?dolibarr_js_JQUERY_FLOT', + '?dolibarr_font_DOL_DEFAULT_TTF', '?dolibarr_font_DOL_DEFAULT_TTF_BOLD' ); $configfilelib=array( @@ -121,7 +124,10 @@ $configfilelib=array( 'dolibarr_lib_ODTPHP_PATH', 'dolibarr_lib_ODTPHP_PATHTOPCLZIP', 'dolibarr_js_CKEDITOR', - 'dolibarr_font_DOL_DEFAULT_TTF', + 'dolibarr_js_JQUERY', + 'dolibarr_js_JQUERY_UI', + 'dolibarr_js_JQUERY_FLOT', + 'dolibarr_font_DOL_DEFAULT_TTF', 'dolibarr_font_DOL_DEFAULT_TTF_BOLD' ); $var=true; diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 9b2a5fc1d41..55bc292704a 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -263,22 +263,18 @@ $dolibarr_main_prod='0'; // Value to overwrite path to use shared libraries instead of embedded one //$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; -// Value to overwrite path to use shared libraries instead of embedded one -//$dolibarr_lib_TCPDF_PATH=''; -// Value to overwrite path to use shared libraries instead of embedded one //$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; -// Value to overwrite path to use shared libraries instead of embedded one -//$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; -// Value to overwrite path to use shared libraries instead of embedded one -//$dolibarr_lib_PHPEXCEL_PATH=''; -// Value to overwrite path to use shared libraries instead of embedded one //$dolibarr_lib_GEOIP_PATH=''; -// Value to overwrite path to use shared libraries instead of embedded one +//$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; +//$dolibarr_lib_PHPEXCEL_PATH=''; //$dolibarr_lib_ODTPHP_PATH=''; -// Value to overwrite some path to use shared libraries instead of embedded one //$dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip"; +//$dolibarr_lib_TCPDF_PATH=''; // Value to overwrite path to use shared javascript instead of embedded one //$dolibarr_js_CKEDITOR='/javascript/ckeditor'; +//$dolibarr_js_JQUERY='/javascript/jquery'; +//$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; +//$dolibarr_js_JQUERY_FLOT='/javascript/flot'; //############################## diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index 005f1b0f863..5d08e506d19 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -30,7 +30,7 @@ include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); class box_services_expired extends ModeleBoxes { - var $boxcode="expiredservices"; + var $boxcode="expiredservices"; // id of box var $boximg="object_contract"; var $boxlabel; var $depends = array("contrat"); // conf->propal->enabled @@ -158,6 +158,6 @@ include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); parent::showBox($this->info_box_head, $this->info_box_contents); } -} + } ?> diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index b853ecb59bc..828ab026090 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -190,6 +190,9 @@ if (! defined('GEOIP_PATH')) { define('GEOIP_PATH', (!isset( if (! defined('ODTPHP_PATH')) { define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH))?DOL_DOCUMENT_ROOT.'/includes/odtphp/':(empty($dolibarr_lib_ODTPHP_PATH)?'':$dolibarr_lib_ODTPHP_PATH.'/')); } if (! defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP))?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/':(empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP)?'':$dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/')); } if (! defined('JS_CKEDITOR')) { define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR))?'':(empty($dolibarr_js_CKEDITOR)?'':$dolibarr_js_CKEDITOR.'/')); } +if (! defined('JS_JQUERY')) { define('JS_JQUERY', (!isset($dolibarr_js_JQUERY))?'':(empty($dolibarr_js_JQUERY)?'':$dolibarr_js_JQUERY.'/')); } +if (! defined('JS_JQUERY_UI')) { define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI))?'':(empty($dolibarr_js_JQUERY_UI)?'':$dolibarr_js_JQUERY_UI.'/')); } +if (! defined('JS_JQUERY_FLOT')) { define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT))?'':(empty($dolibarr_js_JQUERY_FLOT)?'':$dolibarr_js_JQUERY_FLOT.'/')); } // Other required path if (! defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF))?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf':(empty($dolibarr_font_DOL_DEFAULT_TTF)?'':$dolibarr_font_DOL_DEFAULT_TTF)); } if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD))?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf':(empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD)?'':$dolibarr_font_DOL_DEFAULT_TTF_BOLD)); } diff --git a/htdocs/includes/jquery/index.html b/htdocs/includes/jquery/index.html deleted file mode 100644 index 7d057cfaec2..00000000000 --- a/htdocs/includes/jquery/index.html +++ /dev/null @@ -1,395 +0,0 @@ - - - - - jQuery UI Example Page - - - - - - - -

Welcome to jQuery UI!

-

This page demonstrates the widgets you downloaded using the theme you selected in the download builder. We've included and linked to minified versions of jQuery, your personalized copy of jQuery UI (js/jquery-ui-1.8.4.custom.min.js), and css/smoothness/jquery-ui-1.8.4.custom.css which imports the entire jQuery UI CSS Framework. You can choose to link a subset of the CSS Framework depending on your needs.

-

You've downloaded components and a theme that are compatible with jQuery 1.3+. Please make sure you are using jQuery 1.3+ in your production environment.

- -

YOUR COMPONENTS:

- - -

Accordion

-
-
-

First

-
Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.
-
-
-

Second

-
Phasellus mattis tincidunt nibh.
-
-
-

Third

-
Nam dui erat, auctor a, dignissim quis.
-
-
- - -

Autocomplete

-
- -
- - - -

Button

- -
-
- - - -
-
- - - -

Tabs

-
- -
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
-
- - -

Dialog

-

Open Dialog

- - -

Overlay and Shadow Classes (not currently used in UI widgets)

-
-

Lorem ipsum dolor sit amet, Nulla nec tortor. Donec id elit quis purus consectetur consequat.

Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci.

Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat.

Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam.

Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante.

Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi.

- - -
-
-
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-
-
- -
- - - -
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-
- - - -

Framework Icons (content color preview)

- - - - -

Slider

-
- - -

Datepicker

-
- - -

Progressbar

-
- - -

Highlight / Error

-
-
-

- Hey! Sample ui-state-highlight style.

-
-
-
-
-
-

- Alert: Sample ui-state-error style.

-
-
- - - - - diff --git a/htdocs/includes/jquery/mobile/images/ajax-loader.png b/htdocs/includes/jquery/plugins/mobile/images/ajax-loader.png similarity index 100% rename from htdocs/includes/jquery/mobile/images/ajax-loader.png rename to htdocs/includes/jquery/plugins/mobile/images/ajax-loader.png diff --git a/htdocs/includes/jquery/mobile/images/icons-18-black.png b/htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png similarity index 100% rename from htdocs/includes/jquery/mobile/images/icons-18-black.png rename to htdocs/includes/jquery/plugins/mobile/images/icons-18-black.png diff --git a/htdocs/includes/jquery/mobile/images/icons-18-white.png b/htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png similarity index 100% rename from htdocs/includes/jquery/mobile/images/icons-18-white.png rename to htdocs/includes/jquery/plugins/mobile/images/icons-18-white.png diff --git a/htdocs/includes/jquery/mobile/images/icons-36-black.png b/htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png similarity index 100% rename from htdocs/includes/jquery/mobile/images/icons-36-black.png rename to htdocs/includes/jquery/plugins/mobile/images/icons-36-black.png diff --git a/htdocs/includes/jquery/mobile/images/icons-36-white.png b/htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png similarity index 100% rename from htdocs/includes/jquery/mobile/images/icons-36-white.png rename to htdocs/includes/jquery/plugins/mobile/images/icons-36-white.png diff --git a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.css b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css similarity index 100% rename from htdocs/includes/jquery/mobile/jquery.mobile-latest.min.css rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css diff --git a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.jgz b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.jgz similarity index 100% rename from htdocs/includes/jquery/mobile/jquery.mobile-latest.min.jgz rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.jgz diff --git a/htdocs/includes/jquery/mobile/jquery.mobile-latest.min.js b/htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js similarity index 100% rename from htdocs/includes/jquery/mobile/jquery.mobile-latest.min.js rename to htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 571df998c9d..0e1c09e7cb4 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -743,7 +743,7 @@ function write_conf_file($conffile) global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH; global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH; global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP; - global $force_dolibarr_js_CKEDITOR; + global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI, $force_dolibarr_js_JQUERY_FLOT; global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD; $error=0; @@ -828,32 +828,41 @@ function write_conf_file($conffile) // Write params to overwrites default lib path fputs($fp,"\n"); - if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_ADODB_PATH=''; } + if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH=''; } fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';'); fputs($fp,"\n"); - if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_NUSOAP_PATH=''; } - fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';'); - fputs($fp,"\n"); - if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_TCPDF_PATH=''; } - fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';'); - fputs($fp,"\n"); - if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_FPDI_PATH=''; } - fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';'); - fputs($fp,"\n"); - if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_PHPEXCEL_PATH=''; } - fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';'); - fputs($fp,"\n"); - if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_GEOIP_PATH=''; } + if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH=''; } fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';'); fputs($fp,"\n"); - if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_ODTPHP_PATH=''; } + if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH=''; } + fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH=''; } + fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH=''; } + fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH=''; } fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';'); fputs($fp,"\n"); - if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '#'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; } + if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; } fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';'); fputs($fp,"\n"); - if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '#'); $force_dolibarr_js_CKEDITOR=''; } - fputs($fp, '$dolibarr_ks_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';'); + if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH=''; } + fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR=''; } + fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY=''; } + fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI=''; } + fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_js_JQUERY_FLOT)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_FLOT=''; } + fputs($fp, '$dolibarr_js_JQUERY_FLOT=\''.$force_dolibarr_js_JQUERY_FLOT.'\';'); fputs($fp,"\n"); // Write params to overwrites default font path diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 68a005d62f8..c6e8614e9c2 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -905,8 +905,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs // JQuery. Must be before other includes print ''."\n"; - print ''."\n"; - print ''."\n"; + if (constant('JS_JQUERY')) print ''."\n"; + else print ''."\n"; + if (constant('JS_JQUERY_UI')) print ''."\n"; + else print ''."\n"; print ''."\n"; print ''."\n"; //print ''."\n"; @@ -924,10 +926,20 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs // Flot if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT)) { - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + if (constant('JS_JQUERY_FLOT')) + { + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + } + else + { + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + } } // CKEditor if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')) diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 28c5c5936d1..318161f5454 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -31,7 +31,6 @@ * This script reads the conf file, init $lang, $db and and empty $user */ - require_once("filefunc.inc.php"); // May have been already require by main.inc.php. But may not by scripts. diff --git a/htdocs/theme/phones/smartphone/tpl/header.tpl.php b/htdocs/theme/phones/smartphone/tpl/header.tpl.php index 4d10fdb9fcd..adbd31a816e 100644 --- a/htdocs/theme/phones/smartphone/tpl/header.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/header.tpl.php @@ -21,8 +21,8 @@ - + - + \ No newline at end of file