PHP code to manage pair/impair is replaced by native CSS.

This commit is contained in:
Laurent Destailleur 2017-03-07 22:45:22 +01:00
parent 8ac1aab45a
commit 184d52525a
24 changed files with 329 additions and 334 deletions

View File

@ -163,7 +163,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
print '<tr '.$bc[0].'><td align="center" colspan="2">'; print '<tr '.$bc[0].'><td align="center" colspan="2">';
$SommeA=0; $SommeA=0;
@ -201,8 +201,70 @@ if ($conf->use_javascript_ajax)
print '</table>'; print '</table>';
} }
print '<br>';
// List of subscription by year
$Total=array();
$Number=array();
$tot=0;
$numb=0;
$sql = "SELECT c.subscription, c.dateadh as dateh";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
$sql.= " WHERE d.entity IN (".getEntity().")";
$sql.= " AND d.rowid = c.fk_adherent";
if(isset($date_select) && $date_select != '')
{
$sql .= " AND c.dateadh LIKE '".$date_select."%'";
}
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$year=dol_print_date($db->jdate($objp->dateh),"%Y");
$Total[$year]=(isset($Total[$year])?$Total[$year]:0)+$objp->subscription;
$Number[$year]=(isset($Number[$year])?$Number[$year]:0)+1;
$tot+=$objp->subscription;
$numb+=1;
$i++;
}
}
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("Subscriptions").'</th>';
print '<th align="right">'.$langs->trans("Number").'</th>';
print '<th align="right">'.$langs->trans("AmountTotal").'</th>';
print '<th align="right">'.$langs->trans("AmountAverage").'</th>';
print "</tr>\n";
$var=true;
krsort($Total);
foreach ($Total as $key=>$value)
{
$var=!$var;
print "<tr ".$bc[$var].">";
print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
print "<td align=\"right\">".$Number[$key]."</td>";
print "<td align=\"right\">".price($value)."</td>";
print "<td align=\"right\">".price(price2num($value/$Number[$key],'MT'))."</td>";
print "</tr>\n";
}
// Total
print '<tr class="liste_total">';
print '<td>'.$langs->trans("Total").'</td>';
print "<td align=\"right\">".$numb."</td>";
print '<td align="right">'.price($tot)."</td>";
print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
print "</tr>\n";
print "</table><br>\n";
//print '</td><td class="notopnoleftnoright" valign="top">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">'; print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
@ -227,7 +289,7 @@ if ($resql)
{ {
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="4">'.$langs->trans("LastMembersModified",$max).'</td></tr>'; print '<th colspan="4">'.$langs->trans("LastMembersModified",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -290,7 +352,7 @@ if ($resql)
{ {
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="5">'.$langs->trans("LastSubscriptionsModified",$max).'</td></tr>'; print '<th colspan="5">'.$langs->trans("LastSubscriptionsModified",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -336,11 +398,11 @@ else
// Summary of members by type // Summary of members by type
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("MembersTypes").'</td>'; print '<th>'.$langs->trans("MembersTypes").'</th>';
print '<td align=right>'.$langs->trans("MembersStatusToValid").'</td>'; print '<th align=right>'.$langs->trans("MembersStatusToValid").'</th>';
print '<td align=right>'.$langs->trans("MenuMembersNotUpToDate").'</td>'; print '<th align=right>'.$langs->trans("MenuMembersNotUpToDate").'</th>';
print '<td align=right>'.$langs->trans("MenuMembersUpToDate").'</td>'; print '<th align=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
print '<td align=right>'.$langs->trans("MembersStatusResiliated").'</td>'; print '<th align=right>'.$langs->trans("MembersStatusResiliated").'</th>';
print "</tr>\n"; print "</tr>\n";
foreach ($AdherentType as $key => $adhtype) foreach ($AdherentType as $key => $adhtype)
@ -363,71 +425,8 @@ print '<td class="liste_total" align="right">'.$SommeD.' '.$staticmember->LibSta
print '</tr>'; print '</tr>';
print "</table>\n"; print "</table>\n";
print "<br>\n";
// List of subscription by year
$Total=array();
$Number=array();
$tot=0;
$numb=0;
$sql = "SELECT c.subscription, c.dateadh as dateh";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
$sql.= " WHERE d.entity IN (".getEntity().")";
$sql.= " AND d.rowid = c.fk_adherent";
if(isset($date_select) && $date_select != '')
{
$sql .= " AND c.dateadh LIKE '".$date_select."%'";
}
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$year=dol_print_date($db->jdate($objp->dateh),"%Y");
$Total[$year]=(isset($Total[$year])?$Total[$year]:0)+$objp->subscription;
$Number[$year]=(isset($Number[$year])?$Number[$year]:0)+1;
$tot+=$objp->subscription;
$numb+=1;
$i++;
}
}
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Subscriptions").'</td>';
print '<td align="right">'.$langs->trans("Number").'</td>';
print '<td align="right">'.$langs->trans("AmountTotal").'</td>';
print '<td align="right">'.$langs->trans("AmountAverage").'</td>';
print "</tr>\n";
$var=true;
krsort($Total);
foreach ($Total as $key=>$value)
{
$var=!$var;
print "<tr ".$bc[$var].">";
print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
print "<td align=\"right\">".$Number[$key]."</td>";
print "<td align=\"right\">".price($value)."</td>";
print "<td align=\"right\">".price(price2num($value/$Number[$key],'MT'))."</td>";
print "</tr>\n";
}
// Total
print '<tr class="liste_total">';
print '<td>'.$langs->trans("Total").'</td>';
print "<td align=\"right\">".$numb."</td>";
print '<td align="right">'.price($tot)."</td>";
print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
print "</tr>\n";
print "</table><br>\n";
//print '</td></tr></table>';
print '</div></div></div>'; print '</div></div></div>';

View File

@ -199,11 +199,11 @@ if (! $rowid && $action != 'create' && $action != 'edit')
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n"; print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>'; print '<th>'.$langs->trans("Ref").'</th>';
print '<td>'.$langs->trans("Label").'</td>'; print '<th>'.$langs->trans("Label").'</th>';
print '<td align="center">'.$langs->trans("SubscriptionRequired").'</td>'; print '<th align="center">'.$langs->trans("SubscriptionRequired").'</th>';
print '<td align="center">'.$langs->trans("VoteAllowed").'</td>'; print '<th align="center">'.$langs->trans("VoteAllowed").'</th>';
print '<td>&nbsp;</td>'; print '<th>&nbsp;</th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

View File

@ -158,7 +158,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
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("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num > 0) if ($num > 0)
{ {
@ -239,7 +239,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
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("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num > 0) if ($num > 0)
{ {
@ -318,7 +318,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
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").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("DraftOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num) if ($num)
{ {
@ -399,7 +399,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
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("DraftSuppliersOrders").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num) if ($num)
{ {
@ -485,12 +485,12 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
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">'; print '<th colspan="2">';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max); if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max);
else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max); else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
else print $langs->trans("BoxTitleLastModifiedCustomers",$max); else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
print '</td>'; print '</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -549,8 +549,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</td>'; print '<tr class="liste_titre"><th>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -628,7 +628,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
if ($num > 0) if ($num > 0)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastContracts",5).'</td></tr>'; print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts",5).'</th></tr>';
$i = 0; $i = 0;
$staticcontrat=new Contrat($db); $staticcontrat=new Contrat($db);
@ -689,7 +689,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></td></tr>'; print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
while ($i < $nbofloop) while ($i < $nbofloop)
@ -788,7 +788,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></td></tr>'; print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
while ($i < $nbofloop) while ($i < $nbofloop)

View File

@ -119,7 +119,7 @@ if ($resql)
} }
$db->free($resql); $db->free($resql);
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</td></tr>'."\n"; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
$listofstatus=array(0,1,2,3,3,-1); $listofstatus=array(0,1,2,3,3,-1);
$bool=false; $bool=false;
foreach ($listofstatus as $status) foreach ($listofstatus as $status)
@ -187,7 +187,7 @@ if (! empty($conf->commande->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="2">'.$langs->trans("DraftOrders").'</td></tr>'; print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -259,7 +259,7 @@ if ($resql)
{ {
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="4">'.$langs->trans("LastModifiedOrders",$max).'</td></tr>'; print '<th colspan="4">'.$langs->trans("LastModifiedOrders",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -341,7 +341,7 @@ if (! empty($conf->commande->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("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>'; print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
if ($num) if ($num)
{ {
@ -423,7 +423,7 @@ if (! empty($conf->commande->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("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2"><span class="badge">'.$num.'</span></a></td></tr>'; print '<th colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2"><span class="badge">'.$num.'</span></a></th></tr>';
if ($num) if ($num)
{ {

View File

@ -162,7 +162,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
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("CustomersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("CustomersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num) if ($num)
{ {
$companystatic=new Societe($db); $companystatic=new Societe($db);
@ -238,7 +238,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
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("SuppliersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("SuppliersDraftInvoices").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num) if ($num)
{ {
$companystatic=new Societe($db); $companystatic=new Societe($db);
@ -324,11 +324,11 @@ if (! empty($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">'.$langs->trans("BoxTitleLastCustomerBills",$max).'</td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastCustomerBills",$max).'</th>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -432,11 +432,11 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$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">'.$langs->trans("BoxTitleLastSupplierBills",$max).'</td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastSupplierBills",$max).'</th>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print "</tr>\n"; print "</tr>\n";
if ($num) if ($num)
{ {
@ -513,10 +513,10 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("BoxTitleLastModifiedDonations",$max).'</td>'; print '<th>'.$langs->trans("BoxTitleLastModifiedDonations",$max).'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -581,11 +581,11 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ContributionsToPay").($num?' <a href="'.DOL_URL_ROOT.'/compta/sociales/index.php?status=0"><span class="badge">'.$num.'</span></a>':'').'</td>'; print '<th>'.$langs->trans("ContributionsToPay").($num?' <a href="'.DOL_URL_ROOT.'/compta/sociales/index.php?status=0"><span class="badge">'.$num.'</span></a>':'').'</th>';
print '<td align="center">'.$langs->trans("DateDue").'</td>'; print '<th align="center">'.$langs->trans("DateDue").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("Paid").'</td>'; print '<th align="right">'.$langs->trans("Paid").'</th>';
print '<td align="center" width="16">&nbsp;</td>'; print '<th align="center" width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -667,11 +667,11 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
$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">'.$langs->trans("OrdersDeliveredToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=3&amp;billed=0"><span class="badge">'.$num.'</span></a></td>'; print '<th colspan="2">'.$langs->trans("OrdersDeliveredToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=3&amp;billed=0"><span class="badge">'.$num.'</span></a></th>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("ToBill").'</td>'; print '<th align="right">'.$langs->trans("ToBill").'</th>';
print '<td align="center" width="16">&nbsp;</td>'; print '<th align="center" width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
$tot_ht=$tot_ttc=$tot_tobill=0; $tot_ht=$tot_ttc=$tot_tobill=0;
$societestatic = new Societe($db); $societestatic = new Societe($db);
@ -769,12 +769,12 @@ if (! empty($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">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1"><span class="badge">'.$num.'</span></a></td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsCustomersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th>';
print '<td align="right">'.$langs->trans("DateDue").'</td>'; print '<th align="right">'.$langs->trans("DateDue").'</th>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("Received").'</td>'; print '<th align="right">'.$langs->trans("Received").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -891,12 +891,12 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$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">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsSuppliersUnpaid",$num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></th>';
print '<td align="right">'.$langs->trans("DateDue").'</td>'; print '<th align="right">'.$langs->trans("DateDue").'</th>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>'; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th align="right">'.$langs->trans("AmountHT").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("Paid").'</td>'; print '<th align="right">'.$langs->trans("Paid").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print "</tr>\n"; print "</tr>\n";
$societestatic = new Societe($db); $societestatic = new Societe($db);
if ($num) if ($num)
@ -963,7 +963,7 @@ $resql = 0;
if ($resql) if ($resql)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("TasksToDo").'</td>'; print '<tr class="liste_titre"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
print "</tr>\n"; print "</tr>\n";
$var = true; $var = true;
$i = 0; $i = 0;

View File

@ -67,7 +67,7 @@ $resql = $db->query($sql);
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">'.$langs->trans("BankChecks")."</td>\n"; print '<th colspan="2">'.$langs->trans("BankChecks")."</th>\n";
print "</tr>\n"; print "</tr>\n";
if ($resql) if ($resql)
@ -111,12 +111,12 @@ if ($resql)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("LastCheckReceiptShort",$max).'</td>'; print '<th>'.$langs->trans("LastCheckReceiptShort",$max).'</th>';
print '<td>'.$langs->trans("Date")."</td>"; print '<th>'.$langs->trans("Date")."</th>";
print '<td>'.$langs->trans("Account").'</td>'; print '<th>'.$langs->trans("Account").'</th>';
print '<td align="right">'.$langs->trans("NbOfCheques").'</td>'; print '<th align="right">'.$langs->trans("NbOfCheques").'</th>';
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<th align="right">'.$langs->trans("Amount").'</th>';
print '<td align="right">'.$langs->trans("Status").'</td>'; print '<th align="right">'.$langs->trans("Status").'</th>';
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;

View File

@ -74,7 +74,7 @@ $bprev = new BonPrelevement($db);
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
print '<td align="right">'; print '<td align="right">';
@ -114,7 +114,7 @@ if ($resql)
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="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</td></tr>'; print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
if ($num) if ($num)
{ {
$var = True; $var = True;
@ -188,10 +188,10 @@ if ($result)
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("LastWithdrawalReceipt",$limit).'</td>'; print '<tr class="liste_titre"><th>'.$langs->trans("LastWithdrawalReceipt",$limit).'</th>';
print '<td>'.$langs->trans("Date").'</td>'; print '<th>'.$langs->trans("Date").'</th>';
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<th align="right">'.$langs->trans("Amount").'</th>';
print '<td align="right">'.$langs->trans("Status").'</td>'; print '<th align="right">'.$langs->trans("Status").'</th>';
print '</tr>'; print '</tr>';
while ($i < min($num,$limit)) while ($i < min($num,$limit))

View File

@ -180,7 +180,7 @@ else
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</td></tr>'."\n"; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
$var=true; $var=true;
$listofstatus=array(0,4,4,5); $bool=false; $listofstatus=array(0,4,4,5); $bool=false;
foreach($listofstatus as $status) foreach($listofstatus as $status)
@ -248,7 +248,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
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("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</td></tr>'; print '<th colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
if ($num) if ($num)
{ {
$companystatic=new Societe($db); $companystatic=new Societe($db);
@ -324,10 +324,10 @@ if ($result)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastContracts",5).'</td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts",5).'</th>';
print '<td align="center">'.$langs->trans("DateModification").'</td>'; print '<th align="center">'.$langs->trans("DateModification").'</th>';
//print '<td align="left">'.$langs->trans("Status").'</td>'; //print '<th align="left">'.$langs->trans("Status").'</th>';
print '<td align="center" width="80" colspan="4">'.$langs->trans("Services").'</td>'; print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -394,7 +394,7 @@ if ($resql)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("LastModifiedServices",$max).'</td>'; print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -475,7 +475,7 @@ if ($resql)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></td>'; print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -556,7 +556,7 @@ if ($resql)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></td>'; print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

View File

@ -180,9 +180,6 @@ class box_actions extends ModeleBoxes
$actioncejour=false; $actioncejour=false;
$contents=$this->info_box_contents; $contents=$this->info_box_contents;
$nblines=count($contents); $nblines=count($contents);
$bcx=array();
$bcx[0] = 'class="box_pair"';
$bcx[1] = 'class="box_impair"';
if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo")) if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
{ {
$out.= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">'; $out.= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
@ -204,7 +201,7 @@ class box_actions extends ModeleBoxes
$urlsoc=$contents[$line][3]['url']; $urlsoc=$contents[$line][3]['url'];
$dateligne=$contents[$line][4]['text']; $dateligne=$contents[$line][4]['text'];
$percentage=$contents[$line][5]['text']; $percentage=$contents[$line][5]['text'];
$out.= '<tr '.$bcx[$var].'>'; $out.= '<tr class="oddeven">';
$out.= '<td align=center>'; $out.= '<td align=center>';
$out.= img_object("",$logo); $out.= img_object("",$logo);
$out.= '</td>'; $out.= '</td>';

View File

@ -206,9 +206,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
$MAXLENGTHBOX=60; // Mettre 0 pour pas de limite $MAXLENGTHBOX=60; // Mettre 0 pour pas de limite
$bcx = array();
$bcx[0] = 'class="box_pair"';
$bcx[1] = 'class="box_impair"';
$var = false; $var = false;
$cachetime = 900; // 900 : 15mn $cachetime = 900; // 900 : 15mn
@ -284,7 +281,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
// TR // TR
if (isset($contents[$i][0]['tr'])) $out.= '<tr valign="top" '.$contents[$i][0]['tr'].'>'; if (isset($contents[$i][0]['tr'])) $out.= '<tr valign="top" '.$contents[$i][0]['tr'].'>';
else $out.= '<tr valign="top" '.$bcx[$var].'>'; else $out.= '<tr class="oddeven">';
// Loop on each TD // Loop on each TD
$nbcolthisline=count($contents[$i]); $nbcolthisline=count($contents[$i]);

View File

@ -238,8 +238,8 @@ function show_array_actions_to_do($max=5)
$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">'.$langs->trans("LastActionsToDo",$max).'</td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
print '<td colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a>'; print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a></th>';
print '</tr>'; print '</tr>';
$var = true; $var = true;
@ -335,8 +335,8 @@ function show_array_last_actions_done($max=5)
$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">'.$langs->trans("LastDoneTasks",$max).'</td>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
print '<td colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a>'; print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a></th>';
print '</tr>'; print '</tr>';
$var = true; $var = true;
$i = 0; $i = 0;

View File

@ -112,7 +112,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="4">'.$langs->trans("Statistics").'</td>'; print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
print "</tr>\n"; print "</tr>\n";
$listofstatus=array(0,1,-1,2); $listofstatus=array(0,1,-1,2);
@ -182,7 +182,7 @@ if ($resql)
{ {
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="5">'.$langs->trans("LastModifiedDonations",$max).'</td></tr>'; print '<th colspan="5">'.$langs->trans("LastModifiedDonations",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)

View File

@ -88,7 +88,7 @@ if ($resql)
{ {
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("SendingsToValidate").'</td></tr>'; print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
$i = 0; $i = 0;
$var = True; $var = True;
while ($i < $num) while ($i < $num)
@ -141,7 +141,7 @@ if ($resql)
$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="3">'.$langs->trans("OrdersToProcess").'</td></tr>'; print '<th colspan="3">'.$langs->trans("OrdersToProcess").'</th></tr>';
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
@ -203,7 +203,7 @@ if ( $resql )
$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="3">'.$langs->trans("OrdersInProcess").'</td></tr>'; print '<th colspan="3">'.$langs->trans("OrdersInProcess").'</th></tr>';
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
@ -264,7 +264,7 @@ if ($resql)
$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="3">'.$langs->trans("LastSendings",$num).'</td></tr>'; print '<th colspan="3">'.$langs->trans("LastSendings",$num).'</th></tr>';
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {

View File

@ -112,7 +112,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="4">'.$langs->trans("Statistics").'</td>'; print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
print "</tr>\n"; print "</tr>\n";
$listoftype=$tripandexpense_static->listOfTypes(); $listoftype=$tripandexpense_static->listOfTypes();
@ -174,11 +174,11 @@ 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 '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>'; print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
print '<td align="right">'.$langs->trans("AmountHT").'</td>'; print '<th align="right">'.$langs->trans("AmountHT").'</th>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td>&nbsp;</td>'; print '<th>&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {

View File

@ -116,7 +116,7 @@ if ($resql)
} }
$db->free($resql); $db->free($resql);
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</td></tr>'."\n"; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
$listofstatus=array(0,1,2); $listofstatus=array(0,1,2);
$bool=false; $bool=false;
foreach ($listofstatus as $status) foreach ($listofstatus as $status)
@ -181,7 +181,7 @@ if (! empty($conf->ficheinter->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="2">'.$langs->trans("DraftFichinter").'</td></tr>'; print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
$langs->load("fichinter"); $langs->load("fichinter");
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -231,7 +231,7 @@ if ($resql)
{ {
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="4">'.$langs->trans("LastModifiedInterventions",$max).'</td></tr>'; print '<th colspan="4">'.$langs->trans("LastModifiedInterventions",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -303,7 +303,7 @@ if (! empty($conf->ficheinter->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("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>'; print '<th colspan="3">'.$langs->trans("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
if ($num) if ($num)
{ {

View File

@ -112,7 +112,7 @@ if ($resql)
$db->free($resql); $db->free($resql);
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</td></tr>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</th></tr>';
print "</tr>\n"; print "</tr>\n";
foreach (array(0,1,2,3,4,5,6) as $statut) foreach (array(0,1,2,3,4,5,6) as $statut)
{ {
@ -169,8 +169,8 @@ if ($resql)
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Status").'</td>'; print '<tr class="liste_titre"><th>'.$langs->trans("Status").'</th>';
print '<td align="right">'.$langs->trans("Nb").'</td>'; print '<th align="right">'.$langs->trans("Nb").'</th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -216,7 +216,7 @@ if (! empty($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="2">'.$langs->trans("DraftOrders").'</td></tr>'; print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -261,7 +261,7 @@ if ($resql)
$i = 0; $i = 0;
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("UserWithApproveOrderGrant").'</td>'; print '<tr class="liste_titre"><th>'.$langs->trans("UserWithApproveOrderGrant").'</th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -315,7 +315,7 @@ if ($resql)
{ {
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="4">'.$langs->trans("LastModifiedOrders",$max).'</td></tr>'; print '<th colspan="4">'.$langs->trans("LastModifiedOrders",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -385,7 +385,7 @@ $num = $db->num_rows($resql);
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("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></td></tr>'; print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></th></tr>';
if ($num) if ($num)
{ {

View File

@ -121,7 +121,7 @@ if (! empty($conf->holiday->enabled))
$user_id = $user->id; $user_id = $user->id;
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Holidays").'</td></tr>'; print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
print "<tr ".$bc[0].">"; print "<tr ".$bc[0].">";
print '<td colspan="3">'; print '<td colspan="3">';
@ -179,11 +179,11 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
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("BoxTitleLastLeaveRequests",min($max,$num)).'</td>'; print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests",min($max,$num)).'</th>';
print '<td>'.$langs->trans("from").'</td>'; print '<th>'.$langs->trans("from").'</th>';
print '<td>'.$langs->trans("to").'</td>'; print '<th>'.$langs->trans("to").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -250,10 +250,10 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
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">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>'; print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
print '<td align="right">'.$langs->trans("FeesKilometersOrAmout").'</td>'; print '<th align="right">'.$langs->trans("FeesKilometersOrAmout").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {
@ -317,10 +317,10 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
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">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>'; print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</th>';
print '<td align="right">'.$langs->trans("TotalTTC").'</td>'; print '<th align="right">'.$langs->trans("TotalTTC").'</th>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>'; print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
print '<td width="16">&nbsp;</td>'; print '<th width="16">&nbsp;</th>';
print '</tr>'; print '</tr>';
if ($num) if ($num)
{ {

View File

@ -535,7 +535,7 @@ $boxwork.='</tr>'."\n";
if ($showweather) if ($showweather)
{ {
$var=!$var; $var=!$var;
$boxwork.='<tr '.$bc[$var].'>'; $boxwork.='<tr class="nohover">';
$boxwork.='<td colspan="4" class="nohover hideonsmartphone center valignmiddle">'; $boxwork.='<td colspan="4" class="nohover hideonsmartphone center valignmiddle">';
//$boxwork.=$langs->trans("Meteo"); //$boxwork.=$langs->trans("Meteo");
//$boxwork.='</td><td colspan="2" class="nohover center">'; //$boxwork.='</td><td colspan="2" class="nohover center">';
@ -556,10 +556,13 @@ if ($showweather)
// Show dashboard // Show dashboard
$nbworkboardempty=0;
foreach($valid_dashboardlines as $board) foreach($valid_dashboardlines as $board)
{ {
if (empty($boad->nbtodo)) $nbworkboardempty++;
$var=!$var; $var=!$var;
$boxwork.= '<tr '.$bc[$var].'><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>'; $boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$board->label.'</td>';
$boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>'; $boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
$boxwork .= '<td align="right">'; $boxwork .= '<td align="right">';
$textlate = $langs->trans("NActionsLate",$board->nbtodolate); $textlate = $langs->trans("NActionsLate",$board->nbtodolate);

View File

@ -127,7 +127,7 @@ while ($objp = $db->fetch_object($result))
} }
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
if (! empty($conf->product->enabled)) if (! empty($conf->product->enabled))
{ {
$statProducts = "<tr ".$bc[0].">"; $statProducts = "<tr ".$bc[0].">";
@ -268,7 +268,7 @@ if ($result)
$colnb=5; $colnb=5;
if (empty($conf->global->PRODUIT_MULTIPRICES)) $colnb++; if (empty($conf->global->PRODUIT_MULTIPRICES)) $colnb++;
print '<tr class="liste_titre"><td colspan="'.$colnb.'">'.$transRecordedType.'</td></tr>'; print '<tr class="liste_titre"><th colspan="'.$colnb.'">'.$transRecordedType.'</th></tr>';
$var=True; $var=True;

View File

@ -77,7 +77,7 @@ if ($result)
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Warehouses").'</td></tr>'; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Warehouses").'</th></tr>';
if ($num) if ($num)
{ {
@ -132,16 +132,16 @@ if ($resql)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("LastMovements",min($num,$max)).'</td>'; print '<th>'.$langs->trans("LastMovements",min($num,$max)).'</th>';
print '<td>'.$langs->trans("Product").'</td>'; print '<th>'.$langs->trans("Product").'</th>';
if (! empty($conf->productbatch->enabled)) if (! empty($conf->productbatch->enabled))
{ {
print '<td>'.$langs->trans("Batch").'</td>'; print '<th>'.$langs->trans("Batch").'</th>';
print '<td>'.$langs->trans("EatByDate").'</td>'; print '<th>'.$langs->trans("EatByDate").'</th>';
print '<td>'.$langs->trans("SellByDate").'</td>'; print '<th>'.$langs->trans("SellByDate").'</th>';
} }
print '<td>'.$langs->trans("Warehouse").'</td>'; print '<th>'.$langs->trans("Warehouse").'</th>';
print '<td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/product/stock/mouvement.php">'.$langs->trans("FullList").'</a></td>'; print '<th align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/product/stock/mouvement.php">'.$langs->trans("FullList").'</a></th>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

View File

@ -50,7 +50,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
$ponderated_opp_amount = $ponderated_opp_amount / 100; $ponderated_opp_amount = $ponderated_opp_amount / 100;
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</td></tr>'."\n"; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
$var=true; $var=true;
$listofstatus=array_keys($listofoppstatus); $listofstatus=array_keys($listofoppstatus);
foreach ($listofstatus as $status) foreach ($listofstatus as $status)

View File

@ -117,7 +117,7 @@ if ($resql)
$db->free($resql); $db->free($resql);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</td></tr>'."\n"; print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
$var=true; $var=true;
$listofstatus=array(0,1,2,3,4); $listofstatus=array(0,1,2,3,4);
foreach ($listofstatus as $status) foreach ($listofstatus as $status)
@ -169,7 +169,7 @@ if (! empty($conf->supplier_proposal->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="2">'.$langs->trans("DraftRequests").'</td></tr>'; print '<th colspan="2">'.$langs->trans("DraftRequests").'</th></tr>';
$langs->load("supplier_proposal"); $langs->load("supplier_proposal");
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -227,7 +227,7 @@ if ($resql)
{ {
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="4">'.$langs->trans("LastModifiedRequests",$max).'</td></tr>'; print '<th colspan="4">'.$langs->trans("LastModifiedRequests",$max).'</th></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
@ -311,7 +311,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></td></tr>'; print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD)); $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
while ($i < $nbofloop) while ($i < $nbofloop)

View File

@ -2368,23 +2368,23 @@ div.liste_titre_bydiv .divsearchfield {
} }
tr.box_titre .nobordernopadding td { tr.box_titre .nobordernopadding td {
padding: 0px ! important; padding: 0 ! important;
} }
table.nobordernopadding { table.nobordernopadding {
border-collapse: collapse !important; border-collapse: collapse !important;
border: 0px; border: 0;
} }
table.nobordernopadding tr { table.nobordernopadding tr {
border: 0px !important; border: 0 !important;
padding: 0px 0px !important; padding: 0 0 !important;
} }
table.nobordernopadding tr td { table.nobordernopadding tr td {
border: 0px; border: 0 !important;
padding: 0 3px 0 0; padding: 0 3px 0 0;
} }
table.border tr td table.nobordernopadding tr td { table.border tr td table.nobordernopadding tr td {
padding-top: 0px; padding-top: 0;
padding-bottom: 0px; padding-bottom: 0;
} }
td.borderright { td.borderright {
border: none; /* to erase value for table.nobordernopadding td */ border: none; /* to erase value for table.nobordernopadding td */
@ -2559,72 +2559,51 @@ div.pagination li.paginationafterarrows {
margin-top: 9px; margin-top: 9px;
} }
/* Prepare to remove class pair - impair
.noborder > tbody > tr:nth-child(even) td {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
font-family: <?php print $fontlist ?>;
border: 0px;
margin-bottom: 1px;
color: #202020;
min-height: 18px;
}
.noborder > tbody > tr:nth-child(odd) td {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
font-family: <?php print $fontlist ?>;
border: 0px;
margin-bottom: 1px;
color: #202020;
}
*/
/* Set the color for hover lines */ /* Set the color for hover lines */
.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover, .box_pair:hover, .box_impair:hover .oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
{ {
<?php if ($colorbacklinepairhover) { ?> <?php if ($colorbacklinepairhover) { ?>
background: rgb(<?php echo $colorbacklinepairhover; ?>) !important; background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
<?php } ?> <?php } ?>
} }
.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover, tr.box_pair td.nohover, tr.box_impair td.nohover .oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-bottom: 1px; margin-bottom: 1px;
color: #202020; color: #202020;
min-height: 18px; /* seems to not be used */ }
.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
{
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>; background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
} }
#GanttChartDIV { #GanttChartDIV {
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>; background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
} }
.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover { .oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-bottom: 1px; margin-bottom: 1px;
color: #202020; color: #202020;
}
.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
} }
table.dataTable tr.odd { table.dataTable tr.odd, table.dataTable tr.oddeven {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
} }
/* For no hover style */ /* For no hover style */
table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td { td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
} }
tr.nohoverpair td { tr.nohoverpair td {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
} }
table.dataTable td { table.dataTable td {
@ -2699,6 +2678,10 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre
{ {
border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>; border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
} }
/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */
tr:first-child th.liste_titre {
border-bottom: 1px solid #FFF ! important;
}
tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -2723,10 +2706,11 @@ tr.liste_titre_topborder td {
.liste_titre td a.notasortlink:hover { .liste_titre td a.notasortlink:hover {
background: transparent; background: transparent;
} }
tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */ tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>); border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
} }
tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -2796,6 +2780,32 @@ div.tabBar .noborder {
} }
/* Prepare to remove class pair - impair */
.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
}
.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre) {
border-bottom: 1px solid #ddd;
}
.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
}
.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre) {
border-bottom: 1px solid #ddd;
}
/* /*
* Boxes * Boxes
*/ */
@ -2884,29 +2894,6 @@ tr.box_titre td.boxclose {
width: 30px; width: 30px;
} }
tr.box_impair {
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
font-family: <?php print $fontlist ?>;
}
tr.box_pair {
font-family: <?php print $fontlist ?>;
background-color: #f9f9f9;
}
tr.box_pair td, tr.box_impair td {
/* padding: 4px; */
}
tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
border-bottom: 1px solid #ddd;
}
.noborderbottom { .noborderbottom {
border-bottom: none !important; border-bottom: none !important;
} }

View File

@ -2290,19 +2290,19 @@ div.liste_titre_bydiv .divsearchfield {
table.nobordernopadding { table.nobordernopadding {
border-collapse: collapse !important; border-collapse: collapse !important;
border: 0px; border: 0;
} }
table.nobordernopadding tr { table.nobordernopadding tr {
border: 0px !important; border: 0 !important;
padding: 0px 0px !important; padding: 0 0 !important;
} }
table.nobordernopadding tr td { table.nobordernopadding tr td {
border: 0px; border: 0 !important;
padding: 0 3px 0 0; padding: 0 3px 0 0;
} }
table.border tr td table.nobordernopadding tr td { table.border tr td table.nobordernopadding tr td {
padding-top: 0px; padding-top: 0;
padding-bottom: 0px; padding-bottom: 0;
} }
td.borderright { td.borderright {
border: none; /* to erase value for table.nobordernopadding td */ border: none; /* to erase value for table.nobordernopadding td */
@ -2475,44 +2475,48 @@ div.pagination li.paginationafterarrows {
*/ */
/* Set the color for hover lines */ /* Set the color for hover lines */
.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover, .box_pair:hover, .box_impair:hover .oddeven:hover, .odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
{ {
<?php if ($colorbacklinepairhover) { ?> <?php if ($colorbacklinepairhover) { ?>
background: rgb(<?php echo $colorbacklinepairhover; ?>) !important; background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
<?php } ?> <?php } ?>
} }
.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover, tr.box_pair td.nohover, tr.box_impair td.nohover .oddeven, .odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
border: 0px; border: 0px;
margin-bottom: 1px; margin-bottom: 1px;
color: #202020; color: #202020;
min-height: 18px; /* seems to not be used */ }
.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover
{
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>; background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
} }
#GanttChartDIV { #GanttChartDIV {
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>; background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
} }
.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover { .oddeven, .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-bottom: 1px; margin-bottom: 1px;
color: #202020; color: #202020;
}
.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
} }
table.dataTable tr.odd { table.dataTable tr.odd, table.dataTable tr.oddeven {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
} }
/* For no hover style */ /* For no hover style */
table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td { td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
} }
tr.nohoverpair td { tr.nohoverpair td {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
} }
table.dataTable td { table.dataTable td {
@ -2592,6 +2596,10 @@ tr.liste_titre th, tr.liste_titre td, th.liste_titre, form.liste_titre div, div.
{ {
border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>; border-bottom: 1px solid #<?php echo ($colorbacktitle1 == '255,255,255'?'BBBBBB':'FDFFFF'); ?>;
} }
/* TODO Once title line is moved under title search, make border bottom of all th black and force to whit when it's first tr */
tr:first-child th.liste_titre {
border-bottom: 1px solid #FFF ! important;
}
tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@ -2616,7 +2624,7 @@ tr.liste_titre_topborder td {
.liste_titre td a.notasortlink:hover { .liste_titre td a.notasortlink:hover {
background: transparent; background: transparent;
} }
tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel { /* For last line of table headers only */ tr.liste_titre:last-child th.liste_titre, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>); border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
} }
@ -2694,6 +2702,31 @@ div .tdtop {
} }
/* Prepare to remove class pair - impair */
.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
}
.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre) {
border-bottom: 1px solid #ddd;
}
.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
}
.noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre) {
border-bottom: 1px solid #ddd;
}
/* /*
* Boxes * Boxes
*/ */
@ -2784,27 +2817,6 @@ tr.box_titre td.boxclose {
width: 30px; width: 30px;
} }
tr.box_impair {
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
font-family: <?php print $fontlist ?>;
}
tr.box_pair {
font-family: <?php print $fontlist ?>;
background-color: #f9f9f9;
}
tr.box_pair td, tr.box_impair td {
padding: 4px;
}
tr.box_pair:not(:last-child) td, tr.box_impair:not(:last-child) td {
border-bottom: 1px solid #eee;
}
.noborderbottom { .noborderbottom {
border-bottom: none !important; border-bottom: none !important;
} }