diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 067eb65b234..a78d87cf3dd 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.57 2011/08/15 17:45:55 eldy Exp $ + * \version $Id: boxes.php,v 1.58 2011/08/15 18:37:07 eldy Exp $ */ @@ -43,7 +43,7 @@ function printBoxesArea($user,$areacode) if (count($boxarray)) { - print_fiche_titre($langs->trans("OtherInformationsBoxes"),'','','','otherboxes'); + print load_fiche_titre($langs->trans("OtherInformationsBoxes"),'','','','otherboxes'); print ''; print '
'."\n"; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index a1bfc384eae..aec698f8a4c 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -28,7 +28,7 @@ * \file htdocs/lib/functions.lib.php * \brief A set of functions for Dolibarr * This file contains all frequently used functions. - * \version $Id: functions.lib.php,v 1.553 2011/08/15 17:43:40 eldy Exp $ + * \version $Id: functions.lib.php,v 1.554 2011/08/15 18:37:07 eldy Exp $ */ // For compatibility during upgrade @@ -1623,6 +1623,7 @@ function img_picto($alt, $picto, $options='', $pictoisfullpath=0) { if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png'; } + if ($pictoisfullpath) return ''.dol_escape_htmltag($alt).''; return ''.dol_escape_htmltag($alt).''; } @@ -2679,7 +2680,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath $return.= "\n"; $return.= ''; - $return.= ''; + if ($picto) $return.= ''; $return.= ''; diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index 02b7769035e..5c1c3e154ea 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -19,7 +19,7 @@ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.46 2011/08/15 17:43:42 eldy Exp $ + * \version $Id: style.css.php,v 1.47 2011/08/15 18:37:08 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1070,10 +1070,6 @@ a.impayee:hover { font-weight: bold; color: #550000; } .fieldrequired { font-weight: bold; color: #000055; } -#pictotitle { - browser->phone)?'display: none;':''; ?> -} - .photo { border: 0px; /* filter:alpha(opacity=55); */
'.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).''.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).''; $return.= '
'.$titre.'
'; $return.= '