From c54e6694dc076082ae066d5fc70f62525b288d5f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 3 Jun 2009 19:54:48 +0000
Subject: [PATCH] Restore changes after 27 may due to from savannah Crash.

---
 .../menus/barre_top/auguria_backoffice.php    | 168 +++++++++-------
 .../menus/barre_top/auguria_frontoffice.php   | 170 +++++++++-------
 htdocs/lib/security.lib.php                   |  10 +-
 htdocs/theme/auguria/auguria.css.php          | 117 ++++-------
 htdocs/theme/eldy/eldy.css.php                | 184 +++++++-----------
 htdocs/theme/eldy/fckeditor/.cvsignore        |   1 +
 htdocs/theme/freelug/freelug.css.php          |  62 +++---
 7 files changed, 338 insertions(+), 374 deletions(-)
 create mode 100644 htdocs/theme/eldy/fckeditor/.cvsignore

diff --git a/htdocs/includes/menus/barre_top/auguria_backoffice.php b/htdocs/includes/menus/barre_top/auguria_backoffice.php
index 9b64b933ec9..6b30852c5ea 100644
--- a/htdocs/includes/menus/barre_top/auguria_backoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_backoffice.php
@@ -18,92 +18,116 @@
  */
 
 /**
-	    \file       htdocs/includes/menus/barre_top/auguria_backoffice.php
-		\brief      Gestionnaire nomme Auguria du menu du haut
-		\version    $$Id$
+ \file       htdocs/includes/menus/barre_top/auguria_backoffice.php
+ \brief      Gestionnaire nomme Auguria du menu du haut
+ \version    $$Id$
 
-        \remarks    La construction d'un gestionnaire pour le menu du haut est simple:
-        \remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
-        \remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
-		\remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
-*/
+ \remarks    La construction d'un gestionnaire pour le menu du haut est simple:
+ \remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
+ \remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
+ \remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ */
 
 
 /**
-        \class      MenuTop
-	    \brief      Classe permettant la gestion du menu du haut Auguria
-*/
+ *	\class      MenuTop
+ *	\brief      Classe permettant la gestion du menu du haut Auguria
+ */
 
 class MenuTop {
 
-    var $require_left=array("auguria_backoffice");     // Si doit etre en phase avec un gestionnaire de menu gauche particulier
-    var $atarget="";                                // Valeur du target a utiliser dans les liens
+	var $require_left=array("auguria_backoffice");  // Si doit etre en phase avec un gestionnaire de menu gauche particulier
+	var $hideifnotallowed=0;						// Put 0 for back office menu, 1 for front office menu
+	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
-    /**
-     *    \brief      Constructeur
-     *    \param      db      Handler d'acc�s base de donn�e
-     */
-    function MenuTop($db)
-    {
-        $this->db=$db;
-    }
+	/**
+	 *    \brief      Constructeur
+	 *    \param      db      Database access handler
+	 */
+	function MenuTop($db)
+	{
+		$this->db=$db;
+	}
 
 
-    /**
-     *    \brief      Affiche le menu
-     */
-    function showmenu()
-    {
-    	require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
+	/**
+	 *    \brief      Show menu
+	 */
+	function showmenu()
+	{
+		require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
 
-      global $user,$conf,$langs,$dolibarr_main_db_name;;
+		global $user,$conf,$langs,$dolibarr_main_db_name;
+
+		// On sauve en session le menu principal choisi
+		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
+		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+		$_SESSION["leftmenuopened"]="";
+
+		$menuArbo = new Menubase($this->db,'auguria','top');
+		$tabMenu = $menuArbo->menuTopCharger($this->hideifnotallowed,$_SESSION['mainmenu'], 'auguria');
 
 
-      // On sauve en session le menu principal choisi
-      if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-      if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
-      $_SESSION["leftmenuopened"]="";
-      
-      $menuArbo = new Menubase($this->db,'auguria','top');
-      $tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'], 'auguria');
-      
-      print '<ul>';
-      
-      for($i=0; $i<count($tabMenu); $i++)
-      {
-      	if ($tabMenu[$i]['enabled'] == true)
-      	{
-      		if ($tabMenu[$i]['right'] == true)
-      		{
-      			// Define url
-      			if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
-	        	{
-	        		$url = $tabMenu[$i]['url'];
-	        	}
-	        	else
-	        	{
-	        		$url=DOL_URL_ROOT.$tabMenu[$i]['url'];
-	        		if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?';
-	        		else $url.='&';
-	        		$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=';
-	        		$url.="&idmenu=".$tabMenu[$i]['rowid'];
-	        	}
-      			if (! empty($_GET["idmenu"]) && $tabMenu[$i]['rowid'] == $_GET["idmenu"]) $class='class="tmenusel"';
-      			else  $class='class="tmenu"';
-      			// Define idsel
-      			$idsel='';
-      			print '<li><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>'.$tabMenu[$i]['titre'].'</a></li>';
-      		}
-      		else
-	        {
-	        	print '<li><div class="tmenudisabled">'.$tabMenu[$i]['titre'].'</div></li>';
-	        }
-	      }
-	    }
-	    
-	    print '</ul>';
-    }
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<ul class="tmenu">'."\n";
+		else print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'."\n";
+
+		for($i=0; $i<count($tabMenu); $i++)
+		{
+			if ($tabMenu[$i]['enabled'] == true)
+			{
+				$idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
+				if ($tabMenu[$i]['right'] == true)	// Is allowed
+				{
+					// Define url
+					if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+					{
+						$url = $tabMenu[$i]['url'];
+					}
+					else
+					{
+						$url=DOL_URL_ROOT.$tabMenu[$i]['url'];
+						if (! eregi('\?',$url)) $url.='?';
+						else $url.='&';
+						if (! eregi('mainmenu',$url) || ! eregi('leftmenu',$url))
+						{
+							$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=&';
+						}
+						$url.="idmenu=".$tabMenu[$i]['rowid'];
+					}
+					if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"';
+					else $class='class="tmenu"';
+
+					if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
+					else print '<td class="tmenu" id="td_'.$idsel.'">';
+
+					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+					print $tabMenu[$i]['titre'];
+					print '</a>';
+
+					if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '</li>'."\n";
+					else print '</td>'."\n";
+				}
+				else
+				{
+					if (! $this->hideifnotallowed)
+					{
+						if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
+						else print '<td class="tmenu" id="td_'.$idsel.'">';
+
+						print '<a class="tmenudisabled" id="mainmenu_'.$idsel.'" href="#">'.$tabMenu[$i]['titre'].'</a>';
+
+						if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '</li>'."\n";
+						else print '</td>'."\n";
+					}
+				}
+			}
+		}
+
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '</ul>'."\n";
+		else print '</tr></table>'."\n";
+	}
 
 }
