';
- print '| '.$langs->trans("DateFinCP").' ('.$langs->trans("LastDayOfHoliday").') | ';
+ print '';
+ print $langs->trans("DateFinCP");
+ print ' ('.$langs->trans("LastDayOfHoliday").')';
+ print ' | ';
print '';
// Si la demande ne vient pas de l'agenda
if (! GETPOST('date_fin_')) {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3d6e8868bec..6f8e7293efb 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -519,6 +519,12 @@ textarea.centpercent {
.nounderline {
text-decoration: none;
}
+.paddingleft {
+ padding-: 4px;
+}
+.paddingright {
+ padding-: 4px;
+}
.cursorpointer {
cursor: pointer;
}
@@ -1090,7 +1096,8 @@ img.photorefnoborder {
height: 48px;
width: 48px;
object-fit: contain;
- border: 1px solid #CCC;
+ border: 1px solid #AAA;
+ border-radius: 100px;
}
.underrefbanner {
}
@@ -1615,11 +1622,16 @@ img.login, img.printer, img.entity {
color: white;
font-weight: bold;
}
-img.loginphoto {
- border-radius: 2px;
+.userimgatoplogin img.userphoto { /* size for user photo in login bar */
width: 16px;
height: 16px;
}
+img.userphoto { /* size for user photo in lists */
+ border-radius: 2px;
+ width: 18px;
+ height: 18px;
+ vertical-align: middle;
+}
.span-icon-user {
background-image: url();
background-repeat: no-repeat;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index aae0fd7f677..46d410e61cb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -526,6 +526,12 @@ textarea.centpercent {
.nounderline {
text-decoration: none;
}
+.paddingleft {
+ padding-: 4px;
+}
+.paddingright {
+ padding-: 4px;
+}
.cursorpointer {
cursor: pointer;
}
@@ -1141,7 +1147,8 @@ img.photorefnoborder {
height: 48px;
width: 48px;
object-fit: contain;
- border: 1px solid #CCC;
+ border: 1px solid #AAA;
+ border-radius: 100px;
}
.underrefbanner {
}
@@ -1654,13 +1661,17 @@ img.login, img.printer, img.entity {
color: white;
font-weight: bold;
}
-img.loginphoto {
+.userimgatoplogin img.userphoto { /* size for user photo in login bar */
border-radius: 5px;
- margin-top: -4px;
- width: 20px;
- height: 20px;
+ width: 16px;
+ height: 16px;
+ vertical-align: text-bottom;
+}
+img.userphoto { /* size for user photo in lists */
+ width: 18px;
+ height: 18px;
+ vertical-align: middle;
}
-
.span-icon-user {
background-image: url();
background-repeat: no-repeat;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c107c1587ae..4b9c1c9960c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1981,77 +1981,77 @@ class User extends CommonObject
function getNomUrl($withpictoimg=0, $option='', $infologin=0, $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='')
{
global $langs, $conf, $db, $hookmanager;
- global $dolibarr_main_authentication, $dolibarr_main_demo;
- global $menumanager;
+ global $dolibarr_main_authentication, $dolibarr_main_demo;
+ global $menumanager;
if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
- $result = '';
- $companylink = '';
- $link = '';
+ $result = '';
+ $companylink = '';
+ $link = '';
- $label = '' . $langs->trans("User") . '';
- $label.= ' ';
- $label.= '' . $langs->trans('Name') . ': ' . $this->getFullName($langs,'','');
- if (! empty($this->login))
- $label.= '
' . $langs->trans('Login') . ': ' . $this->login;
- $label.= '
' . $langs->trans("EMail").': '.$this->email;
- if (! empty($this->admin))
- $label.= '
' . $langs->trans("Administrator").': '.yn($this->admin);
- if (! empty($this->societe_id) ) // Add thirdparty for external users
- {
- $thirdpartystatic = new Societe($db);
- $thirdpartystatic->fetch($this->societe_id);
- if (empty($hidethirdpartylogo)) $companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
- $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
- }
- $type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
- $label.= '
' . $langs->trans("Type") . ': ' . $type;
- $label.=' ';
- if (! empty($this->photo))
- {
- $label.= '';
+ }
- // Info Login
- if ($infologin)
- {
- $label.= '
';
- $label.= '
'.$langs->trans("Connection").'';
- $label.= '
'.$langs->trans("IPAddress").': '.$_SERVER["REMOTE_ADDR"];
- if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$this->entity.')';
- $label.= '
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
- $label.= '
'.$langs->trans("ConnectedSince").': '.dol_print_date($this->datelastlogin,"dayhour",'tzuser');
- $label.= '
'.$langs->trans("PreviousConnexion").': '.dol_print_date($this->datepreviouslogin,"dayhour",'tzuser');
- $label.= '
'.$langs->trans("CurrentTheme").': '.$conf->theme;
- $label.= '
'.$langs->trans("CurrentMenuManager").': '.$menumanager->name;
- $s=picto_from_langcode($langs->getDefaultLang());
- $label.= '
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang();
- $label.= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
- $label.= '
'.$langs->trans("Layout").': '.$conf->browser->layout;
- $label.= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
- if (! empty($conf->browser->phone)) $label.= '
'.$langs->trans("Phone").': '.$conf->browser->phone;
- if (! empty($_SESSION["disablemodules"])) $label.= '
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"]));
- }
+ // Info Login
+ if ($infologin)
+ {
+ $label.= '
';
+ $label.= '
'.$langs->trans("Connection").'';
+ $label.= '
'.$langs->trans("IPAddress").': '.$_SERVER["REMOTE_ADDR"];
+ if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$this->entity.')';
+ $label.= '
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
+ $label.= '
'.$langs->trans("ConnectedSince").': '.dol_print_date($this->datelastlogin,"dayhour",'tzuser');
+ $label.= '
'.$langs->trans("PreviousConnexion").': '.dol_print_date($this->datepreviouslogin,"dayhour",'tzuser');
+ $label.= '
'.$langs->trans("CurrentTheme").': '.$conf->theme;
+ $label.= '
'.$langs->trans("CurrentMenuManager").': '.$menumanager->name;
+ $s=picto_from_langcode($langs->getDefaultLang());
+ $label.= '
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang();
+ $label.= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
+ $label.= '
'.$langs->trans("Layout").': '.$conf->browser->layout;
+ $label.= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+ if (! empty($conf->browser->phone)) $label.= '
'.$langs->trans("Phone").': '.$conf->browser->phone;
+ if (! empty($_SESSION["disablemodules"])) $label.= '
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"]));
+ }
- if ($option == 'leave') $link.= 'global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
- $langs->load("users");
- $label=$langs->trans("ShowUser");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
- }
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
- }
+ $linkclose="";
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $langs->load("users");
+ $label=$langs->trans("ShowUser");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+ }
if (! is_object($hookmanager))
{
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -2071,9 +2071,11 @@ class User extends CommonObject
{
$paddafterimage='';
if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
- if ($withpictoimg > 0) $picto=''.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).' ';
- else $picto=''.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 'mini', 0, 1).' ';
- $result.=$picto;
+ // Only picto
+ if ($withpictoimg > 0) $picto=''.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).' ';
+ // Picto must be a photo
+ else $picto=''.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto', 'mini', 0, 1).' ';
+ $result.=$picto;
}
if (abs($withpictoimg) != 2)
{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index bb558bd56b3..888d4ca5317 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -146,8 +146,7 @@ $param="search_statut=".$search_statut;
print '';
print '';
print_liste_field_titre($langs->trans("HierarchicView"));
-print ' | ';
+print_liste_field_titre('',$_SERVER['PHP_SELF'],"",'',"",'align="center"');
print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"",'',"",'align="right"');
print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','','','','maxwidthsearch ');
print ' ';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index a5e9db67867..29ef7dac061 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -62,22 +62,21 @@ print '';
// Search User
-$var=false;
print ' ';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 623e2df3434..60defe580a7 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -461,12 +461,10 @@ print "\n";
$user2=new User($db);
-$var=True;
$i = 0;
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($result);
- $var=!$var;
$userstatic->id=$obj->rowid;
$userstatic->ref=$obj->label;
@@ -482,18 +480,18 @@ while ($i < min($num,$limit))
$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
- print " ";
+ print " ";
if (! empty($arrayfields['u.login']['checked']))
{
print '| ';
print $li;
if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
{
- print img_picto($langs->trans("SuperAdministrator"),'redstar');
+ print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
}
else if ($obj->admin)
{
- print img_picto($langs->trans("Administrator"),'star');
+ print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
}
print ' | ';
}
@@ -584,11 +582,11 @@ while ($i < min($num,$limit))
print $user2->getNomUrl(-1,'',0,0,24,0,'');
if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
{
- print img_picto($langs->trans("SuperAdministrator"),'redstar');
+ print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
}
else if ($obj->admin2)
{
- print img_picto($langs->trans("Administrator"),'star');
+ print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
}
}
print '';
|