lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-27 17:53:17 +02:00
parent c659379307
commit e495d0459e
3 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/admin/perms.php
View File

@ -128,9 +128,10 @@ print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>'; print '<td>'.$langs->trans("Module").'</td>';
print '<td class="center">&nbsp;</td>';
print '<td class="center">'.$langs->trans("Default").'</td>'; print '<td class="center">'.$langs->trans("Default").'</td>';
print '<td class="center">&nbsp;</td>';
print '<td>'.$langs->trans("Permissions").'</td>'; print '<td>'.$langs->trans("Permissions").'</td>';
if ($user->admin) print '<td class="right">'.$langs->trans("ID").'</td>';
print '</tr>'."\n"; print '</tr>'."\n";
//print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS; //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
@ -178,7 +179,6 @@ if ($result)
$found = false; $found = false;
foreach ($modules[$obj->module]->rights as $key => $val) 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)) if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
{ {
$found = true; $found = true;
@ -209,6 +209,8 @@ if ($result)
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
// Permission id
if ($user->admin) print '<td class="right"></td>';
print '</tr>'."\n"; print '</tr>'."\n";
} }
@ -223,15 +225,21 @@ if ($result)
// Tick // Tick
if ($obj->bydefault == 1) if ($obj->bydefault == 1)
{ {
print '<td>'; print '<td class="center">';
print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove">'.img_edit_remove().'</a>'; print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove">';
//print img_edit_remove();
print img_picto('', 'switch_on');
print '</a>';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print img_picto($langs->trans("Active"), 'tick'); //print img_picto($langs->trans("Active"), 'tick');
print '</td>'; print '</td>';
} else { } else {
print '<td>'; print '<td class="center">';
print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">'.img_edit_add().'</a>'; print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">';
//print img_edit_add();
print img_picto('', 'switch_off');
print '</a>';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print '&nbsp;'; print '&nbsp;';
@ -241,6 +249,9 @@ if ($result)
// Permission and tick // Permission and tick
print '<td>'.$perm_libelle.'</td>'; print '<td>'.$perm_libelle.'</td>';
// Permission id
if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
print '</tr>'."\n"; print '</tr>'."\n";
$i++; $i++;

21
htdocs/user/group/perms.php
View File

@ -302,8 +302,8 @@ if ($object->id > 0)
} }
print '<td colspan="2">&nbsp;</td>'; print '<td colspan="2">&nbsp;</td>';
// Module id // Permission id
if ($user->admin) print '<td class="right">'.$objMod->numero.'</td>'; if ($user->admin) print '<td class="right"></td>';
print '</tr>'; print '</tr>';
} }
@ -323,7 +323,10 @@ if ($object->id > 0)
// Own permission by group // Own permission by group
if ($caneditperms) if ($caneditperms)
{ {
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>'; print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
//print img_edit_remove($langs->trans("Remove"));
print img_picto($langs->trans("Remove"), 'switch_on');
print '</a></td>';
} }
print '<td class="center nowrap">'; print '<td class="center nowrap">';
print img_picto($langs->trans("Active"), 'tick'); print img_picto($langs->trans("Active"), 'tick');
@ -332,7 +335,10 @@ if ($object->id > 0)
// Do not own permission // Do not own permission
if ($caneditperms) if ($caneditperms)
{ {
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>'; print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
//print img_edit_add($langs->trans("Add"));
print img_picto($langs->trans("Add"), 'switch_off');
print '</a></td>';
} }
print '<td>&nbsp</td>'; print '<td>&nbsp</td>';
} }
@ -340,7 +346,10 @@ if ($object->id > 0)
// Do not own permission // Do not own permission
if ($caneditperms) if ($caneditperms)
{ {
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>'; print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
//print img_edit_add($langs->trans("Add"));
print img_picto($langs->trans("Add"), 'switch_off');
print '</a></td>';
} }
print '<td>&nbsp</td>'; print '<td>&nbsp</td>';
} }
@ -349,7 +358,7 @@ if ($object->id > 0)
print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>'; print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
// Permission id // Permission id
if ($user->admin) print '<td class="right">'.$obj->id.'</td>'; if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
print '</tr>'."\n"; print '</tr>'."\n";

21
htdocs/user/perms.php
View File

@ -366,8 +366,8 @@ if ($result)
} }
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
// Module Id // Permission id
print '<td class="right"></td>'; if ($user->admin) print '<td class="right"></td>';
print '</tr>'."\n"; print '</tr>'."\n";
} }
@ -394,7 +394,10 @@ if ($result)
{ {
if ($caneditperms) if ($caneditperms)
{ {
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>'; print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
//print img_edit_remove($langs->trans("Remove"));
print img_picto($langs->trans("Remove"), 'switch_on');
print '</a></td>';
} }
print '<td class="center nowrap">'; print '<td class="center nowrap">';
print img_picto($langs->trans("Active"), 'tick'); print img_picto($langs->trans("Active"), 'tick');
@ -416,7 +419,10 @@ if ($result)
// Do not own permission // Do not own permission
if ($caneditperms) if ($caneditperms)
{ {
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">'.img_edit_add($langs->trans("Add")).'</a></td>'; print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
//print img_edit_add($langs->trans("Add"));
print img_picto($langs->trans("Add"), 'switch_off');
print '</a></td>';
} }
print '<td>&nbsp</td>'; print '<td>&nbsp</td>';
} }
@ -424,7 +430,10 @@ if ($result)
// Do not own permission // Do not own permission
if ($caneditperms) if ($caneditperms)
{ {
print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">'.img_edit_add($langs->trans("Add")).'</a></td>'; print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
//print img_edit_add($langs->trans("Add"));
print img_picto($langs->trans("Add"), 'switch_off');
print '</a></td>';
} }
print '<td>&nbsp</td>'; print '<td>&nbsp</td>';
} }
@ -434,7 +443,7 @@ if ($result)
print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>'; print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
// Permission id // Permission id
if ($user->admin) print '<td class="right">'.$obj->id.'</td>'; if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
print '</tr>'."\n"; print '</tr>'."\n";