+
 ?>
diff --git a/htdocs/includes/menus/barre_top/auguria_frontoffice.php b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
index ecb14bbca82..29472c0d75b 100644
--- a/htdocs/includes/menus/barre_top/auguria_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
@@ -18,91 +18,115 @@
  */
 
 /**
-	    \file       htdocs/includes/menus/barre_top/auguria_backoffice.php
-		\brief      Gestionnaire nomme Auguria du menu du haut
-		\version    $Id$
+ \file       htdocs/includes/menus/barre_top/auguria_backoffice.php
+ \brief      Gestionnaire nomme Auguria du menu du haut
+ \version    $Id$
 
-        \remarks    La construction d'un gestionnaire pour le menu du haut est simple:
-        \remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
-        \remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
-		\remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
-*/
+ \remarks    La construction d'un gestionnaire pour le menu du haut est simple:
+ \remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
+ \remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
+ \remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ */
 
 
 /**
-        \class      MenuTop
-	    \brief      Classe permettant la gestion du menu du haut Auguria
-*/
+ *	\class      MenuTop
+ *	\brief      Classe permettant la gestion du menu du haut Auguria
+ */
 
 class MenuTop {
 
-    var $require_left=array("auguria_backoffice");     // Si doit etre en phase avec un gestionnaire de menu gauche particulier
-    var $atarget="";                                // Valeur du target a utiliser dans les liens
+	var $require_left=array("auguria_backoffice");	// Si doit etre en phase avec un gestionnaire de menu gauche particulier
+	var $hideifnotallowed=1;						// Put 0 for back office menu, 1 for front office menu
+	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
-    /**
-     *    \brief      Constructeur
-     *    \param      db      Handler d'acc�s base de donn�e
-     */
-    function MenuTop($db)
-    {
-        $this->db=$db;
-    }
+	/**
+	 *    \brief      Constructeur
+	 *    \param      db      Database access handler
+	 */
+	function MenuTop($db)
+	{
+		$this->db=$db;
+	}
 
 
-    /**
-     *    \brief      Affiche le menu
-     */
-    function showmenu()
-    {
-    	require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
-    	
-    	global $user,$conf,$langs,$dolibarr_main_db_name;
-    	
-    	// On sauve en session le menu principal choisi
-    	if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-    	if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
-    	$_SESSION["leftmenuopened"]="";
-    	
-    	$menuArbo = new Menubase($this->db,'auguria','top');
-    	$tabMenu = $menuArbo->menuTopCharger(1,$_SESSION['mainmenu'], 'auguria');
-    	
-    	print '<ul>';
-    	
-    	for($i=0; $i<count($tabMenu); $i++)
-      {
-      	if ($tabMenu[$i]['enabled'] == true)
-      	{
-      		if ($tabMenu[$i]['right'] == true)
-      		{
-      			// Define url
-      			if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
-	        	{
-	        		$url = $tabMenu[$i]['url'];
-	        	}
-	        	else
-	        	{
-	        		$url=DOL_URL_ROOT.$tabMenu[$i]['url'];
-	        		if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?';
-	        		else $url.='&';
-	        		$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=';
-	        		$url.="&idmenu=".$tabMenu[$i]['rowid'];
-	        	}
-      			if (! empty($_GET["idmenu"]) && $tabMenu[$i]['rowid'] == $_GET["idmenu"]) $class='class="tmenusel"';
-      			else  $class='class="tmenu"';
-      			// Define idsel
-      			$idsel='';
-      			print '<li><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>'.$tabMenu[$i]['titre'].'</a></li>';
-      		}
-      		else
-	        {
-	        	print '<li><div class="tmenudisabled">'.$tabMenu[$i]['titre'].'</div></li>';
-	        }
-	      }
-	    }
 
-        print '</ul>';
-    }
+	/**
+	 *    \brief      Show menu
+	 */
+	function showmenu()
+	{
+		require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
+
+		global $user,$conf,$langs,$dolibarr_main_db_name;
+
+		// On sauve en session le menu principal choisi
+		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
+		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+		$_SESSION["leftmenuopened"]="";
+
+		$menuArbo = new Menubase($this->db,'auguria','top');
+		$tabMenu = $menuArbo->menuTopCharger($this->hideifnotallowed,$_SESSION['mainmenu'], 'auguria');
+
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<ul class="tmenu">'."\n";
+		else print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'."\n";
+
+		for($i=0; $i<count($tabMenu); $i++)
+		{
+			if ($tabMenu[$i]['enabled'] == true)
+			{
+				$idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
+				if ($tabMenu[$i]['right'] == true)	// Is allowed
+				{
+					// Define url
+					if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+					{
+						$url = $tabMenu[$i]['url'];
+					}
+					else
+					{
+						$url=DOL_URL_ROOT.$tabMenu[$i]['url'];
+						if (! eregi('\?',$url)) $url.='?';
+						else $url.='&';
+						if (! eregi('mainmenu',$url) || ! eregi('leftmenu',$url))
+						{
+							$url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=&';
+						}
+						$url.="idmenu=".$tabMenu[$i]['rowid'];
+					}
+					if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"';
+					else $class='class="tmenu"';
+
+					if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
+					else print '<td class="tmenu" id="td_'.$idsel.'">';
+
+					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+					print $tabMenu[$i]['titre'];
+					print '</a>';
+
+					if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '</li>'."\n";
+					else print '</td>'."\n";
+				}
+				else
+				{
+					if (! $this->hideifnotallowed)
+					{
+						if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
+						else print '<td class="tmenu" id="td_'.$idsel.'">';
+
+						print '<a class="tmenudisabled" id="mainmenu_'.$idsel.'" href="#">'.$tabMenu[$i]['titre'].'</a>';
+
+						if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '</li>'."\n";
+						else print '</td>'."\n";
+					}
+				}
+			}
+		}
+
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '</ul>'."\n";
+		else print '</tr></table>'."\n";
+	}
 
 }
 
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 050b4eed19e..efbb7b05c08 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -108,13 +108,13 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	// Table 1
 	$title='Dolibarr '.DOL_VERSION;
 	if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title=$conf->global->MAIN_APPLICATION_TITLE;
