lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Enhance installer. More interactive messages.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-17 08:46:56 +00:00
parent f658781def
commit e94d6e85b0
6 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/install/check.php
View File

@ -334,7 +334,7 @@ else
// Array of install choices // Array of install choices
print '<table width="100%" border="1" cellpadding="2">'; print '<table width="100%" border="1" cellpadding="2">';
# Sho first install line # Show first install line
print '<tr><td nowrap="nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>'; print '<tr><td nowrap="nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>';
print '</td>'; print '</td>';
print '<td>'; print '<td>';
@ -403,7 +403,12 @@ else
{ {
print '<br>'; print '<br>';
//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
print '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div></center>'; print '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div>';
if ($count < sizeof($migarray)) // There is other choices after
{
print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION);
}
print '</center>';
// <img src="../theme/eldy/img/tick.png" alt="Ok"> '; // <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
$foundrecommandedchoice=1; // To show only once $foundrecommandedchoice=1; // To show only once
} }

2
htdocs/install/default.css
View File

@ -177,7 +177,7 @@ color: black;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em; margin: 0em 0em 0em 0em;
text-decoration:none; text-decoration:none;
font-size: 12px; font-size: 11px;
border-bottom: 1px solid #8CACBB; border-bottom: 1px solid #8CACBB;
} }

29
htdocs/install/fileconf.php
View File

@ -343,7 +343,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
</td> </td>
<td class="label" valign="top"><input type="checkbox" <td class="label" valign="top"><input type="checkbox"
name="db_create_database" id="db_create_database" name="db_create_database"
<?php if ($force_install_createdatabase) print ' checked="on"'; ?>></td> <?php if ($force_install_createdatabase) print ' checked="on"'; ?>></td>
<td class="comment"><?php echo $langs->trans("CheckToCreateDatabase"); ?> <td class="comment"><?php echo $langs->trans("CheckToCreateDatabase"); ?>
</td> </td>
@ -370,7 +370,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
</td> </td>
<td class="label" valign="top"><input type="checkbox" <td class="label" valign="top"><input type="checkbox"
name="db_create_user" id="db_create_user" name="db_create_user"
<?php if (! empty($force_install_createuser)) print ' checked="on"'; ?>></td> <?php if (! empty($force_install_createuser)) print ' checked="on"'; ?>></td>
<td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?> <td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>
</td> </td>
@ -387,7 +387,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr> <tr>
<td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td> <td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td>
<td class="label" valign="top"><input type="text" name="db_user_root" <td class="label" valign="top"><input type="text" name="db_user_root" class="needroot"
value="<?php print (! empty($db_user_root))?$db_user_root:$force_install_databaserootlogin; ?>"></td> value="<?php print (! empty($db_user_root))?$db_user_root:$force_install_databaserootlogin; ?>"></td>
<td class="label"> <td class="label">
<div class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?> <div class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>
@ -398,7 +398,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
<tr> <tr>
<td class="label" valign="top"><?php echo $langs->trans("Password"); ?> <td class="label" valign="top"><?php echo $langs->trans("Password"); ?>
</td> </td>
<td class="label" valign="top"><input type="password" <td class="label" valign="top"><input type="password" class="needroot"
name="db_pass_root" name="db_pass_root"
value="<?php print (! empty($db_pass_root))?$db_pass_root:$force_install_databaserootpass; ?>"></td> value="<?php print (! empty($db_pass_root))?$db_pass_root:$force_install_databaserootpass; ?>"></td>
<td class="label"> <td class="label">
@ -410,6 +410,27 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t
</table> </table>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
function init_needroot()
{
/*alert(jQuery("#db_create_database").attr("checked")); */
if (jQuery("#db_create_database").attr("checked") || jQuery("#db_create_user").attr("checked"))
{
jQuery(".needroot").removeAttr('disabled');
}
else
{
jQuery(".needroot").attr('disabled','disabled');
}
}
init_needroot();
jQuery("#db_create_database").click(function() {
init_needroot();
});
jQuery("#db_create_user").click(function() {
init_needroot();
});
});
function checkDatabaseName(databasename) { function checkDatabaseName(databasename) {
if (databasename.match(/[;\.]/)) { return false; } if (databasename.match(/[;\.]/)) { return false; }

3
htdocs/install/inc.php
View File

@ -303,6 +303,9 @@ function pHeader($soutitre,$next,$action='set',$param='')
print '<head>'."\n"; print '<head>'."\n";
print '<meta http-equiv="content-type" content="text/html; charset='.$conf->file->character_set_client.'">'."\n"; print '<meta http-equiv="content-type" content="text/html; charset='.$conf->file->character_set_client.'">'."\n";
print '<link rel="stylesheet" type="text/css" href="./default.css">'."\n"; print '<link rel="stylesheet" type="text/css" href="./default.css">'."\n";
print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/smoothness/jquery-ui-latest.custom.css" type="text/css">'."\n";
print '<script type="text/javascript" src="../includes/jquery/js/jquery-latest.min.js"></script>'."\n";
print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui-latest.custom.min.js"></script>'."\n";
print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n"; print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
print '</head>'."\n"; print '</head>'."\n";
print '<body>'."\n"; print '<body>'."\n";

1
htdocs/langs/en_US/install.lang
View File

@ -138,6 +138,7 @@ IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check
ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version. ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b> InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
InstallChoiceSuggested=<b>Install choice suggested by installer</b>. InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct. CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
OpenBaseDir=PHP openbasedir parameter OpenBaseDir=PHP openbasedir parameter

1
htdocs/langs/fr_FR/install.lang
View File

@ -139,6 +139,7 @@ IfLoginDoesNotExistsCheckCreateUser=Si le login n'existe pas encore, vous devez
ErrorConnection=Le serveur "<b>%s</b>", nom de base "<b>%s</b>", login "<b>%s</b>", ou mot de passe de la base de données est peut-être incorrect ou la version du client PHP trop ancienne par rapport à la version de la base de données. ErrorConnection=Le serveur "<b>%s</b>", nom de base "<b>%s</b>", login "<b>%s</b>", ou mot de passe de la base de données est peut-être incorrect ou la version du client PHP trop ancienne par rapport à la version de la base de données.
InstallChoiceRecommanded=Choix recommandé pour installer la version <b>%s</b> depuis votre version actuelle <b>%s</b> InstallChoiceRecommanded=Choix recommandé pour installer la version <b>%s</b> depuis votre version actuelle <b>%s</b>
InstallChoiceSuggested=<b>Choix suggéré par l'installeur</b>. InstallChoiceSuggested=<b>Choix suggéré par l'installeur</b>.
MigrateIsDoneStepByStep=La version cible (%s) ayant un écart de plusieurs versions, l'installeur reviendra proposer la migration suivante une fois celle-ci exécutée.
CheckThatDatabasenameIsCorrect=Vérifiez que le nom de base "<b>%s</b>" est correct. CheckThatDatabasenameIsCorrect=Vérifiez que le nom de base "<b>%s</b>" est correct.
IfAlreadyExistsCheckOption=Si ce nom est correct et que cette base n'existe pas déjà, vous devez cocher l'option "Créer la base de données". IfAlreadyExistsCheckOption=Si ce nom est correct et que cette base n'existe pas déjà, vous devez cocher l'option "Créer la base de données".
OpenBaseDir=Paramètre php openbasedir OpenBaseDir=Paramètre php openbasedir