Look: Modif esthétiques mineures
This commit is contained in:
parent
a03362ec83
commit
e4682b907e
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -411,7 +411,7 @@ if ($resql)
|
|||||||
print '<td>'.$customerstatic->getNomUrl(1,'',24).'</td>';
|
print '<td>'.$customerstatic->getNomUrl(1,'',24).'</td>';
|
||||||
|
|
||||||
// Date
|
// Date
|
||||||
print '<td width="100">'.dolibarr_print_date($obj->da);
|
print '<td width="100" align="right">'.dolibarr_print_date($obj->da,'day');
|
||||||
print "</td>";
|
print "</td>";
|
||||||
|
|
||||||
// Statut
|
// Statut
|
||||||
@ -472,7 +472,7 @@ if ($user->rights->societe->lire)
|
|||||||
$objp = $db->fetch_object($resql);
|
$objp = $db->fetch_object($resql);
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print "<td nowrap><a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom."</a></td>";
|
print "<td nowrap><a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom."</a></td>";
|
||||||
print '<td align="right" nowrap>'.dolibarr_print_date($objp->datec)."</td>";
|
print '<td align="right" nowrap>'.dolibarr_print_date($objp->datec,'day')."</td>";
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
@ -575,33 +575,29 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
|
|||||||
$obj = $db->fetch_object($result);
|
$obj = $db->fetch_object($result);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td width="20%" nowrap="nowrap">';
|
print '<td nowrap="nowrap" width="140">';
|
||||||
|
|
||||||
$propalstatic->id=$obj->propalid;
|
$propalstatic->id=$obj->propalid;
|
||||||
$propalstatic->ref=$obj->ref;
|
$propalstatic->ref=$obj->ref;
|
||||||
|
|
||||||
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
|
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
|
||||||
print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
|
print '<td width="100" class="nobordernopadding" nowrap="nowrap">';
|
||||||
print $propalstatic->getNomUrl(1);
|
print $propalstatic->getNomUrl(1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
print '<td width="18" class="nobordernopadding" nowrap="nowrap">';
|
||||||
print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
|
|
||||||
if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
|
if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
print '<td width="16" align="center" class="nobordernopadding">';
|
||||||
print '<td width="16" align="right" class="nobordernopadding">';
|
|
||||||
|
|
||||||
$filename=sanitize_string($obj->ref);
|
$filename=sanitize_string($obj->ref);
|
||||||
$filedir=$conf->propal->dir_output . '/' . sanitize_string($obj->ref);
|
$filedir=$conf->propal->dir_output . '/' . sanitize_string($obj->ref);
|
||||||
$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$obj->propalid;
|
$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$obj->propalid;
|
||||||
$html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1);
|
$html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1);
|
||||||
|
|
||||||
print '</td></tr></table>';
|
print '</td></tr></table>';
|
||||||
|
|
||||||
print "</td>";
|
print "</td>";
|
||||||
print "<td><a href=\"fiche.php?socid=".$obj->rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."</a></td>\n";
|
print "<td align=\"left\"><a href=\"fiche.php?socid=".$obj->rowid."\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."</a></td>\n";
|
||||||
print "<td align=\"right\">";
|
print "<td align=\"right\">";
|
||||||
print dolibarr_print_date($obj->dp)."</td>\n";
|
print dolibarr_print_date($obj->dp,'day')."</td>\n";
|
||||||
print "<td align=\"right\">".price($obj->price)."</td>";
|
print "<td align=\"right\">".price($obj->price)."</td>";
|
||||||
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($obj->fk_statut,3)."</td>\n";
|
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($obj->fk_statut,3)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -653,34 +649,30 @@ if ($conf->propal->enabled && $user->rights->propale->lire) {
|
|||||||
{
|
{
|
||||||
$objp = $db->fetch_object();
|
$objp = $db->fetch_object();
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td width="20%" nowrap="nowrap">';
|
print '<td nowrap="nowrap" width="140">';
|
||||||
|
|
||||||
$propalstatic->id=$objp->propalid;
|
$propalstatic->id=$objp->propalid;
|
||||||
$propalstatic->ref=$objp->ref;
|
$propalstatic->ref=$objp->ref;
|
||||||
|
|
||||||
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
|
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
|
||||||
print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
|
print '<td width="100" class="nobordernopadding" nowrap="nowrap">';
|
||||||
print $propalstatic->getNomUrl(1);
|
print $propalstatic->getNomUrl(1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
print '<td width="18" class="nobordernopadding" nowrap="nowrap">';
|
||||||
print '<td width="20" class="nobordernopadding" nowrap="nowrap">';
|
|
||||||
print ' ';
|
print ' ';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
print '<td width="16" align="center" class="nobordernopadding">';
|
||||||
print '<td width="16" align="right" class="nobordernopadding">';
|
|
||||||
|
|
||||||
$filename=sanitize_string($objp->ref);
|
$filename=sanitize_string($objp->ref);
|
||||||
$filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref);
|
$filedir=$conf->propal->dir_output . '/' . sanitize_string($objp->ref);
|
||||||
$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid;
|
$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid;
|
||||||
$html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1);
|
$html->show_documents('propal',$filename,$filedir,$urlsource,'','','','','',1);
|
||||||
|
|
||||||
print '</td></tr></table>';
|
print '</td></tr></table>';
|
||||||
|
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
print '<td><a href="fiche.php?socid='.$objp->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>';
|
print '<td align="left"><a href="fiche.php?socid='.$objp->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'</a></td>';
|
||||||
print "<td align=\"right\">";
|
print "<td align=\"right\">";
|
||||||
print dolibarr_print_date($objp->dp)."</td>\n";
|
print dolibarr_print_date($objp->dp,'day')."</td>\n";
|
||||||
print "<td align=\"right\">".price($objp->price)."</td>\n";
|
print "<td align=\"right\">".price($objp->price)."</td>\n";
|
||||||
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($objp->fk_statut,3)."</td>\n";
|
print "<td align=\"center\" width=\"14\">".$propalstatic->LibStatut($objp->fk_statut,3)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|||||||
@ -230,6 +230,20 @@ font.tmenudisabled
|
|||||||
font-size:12px;
|
font-size:12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.tmenu:active
|
||||||
|
{
|
||||||
|
background:#4F9EC9;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.tmenu .tmenudisabled
|
||||||
|
{
|
||||||
|
color: #757575;
|
||||||
|
font-size: 13px;
|
||||||
|
padding-left:10px;
|
||||||
|
padding-right:10px;
|
||||||
|
padding-top:3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Pour menu TOP auguria */
|
/* Pour menu TOP auguria */
|
||||||
|
|
||||||
@ -298,20 +312,6 @@ div.tmenu li a:link
|
|||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tmenu a:active
|
|
||||||
{
|
|
||||||
background:#4F9EC9;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.tmenu .tmenudisabled
|
|
||||||
{
|
|
||||||
color: #757575;
|
|
||||||
font-size: 13px;
|
|
||||||
padding-left:10px;
|
|
||||||
padding-right:10px;
|
|
||||||
padding-top:3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Login */
|
/* Login */
|
||||||
|
|
||||||
|
|||||||
@ -199,7 +199,7 @@ a.tmenu:link
|
|||||||
padding: 0px 5px 0px 5px;
|
padding: 0px 5px 0px 5px;
|
||||||
margin: 0px 1px 2px 1px;
|
margin: 0px 1px 2px 1px;
|
||||||
font: 12px helvetica, verdana, arial, sans-serif;
|
font: 12px helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: bold;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
a.tmenu:visited
|
a.tmenu:visited
|
||||||
{
|
{
|
||||||
@ -208,30 +208,35 @@ a.tmenu:visited
|
|||||||
margin: 0px 1px 2px 1px;
|
margin: 0px 1px 2px 1px;
|
||||||
border: 0px solid #b3c5cc;
|
border: 0px solid #b3c5cc;
|
||||||
font: 12px helvetica, verdana, arial, sans-serif;
|
font: 12px helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: bold;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
a.tmenu#sel
|
a.tmenu#sel
|
||||||
{
|
{
|
||||||
color: #234046;
|
color: #234046;
|
||||||
padding: 0px 5px 0px 5px;
|
padding: 0px 5px 0px 5px;
|
||||||
margin: 0px 0px 2px 0px;
|
margin: 0px 0px 0px 0px;
|
||||||
font: 12px helvetica, verdana, arial, sans-serif;
|
font: 12px helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: bold;
|
font-weight: normal;
|
||||||
background: #dee7ec;
|
background: #F4F4F4;
|
||||||
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/tmenu_inverse.jpg' ?>);
|
/* background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/tmenu_inverse.jpg' ?>); */
|
||||||
border-right: 1px solid #555555;
|
border-right: 1px solid #555555;
|
||||||
border-top: 1px solid #D8D8D8;
|
border-top: 1px solid #D8D8D8;
|
||||||
border-left: 1px solid #D8D8D8;
|
border-left: 1px solid #D8D8D8;
|
||||||
|
border-bottom: 2px solid #F4F4F4;
|
||||||
}
|
}
|
||||||
a.tmenu:hover
|
a.tmenu:hover
|
||||||
{
|
{
|
||||||
color: #234046;
|
color: #234046;
|
||||||
padding: 0px 5px 0px 5px;
|
padding: 0px 5px 0px 5px;
|
||||||
margin: 0px 1px 2px 1px;
|
margin: 0px 0px 0px 0px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font: 12px helvetica, verdana, arial, sans-serif;
|
font: 12px helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: bold;
|
font-weight: normal;
|
||||||
background: #dee7ec;
|
background: #dee7ec;
|
||||||
|
border-right: 1px solid #555555;
|
||||||
|
border-top: 1px solid #D8D8D8;
|
||||||
|
border-left: 1px solid #D8D8D8;
|
||||||
|
border-bottom: 2px solid #dee7ec;
|
||||||
}
|
}
|
||||||
|
|
||||||
font.tmenudisabled
|
font.tmenudisabled
|
||||||
@ -239,13 +244,37 @@ font.tmenudisabled
|
|||||||
color: #93a5aa;
|
color: #93a5aa;
|
||||||
padding: 0px 5px 0px 5px;
|
padding: 0px 5px 0px 5px;
|
||||||
margin: 0px 0px 2px 0px;
|
margin: 0px 0px 2px 0px;
|
||||||
font-weight:bold;
|
font-weight: normal;
|
||||||
font-size:12px;
|
font-size:12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tmenu a:active
|
||||||
|
{
|
||||||
|
padding: 0px 5px 0px 5px;
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
text-decoration: none;
|
||||||
|
font: 12px helvetica, verdana, arial, sans-serif;
|
||||||
|
font-weight: normal;
|
||||||
|
background:#F4F4F4;
|
||||||
|
border-right: 1px solid #555555;
|
||||||
|
border-top: 1px solid #D8D8D8;
|
||||||
|
border-left: 1px solid #D8D8D8;
|
||||||
|
border-bottom: 2px solid #dee7ec;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.tmenu .tmenudisabled
|
||||||
|
{
|
||||||
|
color: #757575;
|
||||||
|
font-size: 13px;
|
||||||
|
padding-left:10px;
|
||||||
|
padding-right:10px;
|
||||||
|
padding-top:3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Pour menu top auguria */
|
/* Pour menu top auguria */
|
||||||
|
|
||||||
|
/*
|
||||||
div.tmenu ul {
|
div.tmenu ul {
|
||||||
padding: 0px 0px 0px 0px;
|
padding: 0px 0px 0px 0px;
|
||||||
margin: 0px 0px 0px 0px;
|
margin: 0px 0px 0px 0px;
|
||||||
@ -255,8 +284,8 @@ div.tmenu ul {
|
|||||||
|
|
||||||
div.tmenu li {
|
div.tmenu li {
|
||||||
float: left;
|
float: left;
|
||||||
border-right: solid 1px #4F9EC9;
|
border-right: solid 1px #7699A9;
|
||||||
height: 22px;
|
height: 18px;
|
||||||
position:relative;
|
position:relative;
|
||||||
liste-style:none;
|
liste-style:none;
|
||||||
display: block;
|
display: block;
|
||||||
@ -266,12 +295,12 @@ div.tmenu li {
|
|||||||
|
|
||||||
div.tmenu li a{
|
div.tmenu li a{
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
color:#FFFFFF;
|
color:#000000;
|
||||||
text-decoration:none;
|
text-decoration:none;
|
||||||
padding-left:10px;
|
padding-left:10px;
|
||||||
padding-right:10px;
|
padding-right:10px;
|
||||||
padding-top: 2px;
|
padding-top: 2px;
|
||||||
height: 22px;
|
height: 18px;
|
||||||
display: block;
|
display: block;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
@ -282,20 +311,20 @@ div.tmenu li a{
|
|||||||
|
|
||||||
div.tmenu li a#sel
|
div.tmenu li a#sel
|
||||||
{
|
{
|
||||||
background:#FFFFFF;
|
background:#F4F4F4;
|
||||||
color:#4F9EC9;
|
color:#000000;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
div.tmenu li a:visited
|
div.tmenu li a:visited
|
||||||
{
|
{
|
||||||
color:#FFFFFF;
|
color:#000000;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.tmenu li a:hover
|
div.tmenu li a:hover
|
||||||
{
|
{
|
||||||
background:#FFFFFF;
|
background:#F4F4F4;
|
||||||
color:#4F9EC9;
|
color:#000000;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,19 +340,8 @@ div.tmenu li a:link
|
|||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tmenu a:active
|
*/
|
||||||
{
|
|
||||||
background:#4F9EC9;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.tmenu .tmenudisabled
|
|
||||||
{
|
|
||||||
color: #757575;
|
|
||||||
font-size: 13px;
|
|
||||||
padding-left:10px;
|
|
||||||
padding-right:10px;
|
|
||||||
padding-top:3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Login */
|
/* Login */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user