Look: L'espace du bord bas des onglets est géré comme les autres bord (par le style plutot que par un br). Ce qui permet d'avoir un rendu sans difference entre IE et Mozilla.

This commit is contained in:
Laurent Destailleur 2005-07-11 00:49:16 +00:00
parent d35830f5bd
commit 3470153303
40 changed files with 68 additions and 65 deletions

View File

@ -535,7 +535,6 @@ if ($_GET["id"])
print '</table>'; print '</table>';
} }
print '<br>';
print "</div>\n"; print "</div>\n";

View File

@ -255,10 +255,9 @@ if ($_socid > 0)
print "</table>"; print "</table>";
print "<br>";
print "</td>\n"; print "</td>\n";
print '<td valign="top" width="50%">'; print '<td valign="top" width="50%">';
// Nbre max d'éléments des petites listes // Nbre max d'éléments des petites listes

View File

@ -743,7 +743,7 @@ if ($_GET['propalid'])
print '</form>'; print '</form>';
} }
print '</table><br>'; print '</table>';
} }
} }

View File

@ -176,8 +176,9 @@ if ($propalid > 0)
{ {
print '<div class="error">'.$langs->trans('ErrorCantOpenDir').'<b> '.$upload_dir.'</b></div>'; print '<div class="error">'.$langs->trans('ErrorCantOpenDir').'<b> '.$upload_dir.'</b></div>';
} }
print '<tr><td>&nbsp;</td></tr>';
print '</table>'; print '</table>';
print '</div>';
} }
else else
{ {

View File

@ -84,7 +84,7 @@ if ($_GET['propalid'])
dolibarr_print_object_info($propal); dolibarr_print_object_info($propal);
print '</td></tr></table>'; print '</td></tr></table>';
print '<br></div>'; print '</div>';
$db->close(); $db->close();
} }

View File

@ -135,7 +135,7 @@ if ($_GET['propalid'])
} }
print '</table>'; print '</table>';
print '<br>';
print '</div>'; print '</div>';
/* /*

View File

@ -264,7 +264,7 @@ else
print '<td colspan="3">'.$account->bic.'</td></tr>'; print '<td colspan="3">'.$account->bic.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print $account->domiciliation; print nl2br($account->domiciliation);
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">';
@ -272,12 +272,11 @@ else
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
print $account->adresse_proprio; print nl2br($account->adresse_proprio);
print "</td></tr>\n"; print "</td></tr>\n";
} }
print '</table>'; print '</table>';
print '<br>';
print '</div>'; print '</div>';

View File

@ -447,7 +447,7 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
} }
else else
{ {
$msg='<div class="error">'.$langs->trans("ErrorMailRecipientIsEmpty").' !</div>'; $msg='<div class="error">'.$langs->trans("ErrorMailRecipientIsEmpty").'</div>';
dolibarr_syslog("Le mail du destinataire est vide"); dolibarr_syslog("Le mail du destinataire est vide");
} }
@ -1381,6 +1381,7 @@ else
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
print "<br>\n";
print_titre($langs->trans("ActionsOnBill")); print_titre($langs->trans("ActionsOnBill"));
$i = 0; $total = 0; $i = 0; $total = 0;

View File

@ -232,7 +232,7 @@ if ($_GET["facid"] > 0)
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>'; print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "</table><br>"; print '</table>';
} }
else else

View File

@ -21,7 +21,8 @@
* *
*/ */
/*! \file htdocs/compta/facture/info.php /**
\file htdocs/compta/facture/info.php
\ingroup facture \ingroup facture
\brief Page des informations d'une facture \brief Page des informations d'une facture
\version $Revision$ \version $Revision$
@ -68,9 +69,9 @@ print '<table width="100%"><tr><td>';
dolibarr_print_object_info($facture); dolibarr_print_object_info($facture);
print '</td></tr></table>'; print '</td></tr></table>';
print "<br></div>"; print '</div>';
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

View File

@ -129,8 +129,6 @@ if ($_GET["facid"])
print "</table>"; print "</table>";
print "<br>";
/* /*
* Actions * Actions
@ -150,5 +148,5 @@ if ($_GET["facid"])
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

View File

@ -226,12 +226,10 @@ if ($socid > 0)
print "</td></tr>"; print "</td></tr>";
print "</table>"; print "</table>";
print "<br>";
/*
*
*/
print "</td>\n"; print "</td>\n";
print '<td valign="top" width="50%">'; print '<td valign="top" width="50%">';
// Nbre max d'éléments des petites listes // Nbre max d'éléments des petites listes