-	print '<table summary="'.$title.'" cellpadding="0" cellspacing="0" border="0" align="center" width="480">'."\n";;
+	print '<table summary="'.$title.'" cellpadding="0" cellspacing="0" border="0" align="center" width="498">'."\n";;
 	print '<tr class="vmenu"><td align="center">'.$title.'</td></tr>'."\n";
 	print '</table>'."\n";
 	print '<br>'."\n\n";
 
 	// Table 2
-	print '<table summary="Login area" cellpadding="2" align="center" width="480">'."\n";
+	print '<table summary="Login area" cellpadding="2" align="center" width="498">'."\n";
 
 	print '<tr><td colspan="3">&nbsp;</td></tr>';
 
@@ -122,7 +122,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	$demologin='';
 	$demopassword='';
-	if (isset($conf->global->MAIN_DEMO))
+	if (! empty($conf->global->MAIN_DEMO))
 	{
 		$tab=split(',',$conf->global->MAIN_DEMO);
 		$demologin=$tab[0];
@@ -151,8 +151,8 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	}
 
 	// Login field
-	print '<td align="left" valign="bottom"> &nbsp; <b>'.$langs->trans("Login").'</b>  &nbsp;</td>';
-	print '<td valign="bottom"><input type="text" id="username" name="username" class="flat" size="15" maxlength="25" value="';
+	print '<td align="left" valign="bottom"> &nbsp; <b>'.$langs->trans("Login").'</b> &nbsp; </td>';
+	print '<td valign="bottom" nowrap="nowrap"><input type="text" id="username" name="username" class="flat" size="15" maxlength="25" value="';
 	print (!empty($lastuser)?$lastuser:(isset($_REQUEST["username"])?$_REQUEST["username"]:$demologin));
 	print '" tabindex="1" /></td>';
 
diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php
index dfaed04df06..bdc8ae9fffd 100644
--- a/htdocs/theme/auguria/auguria.css.php
+++ b/htdocs/theme/auguria/auguria.css.php
@@ -148,19 +148,21 @@ div.tmenu
     border-left: 0px;
     padding: 0px 0px 0px 0px;
     margin: 0px 0px 2px 0px;
-    font-size: 12px;
+    font-size: 13px;
     background-image : url(<?php echo $dolibarr_main_url_root.'/theme/auguria/img/nav.jpg' ?>) ;
     height: 22px;
 }
+
 a.tmenudisabled
 {
 	color: #9FCED9;
 	font-size: 12px;
 	padding-left: 6px;
 	padding-right: 6px;
-	padding-top: 3px;
+	padding-top: 2px;
 	cursor: not-allowed;
     font-weight: normal;
+	font-size: 13px;
 }
 a.tmenudisabled:link
 {
@@ -183,64 +185,49 @@ a.tmenudisabled:active
     font-weight: normal;
 }
 
-table.tmenu
-{
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
-
-a.tmenu:link
+a.tmenu
 {
   	color:#FFFFFF;
 	text-decoration:none;
-	padding-left:5px;
-	padding-right:5px;
+	padding-left:6px;
+	padding-right:6px;
 	padding-top: 2px;
-	height: 21px;
+	height: 22px;
 	font-weight: normal;
+	font-size: 13px;
+}
+a.tmenu:link
+{
+  	color:#FFFFFF;
+    font-weight: normal;
 }
 a.tmenu:visited
 {
   	color:#FFFFFF;
-	text-decoration:none;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 21px;
-	font-weight: normal;
+    font-weight: normal;
 }
 a.tmenu:hover
 {
 	color:#234046;
-	text-decoration:none;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 21px;
-	font-weight: normal;
-	background: #FFFFFF;
+    font-weight: normal;
 }
 a.tmenu:active
 {
 	color:#234046;
-	background:#4F9EC9;
-	text-decoration:none;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 21px;
     font-weight: normal;
 }
+
 a.tmenusel
 {
 	color:#234046;
 	text-decoration:none;
-	padding-left:5px;
-	padding-right:5px;
+	padding-left: 6px;
+	padding-right: 6px;
 	padding-top: 2px;
-	height: 21px;
+	height: 22px;
 	font-weight: normal;
 	background: #FFFFFF;
+	font-size: 13px;
 }
 a.tmenusel:link
 {
@@ -260,63 +247,33 @@ a.tmenusel:active
 }
 
 
-/* Pour menu TOP auguria uniquement */
-* html div.tmenu li a
+/* Top menu */
+
+table.tmenu
+{
+    padding: 1px 0px 0px 0px;	// x y z w x=top offset
+    margin: 0px 0px 0px 0px;
+}
+
+* html li.tmenu a
 {
 	width:40px;
 }
-div.tmenu ul {
-	padding: 0px 0px 0px 0px;
+
+ul.tmenu {
+	padding: 3px 0px 0px 0px;
     margin: 0px 0px 0px 0px;
 	list-style: none;
 }
-div.tmenu li {
+li.tmenu {
 	float: left;
 	border-right: solid 1px #4F9EC9;
-	height: 22px;
+	height: 18px;
 	position:relative;
 	display: block;
-	margin:0;
-	padding:0;
+	padding: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
-div.tmenu li a
-{
-  	font-size: 13px;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 2px;
-	height: 22px;
-	display: block;
-	font-weight: normal;
-}
-div.tmenu li a:visited
-{
-	font-weight: normal;
-}
-div.tmenu li a:hover
-{
-	background:#FFFFFF;
-	color:#4F9EC9;
-	font-weight: normal;
-}
-div.tmenu li a:active
-{
-	color:#4F9EC9;
-	font-weight: normal;
-}
-div.tmenu li a:link
-{
-	font-weight: normal;
-}
-div.tmenu li a.tmenusel
-{
-	background:#FFFFFF;
-	color:#4F9EC9;
-	font-weight: normal;
-}
-
 
 
 /* Login */
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 4d2557ed8e0..837aa4ed952 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C)      2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C)      2007 Regis Houssin        <regis@dolibarr.fr>
  *
@@ -19,10 +19,10 @@
  */
 
 /**
-		\file       htdocs/theme/eldy/eldy.css.php
-		\brief      Fichier de style CSS du theme Eldy
-		\version    $Id$
-*/
+ *		\file       htdocs/theme/eldy/eldy.css.php
+ *		\brief      Fichier de style CSS du theme Eldy
+ *		\version    $Id$
+ */
 
 require("../../conf/conf.php");
 
@@ -178,41 +178,45 @@ div.tmenu
     text-decoration: none;
 }
 
-a.tmenudisabled
-{
-	color: #757575;
-	font-size: 12px;
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	cursor: not-allowed;
-    font-weight: normal;
-}
 a.tmenudisabled:link
 {
 	color: #757575;
     font-weight: normal;
+	font-size: 12px;
+	padding: 0px 5px 0px 5px;
+	margin: 0px 1px 2px 1px;
+	cursor: not-allowed;
+    font-weight: normal;
 }
 a.tmenudisabled:visited
 {
 	color: #757575;
     font-weight: normal;
+	font-size: 12px;
+	padding: 0px 5px 0px 5px;
+	margin: 0px 1px 2px 1px;
+	cursor: not-allowed;
+    font-weight: normal;
 }
 a.tmenudisabled:hover
 {
 	color: #757575;
     font-weight: normal;
+	font-size: 12px;
+	padding: 0px 5px 0px 5px;
+	margin: 0px 1px 2px 1px;
+	cursor: not-allowed;
+    font-weight: normal;
 }
 a.tmenudisabled:active
 {
 	color: #757575;
     font-weight: normal;
-}
-
-table.tmenu
-{
-    padding: 0px 0px 10px 0px;
-    margin: 0px 0px 0px 6px;
+	font-size: 12px;
+	padding: 0px 5px 0px 5px;
+	margin: 0px 1px 2px 1px;
+	cursor: not-allowed;
+    font-weight: normal;
 }
 
 a.tmenu:link
@@ -220,8 +224,6 @@ a.tmenu:link
   color: #234046;
   padding: 0px 5px 0px 5px;
   margin: 0px 1px 2px 1px;
-  font-size: 12px;
-  font-family: helvetica, verdana, arial, sans-serif;
   font-weight: normal;
 }
 a.tmenu:visited
