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

Look and feel v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-17 01:21:33 +02:00
parent b51465434c
commit ddd0848acc
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.form.class.php
View File

@ -8922,10 +8922,11 @@ class Form
$addgendertxt .= '<i class="fas fa-venus"></i>'; $addgendertxt .= '<i class="fas fa-venus"></i>';
break; break;
case 'other': case 'other':
$addgendertxt .= '<i class="fas fa-genderless"></i>'; $addgendertxt .= '<i class="fas fa-transgender"></i>';
break; break;
} }
} }
/* /*
$addadmin = ''; $addadmin = '';
if (property_exists($object, 'admin')) { if (property_exists($object, 'admin')) {
@ -9067,7 +9068,7 @@ class Form
$ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : ''); $ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
} }
} elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) { } elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) {
$ret .= dol_htmlentities($object->getFullName($langs)); $ret .= dol_htmlentities($object->getFullName($langs)).$addgendertxt;
} elseif (in_array($object->element, array('action', 'agenda'))) { } elseif (in_array($object->element, array('action', 'agenda'))) {
$ret .= $object->ref.'<br>'.$object->label; $ret .= $object->ref.'<br>'.$object->label;
} elseif (in_array($object->element, array('adherent_type'))) { } elseif (in_array($object->element, array('adherent_type'))) {

2
htdocs/theme/eldy/global.inc.php
View File

@ -901,7 +901,7 @@ div.urllink, div.urllink a {
color: #339 !important; color: #339 !important;
} }
i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before { i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender::before {
color: #888 !important; color: #888 !important;
opacity: 0.4; opacity: 0.4;
padding-<?php echo $left; ?>: 3px; padding-<?php echo $left; ?>: 3px;

2
htdocs/theme/md/style.css.php
View File

@ -1050,7 +1050,7 @@ div.urllink, div.urllink a {
.fa-info-circle { .fa-info-circle {
padding-<?php echo $left; ?>: 3px; padding-<?php echo $left; ?>: 3px;
} }
i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before { i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender::before {
color: #888 !important; color: #888 !important;
opacity: 0.4; opacity: 0.4;
padding-<?php echo $left; ?>: 3px; padding-<?php echo $left; ?>: 3px;

1
htdocs/user/class/user.class.php
View File

@ -80,6 +80,7 @@ class User extends CommonObject
* @var string gender * @var string gender
*/ */
public $gender; public $gender;
public $birth; public $birth;
/** /**

22
htdocs/user/list.php
View File

@ -661,7 +661,7 @@ if (!empty($arrayfields['u.firstname']['checked'])) {
print '<td class="liste_titre"><input type="text" name="search_firstname" class="maxwidth50" value="'.$search_firstname.'"></td>'; print '<td class="liste_titre"><input type="text" name="search_firstname" class="maxwidth50" value="'.$search_firstname.'"></td>';
} }
if (!empty($arrayfields['u.gender']['checked'])) { if (!empty($arrayfields['u.gender']['checked'])) {
print '<td class="liste_titre">'; print '<td class="liste_titre center">';
$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother")); $arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
print $form->selectarray('search_gender', $arraygender, $search_gender, 1); print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
print '</td>'; print '</td>';
@ -748,7 +748,7 @@ if (!empty($arrayfields['u.firstname']['checked'])) {
print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder);
} }
if (!empty($arrayfields['u.gender']['checked'])) { if (!empty($arrayfields['u.gender']['checked'])) {
print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder); print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder, 'center ');
} }
if (!empty($arrayfields['u.employee']['checked'])) { if (!empty($arrayfields['u.employee']['checked'])) {
print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder, 'center '); print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder, 'center ');
@ -891,9 +891,23 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
} }
} }
if (!empty($arrayfields['u.gender']['checked'])) { if (!empty($arrayfields['u.gender']['checked'])) {
print '<td>'; print '<td class="center">';
if ($obj->gender) { if ($obj->gender) {
print $langs->trans("Gender".$obj->gender); // Preparing gender's display if there is one
$addgendertxt = '';
switch ($obj->gender) {
case 'man':
$addgendertxt .= '<i class="fas fa-mars" title="'.dol_escape_htmltag($langs->trans("Gender".$obj->gender)).'"></i>';
break;
case 'woman':
$addgendertxt .= '<i class="fas fa-venus" title="'.dol_escape_htmltag($langs->trans("Gender".$obj->gender)).'"></i>';
break;
case 'other':
$addgendertxt .= '<i class="fas fa-transgender" title="'.dol_escape_htmltag($langs->trans("Gender".$obj->gender)).'"></i>';
break;
}
print $addgendertxt;
//print $langs->trans("Gender".$obj->gender);
} }
print '</td>'; print '</td>';
if (!$i) { if (!$i) {