View File

@ -181,12 +181,13 @@ else {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</div>";
/* /*
* * Boutons Actions
*
*/ */
print "<br></div>";
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '') if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '')
@ -194,14 +195,14 @@ if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '')
print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&amp;action=valide">'.$langs->trans("Valid").'</a>'; print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&amp;action=valide">'.$langs->trans("Valid").'</a>';
} }
if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET["action"] == '') if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET["action"] == '')
{ {
print '<a class="butDelete" href="fiche.php?id='.$_GET["id"].'&amp;action=delete">'.$langs->trans("Delete").'</a>'; print '<a class="butDelete" href="fiche.php?id='.$_GET["id"].'&amp;action=delete">'.$langs->trans("Delete").'</a>';
} }
print "</div>"; print "</div>";
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

View File

@ -40,7 +40,6 @@ print '<div class="tabs">';
print '<a class="tab" href="fiche.php?id='.$_GET["id"].'">'.$langs->trans("Payment").'</a>'; print '<a class="tab" href="fiche.php?id='.$_GET["id"].'">'.$langs->trans("Payment").'</a>';
print '<a class="tab" href="info.php?id='.$_GET["id"].'" id="active">'.$langs->trans("Info").'</a>'; print '<a class="tab" href="info.php?id='.$_GET["id"].'" id="active">'.$langs->trans("Info").'</a>';
print '</div>'; print '</div>';
print '<div class="tabBar">';
/* /*
* Visualisation de la fiche * Visualisation de la fiche
@ -51,12 +50,16 @@ $paiement = new Paiement($db);
$paiement->fetch($_GET["id"], $user); $paiement->fetch($_GET["id"], $user);
$paiement->info($_GET["id"]); $paiement->info($_GET["id"]);
print '<div class="tabBar">';
print '<table width="100%"><tr><td>'; print '<table width="100%"><tr><td>';
print '<br>'; print '<br>';
dolibarr_print_object_info($paiement); dolibarr_print_object_info($paiement);
print '<br>';
print '</td></tr></table>'; print '</td></tr></table>';
print '</div>';
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');

View File

@ -20,9 +20,12 @@
* $Source$ * $Source$
* *
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
$langs->load("bills"); $langs->load("bills");
$langs->load("compta"); $langs->load("compta");
$langs->load("propal");
function llxHeader($head = "", $title="") { function llxHeader($head = "", $title="") {
global $user, $langs; global $user, $langs;

View File

@ -408,7 +408,7 @@ if ($_GET["propalid"])
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print '</table><br>'; print '</table>';
} }
} }

View File

@ -404,7 +404,7 @@ else
print $langs->trans($yesno[$contact->facturation]); print $langs->trans($yesno[$contact->facturation]);
print '</td></tr>'; print '</td></tr>';
print "</table><br>"; print "</table>";
print "</div>"; print "</div>";

View File

@ -79,7 +79,7 @@ if ($contact->socid > 0)
dolibarr_print_object_info($contact); dolibarr_print_object_info($contact);
print "<br></div>"; print "</div>";
$db->close(); $db->close();

View File

@ -167,7 +167,7 @@ else
} }
print "</tr>"; print "</tr>";
print "</table><br>"; print "</table>";
print "</div>"; print "</div>";

View File

@ -19,15 +19,14 @@
* $Source$ * $Source$
* *
*/ */
require("../main.inc.php"); require("../main.inc.php");
function llxHeader($head = "", $urlp = "") { function llxHeader($head = "", $urlp = "") {
global $user, $conf; global $langs, $user, $conf;
$langs->load("propal");
/*
*
*
*/
top_menu($head); top_menu($head);
$menu = new Menu(); $menu = new Menu();

View File

@ -815,7 +815,7 @@ else
print "</form>"; print "</form>";
} }
print "</table><br>"; print "</table>";
/* /*
* Fin Ajout ligne * Fin Ajout ligne
*/ */

