diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php index 6bb4e1d25f5..7aab9bd6774 100644 --- a/htdocs/core/class/html.formwebsite.class.php +++ b/htdocs/core/class/html.formwebsite.class.php @@ -228,9 +228,10 @@ class FormWebsite * @param int $pageid Preselected container ID * @param int $showempty Show empty record * @param string $action Action on page that use this select list + * @param string $morecss More CSS * @return string HTML select component with list of type of containers */ - public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '') + public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200') { global $langs; @@ -239,11 +240,11 @@ class FormWebsite $out=''; if ($atleastonepage && $action != 'editsource') { - $out.=''; } else { - $out.=''; } if ($showempty || ! $atleastonepage) $out.=''; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index cdae711873b..0efb8dfde59 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -5030,7 +5030,7 @@ function migrate_users_socialnetworks() dol_print_error($db); $db->rollback(); } - print ''.$langs->trans('MigrationUsersSocialNetworks')."
\n"; + print ''.$langs->trans('MigrationFieldsSocialNetworks', 'Users')."
\n"; print ''; } @@ -5121,7 +5121,7 @@ function migrate_members_socialnetworks() dol_print_error($db); $db->rollback(); } - print ''.$langs->trans('MigrationMembersSocialNetworks')."
\n"; + print ''.$langs->trans('MigrationFieldsSocialNetworks', 'Members')."
\n"; print ''; } @@ -5216,7 +5216,7 @@ function migrate_contacts_socialnetworks() dol_print_error($db); $db->rollback(); } - print ''.$langs->trans('MigrationContactsSocialNetworks')."
\n"; + print ''.$langs->trans('MigrationFieldsSocialNetworks', 'Contacts')."
\n"; print ''; } @@ -5306,6 +5306,6 @@ function migrate_thirdparties_socialnetworks() dol_print_error($db); $db->rollback(); } - print ''.$langs->trans('MigrationThirdpartiesSocialNetworks')."
\n"; + print ''.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."
\n"; print ''; } diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index cfd95d879b7..708b3bac479 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -205,10 +205,7 @@ MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_exce MigrationUserRightsEntity=Update entity field value of llx_user_rights MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights MigrationUserPhotoPath=Migration of photo paths for users -MigrationUsersSocialNetworks=Migration of users fields social networks -MigrationMembersSocialNetworks=Migration of members fields social networks -MigrationContactsSocialNetworks=Migration of contacts fields social networks -MigrationThirdpartiesSocialNetworks=Migration of thirdparties fields social networks +MigrationFieldsSocialNetworks=Migration of users fields social networks (%s) MigrationReloadModule=Reload module %s MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show unavailable options diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 26199b90d0b..d35ca0130cb 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -3059,9 +3059,10 @@ if ($action == 'editmeta' || $action == 'createcontainer') } elseif ($result > 0) { - $translationof = $sourcepage->id; + $translationof = 0; + //$translationof = $sourcepage->id; print ''.$langs->trans('ThisPageIsTranslationOf').' '; - print $formwebsite->selectContainer($website, 'pageidfortranslation', $sourcepage->id, 1, $action); + print $formwebsite->selectContainer($website, 'pageidfortranslation', $translationof, 1, $action, 'minwidth300'); } } print '';