Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 23:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source 
Conflicts:
	htdocs/core/class/extrafields.class.php
This commit is contained in:
Laurent Destailleur
2013-06-14 19:56:07 +02:00
parent af8c4cd0d3 0a9cf26a32
commit 3cd303c944
8 changed files with 349 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/functions.lib.php
View File

@@ -2040,15 +2040,16 @@ function img_up($alt = 'default', $selected = 0)
*
* @param string $alt Text to show on alt image
* @param int $selected Selected
* @param string $options Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag
*/
function img_left($alt = 'default', $selected = 0)
function img_left($alt = 'default', $selected = 0, $options='')
{
global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Left');
return img_picto($alt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'));
return img_picto($alt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $options);
}
/**
@@ -2056,15 +2057,16 @@ function img_left($alt = 'default', $selected = 0)
*
* @param string $alt Text to show on alt image
* @param int $selected Selected
* @param string $options Add more attribute on img tag (For example 'style="float: right"')
* @return string Return img tag
*/
function img_right($alt = 'default', $selected = 0)
function img_right($alt = 'default', $selected = 0, $options='')
{
global $conf, $langs;
if ($alt == 'default') $alt = $langs->trans('Right');
return img_picto($alt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'));
return img_picto($alt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $options);
}
/**