From e4682b907e597201150c8a6cddb6f0bd9c1c550f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Aug 2007 23:25:40 +0000 Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tiques=20mineures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/index.php | 44 +++++++--------- htdocs/theme/auguria/auguria.css.php | 28 +++++----- htdocs/theme/eldy/eldy.css.php | 78 +++++++++++++++++----------- 3 files changed, 80 insertions(+), 70 deletions(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 97e897489bf..ead5c59e168 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 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 @@ -411,7 +411,7 @@ if ($resql) print ''.$customerstatic->getNomUrl(1,'',24).''; // Date - print ''.dolibarr_print_date($obj->da); + print ''.dolibarr_print_date($obj->da,'day'); print ""; // Statut @@ -472,7 +472,7 @@ if ($user->rights->societe->lire) $objp = $db->fetch_object($resql); print ""; print "rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom.""; - print ''.dolibarr_print_date($objp->datec).""; + print ''.dolibarr_print_date($objp->datec,'day').""; print ''; $i++; $var=!$var; @@ -575,35 +575,31 @@ if ($conf->propal->enabled && $user->rights->propale->lire) $obj = $db->fetch_object($result); $var=!$var; print ""; - print ''; + print ''; $propalstatic->id=$obj->propalid; $propalstatic->ref=$obj->ref; print ''; - print ''; - - print ''; - - print '
'; + print ''; print $propalstatic->getNomUrl(1); print ''; + print ''; if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print ''; - + print ''; $filename=sanitize_string($obj->ref); $filedir=$conf->propal->dir_output . '/' . sanitize_string($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?propalid='.$obj->propalid; $html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1); - print '
'; print ""; - print "rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."\n"; + print "rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."\n"; print ""; - print dolibarr_print_date($obj->dp)."\n"; + print dolibarr_print_date($obj->dp,'day')."\n"; print "".price($obj->price).""; - print "".$propalstatic->LibStatut($obj->fk_statut,3)."\n"; + print "".$propalstatic->LibStatut($obj->fk_statut,3)."\n"; print "\n"; $i++; $total += $obj->price; @@ -653,34 +649,30 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { { $objp = $db->fetch_object(); print ""; - print ''; + print ''; $propalstatic->id=$objp->propalid; $propalstatic->ref=$objp->ref; print ''; - print ''; - - print ''; - - print ''; + print '
'; + print ''; print $propalstatic->getNomUrl(1); print ''; - print ' '; - print ''; - + print ''; + print ' '; + print ''; $filename=sanitize_string($objp->ref); $filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref); $urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid; $html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1); - print '
'; print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).''; print ""; - print dolibarr_print_date($objp->dp)."\n"; + print dolibarr_print_date($objp->dp,'day')."\n"; print "".price($objp->price)."\n"; print "".$propalstatic->LibStatut($objp->fk_statut,3)."\n"; print "\n"; diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index 5aa46a614b1..9f3990cf0ab 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -230,6 +230,20 @@ font.tmenudisabled font-size:12px; } +a.tmenu:active +{ + background:#4F9EC9; +} + +div.tmenu .tmenudisabled +{ + color: #757575; + font-size: 13px; + padding-left:10px; + padding-right:10px; + padding-top:3px; +} + /* Pour menu TOP auguria */ @@ -298,20 +312,6 @@ div.tmenu li a:link font-weight: normal; } -.tmenu a:active -{ - background:#4F9EC9; -} - -div.tmenu .tmenudisabled -{ - color: #757575; - font-size: 13px; - padding-left:10px; - padding-right:10px; - padding-top:3px; -} - /* Login */ diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 1656beca365..7a73c72edb6 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -199,7 +199,7 @@ a.tmenu:link padding: 0px 5px 0px 5px; margin: 0px 1px 2px 1px; font: 12px helvetica, verdana, arial, sans-serif; - font-weight: bold; + font-weight: normal; } a.tmenu:visited { @@ -208,30 +208,35 @@ a.tmenu:visited margin: 0px 1px 2px 1px; border: 0px solid #b3c5cc; font: 12px helvetica, verdana, arial, sans-serif; - font-weight: bold; + font-weight: normal; } a.tmenu#sel { color: #234046; padding: 0px 5px 0px 5px; - margin: 0px 0px 2px 0px; + margin: 0px 0px 0px 0px; font: 12px helvetica, verdana, arial, sans-serif; - font-weight: bold; - background: #dee7ec; - background-image: url(); + font-weight: normal; + background: #F4F4F4; +/* background-image: url(); */ border-right: 1px solid #555555; border-top: 1px solid #D8D8D8; border-left: 1px solid #D8D8D8; + border-bottom: 2px solid #F4F4F4; } a.tmenu:hover { color: #234046; padding: 0px 5px 0px 5px; - margin: 0px 1px 2px 1px; + margin: 0px 0px 0px 0px; text-decoration: none; font: 12px helvetica, verdana, arial, sans-serif; - font-weight: bold; + font-weight: normal; background: #dee7ec; + border-right: 1px solid #555555; + border-top: 1px solid #D8D8D8; + border-left: 1px solid #D8D8D8; + border-bottom: 2px solid #dee7ec; } font.tmenudisabled @@ -239,13 +244,37 @@ font.tmenudisabled color: #93a5aa; padding: 0px 5px 0px 5px; margin: 0px 0px 2px 0px; - font-weight:bold; + font-weight: normal; font-size:12px; } +.tmenu a:active +{ + padding: 0px 5px 0px 5px; + margin: 0px 0px 0px 0px; + text-decoration: none; + font: 12px helvetica, verdana, arial, sans-serif; + font-weight: normal; + background:#F4F4F4; + border-right: 1px solid #555555; + border-top: 1px solid #D8D8D8; + border-left: 1px solid #D8D8D8; + border-bottom: 2px solid #dee7ec; +} + +div.tmenu .tmenudisabled +{ + color: #757575; + font-size: 13px; + padding-left:10px; + padding-right:10px; + padding-top:3px; +} + /* Pour menu top auguria */ +/* div.tmenu ul { padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; @@ -255,8 +284,8 @@ div.tmenu ul { div.tmenu li { float: left; - border-right: solid 1px #4F9EC9; - height: 22px; + border-right: solid 1px #7699A9; + height: 18px; position:relative; liste-style:none; display: block; @@ -266,12 +295,12 @@ div.tmenu li { div.tmenu li a{ font-size: 13px; - color:#FFFFFF; + color:#000000; text-decoration:none; padding-left:10px; padding-right:10px; padding-top: 2px; - height: 22px; + height: 18px; display: block; font-weight: normal; } @@ -282,20 +311,20 @@ div.tmenu li a{ div.tmenu li a#sel { - background:#FFFFFF; - color:#4F9EC9; + background:#F4F4F4; + color:#000000; font-weight: normal; } div.tmenu li a:visited { - color:#FFFFFF; + color:#000000; font-weight: normal; } div.tmenu li a:hover { - background:#FFFFFF; - color:#4F9EC9; + background:#F4F4F4; + color:#000000; font-weight: normal; } @@ -311,19 +340,8 @@ div.tmenu li a:link font-weight: normal; } -.tmenu a:active -{ - background:#4F9EC9; -} +*/ -div.tmenu .tmenudisabled -{ - color: #757575; - font-size: 13px; - padding-left:10px; - padding-right:10px; - padding-top:3px; -} /* Login */