@@ -229,9 +231,6 @@ a.tmenu:visited
   color: #234046;
   padding: 0px 5px 0px 5px;
   margin: 0px 1px 2px 1px;
-  border: 0px solid #b3c5cc;
-  font-size: 12px;
-  font-family: helvetica, verdana, arial, sans-serif;
   font-weight: normal;
 }
 a.tmenu:hover
@@ -239,9 +238,6 @@ a.tmenu:hover
   color: #234046;
   padding: 0px 5px 0px 5px;
   margin: 0px 0px 0px 0px;
-  text-decoration: none;
-  font-size: 12px;
-  font-family: helvetica, verdana, arial, sans-serif;
   font-weight: normal;
   background: #dee7ec;
   border-right: 1px solid #555555;
@@ -251,136 +247,96 @@ a.tmenu:hover
 }
 a.tmenu:active
 {
+  color: #234046;
   padding: 0px 5px 0px 5px;
   margin: 0px 0px 0px 0px;
-  text-decoration: none;
-  font-size: 12px;
-  font-family: helvetica, verdana, arial, sans-serif;
   font-weight: normal;
-  background:#F4F4F4;
+  background: #F4F4F4;
   border-right: 1px solid #555555;
   border-top: 1px solid #D8D8D8;
   border-left: 1px solid #D8D8D8;
   border-bottom: 2px solid #dee7ec;
 }
