Look: Possibilit� d'utiliser une feuille de style css.php afin de pouvoir y inclure des images dont chemin d�pend du theme.

Look: L'image des lignes de titre de tableau est un d�grad�.
Look: Correction du bug IE qui positionne mal les onglets dans certains cas.

htdocs/compta/facture.php

@@ -1217,11 +1217,15 @@ else
 			{
 				$langs->load('projects');
 				print '<td>';
+				
 				print '<table class="nobordernopadding" width="100%"><tr><td>';
 				print $langs->trans('Project');
 				print '</td>';
-				if ($_GET['action'] != 'classer') print '<td align="right"><a href="facture.php?action=classer&amp;facid='.$fac->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
+				if ($_GET['action'] != 'classer') print '<td align="right"><a href="facture.php?action=classer&amp;facid='.$fac->id.'">';
+				print img_edit($langs->trans('SetProject'));
+				print '</a></td>';
 				print '</tr></table>';
+				
 				print '</td><td colspan="3">';
 				if ($_GET['action'] == 'classer')
 				{
@@ -1653,7 +1657,7 @@ else
 			$html->show_documents('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed);
 
 			/*
-			 *   Propales
+			 *   Propales rattach<63>es
 			 */
 			$sql = 'SELECT '.$db->pdate('p.datep').' as dp, p.price, p.ref, p.rowid as propalid';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'fa_pr as fp WHERE fp.fk_propal = p.rowid AND fp.fk_facture = '.$fac->id;
@@ -1695,7 +1699,6 @@ else
 			{
 				dolibarr_print_error($db);
 			}
-			print '</td><td valign="top" width="50%">';
 
 			/*
 			 * Commandes rattach<63>es
@@ -1743,6 +1746,7 @@ else
 					dolibarr_print_error($db);
 				}
 			}
+
 			print '</td><td valign="top" width="50%">';
 
 			/*

htdocs/compta/facture/apercu.php

@@ -267,6 +267,12 @@ elseif (file_exists($fileimagebis))
 
 print '</div>';
 
+
+// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
+print '<div class="tabsAction">';
+print '</div>';
+
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');

htdocs/compta/facture/info.php

@@ -74,6 +74,7 @@ $head[$h][1] = $langs->trans("Info");
 $hselected = $h;
 $h++;      
 
+
 dolibarr_fiche_head($head, $hselected, $langs->trans("Bill")." : $fac->ref");
 
 
@@ -83,6 +84,10 @@ print '</td></tr></table>';
 
 print '</div>';
 
+// Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
+print '<div class="tabsAction">';
+print '</div>';
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');

htdocs/html.formmail.class.php

@@ -202,7 +202,7 @@ class FormMail
         print "<tr>";
         print "<td width=\"180\">".$langs->trans("MailFile")."</td>";
         print "<td>";
-        print "<input type=\"file\" name=\"addedfile\" value=\"".$langs->trans("Upload")."\"/>";
+        print "<input type=\"file\" class=\"flat\" name=\"addedfile\" value=\"".$langs->trans("Upload")."\"/>";
         print "</td></tr>\n";
     }
 
@@ -236,7 +236,7 @@ class FormMail
         print "</td></tr>\n";
     }
     	
-    print "<tr><td align=center colspan=2><center><input class=\"flat\" type=\"submit\" value=\"".$langs->trans("SendMail")."\"></center></td></tr>\n";
+    print "<tr><td align=center colspan=2><center><input class=\"button\" type=\"submit\" value=\"".$langs->trans("SendMail")."\"></center></td></tr>\n";
     print "</table>\n";
 
     print "</form>\n";	

htdocs/includes/menus/barre_left/default.php

@@ -89,7 +89,7 @@ class MenuLeft {
             }
             
             if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0)  {
-                print '</div>';
+                print "</div>\n";
             }
         }
 

htdocs/includes/menus/barre_left/eldy_backoffice.php

@@ -272,12 +272,12 @@ class MenuLeft {
                     if ($conf->facture->enabled)
                     {
                         $langs->load("bills");
-                        $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),1,$user->rights->facture->lire);
+                        $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),1,$user->rights->fournisseur->facture->lire);
                         if ($user->societe_id == 0) 
                         {
-                          if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"),2,$user->rights->facture->creer);
+                          if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"),2,$user->rights->fournisseur->facture->creer);
                         }
-                        if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"),2,$user->rights->facture->lire);
+                        if ($leftmenu=="suppliers_bills") $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"),2,$user->rights->fournisseur->facture->lire);
                     }
                 }        
         
@@ -492,14 +492,14 @@ class MenuLeft {
               if ($conf->facture->enabled)
                 {
                   $langs->load("bills");
-                  $newmenu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"), 0, $user->rights->facture->lire);
+                  $newmenu->add(DOL_URL_ROOT."/fourn/facture/index.php", $langs->trans("Bills"), 0, $user->rights->fournisseur->facture->lire);
                   
                   if ($user->societe_id == 0) 
             	{
-            	  $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->facture->creer);
+            	  $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer);
             	}
                   
-                  $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"), 1, $user->rights->facture->lire);
+                  $newmenu->add_submenu(DOL_URL_ROOT."/fourn/facture/paiement.php", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire);
                 }
               
               if ($conf->commande->enabled)
@@ -661,7 +661,7 @@ class MenuLeft {
             }
             
             if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0)  {
-                print '</div>';
+                print "</div>\n";
             }
         }
 

htdocs/includes/menus/barre_left/eldy_frontoffice.php

@@ -675,7 +675,7 @@ class MenuLeft {
             }
             
             if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0)  {
-                print '</div>';
+                print "</div>\n";
             }
         }
 

htdocs/langs/en_US/bills.lang

@@ -64,7 +64,8 @@ DraftBills=Draft invoices
 Unpayed=Unpayed
 ConfirmDeleteBill=Are you sure you want to delete this invoice ?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ?
-ConfirmCancelBill=Are you sure you want to cancel this invoice ?
+ConfirmClassifyPayedBill=Are you sure you want to change invoice %s to status payed ?
+ConfirmCancelBill=Are you sure you want to cancel invoice %s ?
 ValidateBill=Validate invoice
 GlobalDiscount=Global discount
 NumberOfBills=Nb of invoices

htdocs/langs/fr_FR/bills.lang

@@ -64,7 +64,8 @@ DraftBills=Factures brouillons
 Unpayed=Impay<61>es
 ConfirmDeleteBill=<3D>tes-vous s<>r de vouloir supprimer cette facture ?
 ConfirmValidateBill=<3D>tes-vous s<>r de vouloir valider cette facture sous la r<>f<EFBFBD>rence %s ?
-ConfirmCancelBill=<3D>tes-vous s<>r de vouloir annuler cette facture ?
+ConfirmClassifyPayedBill=<3D>tes-vous s<>r de vouloir classer la facture %s <20> payer ?
+ConfirmCancelBill=<3D>tes-vous s<>r de vouloir annuler la facture %s ?
 ValidateBill=Valider facture
 GlobalDiscount=Remise globale
 NumberOfBills=Nb de factures

htdocs/lib/functions.inc.php

@@ -177,7 +177,7 @@ function dolibarr_syslog($message, $level=LOG_ERR)
 */
 function dolibarr_fiche_head($links, $active=0, $title='')
 {
-    print "<!-- fiche --><div class=\"tabs\">\n";
+    print '<div class="tabs">'."\n";
 
     if (strlen($title))
     {
@@ -206,7 +206,7 @@ function dolibarr_fiche_head($links, $active=0, $title='')
     }
 
     print "</div>\n";
-    print "<div class=\"tabBar\">\n\n";
+    print '<div class="tabBar">'."\n\n";
 }
 
 /**
@@ -626,7 +626,8 @@ function img_edit($alt = "default")
 {
   global $conf,$langs;
   if ($alt=="default") $alt=$langs->trans("Modify");
-  return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/edit.png" border="0" alt="'.$alt.'" title="'.$alt.'">';
+//  return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/edit.png" border="0" alt="'.$alt.'" title="'.$alt.'">';
+  return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/edit.png" border="0" style="float: right">';
 }
 
 /**
@@ -822,20 +823,25 @@ function loginfunction()
     global $langs,$conf;
     $langs->load("main");
     
+    $conf->css  = "theme/".$conf->theme."/".$conf->theme.".css";
+    // Si feuille de style en php existe
+    if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php";
+    
     print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
     print "\n<html><head><title>Dolibarr Authentification</title>\n";
-  print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.css">';
+    
+    print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
     
     
     
-  print '<style type="text/css">';
-  print '<!--';
+    print '<style type="text/css">'."\n";
+    print '<!--'."\n";
     print '#login {';
     print '  margin-top: 70px;';
     print '  margin-bottom: 50px;';
     print '  text-align: center;';
     print '  font: 12px arial,helvetica;';
-  print '}';
+    print '}'."\n";
     print '#login table {';
     print '  border: 1px solid #C0C0C0;';
     if (file_exists(DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))
@@ -847,16 +853,16 @@ function loginfunction()
       print 'background: #F0F0F0 url('.DOL_URL_ROOT.'/theme/login_background.png) repeat-x;';
     }
     print 'font-size: 12px;';
-  print '}';
-  print '-->';
-  print '</style>';
-  print '<script type="text/javascript">';
+    print '}'."\n";
+    print '-->'."\n";
+    print '</style>'."\n";
+    print '<script type="text/javascript">'."\n";
     print "function donnefocus() {\n";
     print "document.getElementsByTagName('INPUT')[0].focus();";
     print "}\n";
-  print '</script>';
-  print '</head>';
-  print '<body onload="donnefocus();">';
+    print '</script>'."\n";
+    print '</head>'."\n";
+    print '<body class="body" onload="donnefocus();">';
     
     print '<form id="login" method="post" action="' . $_SERVER['PHP_SELF'] . '" name="identification">';
     

htdocs/main.inc.php

@@ -328,9 +328,10 @@ function left_menu($menu_array, $help_url='', $form_search='')
     global $user, $conf, $langs, $db;
 
     print '<div class="vmenuplusfiche">'."\n";
+    print "\n";
 
     // Colonne de gauche
-    print "\n<!-- Debut left vertical menu -->\n";
+    print '<!-- Debut left vertical menu -->'."\n";
     print '<div class="vmenu">'."\n";
 
 
@@ -408,11 +409,14 @@ function left_menu($menu_array, $help_url='', $form_search='')
     }
     print "\n";
     print "</div>\n";
-    print "</div>\n";
     print "<!-- Fin left vertical menu -->\n";
 
+    print "\n";
+    print '</div>'."\n";
     print '<div class="vmenuplusfiche">'."\n";
+    print "\n";
     
+    print '<!-- fiche -->'."\n";
     print '<div class="fiche">'."\n";
 
 }
@@ -450,9 +454,9 @@ function llxFooter($foot='')
 {
   global $dolibarr_auto_user;
 
-  print "\n".'</div><!-- div class="fiche" -->'."\n";
-  print "\n".'</div><!-- div class="vmenuplusfiche" -->';
-  print "\n".'</div><!-- div class="body" -->'."\n";
+  print "\n</div>\n".'<!-- end div class="fiche" -->'."\n";
+  print "\n</div>\n".'<!-- end div class="vmenuplusfiche" -->';
+  print "\n</div>\n".'<!-- end div class="body" -->'."\n";
 
   print "</body>\n</html>\n";
 }

htdocs/product/stock/product.php

@@ -222,7 +222,7 @@ if ($_GET["id"])
         * Contenu des stocks
         *
         */
-        print '<br><table class="border" width="100%">';
+        print '<br><table class="noborder" width="100%">';
         print '<tr class="liste_titre"><td width="40%">'.$langs->trans("Warehouse").'</td><td width="60%">Valeur du stock</td></tr>';
         $sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps";
         $sql .= " WHERE ps.fk_entrepot = e.rowid AND ps.fk_product = ".$product->id;
@@ -241,7 +241,7 @@ if ($_GET["id"])
                 $i++;
             }
         }
-        print '<tr><td align="right">'.$langs->trans("Total").':</td><td>'.$total."</td></tr></table>";
+        print '<tr class="liste_total"><td align="right" class="liste_total">'.$langs->trans("Total").':</td><td class="liste_total">'.$total."</td></tr></table>";
 
     }
     print '</div>';

