From 097139f490cdaa17455bd8c9d0c9e8ee1a3cdd9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 31 Oct 2005 04:57:20 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tiques?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/main.inc.php            | 42 ++++++++++---------
 htdocs/theme/eldy/eldy.css.php | 76 ++++++++++++++++++++++++++--------
 2 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2e932aa4322..ccd782e2135 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -293,13 +293,13 @@ function top_menu($head, $title="", $target="")
      * Si la constante MAIN_NEED_UPDATE est définie (par le script de migration sql en général), c'est que
      * les données ont besoin d'un remaniement. Il faut passer le update.php
      */
-    if (defined("MAIN_NEED_UPDATE") && MAIN_NEED_UPDATE)
+    if ($conf->global->MAIN_NEED_UPDATE)
     {
         $langs->load("admin");
         print '<div class="fiche">'."\n";
         print '<table class="noborder" width="100%">';
         print '<tr><td>';
-        print $langs->trans("UpdateRequired",DOL_URL_ROOT.'/admin/system/update.php');
+        print $langs->trans("UpdateRequired",DOL_URL_ROOT.'/install/index.php');
         print '</td></tr>';
         print "</table>";
         llxFooter();
@@ -376,19 +376,22 @@ function left_menu($menu_array, $help_url='', $form_search='')
         if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_SOCIETE && $user->rights->societe->lire)
         {
             $langs->load("companies");
-            printSearchForm(DOL_URL_ROOT.'/societe.php',DOL_URL_ROOT.'/societe.php',$langs->trans("Companies"),'soc','socname');
+            printSearchForm(DOL_URL_ROOT.'/societe.php',DOL_URL_ROOT.'/societe.php',
+                img_object($langs->trans("List"),'company').' '.$langs->trans("Companies"),'soc','socname');
         }
 
         if ($conf->societe->enabled && $conf->global->MAIN_SEARCHFORM_CONTACT && $user->rights->societe->lire)
         {
             $langs->load("companies");
-            printSearchForm(DOL_URL_ROOT.'/contact/index.php',DOL_URL_ROOT.'/contact/index.php',$langs->trans("Contacts"),'contact','contactname');
+            printSearchForm(DOL_URL_ROOT.'/contact/index.php',DOL_URL_ROOT.'/contact/index.php',
+                img_object($langs->trans("List"),'contact').' '.$langs->trans("Contacts"),'contact','contactname','contact');
         }
 
         if (($conf->produit->enabled || $conf->service->enabled) && $conf->global->MAIN_SEARCHFORM_PRODUITSERVICE && $user->rights->produit->lire)
         {
             $langs->load("products");
-            printSearchForm(DOL_URL_ROOT.'/product/liste.php',DOL_URL_ROOT.'/product/index.php',$langs->trans("Products")."/".$langs->trans("Services"),'products','sall');
+            printSearchForm(DOL_URL_ROOT.'/product/liste.php',DOL_URL_ROOT.'/product/index.php',
+                img_object($langs->trans("List"),'product').' '.$langs->trans("Products")."/".$langs->trans("Services"),'products','sall','product');
         }
 
         /*
@@ -446,24 +449,25 @@ function left_menu($menu_array, $help_url='', $form_search='')
 
 
 /**
- * \brief   Affiche une zone de recherche
- * \param   urlaction       url du post
- * \param   urlobject       url du lien sur titre de la zone de recherche
- * \param   title           titre de la zone de recherche
- * \param   htmlmodesearch  'search'
- * \param   htmlinputname   nom du champ input du formulaire
+ *  \brief   Affiche une zone de recherche
+ *  \param   urlaction          Url du post
+ *  \param   urlobject          Url du lien sur titre de la zone de recherche
+ *  \param   title              Titre de la zone de recherche
+ *  \param   htmlmodesearch     'search'
+ *  \param   htmlinputname      Nom du champ input du formulaire
  */
  
 function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname)
 {
-  global $langs;
-  print '<form action="'.$urlaction.'" method="post">';
-  print '<a class="vmenu" href="'.$urlobject.'">'.$title.'</a><br>';
-  print '<input type="hidden" name="mode" value="search">';
-  print '<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">';
-  print '<input type="text" class="flat" name="'.$htmlinputname.'" size="10">&nbsp;';
-  print '<input type="submit" class="button" value="'.$langs->trans("Go").'">';
-  print "</form>";
+    global $langs;
+    print '<form action="'.$urlaction.'" method="post">';
+    print '<a class="vmenu" href="'.$urlobject.'">';
+    print $title.'</a><br>';
+    print '<input type="hidden" name="mode" value="search">';
+    print '<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">';
+    print '<input type="text" class="flat" name="'.$htmlinputname.'" size="10">&nbsp;';
+    print '<input type="submit" class="button" value="'.$langs->trans("Go").'">';
+    print "</form>";
 }
 
 
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 949e4b55130..e95aaa08468 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -107,14 +107,15 @@ div.tmenu
     display:block;
     white-space: nowrap;
     border:0;
-    border-right: 1px solid #000000;
-    border-bottom: 1px solid #000000;
-    padding: 3px 1em 0em;
-    margin: 0em 0em 0.2em 0em;
+    border-right: 1px solid #555555;
+    border-bottom: 1px solid #555555;
+    padding: 3px 0px 0px 10px;
+    margin: 0px 0px 2px 0px;
     font-weight:bold;
-    font-size:12px;
+    font-size: 12px;
     height: 18px;
     background: #b3c5cc; 
