From 2599caaaec5dc7f12250194c7d723e22e9994881 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 16 Oct 2009 23:25:15 +0000
Subject: [PATCH] Uniformize code
---
htdocs/comm/index.php | 4 +-
htdocs/lib/agenda.lib.php | 2 +-
htdocs/theme/auguria/auguria.css.php | 4 ++
htdocs/theme/bluelagoon/bluelagoon.css.php | 11 ++--
htdocs/theme/eldy/eldy.css.php | 21 ++++++++
htdocs/theme/freelug/freelug.css.php | 8 +--
htdocs/theme/rodolphe/rodolphe.css.php | 58 +++++++++++-----------
htdocs/theme/yellow/yellow.css.php | 29 ++++++-----
8 files changed, 81 insertions(+), 56 deletions(-)
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 99fa89b6e67..88645b1c83e 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -136,7 +136,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire)
}
/*
- * Liste des propal brouillons
+ * Draft proposals
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
@@ -199,7 +199,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
/*
- * Commandes brouillons
+ * Draft orders
*/
if ($conf->commande->enabled && $user->rights->commande->lire)
{
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index f4b61c3d0e0..a5470fc7210 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -80,7 +80,7 @@ function show_array_actions_to_do($max=5)
$staticaction->id=$obj->id;
print '<td>'.$staticaction->getNomUrl(1,12).'</td>';
- print '<td>'.dol_trunc($obj->label,24).'</td>';
+ print '<td>'.dol_trunc($obj->label,22).'</td>';
$customerstatic->id=$obj->rowid;
$customerstatic->nom=$obj->sname;
diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php
index 9839747eafa..440390d3dc9 100644
--- a/htdocs/theme/auguria/auguria.css.php
+++ b/htdocs/theme/auguria/auguria.css.php
@@ -755,6 +755,10 @@ table.nobordernopadding td {
border: 0px;
padding: 0px 0px;
}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
table.liste {
border-collapse: collapse;
diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php
index c69edc81872..86cf7c87b05 100644
--- a/htdocs/theme/bluelagoon/bluelagoon.css.php
+++ b/htdocs/theme/bluelagoon/bluelagoon.css.php
@@ -329,7 +329,6 @@ div.blockvmenuimpair
}
a.leftmenu {
- font-size: 0.9em;
font-weight: bold;
color: #202020;
}
@@ -339,7 +338,6 @@ td.barre {
border-bottom: 1px solid #000000;
background: #b3cccc;
font-family: Helvetica, Verdana;
- font-size: 0.9em;
color: #000000;
text-decoration: none;
}
@@ -490,6 +488,10 @@ border-collapse: collapse;
border: 0px;
padding: 0px 0px;
}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
table.nobordernopadding td {
border: 0px;
padding: 0px 0px;
@@ -527,13 +529,12 @@ div.menus {
.menu {
background: #b3cccc;
- font-size: 0.9em; font-weight: bold;
+ font-weight: bold;
color: #000000;
text-decoration: none }
.submenu {
background: #b3cccc;
- font-size: 0.9em;
color: #000000;
text-decoration: none }
@@ -677,13 +678,11 @@ tr.liste_total td {
.pair {
background: #b3cccc;
font-family: Helvetica, Verdana;
- font-size: 0.9em;
}
.impair {
background: #cceeee;
font-family: Helvetica, Verdana;
- font-size: 0.9em;
}
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 10848b7f883..c56d9d5731b 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -788,6 +788,23 @@ border-bottom-width: 1px;
border-bottom-color: #BBBBBB;
border-bottom-style: solid;
}
+/*
+table.noborder tr {
+border-top-color: #FEFEFE;
+
+border-right-width: 1px;
+border-right-color: #BBBBBB;
+border-right-style: solid;
+
+border-left-width: 1px;
+border-left-color: #BBBBBB;
+border-left-style: solid;
+
+border-bottom-width: 1px;
+border-bottom-color: #BBBBBB;
+border-bottom-style: solid;
+}
+*/
table.noborder td {
border: 0px;
padding: 1px 2px;
@@ -797,6 +814,10 @@ table.nobordernopadding {
border-collapse: collapse;
border: 0px;
}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
table.nobordernopadding td {
border: 0px;
padding: 0px 0px;
diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php
index 5564a288861..e51317ad380 100644
--- a/htdocs/theme/freelug/freelug.css.php
+++ b/htdocs/theme/freelug/freelug.css.php
@@ -638,6 +638,10 @@ table.nobordernopadding {
border-collapse: collapse;
border: 0px;
}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
table.nobordernopadding td {
border: 0px;
padding: 0px 0px;
@@ -741,7 +745,6 @@ tr.liste_titre {
color: #FFFFFF;
background: #777799;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-left: 1px solid #FFFFFF;
border-right: 1px solid #FFFFFF;
border-top: 1px solid #FFFFFF;
@@ -753,7 +756,6 @@ td.liste_titre {
color: #FFFFFF;
background: #777799;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
@@ -764,7 +766,6 @@ td.liste_titre {
color: #DCCCBB;
background: #777799;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
@@ -781,7 +782,6 @@ th {
color: #FFFFFF;
background: #777799;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-left: 1px solid #FFFFFF;
border-right: 1px solid #FFFFFF;
border-top: 1px solid #FFFFFF;
diff --git a/htdocs/theme/rodolphe/rodolphe.css.php b/htdocs/theme/rodolphe/rodolphe.css.php
index 43b380de3c7..535892e0daf 100644
--- a/htdocs/theme/rodolphe/rodolphe.css.php
+++ b/htdocs/theme/rodolphe/rodolphe.css.php
@@ -537,6 +537,10 @@ border-collapse: collapse;
border: 0px;
padding: 0px 0px;
}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
table.nobordernopadding td {
border: 0px;
padding: 0px 0px;
@@ -652,7 +656,7 @@ a.impayee:hover { font-weight: bold; color: #550000; }
div.titre {
font-family: helvetica, verdana, arial, sans-serif;
font-weight: normal;
- color: #666633;
+ color: #333333;
text-decoration: none;
}
@@ -668,26 +672,23 @@ input.liste_titre {
tr.liste_titre {
background: #cc9966;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
- border-top: 1px solid #78746d;
- border-left: 1px solid #78746d;
- border-right: 1px solid #78746d;
- white-space: nowrap;
+ border-top: 1px solid #78746d;
+ border-left: 1px solid #78746d;
+ border-right: 1px solid #78746d;
+ white-space: nowrap;
}
tr.liste_search {
background: #cc9966;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
- border-left: 1px solid #78746d;
- border-right: 1px solid #78746d;
- white-space: nowrap;
+ border-left: 1px solid #78746d;
+ border-right: 1px solid #78746d;
+ white-space: nowrap;
}
td.liste_titre {
background: #cc9966;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
@@ -698,26 +699,22 @@ td.liste_titre {
color: #fcfffc;
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
}
tr.liste_total {
- background: #F0F0F0;
- font-weight: bold;
- white-space: nowrap;
- border-top: 1px solid #FFFFFF;
- border-bottom: 1px solid #78746d;
-
-
+ background: #F0F0F0;
+ white-space: nowrap;
+ border-top: 1px solid #FFFFFF;
+ border-bottom: 1px solid #78746d;
+ font-weight: bold;
}
th {
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-left: 1px solid #FFFFFF;
border-right: 1px solid #FFFFFF;
border-top: 1px solid #FFFFFF;
@@ -742,23 +739,28 @@ tr.impair {
*
*/
tr.box_titre {
- background: #BBBB88;
+ background: #cc9966;
font-family: Helvetica, Verdana;
- font-size: 1.0em;
- font-weight: bold; }
+ border-top: 1px solid #78746d;
+ border-left: 1px solid #78746d;
+ border-right: 1px solid #78746d;
+ white-space: nowrap;
+}
tr.box_pair {
background: #ded8d2;
- font-size: 0.95em; }
+ border: 1px solid #78746d;
+}
tr.box_impair {
- background: #78746d;
- font-family: Helvetica, Verdana;
- font-size: 0.95em; }
+ background: #ded8d2;
+ border: 1px solid #78746d;
+}
tr.fiche {
font-family: Helvetica, Verdana;
- font-size: 0.6em; }
+}
+
/*
* Widgets standard
*/
diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php
index 50200cc034f..6e61fa62fc6 100644
--- a/htdocs/theme/yellow/yellow.css.php
+++ b/htdocs/theme/yellow/yellow.css.php
@@ -608,6 +608,10 @@ table.nobordernopadding {
border-collapse: collapse;
border: 0px;
}
+table.nobordernopadding tr {
+border: 0px;
+padding: 0px 0px;
+}
table.nobordernopadding td {
border: 0px;
padding: 0px 0px;
@@ -733,7 +737,6 @@ input.liste_titre {
tr.liste_titre {
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-bottom: 1px solid #000000;
white-space: nowrap;
}
@@ -741,7 +744,6 @@ tr.liste_titre {
td.liste_titre {
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
@@ -752,7 +754,6 @@ td.liste_titre {
color: #fcfffc;
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
@@ -760,31 +761,27 @@ td.liste_titre {
tr.liste_total td {
background: #F0F0F0;
- font-weight: bold;
white-space: nowrap;
+ font-weight: bold;
border-top: 1px solid #888888;
}
th {
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
border-left: 1px solid #FFFFFF;
border-right: 1px solid #FFFFFF;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
- font-size: 1.0em;
}
.pair {
background: #eeeecc;
- font-size: 1.0em;
}
.impair {
background: #dcdcb3;
- font-size: 1.0em;
}
@@ -792,23 +789,25 @@ th {
* Boxes
*/
tr.box_titre {
- background: #BBBB88;
- font-family: Helvetica, Verdana;
- font-size: 1.0em;
- font-weight: bold; }
+ background: #BBBB88;
+ border-top: 1px solid #FFFFFF;
+ border-bottom: 1px solid #FFFFFF;
+ font-family: Helvetica, Verdana;
+}
tr.box_pair {
background: #dcdcb3;
- font-size: 0.95em; }
+}
tr.box_impair {
background: #eeeecc;
font-family: Helvetica, Verdana;
- font-size: 0.95em; }
+}
tr.fiche {
font-family: Helvetica, Verdana;
- font-size: 0.6em; }
+}
+
/*
* Widgets standard
*/
--
GitLab