htdocs/theme/eldy/eldy.css.php

@@ -27,7 +27,7 @@ require("../../conf/conf.php");
 
 /***** Style du fond *****/
 body {
-    background-color: #F1F1F1;
+    background-color: #F4F4F4;
 	font: 12px helvetica, verdana, arial, sans-serif;
     margin-top: 0;
     margin-bottom: 0;
@@ -35,7 +35,7 @@ body {
     margin-left: 0;
 }
 .body {
-    background-color: #F1F1F1;
+    background-color: #F4F4F4;
 	color: #101010;
 	font: 12px helvetica, verdana, arial, sans-serif;
 }
@@ -55,9 +55,9 @@ input
 }
 input.flat
 { 
-    font: helvetica, verdana, arial, sans-serif;
+    font: 12px helvetica, verdana, arial, sans-serif;
     background: #FDFDFD;
-    border: 1px solid #8C9C9B;
+    border: 1px solid #9CACAB;
     padding: 0px 0px 0px 0px;
     margin: 0px 0px 0px 0px;
 }
@@ -77,7 +77,7 @@ textarea.flat
 .button  {
     font: 12px helvetica, verdana, arial, sans-serif;
 	font-size: 100%;
-	border: 1px solid #ccd7e0;
+	border: 0px;
 	background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>);
 	background-position : bottom;
     padding: 0px 0px 0px 0px;
