diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 02cc6112237..eebc1fc46ea 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -33,6 +33,7 @@ $langs->load("users"); $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"]; + /** * Action ajout */ @@ -170,7 +171,7 @@ else $uss = array(); - // On sélectionne les user qui ne sont pas déjà dans le groupe + // On sélectionne les users qui ne sont pas déjà dans le groupe $sql = "SELECT u.rowid, u.name, u.firstname, u.code "; $sql .= " FROM ".MAIN_DB_PREFIX."user as u "; $sql .= " LEFT JOIN llx_usergroup_user ug ON u.rowid = ug.fk_user"; @@ -201,7 +202,7 @@ else print '
'."\n"; print ''; print ''."\n"; - print ''."\n"; + print ''."\n"; print '
'.$langs->trans("Users").'
'.$langs->trans("NonAffectedUsers").''; print $form->select_array("user",$uss); print ''; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 26bbbcd4709..bbda8933d38 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -73,7 +73,7 @@ if ($result) print ""; print ''; - print_liste_field_titre($langs->trans("LastName"),"index.php","g.nom","","","",$sortfield); + print_liste_field_titre($langs->trans("Group"),"index.php","g.nom","","","",$sortfield); print_liste_field_titre($langs->trans("DateCreation"),"index.php","g.datec","","","",$sortfield); print "\n"; $var=True; @@ -83,7 +83,7 @@ if ($result) $var=!$var; print ""; - print ''; + print ''; print ''; print "\n"; $i++; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 6fad807f7a5..0e42d19e768 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -95,7 +95,7 @@ if ( $db->query($sql) ) $var=!$var; print ""; - print ""; print ""; print ''; @@ -135,7 +135,7 @@ if ( $db->query($sql) ) $var=!$var; print ""; - print ""; print ""; print ''; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 97352ceef9a..780db6d5197 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -75,11 +75,11 @@ if ($result) print ''; if ($obj->login) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; print '';
'.img_file().' '.$obj->nom.''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''.dolibarr_print_date($obj->datec,"%d %b %Y").'
rowid\">".img_file()." "; + print "rowid\">".img_object($langs->trans("ShowGroup"),"group")." "; print "rowid\">$obj->nom".dolibarr_print_date($obj->datec,"%d %b %Y")."
rowid\">".img_file()." "; + print "rowid\">".img_object($langs->trans("ShowUser"),"user")." "; print "rowid\">$obj->firstname $obj->name".strftime("%d %b %Y",$obj->datec)."
'.ucfirst($obj->firstname).''.img_file().' '.$obj->login.''.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''.img_file().' Inactif'.img_object($langs->trans("ShowUser"),"user").' Inactif'.$obj->code.''.dolibarr_print_date($obj->datec,"%d %b %Y").'