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

Look and feel v6

Browse Source
This commit is contained in:
Laurent Destailleur 2017-07-13 14:43:41 +02:00
parent 85d9a2f790
commit ae7797ebf2
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/user/group/card.php
View File

@ -325,14 +325,17 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Name // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>'; if (! empty($conf->mutlicompany->enabled))
print '<td class="valeur">'.$object->name; {
if (empty($object->entity)) print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
{ print '<td class="valeur">'.$object->name;
print img_picto($langs->trans("GlobalGroup"),'redstar'); if (empty($object->entity))
} {
print "</td></tr>\n"; print img_picto($langs->trans("GlobalGroup"),'redstar');
}
print "</td></tr>\n";
}
// Multicompany // Multicompany
if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) if (! empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity)

22
htdocs/user/group/ldap.php
View File

@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
$langs->load("companies"); $langs->load("companies");
$langs->load("ldap"); $langs->load("ldap");
$langs->load("users"); $langs->load("users");
$langs->load("admin");
// Users/Groups management only in master entity if transverse mode // Users/Groups management only in master entity if transverse mode
if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
@ -110,22 +111,23 @@ print '<div class="underbanner clearboth"></div>';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Name // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>'; if (! empty($conf->mutlicompany->enabled))
print '<td class="valeur">'.$object->name;
if (!$object->entity)
{ {
print img_picto($langs->trans("GlobalGroup"),'redstar'); print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
print '<td class="valeur">'.$object->name;
if (!$object->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
}
print "</td></tr>\n";
} }
print "</td></tr>\n";
// Note // Note
print '<tr><td width="25%" class="tdtop">'.$langs->trans("Note").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
print '<td class="valeur">'.nl2br($object->note).'&nbsp;</td>'; print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'</td>';
print "</tr>\n"; print "</tr>\n";
$langs->load("admin");
// LDAP DN // LDAP DN
print '<tr><td>LDAP '.$langs->trans("LDAPGroupDn").'</td><td class="valeur">'.$conf->global->LDAP_GROUP_DN."</td></tr>\n"; print '<tr><td>LDAP '.$langs->trans("LDAPGroupDn").'</td><td class="valeur">'.$conf->global->LDAP_GROUP_DN."</td></tr>\n";

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

@ -205,14 +205,17 @@ if ($object->id)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Nom // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>'; if (! empty($conf->mutlicompany->enabled))
print '<td colspan="2">'.$object->name.'';
if (! $object->entity)
{ {
print img_picto($langs->trans("GlobalGroup"),'redstar'); print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
print '<td colspan="2">'.$object->name.'';
if (! $object->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
}
print "</td></tr>\n";
} }
print "</td></tr>\n";
// Note // Note
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';