Fix: No td if no picto

DChancogne72 · Aug 15, 2011 · 7f51907 · 7f51907
1 parent 28b58c9
commit 7f51907
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git 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 '<table width="100%" class="notopnoleftnoright">';
 		print '<tr><td class="notopnoleftnoright">'."\n";
 

diff --git 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 '<img src="'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
     return '<img src="'.$url.'/'.$path.'/img/'.$picto.'" border="0" alt="'.dol_escape_htmltag($alt).'" title="'.dol_escape_htmltag($alt).'"'.($options?' '.$options:'').'>';
 }
@@ -2679,7 +2680,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath
 
     $return.= "\n";
     $return.= '<table '.($id?'id="'.$id.'" ':'').'summary="" width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 2px;"><tr>';
-    $return.= '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
+    if ($picto) $return.= '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('',$picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
     $return.= '<td class="nobordernopadding" valign="middle">';
     $return.= '<div class="titre">'.$titre.'</div>';
     $return.= '</td>';

diff --git 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 @@
 
 .fieldrequired { font-weight: bold; color: #000055; }
 
-#pictotitle {
-	<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
-}
-
 .photo {
 border: 0px;
 /* filter:alpha(opacity=55); */