Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Duplicate tooltip

Browse Source
This commit is contained in:
Laurent Destailleur
2013-07-26 11:12:29 +02:00
parent 58da76292f
commit 61f11d3621
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1683,7 +1683,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
/** /**
* Show picto whatever it's its name (generic function) * Show picto whatever it's its name (generic function)
* *
* @param string $alt Text on alt and title of image * @param string $alt Text on alt and title of image (alt only if param notitle is set to 1)
* @param string $picto Name of image file to show ('filenew', ...) * @param string $picto Name of image file to show ('filenew', ...)
* If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory. * If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img * Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
@@ -1692,10 +1692,11 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
* @param string $options Add more attribute on img tag (For example 'style="float: right"') * @param string $options Add more attribute on img tag (For example 'style="float: right"')
* @param int $pictoisfullpath If 1, image path is a full path * @param int $pictoisfullpath If 1, image path is a full path
* @param int $srconly Return only content of the src attribute of img. * @param int $srconly Return only content of the src attribute of img.
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
* @return string Return img tag * @return string Return img tag
* @see #img_object, #img_picto_common * @see #img_object, #img_picto_common
*/ */
function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srconly=0) function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
{ {
global $conf; global $conf;
@@ -1739,7 +1740,7 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
} }
if ($srconly) return $fullpathpicto; if ($srconly) return $fullpathpicto;
else return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.(! empty($options)?' '.$options:'').'>'; else return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($alt).'"').($options?' '.$options:'').'>';
} }
/** /**

7
htdocs/main.inc.php
View File

@@ -1421,18 +1421,17 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$logouthtmltext=$appli.' '.DOL_VERSION.'<br>'; $logouthtmltext=$appli.' '.DOL_VERSION.'<br>';
$logouthtmltext.=$langs->trans("Logout").'<br>'; $logouthtmltext.=$langs->trans("Logout").'<br>';
//$logouthtmltext.="<br>"; //$logouthtmltext.="<br>";
if ($_SESSION["dol_authmode"] != 'forceuser' if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
&& $_SESSION["dol_authmode"] != 'http')
{ {
$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php"'; $logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php"';
//$logouttext .=empty($atarget?(' target="'.$atarget.'"'):''; //$logouttext .=empty($atarget?(' target="'.$atarget.'"'):'';
$logouttext .='>'; $logouttext .='>';
$logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"'); $logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
$logouttext .='</a>'; $logouttext .='</a>';
} }
else else
{ {
$logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"'); $logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
} }
print '<div class="login_block">'."\n"; print '<div class="login_block">'."\n";