From ba9592d8dbd03ec3909ec3b15828e1173bca2cf1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 23 Oct 2008 13:45:10 +0000
Subject: [PATCH] Fix: see the logo on all top menus Todo: adjust the width of
 the logo with the left menu

---
 .../menus/barre_left/eldy_backoffice.php      | 24 +++++++++----------
 .../menus/barre_left/eldy_frontoffice.php     | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index d7347e8df39..6ef5958a2f8 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -95,6 +95,17 @@ class MenuLeft {
 		}
 
 		$newmenu = new Menu();
+		
+		// Show logo company
+		if (! empty($conf->global->MAIN_SHOW_LOGO))
+		{
+			$mysoc->logo_small=$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL; 
+	    if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) 
+	    {
+	    	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small); 
+	    	print '<img title="'.$title.'" src="'.$urllogo.'">';
+	    }
+	  }
 
 		/**
 		* On definit newmenu en fonction de mainmenu et leftmenu
@@ -109,18 +120,7 @@ class MenuLeft {
 			if ($mainmenu == 'home')
 			{
 				$langs->load("users");
-
-                // Show logo company
-				if (! empty($conf->global->MAIN_SHOW_LOGO))
-				{
-	                $mysoc->logo_small=$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL; 
-	                if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) 
-	                { 
-	                    $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small); 
-	                    print '<img title="'.$title.'" src="'.$urllogo.'">'; 
-	                } 
-				}
-				 				
+ 				
 				if ($user->admin)
 				{
 					$langs->load("admin");
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index 5ce493beaec..d68a1b85ac9 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -94,6 +94,17 @@ class MenuLeft {
 
 
 		$newmenu = new Menu();
+		
+		// Show logo company
+		if (! empty($conf->global->MAIN_SHOW_LOGO))
+		{
+			$mysoc->logo_small=$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL; 
+	    if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) 
+	    {
+	    	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small); 
+	    	print '<img title="'.$title.'" src="'.$urllogo.'">';
+	    }
+	  }
 
 		/**
 		* On definit newmenu en fonction de mainmenu et leftmenu
@@ -108,18 +119,7 @@ class MenuLeft {
 			if ($mainmenu == 'home')
 			{
 				$langs->load("users");
-
-                // Show logo company
-				if (! empty($conf->global->MAIN_SHOW_LOGO))
-				{
-	                $mysoc->logo_small=$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL; 
-	                if (! empty($mysoc->logo_small) && is_readable($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_small)) 
-	                { 
-	                    $urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small); 
-	                    print '<img title="'.$title.'" src="'.$urllogo.'">'; 
-	                } 
-				}
-				 				
+		
 				// My Informations
 				$newmenu->add(DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'&amp;leftmenu=home', $langs->trans("MyInformations"));