@@ -314,7 +314,7 @@ td.barre_select {
 }
 
 td.photo {
-	background: #FCFCFC; 
+	background: #F4F4F4; 
 	color: #000000;
     border: 1px solid #b3c5cc;
 }
@@ -345,23 +345,22 @@ div.formsearch
 /*
  *   Barre onglets
  */
+div.tabs {
+    top: 20px;
+    margin: 1px 0px 0px 0px;
+    padding: 0px 6px 0px 0px;
+    text-align: left;
+}
+
 div.tabBar {
     color: #234046;
     background: #dee7ec;
-    padding-top: 14px;
-    padding-left: 14px;
-    padding-right: 14px;
-    padding-bottom: 14px;
+    padding-top: 12px;
+    padding-left: 12px;
+    padding-right: 12px;
+    padding-bottom: 12px;
     margin: 0px 0px 10px 0px;
     border: 1px solid #8CACBB;
-    border-top: 1px solid #8CACBB;
-}
-
-div.tabs {
-    top: 20px;
-    margin: 1px 0em 0em 0em;
-    padding: 0em 0.5em;
-    text-align: left;
 }
 
 div.tabsAction {
@@ -370,6 +369,7 @@ div.tabsAction {
     text-align: right;
 }
 
+
 a.tabTitle {
     background: #436976;
     border: 1px solid #8CACBB;
@@ -402,10 +402,16 @@ a.tab:visited {
 a.tab#active {
     background: #dee7ec;
     border-bottom: #dee7ec 1px solid;
+    color: #436976;
+    padding: 0px 6px;
+    margin: 0em 0.2em;
     text-decoration: none;
 }
 a.tab:hover {
     background: #dee7ec;
+    color: #436976;
+    padding: 0px 6px;
+    margin: 0em 0.2em;
     text-decoration: none;
 }
 
@@ -532,16 +538,16 @@ margin: 0px 0px;
 }
 
 table.border {
-border: 1px solid #6C7C8B;
-border-color: #6C7C8B;
+border: 1px solid #8C9CAB;
+border-color: #8C9CAB;
 border-width: 1px;
 border-collapse: collapse;
 }
 
 table.border td {
 padding: 1px 2px;
-border: 1px solid #6C7C8B;
-border-color: #6C7C8B;
+border: 1px solid #8C9CAB;
+border-color: #8C9CAB;
 border-width: 1px;
 border-collapse: collapse;
 }
@@ -576,43 +582,43 @@ width: 100%;
  *  Tableaux
  */ 
 
-input.liste_titre { 
-background: #7699A9;
-}
-
 tr.liste_titre { 
 background: #7699A9;
+background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
 color: #334444;
 font: helvetica, verdana, arial, sans-serif;
 font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
 white-space: nowrap;
 }
 td.liste_titre { 
 background: #7699A9;
+background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
 color: #334444;
 font: helvetica, verdana, arial, sans-serif;
 font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
 white-space: nowrap;
 }
-
-.liste_titre_sel
+td.liste_titre_sel
 { 
 background: #7699A9;
-color: #f0f0ff; 
+background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+color: #F5FFFF; 
 font: helvetica, verdana, arial, sans-serif;
 font-weight: bold; 
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
 white-space: nowrap;
 }
+input.liste_titre { 
+background: #7699A9;
+background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+border: 0px;
+}
 
 tr.liste_total td { 
 border-top: 1px solid #888888;
-background: #F0F0F0;
+background: #F4F4F4;
 font-weight: bold;
 white-space: nowrap;
 }
@@ -662,11 +668,11 @@ background: #c0c4c7;
  */
 tr.box_titre { 
 background: #7699A9;
+background-image : url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
 color: #334444;
 font: 12px helvetica, verdana, arial, sans-serif;
 font-weight: bold;
-border-top: 1px solid #FFFFFF;
-border-bottom: 1px solid #FFFFFF;
+border-bottom: 1px solid #FDFFFF;
 white-space: nowrap;
 }
 
@@ -706,7 +712,7 @@ div.error {
   color: #550000; font-weight: bold; 
   padding: 0.2em 0.2em 0.2em 0.2em;
   margin: 0.5em 0em 0.5em 0em;
-  border: 1px solid #6C7C8B;
+  border: 1px solid #8C9CAB;
 }