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

New: Usage of jquery notify is on by default. We can still deisable it by a hidden option.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-21 14:37:30 +00:00
parent 60a9f280ef
commit 88bb64d525
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/lib/functions.lib.php
View File

@ -3673,7 +3673,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
$out=''; $out='';
$divstart=$divend=''; $divstart=$divend='';
if (empty($conf->global->MAIN_USE_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out)) if (!empty($conf->global->MAIN_DONOT_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out))
{ {
$divstart='<div class="'.$style.'">'; $divstart='<div class="'.$style.'">';
$divend='</div>'; $divend='</div>';
@ -3703,7 +3703,7 @@ function get_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
if ($out) if ($out)
{ {
if (! empty($conf->global->MAIN_USE_JQUERY_JNOTIFY) && empty($keepembedded)) if (empty($conf->global->MAIN_DONOT_USE_JQUERY_JNOTIFY) && empty($keepembedded))
{ {
$return = '<script type="text/javascript"> $return = '<script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

2
htdocs/main.inc.php
View File

@ -959,7 +959,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest.min'.$ext.'"></script>'."\n";
} }
// jQuery jnotify // jQuery jnotify
if (!empty($conf->global->MAIN_USE_JQUERY_JNOTIFY)) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'."\n"; if (empty($conf->global->MAIN_DONOT_USE_JQUERY_JNOTIFY)) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'."\n";
// Flot // Flot
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/excanvas.min.js"></script><![endif]-->'."\n"; print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/excanvas.min.js"></script><![endif]-->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/jquery.flot.min.js"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/jquery.flot.min.js"></script>'."\n";