diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index ebbc648002d119a4f5ad0723dbe1d65440b6f4d1..ae8026d2b683bd907058a84824ac9a9300a9459d 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -187,8 +187,9 @@ if ($id > 0) dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"),0,'company'); - print '<table width="100%" class="notopnoleftnoright">'; - print '<tr><td valign="top" class="notopnoleft">'; + print '<div class="fichecenter"><div class="fichehalfleft">'; + //print '<table width="100%" class="notopnoleftnoright">'; + //print '<tr><td valign="top" class="notopnoleft">'; print '<table class="border" width="100%">'; @@ -440,11 +441,12 @@ if ($id > 0) print "</table>"; - print "</td>\n"; - - - print '<td valign="top" width="50%" class="notopnoleftnoright">'; + + print '</div><div class="fichehalfright"><div class="ficheaddleft">'; + //print "</td>\n"; + //print '<td valign="top" width="50%" class="notopnoleftnoright">'; + // Nbre max d'elements des petites listes $MAXLIST=4; $tableaushown=1; @@ -507,8 +509,8 @@ if ($id > 0) print " ".img_warning(); } print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n"; - print '<td align="right" width="120">'.price($objp->total_ht).'</td>'; - print '<td align="right" width="100" nowrap="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>'; + print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>'; + print '<td align="right" style="min-width: 60px" nowrap="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>'; $var=!$var; $i++; } @@ -576,11 +578,11 @@ if ($id > 0) { $objp = $db->fetch_object($resql); $var=!$var; - print "<tr $bc[$var]>"; + print "<tr ".$bc[$var].">"; print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->cid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."</a>\n"; print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n"; - print '<td align="right" width="120">'.price($objp->total_ht).'</td>'; - print '<td align="right" width="100">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>'; + print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>'; + print '<td align="right" style="min-width: 60px" nowrap="nowrap">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>'; $i++; } $db->free($resql); @@ -781,10 +783,12 @@ if ($id > 0) } } - print "</td></tr>"; - print "</table>"; + print '</div></div></div>'; + print '<div style="clear:both"></div>'; + //print "</td></tr>"; + //print "</table>"; - print "\n</div>\n"; + dol_fiche_end(); /* @@ -899,4 +903,4 @@ dol_htmloutput_mesg('',$mesgs); // End of page llxFooter(); $db->close(); -?> +?> \ No newline at end of file diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 41f96d10d2002dbf27c538236569bca4f2b64c65..a2b4b6ef7d5af9cc9c67a1e722c269f45074fb5a 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -855,7 +855,8 @@ div.fichehalfright { <?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } ?> + <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } + else print "margin-top: 10px;\n"; ?> } diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index ccad4e542635aa2f6f8786a8ac191430de1a5074..44cc9b396417feabec5ce1dae9508f7cfd9d0dec 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -246,7 +246,8 @@ div.fichehalfright { <?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 10px;\n"; } ?> + <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } + else print "margin-top: 10px;\n"; ?> } diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index e0ee62ca8f7ae5c07f587131b7c80c091e2ff114..113ee0e5998453d01b7bffb0139a2bc20f89b634 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -291,7 +291,8 @@ div.fichehalfright { <?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 6px;\n"; } ?> + <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } + else print "margin-top: 10px;\n"; ?> } diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 4dacfbfc70883092d171846d1e17e476013c2025..b33a6fd958bc9c7efcb8c282777998d278870a36 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -256,7 +256,8 @@ div.fichehalfright { <?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 6px;\n"; } ?> + <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } + else print "margin-top: 10px;\n"; ?> } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index eba9a7cc86d2894dc9c0d9244bea647d527326e4..a2eb25bf01f91af9f67a10265dbe53dd0e317120 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -405,7 +405,8 @@ div.fichehalfright { <?php if (empty($conf->dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } ?> + <?php if (empty($conf->dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } + else print "margin-top: 10px;\n"; ?> }