From 86e27744b9cde27f72be85e88862a697f50e16c7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 7 Apr 2010 09:21:30 +0000 Subject: [PATCH] Fix: css optimizing Fix: wrong position of link :link :visited :hover :active --- htdocs/master.inc.php | 4 +- htdocs/theme/eldy/eldy.css.php | 102 +++++++++++---------------------- 2 files changed, 38 insertions(+), 68 deletions(-) diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index be2feba3bee..9fdcaa52de4 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -349,13 +349,14 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) if (is_numeric($conf->global->MAIN_INFO_SOCIETE_PAYS)) { $mysoc->pays_id=$conf->global->MAIN_INFO_SOCIETE_PAYS; - $sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; + $sql = "SELECT code, libelle as label from ".MAIN_DB_PREFIX."c_pays"; $sql .= " WHERE rowid = ".$conf->global->MAIN_INFO_SOCIETE_PAYS; $result=$db->query($sql); if ($result) { $obj = $db->fetch_object(); $mysoc->pays_code=$obj->code; + $mysoc->country=$obj->code?($langs->trans('Country'.$obj->code)!='Country'.$obj->code?$langs->trans('Country'.$obj->code):$obj->label):''; } else { dol_print_error($db); @@ -365,6 +366,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) else { $mysoc->pays_code=$conf->global->MAIN_INFO_SOCIETE_PAYS; + $mysoc->country=$conf->global->MAIN_INFO_SOCIETE_PAYS?$langs->trans('Country'.$conf->global->MAIN_INFO_SOCIETE_PAYS):''; } $mysoc->tel=$conf->global->MAIN_INFO_SOCIETE_TEL; // TODO obsolete $mysoc->phone=$conf->global->MAIN_INFO_SOCIETE_TEL; diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index ffdf502d278..0ace9a68deb 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -705,78 +705,46 @@ td.tab { /* Nouvelle syntaxe a utiliser */ -a.butAction:link { - font-family: helvetica, verdana, arial, sans-serif; - font-weight: bold; - background: white; - border: 1px solid #8CACBB; - color: #436976; - padding: 0em 0.7em; - margin: 0em 0.5em; - text-decoration: none; - white-space: nowrap; } - -a.butAction:visited { - font-family: helvetica, verdana, arial, sans-serif; - font-weight: bold; - background: white; - border: 1px solid #8CACBB; - color: #436976; - padding: 0em 0.7em; - margin: 0em 0.5em; - text-decoration: none; - white-space: nowrap; } - -a.butAction:active { - font-family: helvetica, verdana, arial, sans-serif; - font-weight: bold; - background: white; - border: 1px solid #8CACBB; - color: #436976; - padding: 0em 0.7em; - margin: 0em 0.5em; - text-decoration: none; - white-space: nowrap; } +a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active, a.butActionDelete, a.butActionDelete:link, a.butActionDelete:visited, a.butActionDelete:hover, a.butActionDelete:active { + font-family: helvetica, verdana, arial, sans-serif; + font-weight: bold; + background: white; + border: 1px solid #8CACBB; + color: #436976; + padding: 0em 0.7em; + margin: 0em 0.5em; + text-decoration: none; + white-space: nowrap; +} a.butAction:hover { - font-family: helvetica, verdana, arial, sans-serif; - font-weight: bold; - background: #dee7ec; - border: 1px solid #8CACBB; - color: #436976; - padding: 0em 0.7em; - margin: 0em 0.5em; - text-decoration: none; - white-space: nowrap; } - -.butActionRefused { - font-family: helvetica, verdana, arial, sans-serif !important; - font-weight: bold !important; - background: white !important; - border: 1px solid #AAAAAA !important; - color: #AAAAAA !important; - padding: 0em 0.7em !important; - margin: 0em 0.5em !important; - text-decoration: none !important; - white-space: nowrap !important; - cursor: not-allowed; - } + background: #dee7ec; +} a.butActionDelete { - font-family: helvetica, verdana, arial, sans-serif; - font-weight: bold; - background: white; - border: 1px solid red; - color: #436976; - padding: 0em 0.7em; - margin: 0em 0.5em; - text-decoration: none; - white-space: nowrap; } + border: 1px solid red; +} -a.butActionDelete:link { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: white; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } -a.butActionDelete:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: white; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } -a.butActionDelete:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: white; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } -a.butActionDelete:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: #FFe7ec; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } +a.butActionDelete:link, a.butActionDelete:visited, a.butActionDelete:hover, a.butActionDelete:active { + border: 1px solid #997777; +} + +a.butActionDelete:hover { + background: #FFe7ec; +} + +.butActionRefused { + font-family: helvetica, verdana, arial, sans-serif !important; + font-weight: bold !important; + background: white !important; + border: 1px solid #AAAAAA !important; + color: #AAAAAA !important; + padding: 0em 0.7em !important; + margin: 0em 0.5em !important; + text-decoration: none !important; + white-space: nowrap !important; + cursor: not-allowed; +} /* ============================================================================== */