From 2cbc9f9e361fdeec11de443f63f548d613acfc98 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 7 Jul 2009 15:11:59 +0000
Subject: [PATCH] Look: Some enhancements in look and themes
---
htdocs/commande/index.php | 137 ++++++++--------
htdocs/compta/index.php | 6 +-
htdocs/core/conf.class.php | 4 -
htdocs/fichinter/index.php | 22 +--
htdocs/fourn/index.php | 10 +-
htdocs/html.form.class.php | 4 +-
htdocs/theme/auguria/auguria.css.php | 7 +-
htdocs/theme/bluelagoon/bluelagoon.css.php | 152 +++++++++---------
htdocs/theme/eldy/eldy.css.php | 54 +++++--
htdocs/theme/freelug/freelug.css.php | 7 +-
htdocs/theme/rodolphe/rodolphe.css.php | 172 ++++++++++-----------
htdocs/theme/yellow/yellow.css.php | 7 +-
12 files changed, 293 insertions(+), 289 deletions(-)
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 737056e5852..217d6a57c22 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -33,7 +33,7 @@ if (!$user->rights->commande->lire) accessforbidden();
$langs->load("orders");
-// S�curit� acc�s client
+// S�curit� acc�s client
$socid='';
if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0)
@@ -117,7 +117,7 @@ if ($conf->commande->enabled)
}
/*
- * Commandes � traiter
+ * Orders to process
*/
if ($conf->commande->enabled)
{
@@ -183,73 +183,7 @@ print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
/*
- * Commandes en cours
- */
-if ($conf->commande->enabled)
-{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
- $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
- $sql.= ", ".MAIN_DB_PREFIX."societe as s";
- if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE c.fk_soc = s.rowid";
- $sql.= " AND c.entity = ".$conf->entity;
- $sql.= " AND c.fk_statut = 2 ";
- if ($socid) $sql.= " AND c.fk_soc = ".$socid;
- if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- $sql.= " ORDER BY c.rowid DESC";
-
- if ( $db->query($sql) )
- {
- $num = $db->num_rows();
-
- print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre">';
- print '<td colspan="3">'.$langs->trans("OnProcessOrders").' ('.$num.')</td></tr>';
-
- if ($num)
- {
- $i = 0;
- $var = True;
- while ($i < $num)
- {
- $var=!$var;
- $obj = $db->fetch_object();
- print "<tr $bc[$var]>";
- print '<td width="20%" nowrap="nowrap">';
-
- $commandestatic->id=$obj->rowid;
- $commandestatic->ref=$obj->ref;
-
- print '<table class="nobordernopadding"><tr class="nocellnopadd">';
- print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
- print $commandestatic->getNomUrl(1);
- print '</td>';
-
- print '<td width="16" class="nobordernopadding" nowrap="nowrap">';
- print ' ';
- print '</td>';
-
- print '<td width="16" align="right" class="nobordernopadding">';
- $filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
- $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
- $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1);
- print '</td></tr></table>';
-
- print '</td>';
-
- print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
- print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
- print '</tr>';
- $i++;
- }
- }
- print "</table><br>";
- }
-}
-
-/*
- * Derni�res commandes trait�es
+ * Last closes orders
*/
$max=5;
@@ -318,6 +252,71 @@ if ($resql)
}
+/*
+ * Commandes en cours
+ */
+if ($conf->commande->enabled)
+{
+ $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+ $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql.= " WHERE c.fk_soc = s.rowid";
+ $sql.= " AND c.entity = ".$conf->entity;
+ $sql.= " AND c.fk_statut = 2 ";
+ if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+ if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ $sql.= " ORDER BY c.rowid DESC";
+
+ if ( $db->query($sql) )
+ {
+ $num = $db->num_rows();
+
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commandes/liste.php?viewstatut=2">('.$num.')</a></td></tr>';
+
+ if ($num)
+ {
+ $i = 0;
+ $var = True;
+ while ($i < $num)
+ {
+ $var=!$var;
+ $obj = $db->fetch_object();
+ print "<tr $bc[$var]>";
+ print '<td width="20%" nowrap="nowrap">';
+
+ $commandestatic->id=$obj->rowid;
+ $commandestatic->ref=$obj->ref;
+
+ print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+ print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
+ print $commandestatic->getNomUrl(1);
+ print '</td>';
+
+ print '<td width="16" class="nobordernopadding" nowrap="nowrap">';
+ print ' ';
+ print '</td>';
+
+ print '<td width="16" align="right" class="nobordernopadding">';
+ $filename=dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+ $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+ $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1);
+ print '</td></tr></table>';
+
+ print '</td>';
+
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
+ print '</tr>';
+ $i++;
+ }
+ }
+ print "</table><br>";
+ }
+}
print '</td></tr></table>';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 20e494aab17..f54af2b0ef7 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -688,7 +688,7 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
$i = 0;
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
- print '<td colspan="2"><a href="'.DOL_URL_ROOT.'/compta/commande/liste.php?status=3&afacturer=1">'.$langs->trans("OrdersToBill").' ('.$num.')</a></td>';
+ print '<td colspan="2">'.$langs->trans("OrdersToBill").' <a href="'.DOL_URL_ROOT.'/compta/commande/liste.php?status=3&afacturer=1">('.$num.')</a></td>';
if ($conf->global->MAIN_SHOW_HT_ON_SUMMARY) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("ToBill").'</td>';
@@ -780,7 +780,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$i = 0;
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><td colspan="2"><a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">'.$langs->trans("BillsCustomersUnpayed",min($conf->liste_limit,$num)).' ('.$num.')</a></td>';
+ print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsCustomersUnpayed",min($conf->liste_limit,$num)).' <a href="'.DOL_URL_ROOT.'/compta/facture/impayees.php">('.$num.')</a></td>';
if ($conf->global->MAIN_SHOW_HT_ON_SUMMARY) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("Received").'</td>';
@@ -877,7 +877,7 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
$num = $db->num_rows($resql);
print '<table class="noborder" width="100%">';
- print '<tr class="liste_titre"><td colspan="2"><a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php">'.$langs->trans("BillsSuppliersUnpayed",min($conf->liste_limit,$num)).' ('.$num.')</a></td>';
+ print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("BillsSuppliersUnpayed",min($conf->liste_limit,$num)).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php">('.$num.')</a></td>';
if ($conf->global->MAIN_SHOW_HT_ON_SUMMARY) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("Payed").'</td>';
diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index 19edd54987a..182023c98eb 100644
--- a/htdocs/core/conf.class.php
+++ b/htdocs/core/conf.class.php
@@ -218,10 +218,6 @@ class Conf
// Sous module bons de livraison
$this->livraison_bon->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0;
- // Module don
- $this->don->dir_output=$rootfordata."/dons";
- $this->don->dir_temp =$rootfordata."/dons/temp";
-
// Module fournisseur
$this->fournisseur->commande->dir_output=$rootfordata."/fournisseur/commande";
$this->fournisseur->commande->dir_temp =$rootfordata."/fournisseur/commande/temp";
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 8165987e0cb..a09f0082ac8 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -19,10 +19,10 @@
*/
/**
- \file htdocs/fichinter/index.php
- \brief Page accueil espace fiches interventions
- \ingroup ficheinter
- \version $Id$
+ * \file htdocs/fichinter/index.php
+ * \brief Page accueil espace fiches interventions
+ * \ingroup ficheinter
+ * \version $Id$
*/
require("./pre.inc.php");
@@ -96,13 +96,13 @@ if ($result)
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
- print_liste_field_titre($langs->trans("Ref"),"index.php","f.ref","",$urlparam,'width="15%"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","",$urlparam,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Description"),"index.php","f.description","",$urlparam,'',$sortfield,$sortorder);
- print '<td> </td>';
- print_liste_field_titre($langs->trans("Date"),"index.php","fd.date","",$urlparam,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Duration"),"index.php","fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Status"),"index.php","f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.ref","",$urlparam,'width="15%"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$urlparam,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$urlparam,'',$sortfield,$sortorder);
+ print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
+ print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$urlparam,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
print "</tr>\n";
print '<tr class="liste_titre">';
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index c960bdb38d9..bbee20cd750 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -19,10 +19,10 @@
*/
/**
- \file htdocs/fourn/index.php
- \ingroup fournisseur
- \brief Page accueil de la zone fournisseurs
- \version $Id$
+ * \file htdocs/fourn/index.php
+ * \ingroup fournisseur
+ * \brief Page accueil de la zone fournisseurs
+ * \version $Id$
*/
require("./pre.inc.php");
@@ -122,7 +122,7 @@ if ($conf->fournisseur->enabled)
{
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
- print '<td colspan="3">'.$langs->trans("DraftOrders").'</td></tr>';
+ print '<td colspan="3">'.$langs->trans("DraftOrders").' ('.$num.')</td></tr>';
$i = 0;
$var = true;
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index abed301c55b..b0145ceebef 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -70,6 +70,8 @@ class Form
* \param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres
* \param img Code img du picto
* \param i Numero of tooltip
+ * \param width Width of tooltip
+ * \param shiftX Shift of tooltip
* \return string Code html du tooltip (texte+picto)
*/
function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$i=1,$width='200',$shiftX='10')
@@ -873,7 +875,7 @@ class Form
$found=0;
$currencytext=$langs->trans("Currency".$conf->monnaie);
if (strlen($currencytext) > 10) $currencytext=$conf->monnaie; // If text is too long, we use the short code
-
+
// Multiprice
if ($price_level >= 1) // If we need a particular price level (from 1 to 6)
{
diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php
index c36c74b2d21..fc850897cd9 100644
--- a/htdocs/theme/auguria/auguria.css.php
+++ b/htdocs/theme/auguria/auguria.css.php
@@ -29,11 +29,8 @@ require("../../conf/conf.php");
header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access.
-if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-{
- header('Cache-Control: max-age=3600, public, must-revalidate');
-}
-
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
?>
/* ============================================================================== */
diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php
index ee890807b15..bb089464738 100644
--- a/htdocs/theme/bluelagoon/bluelagoon.css.php
+++ b/htdocs/theme/bluelagoon/bluelagoon.css.php
@@ -30,29 +30,27 @@ require("../../conf/conf.php");
header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access.
-if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-{
- header('Cache-Control: max-age=3600, public, must-revalidate');
-}
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
?>
/***** Style du fond *****/
body {
- background: #e0ebeb;
+ background: #e0ebeb;
margin: 0px;
- font: 12px helvetica, verdana, arial, sans-serif;
+ font: 12px helvetica, verdana, arial, sans-serif;
}
/***** Styles par defaut *****/
input
-{
- font: 12px helvetica, verdana, arial, sans-serif;
+{
+ font: 12px helvetica, verdana, arial, sans-serif;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
}
input.flat
-{
+{
font: 12px helvetica, verdana, arial, sans-serif;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
@@ -63,7 +61,7 @@ textarea {
margin: 0px 0px 0px 0px;
}
textarea.flat
-{
+{
font: 12px helvetica, verdana, arial, sans-serif;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
@@ -117,7 +115,7 @@ div.tmenu
font-weight: bold;
font-size: 12px;
height: 18px;
- color: #000000;
+ color: #000000;
text-decoration: none;
}
@@ -136,7 +134,7 @@ a.tmenu:visited
font-size:12px;
}
a.tmenusel
-{
+{
padding: 0em 1em;
margin: 0em 0em 1em 0em;
font-size:12px;
@@ -221,7 +219,7 @@ li.tmenu a:link
/* Login */
a.login
-{
+{
position: absolute;
right: 24px;
top: 4px;
@@ -271,11 +269,11 @@ a.help:active { font-size:11px; font-family: helvetica, verdana, arial, sa
a.help:hover { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; }
div.blockvmenupair
-{
+{
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
font: helvetica, verdana, arial, sans-serif;
- color: #202020;
+ color: #202020;
text-align:left;
text-decoration: none;
padding: 3px;
@@ -287,31 +285,31 @@ div.blockvmenuimpair
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
font: helvetica, verdana, arial, sans-serif;
- color: #202020;
+ color: #202020;
text-align:left;
text-decoration: none;
padding: 3px;
margin: 1px 0px 0px 0px;
}
-a.leftmenu {
- font-size: 0.9em;
- font-weight: bold;
- color: #202020;
+a.leftmenu {
+ font-size: 0.9em;
+ font-weight: bold;
+ color: #202020;
}
-td.barre {
+td.barre {
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
background: #b3cccc;
font-family: Helvetica, Verdana;
- font-size: 0.9em;
- color: #000000;
+ font-size: 0.9em;
+ color: #000000;
text-decoration: none;
}
-td.barre_select {
- background: #b3cccc;
+td.barre_select {
+ background: #b3cccc;
color: #000000;
}
@@ -464,25 +462,25 @@ padding: 0px 0px;
/*
* Tableaux
- */
+ */
-a {
+a {
text-decoration: none;
font-weight: bold;
color: #000000;
}
-td.menu {
+td.menu {
border: 1px solid #000000;
}
-td.border {
+td.border {
border: 1px solid #000000;
}
-div.menus {
- background: #eeeecc;
+div.menus {
+ background: #eeeecc;
color: #bbbb88;
border-top: 1px dashed #ccccb3;
border-right: 1px dashed #ccccb3;
@@ -491,19 +489,19 @@ div.menus {
}
-.menu {
- background: #b3cccc;
- font-size: 0.9em; font-weight: bold;
- color: #000000;
+.menu {
+ background: #b3cccc;
+ font-size: 0.9em; font-weight: bold;
+ color: #000000;
text-decoration: none }
-.submenu {
- background: #b3cccc;
+.submenu {
+ background: #b3cccc;
font-size: 0.9em;
- color: #000000;
+ color: #000000;
text-decoration: none }
-a.normal{ font-weight: normal }
+a.normal{ font-weight: normal }
a.impayee { font-weight: bold }
/*
@@ -548,7 +546,7 @@ div.warning {
}
div.error {
- color: #550000; font-weight: bold;
+ color: #550000; font-weight: bold;
padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0.5em 0em 0.5em 0em;
border: 1px solid #8C9CAB;
@@ -566,7 +564,7 @@ div.info {
* Liens Payes/Non payes
*/
-a.normal:link { font-weight: normal }
+a.normal:link { font-weight: normal }
a.normal:visited { font-weight: normal }
a.normal:active { font-weight: normal }
a.normal:hover { font-weight: normal }
@@ -582,18 +580,18 @@ a.impayee:hover { font-weight: bold; color: #550000; }
/*
* Lignes titre espace
*/
-div.titre {
+div.titre {
font-family: Helvetica, Verdana;
- font-size: 0.9em;
- font-weight: bold;
- color: #336666;
+ font-size: 0.9em;
+ font-weight: bold;
+ color: #336666;
text-decoration: none }
/*
* Tableaux
- */
+ */
-input.liste_titre {
+input.liste_titre {
background: #b3cccc;
border: 0px;
}
@@ -616,11 +614,11 @@ td.liste_titre {
white-space: nowrap;
}
-.liste_titre_sel {
- color: #000000;
- background: #cceeee;
+.liste_titre_sel {
+ color: #000000;
+ background: #cceeee;
font-family: Helvetica, Verdana;
- font-weight: bold;
+ font-weight: bold;
border-top: 1px solid #8CACBB;
border-right: 0px;
border-right: 0px;
@@ -652,21 +650,21 @@ tr.liste_total td {
*
*/
-td.delete {
+td.delete {
background: red;
font-weight: bold;
}
-td.valid {
+td.valid {
background: pink;
font-weight: bold;
}
-td.small {
+td.small {
font-size: 0.8em;
}
-
+
/* ============================================================================== */
/* Formulaire confirmation (AJAX) */
/* ============================================================================== */
@@ -681,45 +679,45 @@ td.small {
.alert_nw {
width: 5px;
height: 5px;
- background: transparent url(alert/top_left.gif) no-repeat bottom left;
+ background: transparent url(alert/top_left.gif) no-repeat bottom left;
}
.alert_n {
height: 5px;
- background: transparent url(alert/top.gif) repeat-x bottom left;
+ background: transparent url(alert/top.gif) repeat-x bottom left;
}
.alert_ne {
width: 5px;
height: 5px;
- background: transparent url(alert/top_right.gif) no-repeat bottom left
+ background: transparent url(alert/top_right.gif) no-repeat bottom left
}
.alert_e {
width: 5px;
- background: transparent url(alert/right.gif) repeat-y 0 0;
+ background: transparent url(alert/right.gif) repeat-y 0 0;
}
.alert_w {
width: 5px;
- background: transparent url(alert/left.gif) repeat-y 0 0;
+ background: transparent url(alert/left.gif) repeat-y 0 0;
}
.alert_sw {
width: 5px;
height: 5px;
- background: transparent url(alert/bottom_left.gif) no-repeat 0 0;
+ background: transparent url(alert/bottom_left.gif) no-repeat 0 0;
}
.alert_s {
height: 5px;
- background: transparent url(alert/bottom.gif) repeat-x 0 0;
+ background: transparent url(alert/bottom.gif) repeat-x 0 0;
}
.alert_se, .alert_sizer {
width: 5px;
height: 5px;
- background: transparent url(alert/bottom_right.gif) no-repeat 0 0;
+ background: transparent url(alert/bottom_right.gif) no-repeat 0 0;
}
.alert_close {
@@ -797,16 +795,16 @@ td.small {
position: absolute;
}
-.dialog table.table_window {
- border-collapse: collapse;
- border-spacing: 0;
+.dialog table.table_window {
+ border-collapse: collapse;
+ border-spacing: 0;
width: 100%;
margin: 0px;
padding:0px;
}
-.dialog table.table_window td , .dialog table.table_window th {
- padding: 0;
+.dialog table.table_window td , .dialog table.table_window th {
+ padding: 0;
}
.dialog .title_window {
@@ -834,13 +832,13 @@ z-index: 100;
/* ============================================================================== */
/* Calendar */
/* ============================================================================== */
-.bodyline {
+.bodyline {
-moz-border-radius:8px;
- border: 1px #E4ECEC outset;
+ border: 1px #E4ECEC outset;
padding:0px;
margin-bottom:5px;
}
-table.dp {
+table.dp {
width: 180px;
background-color: #FFFFFF;
border-top: solid 2px #DDDDDD;
@@ -850,10 +848,10 @@ table.dp {
}
.dp td, .tpHour td, .tpMinute td{padding:2px; font-size:10px;}
/* Barre titre */
-.dpHead,.tpHead,.tpHour td:Hover .tpHead{
+.dpHead,.tpHead,.tpHour td:Hover .tpHead{
font-weight:bold;
background-color:#b3c5cc;
- color:white;
+ color:white;
font-size:11px;
cursor:auto;
}
@@ -862,9 +860,9 @@ table.dp {
text-align:center;
background-color:#617389;
color:#FFFFFF;
- font-weight:bold;
+ font-weight:bold;
border: 1px outset black;
- cursor:pointer;
+ cursor:pointer;
}
.dpButtons:Active,.tpButtons:Active{border: 1px outset black;}
.dpDayNames td,.dpExplanation {background-color:#D9DBE1; font-weight:bold; text-align:center; font-size:11px;}
@@ -888,7 +886,7 @@ table.dp {
.tpMinute td:Hover {background-color:black; color:white; }
.tpMinute td {background-color:#D9DBE1; text-align:center; cursor:pointer;}
-/* Bouton X fermer */
+/* Bouton X fermer */
.dpInvisibleButtons
{
border-style:none;
@@ -898,7 +896,7 @@ font-size:9px;
border-width:0px;
color:#0B63A2;
vertical-align:middle;
-cursor: pointer;
+cursor: pointer;
}
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 27c21ab7f70..c1b5938e489 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -30,10 +30,8 @@ require("../../conf/conf.php");
header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access.
-if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-{
- header('Cache-Control: max-age=3600, public, must-revalidate');
-}
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
?>
/* ============================================================================== */
@@ -106,7 +104,7 @@ select.flat
border: 0px;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom;
- padding: 0px 0px 0px 0px;
+ padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
}
.button:focus {
@@ -116,7 +114,7 @@ select.flat
border: 0px;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom;
- padding: 0px 0px 0px 0px;
+ padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
}
.buttonajax
@@ -770,16 +768,25 @@ width: 100%;
}
tr.liste_titre {
-background: #7699A9;
-background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+height: 16px;
+/* background: #7699A9; */
+background: #91ABB3;
+<?php if (eregi('firefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE6 ?>
+background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre_2.png' ?>);
+background-repeat: repeat-y;
+<?php } ?>
color: #334444;
font-family: helvetica, verdana, arial, sans-serif;
border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
}
td.liste_titre {
-background: #7699A9;
+/* background: #7699A9; */
+background: #91ABB3;
+<?php if (eregi('firefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE6 ?>
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+background-repeat: repeat-x;
+<?php } ?>
color: #334444;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -788,8 +795,12 @@ white-space: nowrap;
}
td.liste_titre_sel
{
-background: #7699A9;
+/* background: #7699A9; */
+background: #91ABB3;
+<?php if (eregi('firefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE6 ?>
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+background-repeat: repeat-x;
+<?php } ?>
color: #F5FFFF;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -797,8 +808,12 @@ border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
}
input.liste_titre {
-background: #7699A9;
+/* background: #7699A9; */
+background: #91ABB3;
+<?php if (eregi('firefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE6 ?>
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+background-repeat: repeat-x;
+<?php } ?>
border: 0px;
}
@@ -810,7 +825,8 @@ white-space: nowrap;
}
th {
-background: #7699A9;
+/* background: #7699A9; */
+background: #91ABB3;
color: #334444;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -860,16 +876,20 @@ margin: 2px;
}
tr.box_titre {
-background: #7699A9;
-background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
+/* background: #7699A9; */
+background: #91ABB3;
+<?php if (eregi('firefox',$_SERVER['HTTP_USER_AGENT'])) { // Does not work with IE6 ?>
+background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre_2.png' ?>);
+background-repeat: repeat-y;
+<?php } ?>
color: #334444;
font-size: 12px;
font-family: arial, helvetica, verdana, sans-serif;
-font-weight: bold;
+font-weight: normal;
border-bottom: 1px solid #FDFFFF;
white-space: nowrap;
--moz-border-radius-topleft:6px;
--moz-border-radius-topright:6px;
+-moz-border-radius-topleft:4px;
+-moz-border-radius-topright:4px;
}
tr.box_impair {
diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php
index 4b89834a0d6..f9a322991a3 100644
--- a/htdocs/theme/freelug/freelug.css.php
+++ b/htdocs/theme/freelug/freelug.css.php
@@ -29,11 +29,8 @@ require("../../conf/conf.php");
header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access.
-if (! isset($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-{
- header('Cache-Control: max-age=3600, public, must-revalidate');
-}
-
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
?>
/* ============================================================================== */
diff --git a/htdocs/theme/rodolphe/rodolphe.css.php b/htdocs/theme/rodolphe/rodolphe.css.php
index 0981de40b22..8624cbbbf3e 100644
--- a/htdocs/theme/rodolphe/rodolphe.css.php
+++ b/htdocs/theme/rodolphe/rodolphe.css.php
@@ -30,16 +30,14 @@ require("../../conf/conf.php");
header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access.
-if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-{
- header('Cache-Control: max-age=3600, public, must-revalidate');
-}
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
?>
/***** Style du fond *****/
body {
- background: #AAA5A0;
+ background: #AAA5A0;
font-size: 12px;
font-family: helvetica, verdana, arial, sans-serif;
margin-top: 0;
@@ -55,14 +53,14 @@ a:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bol
a:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
a:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: underline; }
input
-{
+{
font-size: 12px;
- font-family: helvetica, verdana, arial, sans-serif;
+ font-family: helvetica, verdana, arial, sans-serif;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
}
input.flat
-{
+{
font-size: 12px;
font-family: helvetica, verdana, arial, sans-serif;
padding: 0px 0px 0px 0px;
@@ -76,7 +74,7 @@ textarea {
margin: 0px 0px 0px 0px;
}
textarea.flat
-{
+{
font-size: 12px;
font-family: helvetica, verdana, arial, sans-serif;
padding: 0px 0px 0px 0px;
@@ -138,8 +136,8 @@ div.tmenu
font-weight:bold;
font-size:12px;
height: 19px;
- background: #ded8d2;
- color: #000000;
+ background: #ded8d2;
+ color: #000000;
text-decoration: none;
}
@@ -162,7 +160,7 @@ a.tmenu:visited
font-size:12px;
}
a.tmenusel
-{
+{
color: #ffffff;
background: #78746d;
padding: 0em 1em;
@@ -303,7 +301,7 @@ div.blockvmenupair
border-bottom: 1px solid #000000;
background: #ded8d2;
font-family: helvetica, verdana, arial, sans-serif;
- color: #000000;
+ color: #000000;
text-align:left;
text-decoration: none;
padding: 3px;
@@ -316,7 +314,7 @@ div.blockvmenuimpair
border-bottom: 1px solid #000000;
background: #ded8d2;
font-family: helvetica, verdana, arial, sans-serif;
- color: #000000;
+ color: #000000;
text-align:left;
text-decoration: none;
padding: 3px;
@@ -329,7 +327,7 @@ div.help
border-bottom: 1px solid #000000;
background: #f0f0f0;
font-family: helvetica, verdana, arial, sans-serif;
- color: #000000;
+ color: #000000;
text-align:left;
text-decoration: none;
padding: 3px;
@@ -337,23 +335,23 @@ div.help
}
-td.barre {
+td.barre {
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
background: #b3c5cc;
font-family: helvetica, verdana, arial, sans-serif;
- color: #000000;
+ color: #000000;
text-align:left;
text-decoration: none
}
-td.barre_select {
- background: #b3c5cc;
- color: #ffffff
+td.barre_select {
+ background: #b3c5cc;
+ color: #ffffff
}
-td.photo {
- background: #FFFFFF;
- color: #000000
+td.photo {
+ background: #FFFFFF;
+ color: #000000
}
@@ -446,8 +444,8 @@ a.butActionDelete:link { font-family: helvetica, verdana, arial, sans-serif;
a.butActionDelete:active { font-family: helvetica, verdana, arial, sans-serif; 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; 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; background: #FFe7ec; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
-
-
+
+
/* ============================================================================== */
/* Tables */
/* ============================================================================== */
@@ -479,7 +477,7 @@ margin: 0px 0px;
}
table.border {
-font-family: helvetica, verdana, arial, sans-serif;
+font-family: helvetica, verdana, arial, sans-serif;
border-collapse: collapse;
border: 1px white ridge;
}
@@ -517,17 +515,17 @@ background: #ddddcc;
/*
* Tableaux
- */
+ */
-td.border {
+td.border {
border-top: 1px solid #000000;
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
border-left: 1px solid #000000;
}
-div.menus {
- background: #78746d;
+div.menus {
+ background: #78746d;
color: #bbbb88;
font-size: 0.95em;
border-top: 1px dashed #ccccb3;
@@ -537,15 +535,15 @@ div.menus {
}
-a.leftmenu {
- font-weight: bold;
+a.leftmenu {
+ font-weight: bold;
color: #202020;
}
-div.leftmenu {
- background: #ccccb3;
+div.leftmenu {
+ background: #ccccb3;
text-align: left;
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
@@ -564,11 +562,11 @@ div.leftmenu {
.error { color: #550000; }
td.warning
-{
- background: #FF9988;
+{
+ background: #FF9988;
font-weight: bold;
font-size: 0.95em;
- color: #000000;
+ color: #000000;
text-decoration: none
}
@@ -581,7 +579,7 @@ div.warning {
}
div.error {
- color: #550000; font-weight: bold;
+ color: #550000; font-weight: bold;
padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0.5em 0em 0.5em 0em;
border: 1px solid #000000;
@@ -592,7 +590,7 @@ div.error {
* Liens Payes/Non payes
*/
-a.normal:link { font-weight: normal }
+a.normal:link { font-weight: normal }
a.normal:visited { font-weight: normal }
a.normal:active { font-weight: normal }
a.normal:hover { font-weight: normal }
@@ -609,21 +607,21 @@ a.impayee:hover { font-weight: bold; color: #550000; }
/*
* ???
*/
-div.titre {
+div.titre {
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
- color: #666633;
+ font-weight: bold;
+ color: #666633;
text-decoration: none }
/*
* Tableaux
- */
+ */
-input.liste_titre {
+input.liste_titre {
background: #cc9966;
}
-tr.liste_titre {
+tr.liste_titre {
background: #cc9966;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -633,7 +631,7 @@ tr.liste_titre {
white-space: nowrap;
}
-tr.liste_search {
+tr.liste_search {
background: #cc9966;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -642,7 +640,7 @@ tr.liste_search {
white-space: nowrap;
}
-td.liste_titre {
+td.liste_titre {
background: #cc9966;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -652,27 +650,27 @@ td.liste_titre {
}
.liste_titre_sel
-{
+{
color: #fcfffc;
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
- font-weight: bold;
+ font-weight: bold;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #FFFFFF;
white-space: nowrap;
}
-tr.liste_total {
+tr.liste_total {
background: #F0F0F0;
font-weight: bold;
white-space: nowrap;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #78746d;
-
+
}
-th {
+th {
background: #BBBB88;
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
@@ -684,54 +682,54 @@ th {
font-size: 1.0em;
}
-tr.pair {
+tr.pair {
background: #ded8d2;
- font-size: 1.0em;
+ font-size: 1.0em;
border: 1px solid #78746d;
}
-tr.impair {
+tr.impair {
background: #ded8d2;
- font-size: 1.0em;
+ font-size: 1.0em;
border: 1px solid #78746d;
}
/*
*
*/
-tr.box_titre {
+tr.box_titre {
background: #BBBB88;
font-family: Helvetica, Verdana;
font-size: 1.0em;
font-weight: bold; }
-tr.box_pair {
- background: #ded8d2;
+tr.box_pair {
+ background: #ded8d2;
font-size: 0.95em; }
-tr.box_impair {
- background: #78746d;
+tr.box_impair {
+ background: #78746d;
font-family: Helvetica, Verdana;
font-size: 0.95em; }
-tr.fiche {
+tr.fiche {
font-family: Helvetica, Verdana;
font-size: 0.6em; }
/*
* Widgets standard
*/
-td.delete {
+td.delete {
background: red;
font-weight: bold;
}
-td.valid {
+td.valid {
background: pink;
font-weight: bold;
}
-td.small {
+td.small {
font-size: 10px;
}
@@ -775,45 +773,45 @@ table.valid {
.alert_nw {
width: 5px;
height: 5px;
- background: transparent url(alert/top_left.gif) no-repeat bottom left;
+ background: transparent url(alert/top_left.gif) no-repeat bottom left;
}
.alert_n {
height: 5px;
- background: transparent url(alert/top.gif) repeat-x bottom left;
+ background: transparent url(alert/top.gif) repeat-x bottom left;
}
.alert_ne {
width: 5px;
height: 5px;
- background: transparent url(alert/top_right.gif) no-repeat bottom left
+ background: transparent url(alert/top_right.gif) no-repeat bottom left
}
.alert_e {
width: 5px;
- background: transparent url(alert/right.gif) repeat-y 0 0;
+ background: transparent url(alert/right.gif) repeat-y 0 0;
}
.alert_w {
width: 5px;
- background: transparent url(alert/left.gif) repeat-y 0 0;
+ background: transparent url(alert/left.gif) repeat-y 0 0;
}
.alert_sw {
width: 5px;
height: 5px;
- background: transparent url(alert/bottom_left.gif) no-repeat 0 0;
+ background: transparent url(alert/bottom_left.gif) no-repeat 0 0;
}
.alert_s {
height: 5px;
- background: transparent url(alert/bottom.gif) repeat-x 0 0;
+ background: transparent url(alert/bottom.gif) repeat-x 0 0;
}
.alert_se, .alert_sizer {
width: 5px;
height: 5px;
- background: transparent url(alert/bottom_right.gif) no-repeat 0 0;
+ background: transparent url(alert/bottom_right.gif) no-repeat 0 0;
}
.alert_close {
@@ -891,16 +889,16 @@ table.valid {
position: absolute;
}
-.dialog table.table_window {
- border-collapse: collapse;
- border-spacing: 0;
+.dialog table.table_window {
+ border-collapse: collapse;
+ border-spacing: 0;
width: 100%;
margin: 0px;
padding:0px;
}
-.dialog table.table_window td , .dialog table.table_window th {
- padding: 0;
+.dialog table.table_window td , .dialog table.table_window th {
+ padding: 0;
}
.dialog .title_window {
@@ -928,13 +926,13 @@ z-index: 100;
/* ============================================================================== */
/* Calendar */
/* ============================================================================== */
-.bodyline {
+.bodyline {
-moz-border-radius:8px;
- border: 1px #E4ECEC outset;
+ border: 1px #E4ECEC outset;
padding:0px;
margin-bottom:5px;
}
-table.dp {
+table.dp {
width: 180px;
background-color: #FFFFFF;
border-top: solid 2px #DDDDDD;
@@ -944,10 +942,10 @@ table.dp {
}
.dp td, .tpHour td, .tpMinute td{padding:2px; font-size:10px;}
/* Barre titre */
-.dpHead,.tpHead,.tpHour td:Hover .tpHead{
+.dpHead,.tpHead,.tpHour td:Hover .tpHead{
font-weight:bold;
background-color:#b3c5cc;
- color:white;
+ color:white;
font-size:11px;
cursor:auto;
}
@@ -956,9 +954,9 @@ table.dp {
text-align:center;
background-color:#617389;
color:#FFFFFF;
- font-weight:bold;
+ font-weight:bold;
border: 1px outset black;
- cursor:pointer;
+ cursor:pointer;
}
.dpButtons:Active,.tpButtons:Active{border: 1px outset black;}
.dpDayNames td,.dpExplanation {background-color:#D9DBE1; font-weight:bold; text-align:center; font-size:11px;}
@@ -982,7 +980,7 @@ table.dp {
.tpMinute td:Hover {background-color:black; color:white; }
.tpMinute td {background-color:#D9DBE1; text-align:center; cursor:pointer;}
-/* Bouton X fermer */
+/* Bouton X fermer */
.dpInvisibleButtons
{
border-style:none;
@@ -992,7 +990,7 @@ font-size:9px;
border-width:0px;
color:#0B63A2;
vertical-align:middle;
-cursor: pointer;
+cursor: pointer;
}
diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php
index 4281af13188..0f8c14c9286 100644
--- a/htdocs/theme/yellow/yellow.css.php
+++ b/htdocs/theme/yellow/yellow.css.php
@@ -29,11 +29,8 @@ require("../../conf/conf.php");
header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access.
-if (! isset($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-{
- header('Cache-Control: max-age=3600, public, must-revalidate');
-}
-
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
?>
/* ============================================================================== */
--
GitLab