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

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-12 15:34:31 +01:00
parent 9f1051f95c
commit af5db0f5fa
6 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/translate.class.php
View File

@ -572,6 +572,7 @@ class Translate
}
$newstr = $key;
$reg = array();
if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg)) {
$newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg)) {
@ -734,6 +735,7 @@ class Translate
* @param string $str string root to translate
* @param string $countrycode country code (FR, ...)
* @return string translated string
* @see transcountrynoentities()
*/
public function transcountry($str, $countrycode)
{
@ -751,6 +753,7 @@ class Translate
* @param string $str string root to translate
* @param string $countrycode country code (FR, ...)
* @return string translated string
* @see transcountry()
*/
public function transcountrynoentities($str, $countrycode)
{

9
htdocs/core/lib/functions.lib.php
View File

@ -3447,7 +3447,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
'help', 'holiday',
'intervention', 'inventory', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
'info', 'intervention', 'inventory', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_asset', 'object_barcode', 'object_bill', 'object_billr', 'object_billa', 'object_billd', 'object_bom',
'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_clock', 'object_dolly', 'object_dollyrevert',
@ -3500,7 +3500,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
'email'=>'at',
'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
'generic'=>'file', 'holiday'=>'umbrella-beach', 'inventory'=>'boxes', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
'generic'=>'file', 'holiday'=>'umbrella-beach',
'info'=>'info-circle', 'inventory'=>'boxes', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
'trip'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',
'sign-out'=>'sign-out-alt',
@ -3557,7 +3558,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
if (in_array($pictowithouttext, array('holiday', 'project'))) {
$morecss = 'em088';
}
if (in_array($pictowithouttext, array('intervention', 'payment', 'loan', 'stock', 'technic'))) {
if (in_array($pictowithouttext, array('intervention', 'info', 'payment', 'loan', 'stock', 'technic'))) {
$morecss = 'em080';
}
@ -3584,7 +3585,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'order'=>'infobox-commande',
'user'=>'infobox-adherent', 'users'=>'infobox-adherent',
'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande', 'loan'=>'infobox-bank_account',
'holiday'=>'infobox-holiday', 'info'=>'opacityhigh', 'invoice'=>'infobox-commande', 'loan'=>'infobox-bank_account',
'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'pos'=>'infobox-bank_account', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
'resource'=>'infobox-action',

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

@ -393,7 +393,7 @@ input.pageplusone {
opacity: 0.6;
}
.opacityhigh {
opacity: 0.2;
opacity: 0.24;
}
.opacitytransp {
opacity: 0;
@ -762,6 +762,12 @@ textarea.centpercent {
overflow-y: auto;
}
i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before {
color: #888 !important;
opacity: 0.4;
padding-<?php echo $left; ?>: 3px;
}
body[class*="colorblind-"] .text-warning{
color : <?php print $colorblind_deuteranopes_textWarning; ?>
}

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

@ -585,7 +585,7 @@ input.pageplusone {
opacity: 0.6;
}
.opacityhigh {
opacity: 0.2;
opacity: 0.24;
}
.opacitytransp {
opacity: 0;
@ -894,6 +894,12 @@ textarea.centpercent {
overflow-y: auto;
}
i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before {
color: #888 !important;
opacity: 0.4;
padding-<?php echo $left; ?>: 3px;
}
.text-warning{
color : <?php print $textWarning; ?>
}
@ -1597,7 +1603,7 @@ td.showDragHandle {
padding-bottom: 10px;
<?php if (GETPOST('optioncss', 'aZ09') != 'print') { ?>
padding-left: 229px;
padding-top: 12px;
padding-top: 16px;
<?php } ?>
}
@ -1780,8 +1786,8 @@ div.fiche {
<?php } ?>
div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '24' : '6')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '22' : '6')); ?>px;
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '28' : '6')); ?>px;
<?php if (!empty($dol_hide_leftmenu) && !empty($dol_hide_topmenu)) {
print 'margin-top: 12px;';
} ?>

29
htdocs/user/card.php
View File

@ -1059,6 +1059,9 @@ if ($action == 'create' || $action == 'adduserldap') {
if ($value['active']) {
print '<tr><td>'.$langs->trans($value['label']).'</td>';
print '<td>';
if (!empty($value['icon'])) {
print '<span class="fa '.$value['icon'].'"></span>';
}
if (!empty($ldap_social[$key])) {
print '<input type="hidden" name="'.$key.'" value="'.$ldap_social[$key].'">';
print $ldap_social[$key];
@ -1097,13 +1100,13 @@ if ($action == 'create' || $action == 'adduserldap') {
if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td><td colspan="3">';
$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
print img_picto('', 'category').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
print "</td></tr>";
}
if (!empty($conf->global->MAIN_MULTILANGS)) {
print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
print $formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
print img_picto('', 'language').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
print '</td>';
print '</tr>';
}
@ -1172,7 +1175,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
print '</td>';
print '<td>';
print '<input size="8" type="text" name="thm" value="'.dol_escape_htmltag(GETPOST('thm')).'">';
print '<input size="8" type="text" name="thm" value="'.dol_escape_htmltag(GETPOST('thm')).'"> '.$langs->getCurrencySymbol($conf->currency);
print '</td>';
print "</tr>\n";
@ -1182,14 +1185,14 @@ if ($action == 'create' || $action == 'adduserldap') {
print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
print '</td>';
print '<td>';
print '<input size="8" type="text" name="tjm" value="'.dol_escape_htmltag(GETPOST('tjm')).'">';
print '<input size="8" type="text" name="tjm" value="'.dol_escape_htmltag(GETPOST('tjm')).'"> '.$langs->getCurrencySymbol($conf->currency);
print '</td>';
print "</tr>\n";
// Salary
print '<tr><td>'.$langs->trans("Salary").'</td>';
print '<td>';
print '<input size="8" type="text" name="salary" value="'.dol_escape_htmltag(GETPOST('salary')).'">';
print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<input size="8" type="text" name="salary" value="'.dol_escape_htmltag(GETPOST('salary')).'"> '.$langs->getCurrencySymbol($conf->currency);
print '</td>';
print "</tr>\n";
}
@ -1566,7 +1569,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Salary
print '<tr><td>'.$langs->trans("Salary").'</td>';
print '<td>';
print ($object->salary != '' ?price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '');
print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '');
print '</td>';
print "</tr>\n";
}
@ -2147,7 +2150,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print '<tr><td class="titlefield">'.$langs->trans("HierarchicalResponsible").'</td>';
print '<td>';
if ($caneditfield) {
print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
} else {
print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
$huser = new User($db);
@ -2165,7 +2168,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print '</td>';
print '<td>';
if ($caneditfield) {
print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
} else {
print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
$evuser = new User($db);
@ -2184,7 +2187,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print '</td>';
print '<td>';
if ($caneditfield) {
print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
} else {
print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
$hvuser = new User($db);
@ -2344,6 +2347,9 @@ if ($action == 'create' || $action == 'adduserldap') {
if ($value['active']) {
print '<tr><td>'.$langs->trans($value['label']).'</td>';
print '<td>';
if (!empty($value['icon'])) {
print '<span class="fa '.$value['icon'].'"></span>';
}
if ($caneditfield && empty($object->ldap_sid)) {
print '<input size="40" type="text" name="'.$key.'" class="flat" value="'.$object->socialnetworks[$key].'">';
} else {
@ -2412,6 +2418,7 @@ if ($action == 'create' || $action == 'adduserldap') {
if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td>';
print '<td>';
print img_picto('', 'category');
$cate_arbo = $form->select_all_categories(Categorie::TYPE_USER, null, null, null, null, 1);
$c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_USER);
@ -2429,7 +2436,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Default language
if (!empty($conf->global->MAIN_MULTILANGS)) {
print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
print $formadmin->select_language($object->lang, 'default_lang', 0, 0, 1);
print img_picto('', 'language').$formadmin->select_language($object->lang, 'default_lang', 0, 0, 1);
print '</td>';
print '</tr>';
}
@ -2578,7 +2585,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Salary
print '<tr><td>'.$langs->trans("Salary").'</td>';
print '<td>';
print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ?GETPOST('salary') : $object->salary).'">';
print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ?GETPOST('salary') : $object->salary).'">';
print '</td>';
print "</tr>\n";
}

6
htdocs/user/list.php
View File

@ -925,16 +925,16 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
}
}
if (!empty($arrayfields['u.fk_soc']['checked'])) {
print "<td>";
print '<td class="tdoverflowmax200">';
if ($obj->fk_soc) {
$companystatic->id = $obj->fk_soc;
$companystatic->name = $obj->name;
$companystatic->canvas = $obj->canvas;
print $companystatic->getNomUrl(1);
} elseif ($obj->ldap_sid) {
print $langs->trans("DomainUser");
print '<span class="opacitymedium">'.$langs->trans("DomainUser").'</span>';
} else {
print $langs->trans("InternalUser");
print '<span class="opacitymedium">'.$langs->trans("InternalUser").'</span>';
}
print '</td>';
if (!$i) {