diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 141c39d7e9e..940c6c6e457 100644 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -115,16 +115,11 @@ if ($conf->use_javascript_ajax) { if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'0\') { - jQuery("#tramount").hide(); - jQuery("#tredit").hide(); - jQuery("#trpayment").hide(); - jQuery("#tremail").hide(); + jQuery("#trforcetype, #tramount, #tredit, #trpayment, #tremail").hide(); } if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'1\') { - jQuery("#tramount").show(); - jQuery("#tredit").show(); - jQuery("#trpayment").show(); + jQuery("#trforcetype, #tramount, #tredit, #trpayment").show(); if (jQuery("#MEMBER_NEWFORM_PAYONLINE").val()==\'-1\') jQuery("#tremail").hide(); else jQuery("#tremail").show(); } @@ -156,9 +151,9 @@ print "\n"; // Force Type $adht = new AdherentType($db); -print ''; +print ''; print $langs->trans("ForceMemberType"); -print ''; +print ''; $listofval = array(-1 => $langs->trans("Undefined")); $listofval += $adht->liste_array(); $forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index a2cab708281..f174c51cc74 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -115,7 +115,7 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo print 'Logo'; print '
'; - print '
'; + print '
'; } /** @@ -407,8 +407,9 @@ print ''; print ''; print ''; +print '
'; -print '
'.$langs->trans("FieldsWithAreMandatory",'*').'
'; +print '
'.$langs->trans("FieldsWithAreMandatory",'*').'
'; //print $langs->trans("FieldsWithIsForPublic",'**').'
'; dol_fiche_head(''); @@ -448,7 +449,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) $defaulttype=''; $isempty=1; if (count($listoftype)==1) { $defaulttype=$tmp[0]; $isempty=0; } - print ''.$langs->trans("Type").' *'; + print ''.$langs->trans("Type").' *'; print $form->selectarray("type", $adht->liste_array(), GETPOST('type')?GETPOST('type'):$defaulttype, $isempty); print ''."\n"; } @@ -463,7 +464,7 @@ $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Moral"); if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) { - print ''.$langs->trans('Nature').' *'."\n"; + print ''.$langs->trans('Nature').' *'."\n"; print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1); print ''."\n"; } @@ -473,14 +474,14 @@ else print ''; } // Civility -print ''.$langs->trans('UserTitle').''; +print ''.$langs->trans('UserTitle').''; print $formcompany->select_civility(GETPOST('civility_id'),'civility_id').''."\n"; // Lastname -print ''.$langs->trans("Lastname").' *'."\n"; +print ''.$langs->trans("Lastname").' *'."\n"; // Firstname -print ''.$langs->trans("Firstname").' *'."\n"; +print ''.$langs->trans("Firstname").' *'."\n"; // Company -print ''.$langs->trans("Company").''."\n"; +print ''.$langs->trans("Company").''."\n"; // Address print ''.$langs->trans("Address").''."\n"; print ''."\n"; @@ -491,7 +492,7 @@ print ' / '; print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode','selectcountry_id','state_id'), 0, 1); print ''; // Country -print ''.$langs->trans('Country').''; +print ''.$langs->trans('Country').''; $country_id=GETPOST('country_id'); if (! $country_id && ! empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) $country_id=getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE,2,$db,$langs); if (! $country_id && ! empty($conf->geoipmaxmind->enabled)) @@ -517,20 +518,20 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) print ''; } // EMail -print ''.$langs->trans("Email").' *'."\n"; +print ''.$langs->trans("Email").' *'."\n"; // Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { - print ''.$langs->trans("Login").' *'."\n"; - print ''.$langs->trans("Password").' *'."\n"; - print ''.$langs->trans("PasswordAgain").' *'."\n"; + print ''.$langs->trans("Login").' *'."\n"; + print ''.$langs->trans("Password").' *'."\n"; + print ''.$langs->trans("PasswordAgain").' *'."\n"; } // Birthday print ''.$langs->trans("DateToBirth").''; print $form->select_date($birthday,'birth',0,0,1,"newmember",1,0,1); print ''."\n"; // Photo -print ''.$langs->trans("URLPhoto").''."\n"; +print ''.$langs->trans("URLPhoto").''."\n"; // Public print ''.$langs->trans("Public").''."\n"; // Extrafields diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 9ba91c33475..320d4f1859b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -792,6 +792,8 @@ div.fiche>form>div.div-table-responsive { /* Force values for small screen 570 */ @media only screen and (max-width: 570px) { + .divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; } + .tdoverflowonsmartphone { max-width: 0; overflow: hidden; @@ -3077,7 +3079,8 @@ div.titre { #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; } #tablepublicpayment tr.liste_total td { border-top: none; } -#divsubscribe { width: 700px; } +.divmainbodylarge { margin-left: 40px; margin-right: 40px; } +#divsubscribe { max-width: 900px; } #tablesubscribe { width: 100%; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index a1d26705d46..c21aafd407f 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -794,6 +794,8 @@ div.fiche>form>div.div-table-responsive { /* Force values for small screen 570 */ @media only screen and (max-width: 570px) { + .divmainbodylarge { margin-left: 20px; margin-right: 20px; } + .tdoverflowonsmartphone { max-width: 0; overflow: hidden; @@ -3156,7 +3158,8 @@ div.titre { #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; } #tablepublicpayment tr.liste_total td { border-top: none; } -#divsubscribe { width: 700px; } +.divmainbodylarge { margin-left: 40px; margin-right: 40px; } +#divsubscribe { max-width: 900px; } #tablesubscribe { width: 100%; }