From 6180b6c0a65f53fbab855bad44a39276a2aa0086 Mon Sep 17 00:00:00 2001 From: simnandez Date: Tue, 2 Jul 2013 18:53:42 +0200 Subject: [PATCH 1/4] Fix: Amarok Tab visu. --- htdocs/theme/amarok/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 195fed98fac..2866da54411 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -957,7 +957,7 @@ a.tabTitle img { } a.tab { - padding: 5px 12px 5px; + padding: 5px 12px 2px; margin: 0em 0.2em; background-color:rgba(0,0,0,.2); color:#666666; From 94772dbe30b2201b6f641e68d0dcd6b5e74c2292 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 3 Jul 2013 15:25:22 +0200 Subject: [PATCH 2/4] Update fiche.php change restricted area, too much agressive --- htdocs/comm/action/fiche.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index f9edbb47c05..59b2e6c0a80 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -56,7 +56,8 @@ $contactid=GETPOST('contactid','int'); $socid = GETPOST('socid','int'); $id = GETPOST('id','int'); if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id'); +$result = restrictedArea($user,'societe',$id,'&societe'); +//$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions&allactions', '', 'id'); $error=GETPOST("error"); $mesg=''; From a9198e66ebb5fb9b76bda78444319cce6986862f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 3 Jul 2013 16:06:42 +0200 Subject: [PATCH 3/4] Fix: change for use url of image --- htdocs/core/lib/images.lib.php | 11 ++++++++--- htdocs/core/lib/pdf.lib.php | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 9df392a66eb..7dea7357535 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -65,16 +65,21 @@ function image_format_supported($file) * Return size of image file on disk (Supported extensions are gif, jpg, png and bmp) * * @param string $file Full path name of file + * @param bool $url Image with url (true or false) * @return array array('width'=>width, 'height'=>height) */ -function dol_getImageSize($file) +function dol_getImageSize($file, $url = false) { $ret=array(); if (image_format_supported($file) < 0) return $ret; - $fichier = realpath($file); // Chemin canonique absolu de l'image - $dir = dirname($file); // Chemin du dossier contenant l'image + $fichier = $file; + if (!$url) + { + $fichier = realpath($file); // Chemin canonique absolu de l'image + $dir = dirname($file); // Chemin du dossier contenant l'image + } $infoImg = getimagesize($fichier); // Recuperation des infos de l'image $ret['width']=$infoImg[0]; // Largeur de l'image diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 104114ed10a..d6d135edc4a 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -261,13 +261,14 @@ function pdf_getPDFFontSize($outputlangs) * Return height to use for Logo onot PDF * * @param string $logo Full path to logo file to use + * @param bool $url Image with url (true or false) * @return number */ -function pdf_getHeightForLogo($logo) +function pdf_getHeightForLogo($logo, $url = false) { $height=22; $maxwidth=130; include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; - $tmp=dol_getImageSize($logo); + $tmp=dol_getImageSize($logo, $url); if ($tmp['height']) { $width=round($height*$tmp['width']/$tmp['height']); From c474929caa7f87521fe7fee245c17a5c0b1294e5 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 3 Jul 2013 16:49:54 +0200 Subject: [PATCH 4/4] Trad: Load contracts lang for stats panel --- htdocs/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/index.php b/htdocs/index.php index 26a13b9d20c..44aa2c6005c 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -106,6 +106,7 @@ print "\n"; $langs->load("commercial"); $langs->load("bills"); $langs->load("orders"); +$langs->load("contracts"); //print memory_get_usage(); if ($user->societe_id == 0)