+//    background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
     color: #000000; 
     text-decoration: none;
 }
@@ -157,7 +158,6 @@ table.topbarre
 .menu
 { 
     background: #b3c5cc; 
-    font-size: 12px; 
     color: #000000; 
     text-decoration: none;
 }
@@ -168,8 +168,8 @@ a.tmenu:link
   padding: 0em 1em;
   margin: 0em 0em 1.5em 0em;
   border: 1px solid #b3c5cc;
-  font-weight:bold;
-  font-size:12px;
+  font: 12px helvetica, verdana, arial, sans-serif;
+  font-weight: bold;
 }
 a.tmenu:visited
 {
@@ -177,8 +177,8 @@ a.tmenu:visited
   padding: 0em 1em;
   margin: 0em 0em 1.5em 0em;
   border: 1px solid #b3c5cc;
-  font-weight:bold;
-  font-size:12px;
+  font: 12px helvetica, verdana, arial, sans-serif;
+  font-weight: bold;
 }
 a.tmenu#sel
 { 
@@ -187,6 +187,8 @@ a.tmenu#sel
   padding: 0em 1em;
   margin: 0em 0em 1.5em 0em;
   border: 1px solid #8CACBB;
+  font: 12px helvetica, verdana, arial, sans-serif;
+  font-weight: bold;
 }
 a.tmenu:hover
 {
@@ -196,6 +198,8 @@ a.tmenu:hover
   margin: 0em 0em 1.5em 0em;
   border: 1px solid #8CACBB;
   text-decoration: none;
+  font: 12px helvetica, verdana, arial, sans-serif;
+  font-weight: bold;
 }
 
 font.tmenudisabled
@@ -264,8 +268,8 @@ a.help:hover        { font-size:11px; font: helvetica, verdana, arial, sans-seri
 
 div.blockvmenupair
 {
-	border-right: 1px solid #000000;
-	border-bottom: 1px solid #000000;
+    border-right: 1px solid #555555;
+    border-bottom: 1px solid #555555;
 	background: #b3c5cc;
 	font: helvetica, verdana, arial, sans-serif;
 	color: #000000; 
@@ -273,12 +277,13 @@ div.blockvmenupair
 	text-decoration: none;
     padding: 3px;
     margin: 1px 0px 0px 0px;
+
 }
 
 div.blockvmenuimpair
 {
-	border-right: 1px solid #000000;
-	border-bottom: 1px solid #000000;
+    border-right: 1px solid #555555;
+    border-bottom: 1px solid #555555;
 	background: #b3c5cc;
 	font: helvetica, verdana, arial, sans-serif;
 	color: #000000; 
@@ -364,7 +369,15 @@ div.tabBar {
     padding-right: 12px;
     padding-bottom: 12px;
     margin: 0px 0px 10px 0px;
-    border: 1px solid #8CACBB;
+    -moz-border-radius-topleft:6px;
+    -moz-border-radius-topright:6px;
+    -moz-border-radius-bottomleft:6px;
+    -moz-border-radius-bottomright:6px;
+    border-right: 1px solid #555555;
+    border-bottom: 1px solid #555555;
+    border-left: 1px solid #D0D0D0;
+    border-top: 1px solid #D8D8D8;
+//    border: 1px solid #8CACBB;
 }
 
 div.tabsAction {
@@ -376,32 +389,47 @@ div.tabsAction {
 
 a.tabTitle {
     background: #436976;
-    border: 1px solid #8CACBB;
     color: white;
     font-weight: normal;
     padding: 0px 6px;
     margin: 0em 0.5em;
     text-decoration: none;
     white-space: nowrap;
+
+    border-right: 1px solid #555555;
+    border-left: 1px solid #D8D8D8;
+    border-top: 1px solid #D8D8D8;
 }
 
 a.tab:link {
     background: white;
-    border: 1px solid #8CACBB;
+//    border: 1px solid #8CACBB;
     color: #436976;
     padding: 0px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;
+    -moz-border-radius-topleft:4px;
+    -moz-border-radius-topright:4px;
+
+    border-right: 1px solid #555555;
+    border-left: 1px solid #D8D8D8;
+    border-top: 1px solid #D8D8D8;
 }
 a.tab:visited {
     background: white;
-    border: 1px solid #8CACBB;
+//    border: 1px solid #8CACBB;
     color: #436976;
     padding: 0px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
     white-space: nowrap;
+    -moz-border-radius-topleft:4px;
+    -moz-border-radius-topright:4px;
+
+    border-right: 1px solid #555555;
+    border-left: 1px solid #D8D8D8;
+    border-top: 1px solid #D8D8D8;
 }
 a.tab#active {
     background: #dee7ec;
@@ -410,6 +438,12 @@ a.tab#active {
     padding: 0px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
+    -moz-border-radius-topleft:4px;
+    -moz-border-radius-topright:4px;
+
+    border-right: 1px solid #555555;
+    border-left: 1px solid #D8D8D8;
+    border-top: 1px solid #D8D8D8;
 }
 a.tab:hover {
     background: #dee7ec;
@@ -417,6 +451,12 @@ a.tab:hover {
     padding: 0px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
+    -moz-border-radius-topleft:4px;
+    -moz-border-radius-topright:4px;
+
+    border-right: 1px solid #555555;
+    border-left: 1px solid #D8D8D8;
+    border-top: 1px solid #D8D8D8;
 }
 
 a.tabimage {