-a.tmenusel
+
+a.tmenusel:link
 {
-  color: #234046;
   padding: 0px 5px 0px 5px;
   margin: 0px 0px 0px 0px;
-  font-size: 12px;
-  font-family: helvetica, verdana, arial, sans-serif;
   font-weight: normal;
+  color: #234046;
   background: #F4F4F4;
   border-right: 1px solid #555555;
   border-top: 1px solid #D8D8D8;
   border-left: 1px solid #D8D8D8;
   border-bottom: 2px solid #F4F4F4;
 }
-a.tmenusel:link
-{
-  font-weight: normal;
-}
 a.tmenusel:visited
 {
+  padding: 0px 5px 0px 5px;
+  margin: 0px 0px 0px 0px;
   font-weight: normal;
+  color: #234046;
+  background: #F4F4F4;
+  border-right: 1px solid #555555;
+  border-top: 1px solid #D8D8D8;
+  border-left: 1px solid #D8D8D8;
+  border-bottom: 2px solid #F4F4F4;
 }
 a.tmenusel:hover
 {
+  padding: 0px 5px 0px 5px;
+  margin: 0px 0px 0px 0px;
   font-weight: normal;
+  color: #234046;
+  background: #F4F4F4;
+  border-right: 1px solid #555555;
+  border-top: 1px solid #D8D8D8;
+  border-left: 1px solid #D8D8D8;
+  border-bottom: 2px solid #F4F4F4;
 }
 a.tmenusel:active
 {
+  padding: 0px 5px 0px 5px;
+  margin: 0px 0px 0px 0px;
   font-weight: normal;
+  color: #234046;
+  background: #F4F4F4;
+  border-right: 1px solid #555555;
+  border-top: 1px solid #D8D8D8;
+  border-left: 1px solid #D8D8D8;
+  border-bottom: 2px solid #F4F4F4;
 }
 
+/* Top menu */
 
