Look: Modif esth�tiques mineures

htdocs/comm/index.php

@@ -173,8 +173,9 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 if ($conf->commande->enabled)
 {
     $langs->load("orders");
-  $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.nom, s.idp FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
+    $sql = "SELECT c.rowid, c.ref, c.total_ttc, s.nom, s.idp";
-  $sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0";
+    $sql.= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
+    $sql.= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0";
     if ($socidp)
     {
         $sql .= " AND c.fk_soc = $socidp";
@@ -199,7 +200,7 @@ if ($conf->commande->enabled)
                 $obj = $db->fetch_object($resql);
                 print "<tr $bc[$var]><td nowrap><a href=\"../commande/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref."</a></td>";
                 print '<td><a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,18).'</a></td>';
-	      print '<td align="right">'.price($obj->total_ttc).'</td></tr>';
+                print '<td align="right" nowrap="nowrap">'.price($obj->total_ttc).'</td></tr>';
                 $i++;
                 $total += $obj->total_ttc;
             }

htdocs/contact/index.php

@@ -143,11 +143,17 @@ $result = $db->query($sql);
 
 if ($result)
 {
+    $begin=$_GET["begin"];
+    
     $num = $db->num_rows($result);
     $i = 0;
 
-    print_barre_liste($titre ,$page, "index.php", '&begin='.$_GET["begin"].'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num);
+    print_barre_liste($titre ,$page, "index.php", '&begin='.$begin.'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num);
 
+    print '<form method="post" action="index.php">';
+    print '<input type="hidden" name="view" value="'.$view.'">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
     print '<table class="liste" width="100%">';
 
@@ -176,10 +182,6 @@ if ($result)
     print "</tr>\n";
 
     // Ligne des champs de filtres
-    print '<form method="post" action="index.php">';
-    print '<input type="hidden" name="view" value="'.$view.'">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">';
     print '<input class="flat" type="text" name="search_nom" size="12" value="'.$search_nom.'">';
@@ -215,7 +217,6 @@ if ($result)
     print '&nbsp; <input type="image" value="button_removefilter" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" name="button_removefilter" alt="'.$langs->trans("RemoveFilter").'">';
     print '</td>';
     print '</tr>';
-    print '</form>';
 
     $var=True;
     while ($i < min($num,$limit))
@@ -270,7 +271,10 @@ if ($result)
         $i++;
     }
     print "</table>";
-    $db->free();
+
+    print '</form>';
+
+    $db->free($result);
 }
 else
 {
@@ -296,15 +300,14 @@ if (2==1 && (strlen($_GET["search_nom"]) OR strlen($_GET["search_prenom"])))
     $sql .= " FROM phprojekt.contacts as p";
     $sql .= " WHERE upper(p.nachname) like '%".$_GET["search_nom"]."%'";
     
-
+    $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1, $offset);
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit( $limit + 1, $offset);
     
     
-$result = $db->query($sql);
+    $result = $db->query($sql);
     
-if ($result) 
+    if ($result)
-{
+    {
-  $num = $db->num_rows();
+        $num = $db->num_rows($result);
         $i = 0;
     
         print '<table class="noborder" width="100%">';
@@ -319,12 +322,12 @@ if ($result)
     
         if ($_GET["view"] == 'phone')
         {
-      print '<td>Portable</td>';
+            print '<td>'.$langs->trans("Mobile").'</td>';
-      print '<td>Fax</td>';
+            print '<td>'.$langs->trans("Fax").'</td>';
         }
         else
         {
-      print '<td>email</td>';
+            print '<td>'.$langs->trans("Email").'</td>';
         }
     
         print "</tr>\n";
@@ -337,14 +340,13 @@ if ($result)
     
             print "<tr $bc[$var]>";
     
+            // Nom
             print '<td valign="center">';
-      print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'">';
+            print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'">'.img_file().' '.$obj->nachname.'</a></td>';
-      print img_file();
-      print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'">'.$obj->nachname.'</a></td>';
             print '<td>'.$obj->vorname.'</td>';
     
             print '<td>';
-      print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=$obj->idp\">$obj->firma</A></td>\n";
+            print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=$obj->idp\">$obj->firma</a></td>\n";
     
     
             print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;actionid=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->idp.'">'.dolibarr_print_phone($obj->phone).'</a>&nbsp;</td>';
@@ -370,11 +372,11 @@ if ($result)
         }
         print "</table>";
         $db->free();
-}
+    }
-else
+    else
-{
+    {
         dolibarr_print_error($db);
-}
+    }
 
 }
 

htdocs/lib/functions.inc.php

@@ -1433,7 +1433,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
     }
     else
     {
-        print '<tr><td><div class="titre">'.$titre.'</div></td>';
+        print '<tr><td class="notopnoleftnoright"><div class="titre">'.$titre.'</div></td>';
     }
 
     if ($center)