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

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-11 13:32:40 +02:00
parent 64b28020c8
commit c4383747a1
17 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1390,7 +1390,7 @@ class ActionComm extends CommonObject
if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
}
$tooltip = '<u>'.$langs->trans('Action').'</u>';
$tooltip = img_picto('', $this->picto).' <u>'.$langs->trans('Action').'</u>';
if (!empty($this->ref))
$tooltip .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
if (!empty($label))

2
htdocs/compta/bank/class/account.class.php
View File

@ -1353,7 +1353,7 @@ class Account extends CommonObject
global $conf, $langs, $user;
$result = '';
$label = '<u>'.$langs->trans("BankAccount").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("BankAccount").'</u>';
$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
$label .= '<br><b>'.$langs->trans('AccountNumber').':</b> '.$this->number;
$label .= '<br><b>'.$langs->trans('IBAN').':</b> '.$this->iban;

2
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -1303,7 +1303,7 @@ class BonPrelevement extends CommonObject
$result = '';
$labeltoshow = 'Withdraw';
$labeltoshow = 'PaymentByDirectDebit';
if ($this->type == 'bank-transfer') {
$labeltoshow = 'PaymentByBankTransfer';
}

6
htdocs/core/lib/functions.lib.php
View File

@ -3011,7 +3011,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
'accountancy', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
'accountancy', 'account', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title',
@ -3036,7 +3036,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
'error', 'warning',
'recruitmentcandidature', 'recruitmentjobposition',
'supplier_proposal', 'supplier_order', 'supplier_invoice',
'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
)
)) {

2
htdocs/expensereport/class/expensereport.class.php
View File

@ -1556,7 +1556,7 @@ class ExpenseReport extends CommonObject
if ($short) return $url;
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowExpenseReport").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ExpenseReport").'</u>';
if (!empty($this->ref))
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
if (!empty($this->total_ht))

3
htdocs/livraison/class/livraison.class.php
View File

@ -718,7 +718,8 @@ class Livraison extends CommonObject
$result = '';
$picto = 'sending';
$label = $langs->trans("ShowReceiving").': '.$this->ref;
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowReceiving").'</u>:<br>';
$label .= '<b>'.$langs->trans("Status").'</b>: '.$this->ref;
$url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;

3
htdocs/opensurvey/class/opensurveysondage.class.php
View File

@ -418,9 +418,8 @@ class Opensurveysondage extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
$companylink = '';
$label = '<u>'.$langs->trans("ShowSurvey").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowSurvey").'</u>';
$label .= '<br>';
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
$label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';

2
htdocs/projet/class/project.class.php
View File

@ -1021,7 +1021,7 @@ class Project extends CommonObject
}
$label = '';
if ($option != 'nolink') $label = '<u>'.$langs->trans("Project").'</u>';
if ($option != 'nolink') $label = img_picto('', $this->picto).' <u>'.$langs->trans("Project").'</u>';
$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
if (isset($this->public)) {

2
htdocs/projet/class/task.class.php
View File

@ -648,7 +648,7 @@ class Task extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
$label = '<u>'.$langs->trans("ShowTask").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowTask").'</u>';
if (!empty($this->ref))
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
if (!empty($this->label))

2
htdocs/reception/class/reception.class.php
View File

@ -1071,7 +1071,7 @@ class Reception extends CommonObject
{
global $conf, $langs;
$result = '';
$label = '<u>'.$langs->trans("Reception").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("Reception").'</u>';
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);

2
htdocs/recruitment/class/recruitmentcandidature.class.php
View File

@ -710,7 +710,7 @@ class RecruitmentCandidature extends CommonObject
$result = '';
$label = '<u>'.$langs->trans("RecruitmentCandidature").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("RecruitmentCandidature").'</u>';
$label .= '<br>';
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;

2
htdocs/recruitment/class/recruitmentjobposition.class.php
View File

@ -798,7 +798,7 @@ class RecruitmentJobPosition extends CommonObject
$result = '';
$label = '<u>'.$langs->trans("PositionToBeFilled").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("PositionToBeFilled").'</u>';
$label .= '<br>';
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;

2
htdocs/resource/class/dolresource.class.php
View File

@ -922,7 +922,7 @@ class Dolresource extends CommonObject
global $conf, $langs;
$result = '';
$label = '<u>'.$langs->trans("ShowResource").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowResource").'</u>';
$label .= '<br>';
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
/*if (isset($this->status)) {

2
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -2468,7 +2468,7 @@ class SupplierProposal extends CommonObject
$url = '';
$result = '';
$label = '<u>'.$langs->trans("SupplierProposal").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("SupplierProposal").'</u>';
if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
if (!empty($this->ref_fourn)) $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
if (!empty($this->total_ht)) $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);

3
htdocs/ticket/class/ticket.class.php
View File

@ -1268,9 +1268,8 @@ class Ticket extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
$companylink = '';
$label = '<u>'.$langs->trans("Ticket").'</u>';
$label = img_picto('', $this->picto).' <u>'.$langs->trans("Ticket").'</u>';
$label .= '<br>';
$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
$label .= '<b>'.$langs->trans('TicketTrackId').':</b> '.$this->track_id.'<br>';

2
htdocs/user/class/user.class.php
View File

@ -2244,7 +2244,7 @@ class User extends CommonObject
// Info Login
$label .= '<div class="centpercent">';
$label .= '<u>'.$langs->trans("User").'</u><br>';
$label .= img_picto('', $this->picto).' <u>'.$langs->trans("User").'</u><br>';
$label .= '<b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs, '');
if (!empty($this->login)) $label .= '<br><b>'.$langs->trans('Login').':</b> '.$this->login;
if (!empty($this->job)) $label .= '<br><b>'.$langs->trans("Job").':</b> '.$this->job;

8
test/phpunit/FilesLibTest.php
View File

@ -365,13 +365,10 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertTrue($result, 'move with forced mask');
$conf->global->MAIN_ENABLE_LOG_TO_HTML=1; $conf->syslog->enabled=1; $_REQUEST['logtohtml']=1;
$conf->logbuffer=array();
// To test a delete that should success
$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv');
print __METHOD__." result delete=".var_export($result, true)."\n";
$this->assertTrue($result, 'delete file '.join("\n", $conf->logbuffer));
print __METHOD__." result=".$result."\n";
$this->assertTrue($result, 'delete file');
// Again to test there is error when deleting a non existing file with option disableglob
$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
@ -398,7 +395,6 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
* testDolCompressUnCompress
*
* @return void
* @depends testDolCopyMoveDelete
*/
public function testDolCompressUnCompress()
{