From dddf28b0ed476172719511123875b5ae12b04726 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Jun 2008 22:56:02 +0000 Subject: [PATCH] Fix: Removed this boring cut of area using div and use table instead. This solve also pb with firefox 3. --- .../menus/barre_left/eldy_backoffice.php | 10 +- htdocs/index.php | 16 ++- htdocs/main.inc.php | 25 ++-- htdocs/theme/auguria/auguria.css.php | 129 ++++++------------ htdocs/theme/bluelagoon/bluelagoon.css | 51 ++++--- htdocs/theme/dev/dev.css | 72 +++++----- htdocs/theme/eldy/eldy.css.php | 59 +++----- htdocs/theme/freelug/freelug.css.php | 31 +---- htdocs/theme/rodolphe/rodolphe.css | 37 ++--- htdocs/theme/yellow/yellow.css.php | 28 +--- 10 files changed, 166 insertions(+), 292 deletions(-) diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 1f355aa464f..6e5f6a8095b 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -898,7 +898,7 @@ class MenuLeft { { print '
'."\n"; print $langs->trans("NoMenu"); - print '
'; + print ''."\n"; } else { @@ -935,11 +935,11 @@ class MenuLeft { if ($contenu == 1) print ''."\n"; if ($this->menu_array[$i]['enabled']) { - print ''; + print ''."\n"; } else { - print ''; + print ''."\n"; } } // Menu niveau > 0 @@ -954,13 +954,13 @@ class MenuLeft { print ''; // If title is not pure text and contains a table, no carriage return added if (! strstr($this->menu_array[$i]['titre'],''; - print ''; + print ''."\n"; } else { print ''; + print ''."\n"; } } diff --git a/htdocs/index.php b/htdocs/index.php index 0f019ac3ad7..37a9bbebf27 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -575,7 +575,9 @@ if (sizeof($boxarray)) // Affichage colonne gauche print "\n\n"; - print '
'."\n"; + print ''; print "\n"; print "\n"; // Affichage colonne droite print "\n\n"; -// print '
'."\n"; + print '
'."\n"; + $ii=0; foreach ($boxarray as $key => $box) { @@ -602,13 +604,16 @@ if (sizeof($boxarray)) } print "
\n"; + print '
'; + // print '\n"; + print "
\n"; print "\n"; - print "\n"; + print "\n"; print ""; print ""; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4d4c0ef674a..ad2b205e8de 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -968,7 +968,9 @@ function left_menu($menu_array, $helppagename='', $form_search='') { global $user, $conf, $langs, $db; - print '
'."\n"; +// print '
'."\n"; + print '
'; + print "\n"; // Colonne de gauche @@ -1066,14 +1068,17 @@ function left_menu($menu_array, $helppagename='', $form_search='') if ($conf->theme != 'auguria') { print "\n"; - print ''."\n"; - print ''; - print '
'."\n"; - print "\n"; + + print ''."\n"; +// print '
'."\n"; +// print '
'."\n"; + print '
'."\n"; + + print "\n"; } - print ''."\n"; - print '
'."\n"; + print "\n"; + print '
'."\n"; } @@ -1114,8 +1119,10 @@ function llxFooter($foot='',$limitIEbug=1) { global $conf, $dolibarr_auto_user, $micro_start_time; - print "\n
\n".''."\n"; - print "\n
\n".''."\n"; + print "\n".' '."\n"; + +// print "\n".' '."\n"; + print "\n".'
'."\n"; if (! empty($_SERVER['DOL_TUNING'])) { diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index 314b47653c1..40a1d0de9fe 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -122,76 +122,35 @@ form /* Styles de positionnement des zones */ /* ============================================================================== */ -div.vmenuplusfiche +/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ + +td.vmenu { - top: auto; - left: auto; - - position: static; - float: left; - - display: block; - margin-right: 10px; - margin-left: 1px; -} - -div.vmenu -{ - float: left; margin-right: 2px; padding: 0px; padding-bottom: 0px; - width: 165px; + width: 164px; } div.fiche { - float: right; - - display: block; - margin-top: 8px; + margin-left: 4px; margin-right: 2px; - width:auto; } -* html div.fiche -{ - width:800px; -} - - /* ============================================================================== */ -/* Menu superieur et 1ere ligne tableau */ +/* Menu top et 1ere ligne tableau */ /* ============================================================================== */ div.tmenu { position: relative; + display: block; white-space: nowrap; border-left: 0px; padding: 0px 0px 0px 0px; margin: 0px 0px 2px 0px; font-size: 12px; - height: 19px; background-image : url() ; height: 22px; } @@ -199,9 +158,9 @@ div.tmenu .tmenudisabled { color: #757575; font-size: 12px; - padding-left:10px; - padding-right:10px; - padding-top:3px; + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; cursor: not-allowed; } @@ -219,7 +178,6 @@ a.tmenu:link padding-right:10px; padding-top: 2px; height: 21px; - display: block; font-weight: normal; } @@ -235,7 +193,6 @@ a.tmenu:visited font-weight: normal; } - a.tmenu#sel { color:#234046; @@ -261,22 +218,23 @@ a.tmenu:hover background: #FFFFFF; } +a.tmenu:active +{ + padding: 0px 5px 0px 5px; + margin: 0px 0px 0px 0px; + background:#4F9EC9; + font-weight: normal; + font-size: 12px; +} + font.tmenudisabled { color: #93a5aa; - padding: 0px 5px 0px 5px; - margin: 0px 0px 2px 0px; font-weight: normal; font-size: 12px; cursor: not-allowed; } -a.tmenu:active -{ - background:#4F9EC9; -} - - /* Pour menu TOP auguria uniquement */ div.tmenu ul { @@ -297,8 +255,8 @@ div.tmenu li a{ font-size: 13px; color:#FFFFFF; text-decoration:none; - padding-left:10px; - padding-right:10px; + padding-left: 6px; + padding-right: 6px; padding-top: 2px; height: 22px; display: block; @@ -388,26 +346,28 @@ a.help:active { font-size: 10px; font-weight: bold; background: #FFFFFF; b a.help:hover { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #6198BA; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } -div.blockvmenuimpair -{ - margin: 0px; - border-spacing: 0px; - padding: 0px; -/* width: 166px;*/ - border : 0px solid #68ACCF; -} div.blockvmenupair { margin: 0px; border-spacing: 0px; padding: 0px; -/* width: 166px; */ + width: 166px; + border : 0px solid #68ACCF; +} +div.blockvmenuimpair +{ + margin: 0px; + border-spacing: 0px; + padding: 0px; + width: 166px; border : 0px solid #68ACCF; } + div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu { - display: block; + width: 166px; + color: #000000; text-align:left; text-decoration: none; @@ -419,6 +379,7 @@ div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu div.help { + width: 166px; margin-left:5px; margin-top:15px; text-align: center; @@ -496,7 +457,6 @@ div.tabs { } div.tabBar { - width:auto; color: #234046; padding-top: 12px; padding-left: 12px; @@ -625,12 +585,15 @@ a.tabimage { white-space: nowrap; } +td.tab { + background: #dee7ec; +} /* ============================================================================== */ /* Boutons actions */ /* ============================================================================== */ -/* Nouvelle syntaxe à utiliser */ +/* Nouvelle syntaxe a utiliser */ a.butAction:link { font-weight: bold; @@ -733,7 +696,6 @@ margin: 0px 0px; table.border { border: 0px solid #9CACBB; -border: 0px; border-collapse: collapse; } table.border td { @@ -743,22 +705,9 @@ border: 1px solid #9CACBB; border-collapse: collapse; } -table.list { -border: 0px solid #9CACBB; -border-collapse: collapse; -} -table.list td { -padding: 2px 2px; -padding-left: 4px; -padding-top:0px; -padding-bottom:0px; -border: 0px solid; -border-collapse: collapse; -} - table.noborder { -border: 6px; +border: 2px; } table.noborder td { border: 0px; diff --git a/htdocs/theme/bluelagoon/bluelagoon.css b/htdocs/theme/bluelagoon/bluelagoon.css index 1b47da27e44..4efd5c5be1c 100644 --- a/htdocs/theme/bluelagoon/bluelagoon.css +++ b/htdocs/theme/bluelagoon/bluelagoon.css @@ -1,5 +1,5 @@ /* Copyright (C) 2002-2004 Rodolphe Quiedeville - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,10 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ +/** + \file htdocs/theme/bluelagoon/bluelagoon.css.php + \brief Fichier de style CSS du theme Blue lagoon + \version $Id$ +*/ + /***** Style du fond *****/ body { @@ -61,43 +65,30 @@ form } -div.vmenuplusfiche -{ - top: auto; - left: auto; - display: block; - margin-right: 13px; - margin-left: 1px; - margin-top: 10px; - -} +/* ============================================================================== */ +/* Styles de positionnement des zones */ +/* ============================================================================== */ -div.vmenu +/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ + +td.vmenu { - float: left; margin-right: 2px; padding: 0px; padding-bottom: 0px; - width: 160px; + width: 164px; } div.fiche { - float: right top; - display: block; - - margin-left: 180px; - width:auto; + margin-left: 4px; + margin-right: 2px; } -* html div.fiche -{ - width:800px; -} -/* - * Menu superieur et 1ere ligne tableau - */ +/* ============================================================================== */ +/* Menu top et 1ere ligne tableau */ +/* ============================================================================== */ div.tmenu { @@ -765,4 +756,8 @@ cursor: pointer; .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-left: 2px; padding-right: 1px; padding-top: 0px; padding-bottom: 0px; } table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-left: 0px; padding-right: 2px; padding-top: 0px; padding-bottom: 0px; } */ +.cal_event a:link { color: #111111; font-size: 11px; font-weight: normal; !important } +.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal; !important } +.cal_event a:active { color: #111111; font-size: 11px; font-weight: normal; !important } +.cal_event a:hover { color: #111111; font-size: 11px; font-weight: normal; !important } diff --git a/htdocs/theme/dev/dev.css b/htdocs/theme/dev/dev.css index 333c26729a1..3ae473957f0 100644 --- a/htdocs/theme/dev/dev.css +++ b/htdocs/theme/dev/dev.css @@ -1,5 +1,5 @@ /* Copyright (C) 2002-2004 Rodolphe Quiedeville - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,10 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ +/** + \file htdocs/theme/dev/dev.css.php + \brief Fichier de style CSS du theme Dev + \version $Id$ +*/ + /***** Style du fond *****/ body { @@ -32,40 +36,6 @@ body } -div.vmenuplusfiche -{ - top: auto; - left: auto; - display: block; - margin-right: 13px; - margin-left: 1px; - margin-top: 10px; - -} - -div.vmenu -{ - float: left; - margin-right: 2px; - padding: 0px; - padding-bottom: 0px; - width: 160px; -} - -div.fiche -{ - float: right top; - display: block; - - margin-left: 180px; - width:auto; -} - -* html div.fiche -{ - width:800px; -} - a { text-decoration: none; @@ -351,16 +321,40 @@ textarea.flat padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; } -button.flat { +.button { font-family: arial,verdana,helvetica, sans-serif; font-size: 100%; font-weight: normal; border: 1px solid #ccd7e0; - background-image : url(img/button_bg.gif); background-position : bottom; } +form +{ + padding: 0em 0em 0em 0em; + margin: 0em 0em 0em 0em; +} +/* ============================================================================== */ +/* Styles de positionnement des zones */ +/* ============================================================================== */ + +/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ + +td.vmenu +{ + margin-right: 2px; + padding: 0px; + padding-bottom: 0px; + width: 164px; +} + +div.fiche +{ + margin-left: 4px; + margin-right: 2px; +} + /* * Onglets diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 04f134c07dd..4e9239d942a 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007 Regis Houssin * @@ -140,41 +140,20 @@ form /* Styles de positionnement des zones */ /* ============================================================================== */ -div.vmenuplusfiche +/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ + +td.vmenu { - top: auto; - left: auto; - - position: static; - float: left; - - display: block; - margin-right: 6px; - margin-left: 1px; - margin-top: 2px; -} - -div.vmenu -{ - float: left; - margin-right: 2px; padding: 0px; padding-bottom: 0px; - width: 162px; + width: 164px; } div.fiche { - float: right; - - display: block; - margin-left: 2px; + margin-left: 4px; margin-right: 2px; - width:auto; } /* ============================================================================== */ @@ -204,9 +183,9 @@ div.tmenu .tmenudisabled { color: #757575; font-size: 12px; - padding-left:10px; - padding-right:10px; - padding-top:3px; + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; cursor: not-allowed; } @@ -244,7 +223,6 @@ a.tmenu#sel font-family: helvetica, verdana, arial, sans-serif; font-weight: normal; background: #F4F4F4; -/* background-image: url(); */ border-right: 1px solid #555555; border-top: 1px solid #D8D8D8; border-left: 1px solid #D8D8D8; @@ -266,16 +244,6 @@ a.tmenu:hover border-bottom: 2px solid #dee7ec; } -font.tmenudisabled -{ - color: #93a5aa; - padding: 0px 5px 0px 5px; - margin: 0px 0px 2px 0px; - font-weight: normal; - font-size: 12px; - cursor: not-allowed; -} - a.tmenu:active { padding: 0px 5px 0px 5px; @@ -291,6 +259,15 @@ a.tmenu:active border-bottom: 2px solid #dee7ec; } +font.tmenudisabled +{ + color: #93a5aa; + padding: 0px 5px 0px 5px; + margin: 0px 0px 2px 0px; + font-weight: normal; + font-size: 12px; + cursor: not-allowed; +} /* Pour menu TOP auguria uniquement */ diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php index 9d52c1f8be1..144c58dd78f 100644 --- a/htdocs/theme/freelug/freelug.css.php +++ b/htdocs/theme/freelug/freelug.css.php @@ -138,42 +138,19 @@ form /* Styles de positionnement des zones */ /* ============================================================================== */ -div.vmenuplusfiche +td.vmenu { - top: auto; - left: auto; - position: static; - float: left; - display: block; - margin-right: 6px; - margin-left: 1px; - margin-top: 2px; - -} - -div.vmenu -{ - float: left; - margin-right: 0px; + padding-right: 2px; padding: 0px; padding-bottom: 0px; - width: 174px; + width: 180px; } div.fiche { - - display: block; - margin-left: 2px; - margin-right: 2px; - width:auto; + margin-left: 5px; } - - /* ============================================================================== */ /* Menu superieur et 1ere ligne tableau */ /* ============================================================================== */ diff --git a/htdocs/theme/rodolphe/rodolphe.css b/htdocs/theme/rodolphe/rodolphe.css index ec64c72c139..d2598f6c5ec 100644 --- a/htdocs/theme/rodolphe/rodolphe.css +++ b/htdocs/theme/rodolphe/rodolphe.css @@ -85,42 +85,29 @@ form } -div.vmenuplusfiche -{ - top: auto; - left: auto; - display: block; - margin-right: 13px; - margin-left: 1px; - margin-top: 10px; - -} +/* ============================================================================== */ +/* Styles de positionnement des zones */ +/* ============================================================================== */ -div.vmenu +/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ + +td.vmenu { - float: left; margin-right: 2px; padding: 0px; padding-bottom: 0px; - width: 160px; + width: 164px; } div.fiche { - display: block; - margin-left: 180px; - width:auto; + margin-left: 4px; + margin-right: 2px; } -* html div.fiche -{ - width:800px; -} - - -/* - * Menu superieur et 1ere ligne tableau - */ +/* ============================================================================== */ +/* Menu top et 1ere ligne tableau */ +/* ============================================================================== */ div.tmenu { diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php index 9f19f0a0d98..8ea2b5339da 100644 --- a/htdocs/theme/yellow/yellow.css.php +++ b/htdocs/theme/yellow/yellow.css.php @@ -123,38 +123,20 @@ form /* Styles de positionnement des zones */ /* ============================================================================== */ -div.vmenuplusfiche -{ - top: auto; - left: auto; - position: static; - float: left; - display: block; - margin-right: 6px; - margin-left: 1px; - margin-top: 4px; - -} +/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ -div.vmenu +td.vmenu { - float: left; margin-right: 2px; padding: 0px; padding-bottom: 0px; - width: 160px; + width: 164px; } div.fiche { - - display: block; - margin-left: 2px; - margin-right: 4px; - width:auto; + margin-left: 4px; + margin-right: 2px; }