lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Some enhancements in look and themes

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-07 15:11:59 +00:00
parent d5e6641e62
commit 2cbc9f9e36
12 changed files with 293 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
htdocs/commande/index.php
View File

@ -33,7 +33,7 @@ if (!$user->rights->commande->lire) accessforbidden();
$langs->load("orders"); $langs->load("orders");
// Sécurité accés client // S<EFBFBD>curit<EFBFBD> acc<63>s client
$socid=''; $socid='';
if ($_GET["socid"]) { $socid=$_GET["socid"]; } if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0) if ($user->societe_id > 0)
@ -117,7 +117,7 @@ if ($conf->commande->enabled)
} }
/* /*
* Commandes à traiter * Orders to process
*/ */
if ($conf->commande->enabled) if ($conf->commande->enabled)
{ {
@ -183,73 +183,7 @@ print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
/* /*
* Commandes en cours * Last closes orders
*/
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 '&nbsp;';
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
*/ */
$max=5; $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 '&nbsp;';
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>'; print '</td></tr></table>';

6
htdocs/compta/index.php
View File

@ -688,7 +688,7 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; 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>'; 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("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("ToBill").'</td>'; print '<td align="right">'.$langs->trans("ToBill").'</td>';
@ -780,7 +780,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; 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>'; 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("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("Received").'</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); $num = $db->num_rows($resql);
print '<table class="noborder" width="100%">'; 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>'; 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("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("Payed").'</td>'; print '<td align="right">'.$langs->trans("Payed").'</td>';

4
htdocs/core/conf.class.php
View File

@ -218,10 +218,6 @@ class Conf
// Sous module bons de livraison // Sous module bons de livraison
$this->livraison_bon->enabled=defined("MAIN_SUBMODULE_LIVRAISON")?MAIN_SUBMODULE_LIVRAISON:0; $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 // Module fournisseur
$this->fournisseur->commande->dir_output=$rootfordata."/fournisseur/commande"; $this->fournisseur->commande->dir_output=$rootfordata."/fournisseur/commande";
$this->fournisseur->commande->dir_temp =$rootfordata."/fournisseur/commande/temp"; $this->fournisseur->commande->dir_temp =$rootfordata."/fournisseur/commande/temp";

22
htdocs/fichinter/index.php
View File

@ -19,10 +19,10 @@
*/ */
/** /**
\file htdocs/fichinter/index.php * \file htdocs/fichinter/index.php
\brief Page accueil espace fiches interventions * \brief Page accueil espace fiches interventions
\ingroup ficheinter * \ingroup ficheinter
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -96,13 +96,13 @@ if ($result)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; 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("Ref"),$_SERVER["PHP_SELF"],"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("Company"),$_SERVER["PHP_SELF"],"s.nom","",$urlparam,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Description"),"index.php","f.description","",$urlparam,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$urlparam,'',$sortfield,$sortorder);
print '<td>&nbsp;</td>'; print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
print_liste_field_titre($langs->trans("Date"),"index.php","fd.date","",$urlparam,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"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("Duration"),$_SERVER["PHP_SELF"],"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("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

10
htdocs/fourn/index.php
View File

@ -19,10 +19,10 @@
*/ */
/** /**
\file htdocs/fourn/index.php * \file htdocs/fourn/index.php
\ingroup fournisseur * \ingroup fournisseur
\brief Page accueil de la zone fournisseurs * \brief Page accueil de la zone fournisseurs
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -122,7 +122,7 @@ if ($conf->fournisseur->enabled)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; 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; $i = 0;
$var = true; $var = true;

2
htdocs/html.form.class.php
View File

@ -70,6 +70,8 @@ class Form
* \param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres * \param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres
* \param img Code img du picto * \param img Code img du picto
* \param i Numero of tooltip * \param i Numero of tooltip
* \param width Width of tooltip
* \param shiftX Shift of tooltip
* \return string Code html du tooltip (texte+picto) * \return string Code html du tooltip (texte+picto)
*/ */
function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$i=1,$width='200',$shiftX='10') function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$i=1,$width='200',$shiftX='10')

