diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 6fe739d4a99..dc479c90cbd 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -533,8 +533,9 @@ dol_htmloutput_events(); // Print form print '
'."\n"; -print ''; +print ''; print ''; +print ''; if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFORM_FORCETYPE') || $action == 'create') { print ''; @@ -610,19 +611,21 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR // Company // TODO : optional hide print ''.$langs->trans("Company").''; - print img_picto('', 'company', 'class="pictofixedwidth"'); + print img_picto('', 'company', 'class="pictofixedwidth paddingright"'); print ''."\n"; // Title - print ''.$langs->trans('UserTitle').''; - print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').''."\n"; - - // Lastname - print ''.$langs->trans("Lastname").' *'."\n"; + if (getDolGlobalString('MEMBER_NEWFORM_ASK_TITLE')) { + print ''.$langs->trans('UserTitle').''; + print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').''."\n"; + } // Firstname print ''.$langs->trans("Firstname").' *'."\n"; + // Lastname + print ''.$langs->trans("Lastname").' *'."\n"; + // EMail print ''.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' *' : '').''; //print img_picto('', 'email', 'class="pictofixedwidth"'); @@ -655,7 +658,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR // Country print ''.$langs->trans('Country').''; - print img_picto('', 'country', 'class="pictofixedwidth"'); + print img_picto('', 'country', 'class="pictofixedwidth paddingright"'); $country_id = GETPOST('country_id', 'int'); if (!$country_id && getDolGlobalString('MEMBER_NEWFORM_FORCECOUNTRYCODE')) { $country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs); @@ -678,6 +681,7 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) { print ''.$langs->trans('State').''; if ($country_code) { + print img_picto('', 'state', 'class="pictofixedwidth paddingright"'); print $formcompany->select_state(GETPOST("state_id"), $country_code); } print ''; @@ -689,13 +693,13 @@ if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFOR print ''."\n"; // Photo - print ''.$langs->trans("URLPhoto").''."\n"; + print ''.$langs->trans("URLPhoto").''."\n"; // Public if (getDolGlobalString('MEMBER_PUBLIC_ENABLED')) { $linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : ''); $publiclabel = $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist); - print ''.$publiclabel.''."\n"; + print ''.$form->textwithpicto($langs->trans("MembershipPublic"), $publiclabel).''."\n"; } // Other attributes diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 797f3d5889a..58a2421c0d8 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -5007,7 +5007,7 @@ table.table-fiche-title { div.backgreypublicpayment { - background-color: var(--colorbacktitle1); + background-color: var(--colorbackgrey); padding: 20px; border-bottom: 1px solid #ddd; text-align: center; @@ -5015,7 +5015,10 @@ div.backgreypublicpayment { top: 0; z-index: 1005; } -.backgreypublicpayment a { color: #222 !important; } +.backgreypublicpayment a { + color: var(--colorblack) !important; + opacity: 0.9; +} .poweredbypublicpayment { float: right; top: 8px;