diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 6092a95d0b9fd07f75e993a759dea89c2ca8dd65..892e0860cbd553e0893693515b074b8a87569d5b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -86,7 +86,7 @@ print '<input type="hidden" name="action" value="save">';
$head=security_prepare_head();
-dol_fiche_head($head, 'audit', $langs->trans("Security"));
+dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
$var=true;
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 4302222630ceee6471aa3eff21a9f72b40c4ae6e..84cb9ed8bf21da5d1814aed3f96a932bcfb5d1f3 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -118,7 +118,7 @@ $db->commit();
$head=security_prepare_head();
-dol_fiche_head($head, 'default', $langs->trans("Security"));
+dol_fiche_head($head, 'default', $langs->trans("Security"), -1);
// Show warning about external users
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 1f6e45223b48b14cc894cfd14c0dbe02f39a0cea..848364074990cab7d270daeb42bdf7d8ff08d9d1 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -96,7 +96,7 @@ print '<input type="hidden" name="action" value="set_proxy">';
$head=security_prepare_head();
-dol_fiche_head($head, 'proxy', $langs->trans("Security"));
+dol_fiche_head($head, 'proxy', $langs->trans("Security"), -1);
if ($conf->use_javascript_ajax)
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 97cae20377c6c32bc1d4ca406a84e343a85ee569..3aa0bdf33bf9b4ce82471be787affc0e78b326a7 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -198,7 +198,7 @@ print "<br>\n";
$head=security_prepare_head();
-dol_fiche_head($head, 'passwords', $langs->trans("Security"));
+dol_fiche_head($head, 'passwords', $langs->trans("Security"), -1);
$var=false;
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index f7a776c7249126cf4ba4d185b356a078b6427c6c..0114bbb74b80347c9133e02b6477a6d150cc4439 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -124,7 +124,7 @@ print '<input type="hidden" name="action" value="updateform">';
$head=security_prepare_head();
-dol_fiche_head($head, 'file', $langs->trans("Security"));
+dol_fiche_head($head, 'file', $langs->trans("Security"), -1);
// Upload options
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index ac0a1e883eb465c0209be20da36c97e8b704f53d..9ce79359a7c3953d8a81de45902b76fde67b02e2 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -103,7 +103,7 @@ print '<input type="hidden" name="action" value="updateform">';
$head=security_prepare_head();
-dol_fiche_head($head, 'misc', $langs->trans("Security"));
+dol_fiche_head($head, 'misc', $langs->trans("Security"), -1);
// Other Options
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 7d07f7ead9425ff0794fd0bc52eb503a08af5bb7..4dbfc53c821ed3a1524472b26bfe306bd45d1491 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -181,7 +181,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
$head=translation_prepare_head();
-dol_fiche_head($head, $mode, '', 0, '');
+dol_fiche_head($head, $mode, '', -1, '');
if ($mode == 'overwrite')
{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1366435f1448fe7e6da3eaa82b8ebdffc112c9f8..1256732999ac7dbe044ca4efbf075250a70f8167 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5998,7 +5998,7 @@ class Form
if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
}
- $ret.='<img alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
+ $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
if ($addlinktofullsize) $ret.='</a>';
}
else if ($altfile && file_exists($dir."/".$altfile))
@@ -6009,7 +6009,7 @@ class Form
if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
}
- $ret.='<img alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
+ $ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="'.$cssclass.'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
if ($addlinktofullsize) $ret.='</a>';
}
else
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3851a173c242bc12813d132889878a3ce5b2760d..4ca49934bcd8d94bb8e45960f42d08d0efd2fbc4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2378,7 +2378,7 @@ function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $
if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB
$title=$tmparray[0];
$alt=empty($tmparray[1])?'':$tmparray[1];
- return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($morealt?' '.$morealt:'').'>'; // Alt is used for accessibility, title for popup
+ return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($morealt?' '.$morealt:'').'>'; // Alt is used for accessibility, title for popup
}
}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 6583ad09b61a2cb8c1a0422ad6687b46eda213fd..bd520676f756434012961b3da8f8ab27305a7845 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -828,7 +828,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
// Date start
print '<tr>';
- print '<td class="fieldrequired">'.$langs->trans("DateDebCP").' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+ print '<td class="fieldrequired">';
+ print $langs->trans("DateDebCP");
+ print ' ('.$langs->trans("FirstDayOfHoliday").')';
+ print '</td>';
print '<td>';
// Si la demande ne vient pas de l'agenda
if (! GETPOST('date_debut_')) {
@@ -844,7 +847,10 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
// Date end
print '<tr>';
- print '<td class="fieldrequired">'.$langs->trans("DateFinCP").' ('.$langs->trans("LastDayOfHoliday").')</td>';
+ print '<td class="fieldrequired">';
+ print $langs->trans("DateFinCP");
+ print ' ('.$langs->trans("LastDayOfHoliday").')';
+ print '</td>';
print '<td>';
// 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 3d6e8868bece0ba7cf6570a555eb060834b765fb..6f8e7293efba81a31d1895a307d4aa40187302dd 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-<?php print $left; ?>: 4px;
+}
+.paddingright {
+ padding-<?php print $right; ?>: 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(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
background-repeat: no-repeat;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index aae0fd7f6772e1dd7b995a25ca39f4700a275e77..46d410e61cbbb99cf2c269773b4b5210b5a669a1 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-<?php print $left; ?>: 4px;
+}
+.paddingright {
+ padding-<?php print $right; ?>: 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(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
background-repeat: no-repeat;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c107c1587ae51ffe6246e2c27599ef4d50e9c0b4..4b9c1c9960c9ba98ce6449fe0b43080bb1320402 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 = '';
-
- $label = '<u>' . $langs->trans("User") . '</u>';
- $label.= '<div width="100%">';
- $label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
- if (! empty($this->login))
- $label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
- $label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
- if (! empty($this->admin))
- $label.= '<br><b>' . $langs->trans("Administrator").'</b>: '.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.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
- $label.='</div>';
- if (! empty($this->photo))
- {
- $label.= '<div class="photointooltip">';
+ $result = '';
+ $companylink = '';
+ $link = '';
+
+ $label = '<u>' . $langs->trans("User") . '</u>';
+ $label.= '<div width="100%">';
+ $label.= '<b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs,'','');
+ if (! empty($this->login))
+ $label.= '<br><b>' . $langs->trans('Login') . ':</b> ' . $this->login;
+ $label.= '<br><b>' . $langs->trans("EMail").':</b> '.$this->email;
+ if (! empty($this->admin))
+ $label.= '<br><b>' . $langs->trans("Administrator").'</b>: '.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.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
+ $label.='</div>';
+ if (! empty($this->photo))
+ {
+ $label.= '<div class="photointooltip">';
$label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
- $label.= '</div><div style="clear: both;"></div>';
- }
+ $label.= '</div><div style="clear: both;"></div>';
+ }
- // Info Login
- if ($infologin)
- {
- $label.= '<br>';
- $label.= '<br><u>'.$langs->trans("Connection").'</u>';
- $label.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
- if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
- $label.= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
- $label.= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($this->datelastlogin,"dayhour",'tzuser');
- $label.= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($this->datepreviouslogin,"dayhour",'tzuser');
- $label.= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
- $label.= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
- $s=picto_from_langcode($langs->getDefaultLang());
- $label.= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($s?$s.' ':'').$langs->getDefaultLang();
- $label.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
- $label.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
- $label.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
- if (! empty($conf->browser->phone)) $label.= '<br><b>'.$langs->trans("Phone").':</b> '.$conf->browser->phone;
- if (! empty($_SESSION["disablemodules"])) $label.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
- }
+ // Info Login
+ if ($infologin)
+ {
+ $label.= '<br>';
+ $label.= '<br><u>'.$langs->trans("Connection").'</u>';
+ $label.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
+ if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
+ $label.= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
+ $label.= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($this->datelastlogin,"dayhour",'tzuser');
+ $label.= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($this->datepreviouslogin,"dayhour",'tzuser');
+ $label.= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
+ $label.= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+ $s=picto_from_langcode($langs->getDefaultLang());
+ $label.= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($s?$s.' ':'').$langs->getDefaultLang();
+ $label.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
+ $label.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
+ $label.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+ if (! empty($conf->browser->phone)) $label.= '<br><b>'.$langs->trans("Phone").':</b> '.$conf->browser->phone;
+ if (! empty($_SESSION["disablemodules"])) $label.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ',explode(',',$_SESSION["disablemodules"]));
+ }
- if ($option == 'leave') $link.= '<a href="'.DOL_URL_ROOT.'/holiday/list.php?id='.$this->id.'"';
- else $link.= '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
+ if ($option == 'leave') $link.= '<a href="'.DOL_URL_ROOT.'/holiday/list.php?id='.$this->id.'"';
+ else $link.= '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'"';
- $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:'').'"';
- }
+ $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='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
- else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 'mini', 0, 1).'</div>';
- $result.=$picto;
+ // Only picto
+ if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+ // Picto must be a photo
+ else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto', 'mini', 0, 1).'</div>';
+ $result.=$picto;
}
if (abs($withpictoimg) != 2)
{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index bb558bd56b3d72a3fe17019fc8162ca96a33a6db..888d4ca531744c8caad360696ef48b0e4d0670fd 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -146,8 +146,7 @@ $param="search_statut=".$search_statut;
print '<table class="liste nohover" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("HierarchicView"));
-print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
-print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
+print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div>',$_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 '</tr>';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index a5e9db678678c2d08ea9daf7160cdddd073bbbda..29ef7dac06177b7371b5df9abe01fdb9a71170c8 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -62,22 +62,21 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
// Search User
-$var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("User").':</td><td><input class="flat inputsearch" type="text" name="search_user" size="18"></td><td'.($canreadperms?' rowspan="2"':'').'><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Search").'</td></tr>';
+print '<tr><td>';
+print $langs->trans("User").':</td><td><input class="flat inputsearch" type="text" name="search_user" size="18"></td></tr>';
// Search Group
if ($canreadperms)
{
- $var=false;
- print '<tr '.$bc[$var].'><td>';
+ print '<tr><td>';
print $langs->trans("Group").':</td><td><input class="flat inputsearch" type="text" name="search_group" size="18"></td></tr>';
}
+print '<tr><td class="center" colspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</table><br>\n";
print '</form>';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 623e2df34340b3f89bdc2cc84ae5713013541231..60defe580a7e0f60ce642f3315a6d644a65609e5 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -461,12 +461,10 @@ print "</tr>\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 "<tr ".$bc[$var].">";
+ print "<tr>";
if (! empty($arrayfields['u.login']['checked']))
{
print '<td>';
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 '</td>';
}
@@ -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 '</td>';