View File

@ -65,7 +65,7 @@ print '<table width="100%"><tr><td>';
dolibarr_print_object_info($contrat); dolibarr_print_object_info($contrat);
print '</td></tr></table>'; print '</td></tr></table>';
print "<br></div>"; print '</div>';
$db->close(); $db->close();

View File

@ -341,7 +341,7 @@ if ($id > 0)
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print '</table><br>'; print '</table>';
print '</div>'; print '</div>';
if ($user->rights->contrat->activer && $contrat->statut == 1 && $objp->statut <> 4) if ($user->rights->contrat->activer && $contrat->statut == 1 && $objp->statut <> 4)

View File

@ -176,7 +176,7 @@ if ($socid > 0)
print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>'; print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
print '</table>'; print '</table>';
print '<br></div>'; print '</div>';
if ($mesg) { print "$mesg<br>"; } if ($mesg) { print "$mesg<br>"; }

View File

@ -622,7 +622,7 @@ else
print '</tr>'; print '</tr>';
} }
print "</table><br>"; print "</table>";
print "</div>\n"; print "</div>\n";
} }

View File

@ -36,6 +36,7 @@ function llxHeader($head = "", $title = "", $addons='') {
global $user, $conf, $langs; global $user, $conf, $langs;
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("propal");
top_menu($head, $title); top_menu($head, $title);

View File

@ -117,11 +117,10 @@ if ( $societe->fetch($socid) )
* *
* *
*/ */
print '<table width="100%">'; print '<table width="100%">';
print '<tr><td valign="top" width="50%">'; print '<tr><td valign="top" width="50%">';
/*
*
*/
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>'; print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse).'</td></tr>'; print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($societe->adresse).'</td></tr>';
@ -132,18 +131,20 @@ if ( $societe->fetch($socid) )
print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dolibarr_print_phone($societe->tel).'&nbsp;</td><td>'.$langs->trans("Fax").'</td><td>'.dolibarr_print_phone($societe->fax).'&nbsp;</td></tr>'; print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dolibarr_print_phone($societe->tel).'&nbsp;</td><td>'.$langs->trans("Fax").'</td><td>'.dolibarr_print_phone($societe->fax).'&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\">$societe->url</a>&nbsp;</td></tr>"; print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\">$societe->url</a>&nbsp;</td></tr>";
print '</table><br>'; print '</table>';
/* /*
* *
*/ */
print '</td><td valign="top" width="50%">'; print '</td><td valign="top" width="50%">';
$var=true; $var=true;
/* /*
*
* Liste des produits * Liste des produits
*
*/ */
if ($conf->produit->enabled || $conf->service->enabled) if ($conf->produit->enabled || $conf->service->enabled)
{ {

View File

@ -37,6 +37,7 @@ function llxHeader($head = "", $title="", $addons='') {
global $user, $conf, $langs; global $user, $conf, $langs;
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("propal");
top_menu($head, $title); top_menu($head, $title);

View File

@ -430,7 +430,7 @@ if ($_GET["id"])
print '</td></tr>'; print '</td></tr>';
} }
print "</table><br>\n"; print "</table>\n";
print "</div>\n"; print "</div>\n";
} }

