diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 5b66d0b5734..2daa2f0285f 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -334,7 +334,7 @@ else // Array of install choices print '
| '.$langs->trans("FreshInstall").''; print ' | '; print '';
@@ -403,7 +403,12 @@ else
{
print ' '; //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); - print ' '.$langs->trans("InstallChoiceSuggested").' '.$langs->trans("InstallChoiceSuggested").' ';
+ if ($count < sizeof($migarray)) // There is other choices after
+ {
+ print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION);
+ }
+ print ' ';
$foundrecommandedchoice=1; // To show only once
}
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index ed5237d940f..9978c8f437a 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -177,7 +177,7 @@ color: black;
padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em;
text-decoration:none;
-font-size: 12px;
+font-size: 11px;
border-bottom: 1px solid #8CACBB;
}
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index b8bfe31e595..c6f4366ffca 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -343,7 +343,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
|
> | trans("CheckToCreateDatabase"); ?> | @@ -370,7 +370,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t> | trans("CheckToCreateUser"); ?> | @@ -387,7 +387,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
| trans("Login"); ?> | -
trans("DatabaseRootLoginDescription"); ?>
@@ -398,7 +398,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
trans("Password"); ?>
|
-
|
@@ -410,6 +410,27 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
| |