7
htdocs/theme/auguria/auguria.css.php
View File

@ -29,11 +29,8 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
{ else header('Cache-Control: no-cache');
header('Cache-Control: max-age=3600, public, must-revalidate');
}
?> ?>
/* ============================================================================== */ /* ============================================================================== */

6
htdocs/theme/bluelagoon/bluelagoon.css.php
View File

@ -30,10 +30,8 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
{ else header('Cache-Control: no-cache');
header('Cache-Control: max-age=3600, public, must-revalidate');
}
?> ?>

54
htdocs/theme/eldy/eldy.css.php
View File

@ -30,10 +30,8 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
{ else header('Cache-Control: no-cache');
header('Cache-Control: max-age=3600, public, must-revalidate');
}
?> ?>
/* ============================================================================== */ /* ============================================================================== */
@ -106,7 +104,7 @@ select.flat
border: 0px; border: 0px;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>); background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom; background-position: bottom;
padding: 0px 0px 0px 0px; padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
.button:focus { .button:focus {
@ -116,7 +114,7 @@ select.flat
border: 0px; border: 0px;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>); background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom; background-position: bottom;
padding: 0px 0px 0px 0px; padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
.buttonajax .buttonajax
@ -770,16 +768,25 @@ width: 100%;
} }
tr.liste_titre { tr.liste_titre {
background: #7699A9; height: 16px;
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; color: #334444;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
white-space: nowrap; white-space: nowrap;
} }
td.liste_titre { 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-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x;
<?php } ?>
color: #334444; color: #334444;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold; font-weight: bold;
@ -788,8 +795,12 @@ white-space: nowrap;
} }
td.liste_titre_sel 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-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x;
<?php } ?>
color: #F5FFFF; color: #F5FFFF;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold; font-weight: bold;
@ -797,8 +808,12 @@ border-bottom: 1px solid #FDFFFF;
white-space: nowrap; white-space: nowrap;
} }
input.liste_titre { 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-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>);
background-repeat: repeat-x;
<?php } ?>
border: 0px; border: 0px;
} }
@ -810,7 +825,8 @@ white-space: nowrap;
} }
th { th {
background: #7699A9; /* background: #7699A9; */
background: #91ABB3;
color: #334444; color: #334444;
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold; font-weight: bold;
@ -860,16 +876,20 @@ margin: 2px;
} }
tr.box_titre { tr.box_titre {
background: #7699A9; /* background: #7699A9; */
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/liste_titre.png' ?>); 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; color: #334444;
font-size: 12px; font-size: 12px;
font-family: arial, helvetica, verdana, sans-serif; font-family: arial, helvetica, verdana, sans-serif;
font-weight: bold; font-weight: normal;
border-bottom: 1px solid #FDFFFF; border-bottom: 1px solid #FDFFFF;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-topleft:6px; -moz-border-radius-topleft:4px;
-moz-border-radius-topright:6px; -moz-border-radius-topright:4px;
} }
tr.box_impair { tr.box_impair {

7
htdocs/theme/freelug/freelug.css.php
View File

@ -29,11 +29,8 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (! isset($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
{ else header('Cache-Control: no-cache');
header('Cache-Control: max-age=3600, public, must-revalidate');
}
?> ?>
/* ============================================================================== */ /* ============================================================================== */

6
htdocs/theme/rodolphe/rodolphe.css.php
View File

@ -30,10 +30,8 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
{ else header('Cache-Control: no-cache');
header('Cache-Control: max-age=3600, public, must-revalidate');
}
?> ?>

7
htdocs/theme/yellow/yellow.css.php
View File

@ -29,11 +29,8 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (! isset($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
{ else header('Cache-Control: no-cache');
header('Cache-Control: max-age=3600, public, must-revalidate');
}
?> ?>
/* ============================================================================== */ /* ============================================================================== */