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

Merge pull request #5909 from aspangaro/5.0-p27

Browse Source 
Better presentation for user edit card
This commit is contained in:
Laurent Destailleur 2016-10-24 00:10:31 +02:00 committed by GitHub
commit 399d691340
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/user/card.php
View File

@ -1784,15 +1784,6 @@ else
dol_fiche_head($head, 'user', $title, 0, 'user');
$rowspan=22;
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
if (! empty($conf->societe->enabled)) $rowspan++;
if (! empty($conf->adherent->enabled)) $rowspan++;
if (! empty($conf->skype->enabled)) $rowspan++;
if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $rowspan = $rowspan+3;
if (! empty($conf->agenda->enabled)) $rowspan++;
if (! empty($conf->accounting->enabled)) $rowspan++;
print '<table width="100%" class="border">';
// Ref/ID
@ -1819,12 +1810,6 @@ else
print $object->lastname;
}
print '</td>';
// Photo
print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
print $form->showphoto('userphoto',$object,100,0,$caneditfield,'photowithmargin','small');
print '</td>';
print '</tr>';
// Firstname
@ -1841,6 +1826,14 @@ else
}
print '</td></tr>';
// Photo
print '<tr>';
print '<td>'.$langs->trans("Photo").'</td>';
print '<td valign="middle">';
print $form->showphoto('userphoto',$object,100,0,$caneditfield,'photowithmargin','small');
print '</td>';
print '</tr>';
// Employee
print '<tr>';
print '<td>'.fieldLabel('Employee','employee',0).'</td><td>';