-/* Pour menu TOP auguria uniquement */
-* html div.tmenu li a{
+table.tmenu
+{
+    padding: 0px 0px 10px 0px;	// x y z w x=top offset
+    margin: 0px 0px 0px 6px;
+}
+
+* html li.tmenu a
+{
 	width:40px;
 }
-div.tmenu ul {
-	padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-	list-style: none;
 
+ul.tmenu {
+    padding: 0px 0px 10px 0px;
+    margin: 3px 0px 0px 6px;
+	list-style: none;
 }
-div.tmenu li {
+li.tmenu {
 	float: left;
-	border-right: solid 1px #7699A9;
 	padding-left:5px;
 	padding-right:5px;
 	padding-top: 2px;
 	height: 18px;
 	position:relative;
 	display: block;
-	margin:0;
-	padding:0;
-	font-weight: normal;
-	}
-div.tmenu li a
-{
-  	font-size: 13px;
-	color:#000000;
-	text-decoration:none;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 18px;
-	display: block;
-	margin:0;
-	padding:0;
+	padding: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 	font-weight: normal;
 }
-div.tmenu li a.tmenusel
-{
-	background:#F4F4F4;
-	color:#000000;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 18px;
-	font-weight: normal;
-}
-div.tmenu li a:visited
-{
-	color:#000000;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 18px;
-	font-weight: normal;
-}
-div.tmenu li a:hover
-{
-	background:#F4F4F4;
-	color:#000000;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 18px;
-	font-weight: normal;
-	border-bottom: 0px;
-}
-div.tmenu li a:active
-{
-	color:#4F9EC9;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 18px;
-	font-weight: normal;
-}
-div.tmenu li a:link
-{
-	color:#000000;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top: 2px;
-	height: 18px;
-	font-weight: normal;
-}
-
 
 
 /* Login */
diff --git a/htdocs/theme/eldy/fckeditor/.cvsignore b/htdocs/theme/eldy/fckeditor/.cvsignore
new file mode 100644
index 00000000000..085e8baf0c8
--- /dev/null
+++ b/htdocs/theme/eldy/fckeditor/.cvsignore
@@ -0,0 +1 @@
+Thumbs.db
diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php
index 34635609a8c..de7ca9517d0 100644
--- a/htdocs/theme/freelug/freelug.css.php
+++ b/htdocs/theme/freelug/freelug.css.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,10 +18,10 @@
  */
 
 /**
-		\file       htdocs/theme/freelug/freelug.css.php
-		\brief      Fichier de style CSS du theme Freelug
-		\version    $Id$
-*/
+ *		\file       htdocs/theme/freelug/freelug.css.php
+ *		\brief      Fichier de style CSS du theme Freelug
+ *		\version    $Id$
+ */
 
 require("../../conf/conf.php");
 
@@ -203,21 +203,6 @@ a.tmenudisabled:active
     font-weight: normal;
 }
 
-table.tmenu
-{
-    padding: 0px 0px 10px 0px;
-    margin: 0px 0px 0px 6px;
-}
-
-.menu
-{
-  background: #ccccb3;
-  font-size: 12px;
-  color: #000000;
-  text-decoration: none;
-}
-
-
 a.tmenu:link
 {
   color: #234046;
@@ -245,6 +230,15 @@ a.tmenu:hover
   border: 1px solid #eeeedd;
   text-decoration: none;
 }
+a.tmenu:active
+{
+  color: #202020;
+  background: #bbbbcc;
+  padding: 0px 8px;
+  margin: 0px 0px 6px 0px;
+  border: 1px solid #eeeedd;
+  text-decoration: none;
+}
 
 a.tmenusel
 {
@@ -256,18 +250,26 @@ a.tmenusel
 }
 
 
-/* Pour menu TOP auguria uniquement */
-* html div.tmenu li a
+/* Top menu */
+
+table.tmenu
+{
+    padding: 0px 0px 10px 0px;
+    margin: 0px 0px 0px 6px;
+}
+
+* html li.tmenu a
 {
 	width:40px;
 }
-div.tmenu ul {
+
+ul.tmenu {
 	padding: 0px 0px 0px 0px;
     margin: 0px 0px 0px 0px;
 	list-style: none;
 
 }
-div.tmenu li {
+li.tmenu {
 	float: left;
 	border-right: solid 1px #000000;
 	height: 18px;
@@ -276,7 +278,7 @@ div.tmenu li {
 	margin:0;
 	padding:0;
 }
-div.tmenu li a{
+li.tmenu a{
   	font-size: 13px;
 	color:#000000;
 	text-decoration:none;
@@ -287,29 +289,29 @@ div.tmenu li a{
 	display: block;
 	font-weight: normal;
 }
-div.tmenu li a.tmenusel
+li.tmenu a.tmenusel
 {
 	background:#FFFFFF;
 	color:#000000;
 	font-weight: normal;
 }
-div.tmenu li a:visited
+li.tmenu a:visited
 {
 	color:#000000;
 	font-weight: normal;
 }
-div.tmenu li a:hover
+li.tmenu a:hover
 {
 	background:#FFFFFF;
 	color:#000000;
 	font-weight: normal;
 }
-div.tmenu li a:active
+li.tmenu a:active
 {
 	color:#000000;
 	font-weight: normal;
 }
-div.tmenu li a:link
+li.tmenu a:link
 {
 
 	font-weight: normal;