View File

@ -231,7 +231,7 @@ if ($_GET["id"])
else print $langs->trans("NotOnSell"); else print $langs->trans("NotOnSell");
print '</td></tr>'; print '</td></tr>';
print '</table><br />'; print '</table>';
print "</div>\n"; print "</div>\n";

View File

@ -162,7 +162,7 @@ if ($_GET["id"])
else print $langs->trans("NotOnSell"); else print $langs->trans("NotOnSell");
print '</td></tr>'; print '</td></tr>';
print "</table><br>\n"; print "</table>\n";
print "</div>\n"; print "</div>\n";

View File

@ -153,7 +153,7 @@ if ($product->envente) print $langs->trans("OnSell");
else print $langs->trans("NotOnSell"); else print $langs->trans("NotOnSell");
print '</td></tr>'; print '</td></tr>';
print "</table><br>\n"; print "</table>\n";
print "</div>\n"; print "</div>\n";

View File

@ -148,7 +148,6 @@ if ($_GET["id"])
print "</table>"; print "</table>";
print "<br>";
print '</div>'; print '</div>';
print_barre_liste($langs->trans("Bills"),$page,"facture.php","&amp;id=$product->id",$sortfield,$sortorder); print_barre_liste($langs->trans("Bills"),$page,"facture.php","&amp;id=$product->id",$sortfield,$sortorder);

View File

@ -262,8 +262,9 @@ if ($_GET["id"])
} }
print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">'.$langs->trans("ReCalculate").'</a>]</td></tr>'; print '<td align="center">[<a href="fiche.php?id='.$product->id.'&amp;action=recalcul">'.$langs->trans("ReCalculate").'</a>]</td></tr>';
print '</table><br>'; print '</table>';
print '</div>';
} }
} }
else else

View File

@ -599,7 +599,7 @@ else
print '</table>'; print '</table>';
print "<br></div>\n"; print "</div>\n";
/* /*
* *
*/ */

View File

@ -163,7 +163,7 @@ if ( $soc->fetch($soc->id) )
print '<table class="border"width="100%">'; print '<table class="border"width="100%">';
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td colspan="3">'.$soc->nom.'</td></tr>'; print '<tr><td width="20%">'.$langs->trans("Name").'</td><td colspan="3">'.$soc->nom.'</td></tr>';
print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td><td colspan="3">0 (TODO Nombre non mis a jour)</td></tr>'; print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td><td colspan="3">0 (TODO Nombre non mis a jour)</td></tr>';
print '</table><br>'; print '</table>';
print '</div>'; print '</div>';

View File

@ -117,7 +117,7 @@ if ($_GET["socid"] > 0) {
print '<center><input type="submit" value="'.$langs->trans("Modify").'"></center></form>'; print '<center><input type="submit" value="'.$langs->trans("Modify").'"></center></form>';
} }
print '<br>'; print '</div><br>';
$db->close(); $db->close();

View File

@ -136,7 +136,6 @@ if ($_GET["id"])
print "</table>\n"; print "</table>\n";
print "<br>\n";
print "</div>\n"; print "</div>\n";

View File

@ -469,7 +469,7 @@ else
} }
print "</table>\n"; print "</table>\n";
print "<br>\n"; // print "<br>\n";
print "</div>\n"; print "</div>\n";

View File

@ -21,9 +21,9 @@
*/ */
/** /**
\file htdocs/user/group/fiche.php \file htdocs/user/group/fiche.php
\brief Onglet groupes utilisateurs \brief Onglet groupes utilisateurs
\version $Revision$ \version $Revision$
*/ */
@ -217,7 +217,6 @@ else
print '<td class="valeur">'.nl2br($group->note).'&nbsp;</td>'; print '<td class="valeur">'.nl2br($group->note).'&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
print "</table>\n"; print "</table>\n";
print "<br>\n";
print '</div>'; print '</div>';