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

Works on enhancement of "ok","warning" or "error" message with jQuery jnotify

Browse Source
This commit is contained in:
Regis Houssin 2011-03-18 15:56:11 +00:00
parent 05d71122e5
commit d3dc8e3d58
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3414,9 +3414,9 @@ function monthArrayOrSelected($selected=0)
* @return html Return html output * @return html Return html output
* @see dol_print_error * @see dol_print_error
*/ */
function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $ajax=0) function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok')
{ {
global $langs; global $conf, $langs;
$ret = ''; $ret = '';
$out = ''; $out = '';
@ -3424,24 +3424,24 @@ function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $ajax=0)
if (is_array($mesgarray) && sizeof($mesgarray)) if (is_array($mesgarray) && sizeof($mesgarray))
{ {
$langs->load("errors"); $langs->load("errors");
if (! $ajax) $out.= '<div class="'.$style.'">'; if (! $conf->global->MAIN_USE_JQUERY_JNOTIFY) $out.= '<div class="'.$style.'">';
foreach($mesgarray as $message) foreach($mesgarray as $message)
{ {
$ret++; $ret++;
$out.= $langs->trans($message); $out.= $langs->trans($message);
if ($ret < sizeof($mesgarray)) $out.= "<br>\n"; if ($ret < sizeof($mesgarray)) $out.= "<br>\n";
} }
if (! $ajax) $out.= '</div>'; if (! $conf->global->MAIN_USE_JQUERY_JNOTIFY) $out.= '</div>';
} }
if ($mesgstring) if ($mesgstring)
{ {
$langs->load("errors"); $langs->load("errors");
$ret++; $ret++;
if (! $ajax) $out.= '<div class="'.$style.'">'; if (! $conf->global->MAIN_USE_JQUERY_JNOTIFY) $out.= '<div class="'.$style.'">';
$out.= $langs->trans($mesgstring); $out.= $langs->trans($mesgstring);
if (! $ajax) $out.= '</div>'; if (! $conf->global->MAIN_USE_JQUERY_JNOTIFY) $out.= '</div>';
} }
if ($ajax) if ($conf->global->MAIN_USE_JQUERY_JNOTIFY)
{ {
print '<script type="text/javascript"> print '<script type="text/javascript">
jQuery(document).ready(function() { jQuery(document).ready(function() {
@ -3464,9 +3464,9 @@ function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $ajax=0)
* @return html Return html output * @return html Return html output
* @see dol_print_error * @see dol_print_error
*/ */
function dol_htmloutput_errors($mesgstring='',$mesgarray='',$ajax=0) function dol_htmloutput_errors($mesgstring='',$mesgarray='')
{ {
return dol_htmloutput_mesg($mesgstring, $mesgarray, 'error',$ajax); return dol_htmloutput_mesg($mesgstring, $mesgarray, 'error');
} }