From e495d0459eead69a61d953c16854728b4c618dde Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 27 Sep 2020 17:53:17 +0200 Subject: [PATCH] Look and feel v13 --- htdocs/admin/perms.php | 25 ++++++++++++++++++------- htdocs/user/group/perms.php | 21 +++++++++++++++------ htdocs/user/perms.php | 21 +++++++++++++++------ 3 files changed, 48 insertions(+), 19 deletions(-) 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 ''; print ''; print ''; -print ''; print ''; +print ''; print ''; +if ($user->admin) print ''; print ''."\n"; //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS; @@ -178,7 +179,6 @@ if ($result) $found = false; foreach ($modules[$obj->module]->rights as $key => $val) { - $rights_class = $objMod->rights_class; if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms)) { $found = true; @@ -209,6 +209,8 @@ if ($result) print ''; print ''; print ''; + // Permission id + if ($user->admin) print ''; print ''."\n"; } @@ -223,15 +225,21 @@ if ($result) // Tick if ($obj->bydefault == 1) { - print ''; print ''; } else { - print ''; print ''; + // Permission id + if ($user->admin) print ''; + 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 ''; + // Permission id + if ($user->admin) print ''; print ''; } @@ -323,7 +323,10 @@ if ($object->id > 0) // Own permission by group if ($caneditperms) { - print ''; + print ''; } print ''; + print ''; } print ''; } @@ -340,7 +346,10 @@ if ($object->id > 0) // Do not own permission if ($caneditperms) { - print ''; + print ''; } print ''; } @@ -349,7 +358,7 @@ if ($object->id > 0) print ''; // Permission id - if ($user->admin) print ''; + if ($user->admin) print ''; 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 ''; + print ''; } print ''; + print ''; } print ''; } @@ -424,7 +430,10 @@ if ($result) // Do not own permission if ($caneditperms) { - print ''; + print ''; } print ''; } @@ -434,7 +443,7 @@ if ($result) print ''; // Permission id - if ($user->admin) print ''; + if ($user->admin) print ''; print ''."\n";
'.$langs->trans("Module").' '.$langs->trans("Default").' '.$langs->trans("Permissions").''.$langs->trans("ID").'
   
'; - print ''.img_edit_remove().''; + print ''; + print ''; + //print img_edit_remove(); + print img_picto('', 'switch_on'); + print ''; print ''; - print img_picto($langs->trans("Active"), 'tick'); + //print img_picto($langs->trans("Active"), 'tick'); print ''; - print ''.img_edit_add().''; + print ''; + print ''; + //print img_edit_add(); + print img_picto('', 'switch_off'); + print ''; print ''; print ' '; @@ -241,6 +249,9 @@ if ($result) // Permission and tick print ''.$perm_libelle.''.$obj->id.'
 '.$objMod->numero.'
id.'">'.img_edit_remove($langs->trans("Remove")).'id.'">'; + //print img_edit_remove($langs->trans("Remove")); + print img_picto($langs->trans("Remove"), 'switch_on'); + print ''; print img_picto($langs->trans("Active"), 'tick'); @@ -332,7 +335,10 @@ if ($object->id > 0) // Do not own permission if ($caneditperms) { - print 'id.'">'.img_edit_add($langs->trans("Add")).'id.'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' id.'">'.img_edit_add($langs->trans("Add")).'id.'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' '.$permlabel.''.$obj->id.''.$obj->id.'
 
id.'&confirm=yes&token='.newToken().'">'.img_edit_remove($langs->trans("Remove")).'id.'&confirm=yes&token='.newToken().'">'; + //print img_edit_remove($langs->trans("Remove")); + print img_picto($langs->trans("Remove"), 'switch_on'); + print ''; print img_picto($langs->trans("Active"), 'tick'); @@ -416,7 +419,10 @@ if ($result) // Do not own permission if ($caneditperms) { - print 'id.'&confirm=yes&token='.newToken().'">'.img_edit_add($langs->trans("Add")).'id.'&confirm=yes&token='.newToken().'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' id.'&confirm=yes&token='.newToken().'">'.img_edit_add($langs->trans("Add")).'id.'&confirm=yes&token='.newToken().'">'; + //print img_edit_add($langs->trans("Add")); + print img_picto($langs->trans("Add"), 'switch_off'); + print ' '.$permlabel.''.$obj->id.''.$obj->id.'