diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 0662a571cc9..cd9d290b828 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -128,9 +128,10 @@ print '
| '.$langs->trans("Module").' | '; -print ''; print ' | '.$langs->trans("Default").' | '; +print ''; print ' | '.$langs->trans("Permissions").' | '; +if ($user->admin) print ''.$langs->trans("ID").' | '; print ''; print ' | '; print ' | '; + // Permission id + if ($user->admin) print ' | '; print ''."\n"; } @@ -223,15 +225,21 @@ if ($result) // Tick if ($obj->bydefault == 1) { - print ' | '; - print ''.img_edit_remove().''; + print ' | '; + print ''; + //print img_edit_remove(); + print img_picto('', 'switch_on'); + print ''; print ' | '; print ''; - print img_picto($langs->trans("Active"), 'tick'); + //print img_picto($langs->trans("Active"), 'tick'); print ' | '; } else { - print ''; - print ''.img_edit_add().''; + print ' | '; + print ''; + //print img_edit_add(); + print img_picto('', 'switch_off'); + print ''; print ' | '; print ''; print ' '; @@ -241,6 +249,9 @@ if ($result) // Permission and tick print ' | '.$perm_libelle.' | '; + // Permission id + if ($user->admin) print ''.$obj->id.' | '; + print ''."\n"; $i++; diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index af81542d99a..82e268a6300 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -302,8 +302,8 @@ if ($object->id > 0) } print ''; - // Module id - if ($user->admin) print ' | '.$objMod->numero.' | '; + // Permission id + if ($user->admin) print ''; print ''; } @@ -323,7 +323,10 @@ if ($object->id > 0) // Own permission by group if ($caneditperms) { - print ' | id.'&action=delrights&entity='.$entity.'&rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).' | '; + print 'id.'&action=delrights&entity='.$entity.'&rights='.$obj->id.'">'; + //print img_edit_remove($langs->trans("Remove")); + print img_picto($langs->trans("Remove"), 'switch_on'); + print ' | '; } print ''; print img_picto($langs->trans("Active"), 'tick'); @@ -332,7 +335,10 @@ if ($object->id > 0) // Do not own permission if ($caneditperms) { - print ' | id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).' | '; + print 'id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' | '; } print '  | '; } @@ -340,7 +346,10 @@ if ($object->id > 0) // Do not own permission if ($caneditperms) { - print 'id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).' | '; + print 'id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' | '; } print '  | '; } @@ -349,7 +358,7 @@ if ($object->id > 0) print ''.$permlabel.' | '; // Permission id - if ($user->admin) print ''.$obj->id.' | '; + if ($user->admin) print ''.$obj->id.' | '; print ''."\n"; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 97cf6007327..7672a3d8dbb 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -366,8 +366,8 @@ if ($result) } print ''; - // Module Id - print ' | '; + // Permission id + if ($user->admin) print ' | '; print ''."\n"; } @@ -394,7 +394,10 @@ if ($result) { if ($caneditperms) { - print ' | id.'&action=delrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">'.img_edit_remove($langs->trans("Remove")).' | '; + print 'id.'&action=delrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">'; + //print img_edit_remove($langs->trans("Remove")); + print img_picto($langs->trans("Remove"), 'switch_on'); + print ' | '; } print ''; print img_picto($langs->trans("Active"), 'tick'); @@ -416,7 +419,10 @@ if ($result) // Do not own permission if ($caneditperms) { - print ' | id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">'.img_edit_add($langs->trans("Add")).' | '; + print 'id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' | '; } print '  | '; } @@ -424,7 +430,10 @@ if ($result) // Do not own permission if ($caneditperms) { - print 'id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">'.img_edit_add($langs->trans("Add")).' | '; + print 'id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' | '; } print '  | '; } @@ -434,7 +443,7 @@ if ($result) print ''.$permlabel.' | '; // Permission id - if ($user->admin) print ''.$obj->id.' | '; + if ($user->admin) print ''.$obj->id.' | '; print ''."\n";