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

Merge branch 'Dolibarr:develop' into MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS

Browse Source
This commit is contained in:
marcusdeangabriel 2023-01-26 13:40:30 +01:00 committed by GitHub
commit 5cabeb98a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/company_socialnetworks.php
View File

@ -84,6 +84,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))) {
* View * View
*/ */
$form = new Form($db);
$wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'; $wikihelp = 'EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
llxHeader('', $langs->trans("Setup"), $wikihelp); llxHeader('', $langs->trans("Setup"), $wikihelp);

26
htdocs/public/users/view.php
View File

@ -229,6 +229,12 @@ if ($object->job && !getDolUserInt('USER_PUBLIC_HIDE_JOBPOSITION', 0, $object))
print dol_escape_htmltag($object->job); print dol_escape_htmltag($object->job);
print '</div>'; print '</div>';
} }
if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
print '<div class="bold">';
print dol_escape_htmltag($mysoc->name);
print '</div>';
}
print '</div>'; print '</div>';
@ -240,7 +246,7 @@ print '</div>';
if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) { if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) {
print '<div class="backimagepublicrecruitment">'; print '<div class="backimagepublicrecruitment">';
print '<img id="idUSER_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">'; print '<img id="idUSER_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->USER_IMAGE_PUBLIC_INTERFACE.'">';
print '</div>'; print '</div>';
} }
@ -292,19 +298,19 @@ if ($object->office_phone && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_PHONE', 0,
$usersection .= '<div class="flexitemsmall">'; $usersection .= '<div class="flexitemsmall">';
$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"'); $usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
$usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, ''); $usersection .= dol_print_phone($object->office_phone, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
$usersection .= '<div>'; $usersection .= '</div>';
} }
if ($object->office_fax && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) { if ($object->office_fax && !getDolUserInt('USER_PUBLIC_HIDE_OFFICE_FAX', 0, $object)) {
$usersection .= '<div class="flexitemsmall">'; $usersection .= '<div class="flexitemsmall">';
$usersection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"'); $usersection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
$usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', 0, ''); $usersection .= dol_print_phone($object->office_fax, $object->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
$usersection .= '<div>'; $usersection .= '</div>';
} }
if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) { if ($object->user_mobile && !getDolUserInt('USER_PUBLIC_HIDE_USER_MOBILE', 0, $object)) {
$usersection .= '<div class="flexitemsmall">'; $usersection .= '<div class="flexitemsmall">';
$usersection .= img_picto('', 'phone', 'class="pictofixedwidth"'); $usersection .= img_picto('', 'phone', 'class="pictofixedwidth"');
$usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, ''); $usersection .= dol_print_phone($object->user_mobile, $object->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
$usersection .= '<div>'; $usersection .= '</div>';
} }
// Social networks // Social networks
@ -324,7 +330,7 @@ if ($usersection) {
// Output payment summary form // Output payment summary form
print '<tr><td class="left">'; print '<tr><td class="left">';
print '<div class="nowidthimp" id="tablepublicpayment">'; print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
print $usersection; print $usersection;
@ -344,7 +350,7 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
$companysection .= '<div class="flexitemsmall">'; $companysection .= '<div class="flexitemsmall">';
$companysection .= img_picto('', 'email', 'class="pictofixedwidth"'); $companysection .= img_picto('', 'email', 'class="pictofixedwidth"');
$companysection .= dol_print_email($mysoc->email, 0, 0, 1); $companysection .= dol_print_email($mysoc->email, 0, 0, 1);
$companysection .= '<div>'; $companysection .= '</div>';
} }
if ($mysoc->url) { if ($mysoc->url) {
@ -358,13 +364,13 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
$companysection .= '<div class="flexitemsmall">'; $companysection .= '<div class="flexitemsmall">';
$companysection .= img_picto('', 'phone', 'class="pictofixedwidth"'); $companysection .= img_picto('', 'phone', 'class="pictofixedwidth"');
$companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, ''); $companysection .= dol_print_phone($mysoc->phone, $mysoc->country_code, 0, $mysoc->id, 'tel', ' ', 0, '');
$companysection .= '<div>'; $companysection .= '</div>';
} }
if ($mysoc->fax) { if ($mysoc->fax) {
$companysection .= '<div class="flexitemsmall">'; $companysection .= '<div class="flexitemsmall">';
$companysection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"'); $companysection .= img_picto('', 'phoning_fax', 'class="pictofixedwidth"');
$companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', 0, ''); $companysection .= dol_print_phone($mysoc->fax, $mysoc->country_code, 0, $mysoc->id, 'fax', ' ', 0, '');
$companysection .= '<div>'; $companysection .= '</div>';
} }
// Social networks // Social networks
@ -414,12 +420,12 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
// Output payment summary form // Output payment summary form
print '<tr><td class="left">'; print '<tr><td class="left">';
print '<div class="nowidthimp" id="tablepublicpayment">'; print '<div class="nowidthimp nopaddingtoponsmartphone" id="tablepublicpayment">';
// Add company info // Add company info
if ($mysoc->name) { if ($mysoc->name) {
print '<div class="center bold">'; print '<div class="center bold">';
print $mysoc->name; print dol_escape_htmltag($mysoc->name);
print '</div>'; print '</div>';
print '<br>'; print '<br>';
} }

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

@ -1770,6 +1770,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
.smallonsmartphone { .smallonsmartphone {
font-size: 0.8em; font-size: 0.8em;
} }
.nopaddingtoponsmartphone {
padding-top: 0 !important;
}
.nopaddingbottomonsmartphone {
padding-bottom: 0 !important;
}
} }
/* Force values for small screen 570 */ /* Force values for small screen 570 */

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

@ -1981,6 +1981,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
.smallonsmartphone { .smallonsmartphone {
font-size: 0.8em; font-size: 0.8em;
} }
.nopaddingtoponsmartphone {
padding-top: 0 !important;
}
.nopaddingbottomonsmartphone {
padding-bottom: 0 !important;
}
} }
/* Force values for small screen 570 */ /* Force values for small screen 570 */