Fix: traduction et modif esthétique
This commit is contained in:
parent
12b94eaf7e
commit
81211651c9
@ -64,9 +64,9 @@ class box_actions extends ModeleBoxes {
|
|||||||
global $user, $langs, $db, $conf;
|
global $user, $langs, $db, $conf;
|
||||||
|
|
||||||
include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
|
include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
|
||||||
$actionstatic=new ActionComm($db);
|
$actionstatic=new ActionComm($db);
|
||||||
|
|
||||||
$this->info_box_head = array('text' =>$langs->trans("ActionsToDo"));
|
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max));
|
||||||
|
|
||||||
if ($user->rights->commercial->main->lire)
|
if ($user->rights->commercial->main->lire)
|
||||||
{
|
{
|
||||||
@ -100,7 +100,7 @@ class box_actions extends ModeleBoxes {
|
|||||||
|
|
||||||
if (date("U",$objp->dp) < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) $late=img_warning($langs->trans("Late"));
|
if (date("U",$objp->dp) < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) $late=img_warning($langs->trans("Late"));
|
||||||
|
|
||||||
$label=($langs->trans("Action".$objp->code)!=("Action".$objp->code) ? $langs->trans("Action".$objp->code) : $objp->label);
|
$label=($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label);
|
||||||
|
|
||||||
$this->info_box_contents[$i][0] = array('align' => 'left',
|
$this->info_box_contents[$i][0] = array('align' => 'left',
|
||||||
'nowrap' => 1,
|
'nowrap' => 1,
|
||||||
@ -119,12 +119,28 @@ class box_actions extends ModeleBoxes {
|
|||||||
$this->info_box_contents[$i][3] = array('align' => 'right',
|
$this->info_box_contents[$i][3] = array('align' => 'right',
|
||||||
'text' => $objp->percent. "%");
|
'text' => $objp->percent. "%");
|
||||||
|
|
||||||
$this->info_box_contents[$i][4] = array(
|
$this->info_box_contents[$i][4] = array(
|
||||||
'align' => 'right',
|
'align' => 'right',
|
||||||
'text' => $actionstatic->LibStatut($objp->percent,3));
|
'text' => $actionstatic->LibStatut($objp->percent,3));
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$i=$num;
|
||||||
|
while ($i < $max)
|
||||||
|
{
|
||||||
|
if ($num==0 && $i==$num)
|
||||||
|
{
|
||||||
|
$this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoActionsToDo"));
|
||||||
|
$this->info_box_contents[$i][1] = array('text'=>' ');
|
||||||
|
$this->info_box_contents[$i][2] = array('text'=>' ');
|
||||||
|
} else {
|
||||||
|
$this->info_box_contents[$i][0] = array('text'=>' ');
|
||||||
|
$this->info_box_contents[$i][1] = array('text'=>' ');
|
||||||
|
$this->info_box_contents[$i][2] = array('text'=>' ');
|
||||||
|
}
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db);
|
||||||
|
|||||||
@ -96,8 +96,8 @@ class box_clients extends ModeleBoxes {
|
|||||||
'text' => stripslashes($objp->nom),
|
'text' => stripslashes($objp->nom),
|
||||||
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp);
|
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp);
|
||||||
|
|
||||||
$this->info_box_contents[$i][1] = array('align' => 'right',
|
$this->info_box_contents[$i][1] = array('align' => 'right',
|
||||||
'text' => dolibarr_print_date($objp->dc, "day"));
|
'text' => dolibarr_print_date($objp->dc, "day"));
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,7 @@ BoxTitleLastSuppliers=Last %s recorded suppliers
|
|||||||
BoxTitleLastCustomers=Last %s recorded customers
|
BoxTitleLastCustomers=Last %s recorded customers
|
||||||
BoxTitleLastPropals=Last %s recorded proposals
|
BoxTitleLastPropals=Last %s recorded proposals
|
||||||
BoxTitleLastCustomerBills=Last %s customer's invoices
|
BoxTitleLastCustomerBills=Last %s customer's invoices
|
||||||
BoxTitleLastSupplierBills=Les %s supplier's invoices
|
BoxTitleLastSupplierBills=Last %s supplier's invoices
|
||||||
BoxTitleLastProspects=Last %s recorded prospects
|
BoxTitleLastProspects=Last %s recorded prospects
|
||||||
BoxTitleLastProductsInContract=Last %s derniers produits/services contractés
|
BoxTitleLastProductsInContract=Last %s derniers produits/services contractés
|
||||||
BoxTitleOldestUnpayedCustomerBills=Oldest %s unpayed customer's invoices
|
BoxTitleOldestUnpayedCustomerBills=Oldest %s unpayed customer's invoices
|
||||||
@ -38,3 +38,4 @@ BoxMyLastBookmarks=My last %s bookmarks
|
|||||||
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
|
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
|
||||||
NoRecordedBookmarks=No bookmarks defined. Click <a href="%s">here</a> to add bookmarks.
|
NoRecordedBookmarks=No bookmarks defined. Click <a href="%s">here</a> to add bookmarks.
|
||||||
NoRecordedCustomers=No recorded customers
|
NoRecordedCustomers=No recorded customers
|
||||||
|
BoxTitleLastActionsToDo=Last %s actions to do
|
||||||
@ -38,3 +38,4 @@ BoxMyLastBookmarks=Mes %s derniers marque-pages
|
|||||||
FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Date du dernier rafraichissement: %s
|
FailedToRefreshDataInfoNotUpToDate=Echec du rafraichissement du flux RSS. Date du dernier rafraichissement: %s
|
||||||
NoRecordedBookmarks=Pas de bookmarks personnels. Cliquer ici pour en ajouter.
|
NoRecordedBookmarks=Pas de bookmarks personnels. Cliquer ici pour en ajouter.
|
||||||
NoRecordedCustomers=Pas de clients enregistrés
|
NoRecordedCustomers=Pas de clients enregistrés
|
||||||
|
BoxTitleLastActionsToDo=Les %s dernières actions à faires
|
||||||
@ -1139,10 +1139,10 @@ function dol_loginfunction($notused,$pearstatus)
|
|||||||
print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
|
print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
|
||||||
|
|
||||||
print "\n";
|
print "\n";
|
||||||
print "<html>\n";
|
print "<html>\n";
|
||||||
print "<head>\n";
|
print "<head>\n";
|
||||||
print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots
|
print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots
|
||||||
print "<title>Dolibarr Authentification</title>\n";
|
print "<title>Dolibarr Authentification</title>\n";
|
||||||
|
|
||||||
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
|
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/'.$conf->css.'">'."\n";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user