|
@@ -161,10 +161,17 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
|
|
|
*/
|
|
|
function llxFooterVierge()
|
|
|
{
|
|
|
+ global $conf;
|
|
|
+
|
|
|
print '</div>';
|
|
|
|
|
|
printCommonFooter('public');
|
|
|
|
|
|
+ if (!empty($conf->use_javascript_ajax)) {
|
|
|
+ print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
|
|
|
+ print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
|
|
|
+ }
|
|
|
+
|
|
|
print "</body>\n";
|
|
|
print "</html>\n";
|
|
|
}
|
|
@@ -507,7 +514,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); // fetch optio
|
|
|
llxHeaderVierge($langs->trans("NewSubscription"));
|
|
|
|
|
|
print '<br>';
|
|
|
-print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center');
|
|
|
+print load_fiche_titre(img_picto('', 'member_nocolor', 'class="pictofixedwidth"').' '.$langs->trans("NewSubscription"), '', '', 0, 0, 'center');
|
|
|
|
|
|
|
|
|
print '<div align="center">';
|
|
@@ -532,7 +539,9 @@ print '<input type="hidden" name="entity" value="'.$entity.'" />';
|
|
|
if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEWFORM_FORCETYPE) || $action == 'create') {
|
|
|
print '<input type="hidden" name="action" value="add" />';
|
|
|
print '<br>';
|
|
|
- print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
|
|
|
+
|
|
|
+ $messagemandatory = '<span class="">'.$langs->trans("FieldsWithAreMandatory", '*').'</span>';
|
|
|
+ //print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
|
|
|
//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
|
|
|
|
|
|
print dol_get_fiche_head('');
|
|
@@ -579,7 +588,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
|
|
|
$defaulttype = $tmp[0];
|
|
|
$isempty = 0;
|
|
|
}
|
|
|
- print '<tr><td class="titlefield">'.$langs->trans("Type").' <span style="color: red">*</span></td><td>';
|
|
|
+ print '<tr><td class="titlefield classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Type").' <span class="star">*</span></td><td>';
|
|
|
print $form->selectarray("typeid", $adht->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
|
|
|
print '</td></tr>'."\n";
|
|
|
} else {
|
|
@@ -591,7 +600,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
|
|
|
$morphys["phy"] = $langs->trans("Physical");
|
|
|
$morphys["mor"] = $langs->trans("Moral");
|
|
|
if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
|
|
|
- print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <span style="color: red">*</span></td><td>'."\n";
|
|
|
+ print '<tr class="morphy"><td class="titlefield classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans('MemberNature').' <span class="star">*</span></td><td>'."\n";
|
|
|
print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
|
|
|
print '</td></tr>'."\n";
|
|
|
} else {
|
|
@@ -609,21 +618,21 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
|
|
|
print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
|
|
|
|
|
|
// Lastname
|
|
|
- print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
|
|
|
+ print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
|
|
|
|
|
|
// Firstname
|
|
|
- print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
|
|
|
+ print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Firstname").' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
|
|
|
|
|
|
// EMail
|
|
|
- print '<tr><td>'.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' <span style="color:red;">*</span>' : '').'</td><td>';
|
|
|
+ print '<tr><td class="'.(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? 'classfortooltip' : '').'" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' <span class="star">*</span>' : '').'</td><td>';
|
|
|
//print img_picto('', 'email', 'class="pictofixedwidth"');
|
|
|
print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
|
|
|
|
|
|
// Login
|
|
|
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
|
|
|
- print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
|
|
|
- print '<tr><td>'.$langs->trans("Password").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
|
|
|
- print '<tr><td>'.$langs->trans("PasswordRetype").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
|
|
|
+ print '<tr><td>'.$langs->trans("Login").' <span class="star">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
|
|
|
+ print '<tr><td>'.$langs->trans("Password").' <span class="star">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
|
|
|
+ print '<tr><td>'.$langs->trans("PasswordRetype").' <span class="star">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
|
|
|
}
|
|
|
|
|
|
// Gender
|
|
@@ -699,7 +708,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
|
|
|
// TODO Move this into generic feature.
|
|
|
if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
|
|
|
$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
|
|
|
- print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span style="color: red">*</span></td><td>';
|
|
|
+ print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span class="star">*</span></td><td>';
|
|
|
print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
|
|
|
print ' € or $';
|
|
|
|