diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 01e5f1f3063..8c3dd46cc29 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -64,7 +64,7 @@ border: 1px solid #8CACBB; table.main-inside { padding-left: 20px; padding-right: 20px; -margin-bottom: 40px; +margin-bottom: 20px; margin-top: 10px; } diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index fd5eea41ce4..c59ee6e3bc8 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2007 Cyrille de Lambert + * Copyright (C) 2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -106,13 +107,16 @@ if ($db->connected) { ?> - + + + diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 9717b0357bf..1ab37f7d645 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -70,7 +70,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; } if ($_POST["action"] == "set") { umask(0); - print '

'.$langs->trans("SaveConfigurationFile").'

'; + print '

'.$langs->trans("SaveConfigurationFile").'

'; print '
trans("CharsetChoice");?>

trans("CharsetChoice");?>

trans("CharacterSetClient"); ?>
trans("CharacterSetClientComment"); ?>
'; // Verification validite parametre main_dir diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index 788dcd7703c..dd837702292 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -62,7 +62,7 @@ pHeader($langs->trans("CreateDatabaseObjects"),"etape4"); if ($_POST["action"] == "set") { - print '

'.$langs->trans("Database").'

'; + print '

'.$langs->trans("Database").'

'; print '
'; $error=0; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index e3fd49ac7b3..f042742d0c1 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -45,6 +45,13 @@ pHeader($langs->trans("ConfigurationFile"),"etape0"); print '
'; +?> + + +'; print ' + + - + + + + - +

+trans("Main"); ?> +

'; print $langs->trans("WebPagesDirectory"); @@ -76,7 +83,7 @@ if(! isset($dolibarr_main_url_root) || strlen($dolibarr_main_url_root) == 0) $dolibarr_main_document_root = ereg_replace('[\\\/]+$','',$dolibarr_main_document_root); } } -echo $PMA_MYSQL_INT_VERSION; +//echo $PMA_MYSQL_INT_VERSION; ?> @@ -152,10 +159,12 @@ print $langs->trans("Examples").":
";
  • http://www.myserver.com:8180/dolibarr

    • +


    trans("DolibarrDatabase"); ?> -

    +


    trans("DatabaseSuperUserAccess"); ?> -

    diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3c92b9f922e..464d081edbd 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -116,16 +116,17 @@ function pHeader($soutitre,$next,$action='set') print ''.$langs->trans("DolibarrSetup").''; print ''; print ''; - print ''.$langs->trans("DolibarrSetup").''; + print ''.$langs->trans("DolibarrSetup"); + if ($soutitre) { + print ' - '.$soutitre; + } + print ''; print '
    '; print ''; print ''; print '
    '; - if ($soutitre) { - print '
    '.$soutitre.'
    '; - } print '
    '; diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 435931cb1e2..0f4f469a94e 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -40,9 +40,9 @@ dolibarr_install_syslog("licence: Entering licence.php page"); pHeader($langs->trans("License"),"fileconf"); -print '
    ';
+print '
    ';
 $langs->print_file("html/gpl.txt",1);
-print "
    ";
+print '
    '; pFooter(0,$setuplang); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 3d7475f2834..3a0800ed771 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -65,7 +65,7 @@ pHeader($langs->trans("DatabaseMigration"),"upgrade2","upgrade"); if (! isset($_GET["action"]) || $_GET["action"] == "upgrade") { - print '

    '.$langs->trans("DatabaseMigration").'

    '; + print '

    '.$langs->trans("DatabaseMigration").'

    '; if (! $versionfrom && ! $versionto) { diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index adc34fbe03a..1d38bdb20f3 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -70,7 +70,7 @@ pHeader($langs->trans('DataMigration'),'etape5','upgrade'); if (isset($_POST['action']) && $_POST['action'] == 'upgrade') { - print '

    '.$langs->trans('DataMigration').'

    '; + print '

    '.$langs->trans('DataMigration').'

    '; print ''; @@ -145,8 +145,6 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade') $db->begin(); - print ''; - // Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec // dans la 1ere colonne, la description de l'action a faire // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error' @@ -329,13 +327,13 @@ function migrate_paiements_orphelins_1($db,$langs,$conf) if (sizeof($row)) { - print $langs->trans('MigrationPaymentsNumberToUpdate', sizeof($row))."
    \n"; + print $langs->trans('OrphelinsPaymentsDetectedByMethod', 1).': '.sizeof($row)."
    \n"; $db->begin(); $res = 0; for ($i = 0 ; $i < sizeof($row) ; $i++) { - print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'
    '; + if ($conf->MAIN_ENABLE_DEVELOPMENT) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'
    '; // On cherche facture sans lien paiement et du meme montant et pour meme societe. $sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f"; @@ -373,14 +371,14 @@ function migrate_paiements_orphelins_1($db,$langs,$conf) } else { - print $langs->trans('MigrationPaymentsNothingToUpdate')."
    \n"; + print $langs->trans('MigrationPaymentsNothingUpdatable')."
    \n"; } $db->commit(); } else { - print $langs->trans('MigrationPaymentsNothingToUpdate')."
    \n"; + print $langs->trans('MigrationPaymentsNothingUpdatable')."
    \n"; } print ''; @@ -437,13 +435,13 @@ function migrate_paiements_orphelins_2($db,$langs,$conf) if (sizeof($row)) { - print $langs->trans('MigrationPaymentsNumberToUpdate', sizeof($row))."
    \n"; + print $langs->trans('OrphelinsPaymentsDetectedByMethod', 2).': '.sizeof($row)."
    \n"; $db->begin(); $res = 0; for ($i = 0 ; $i < sizeof($row) ; $i++) { - print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'
    '; + if ($conf->MAIN_ENABLE_DEVELOPMENT) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'
    '; // On cherche facture sans lien paiement et du meme montant et pour meme societe. $sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f"; @@ -481,14 +479,14 @@ function migrate_paiements_orphelins_2($db,$langs,$conf) } else { - print $langs->trans('MigrationPaymentsNothingToUpdate')."
    \n"; + print $langs->trans('MigrationPaymentsNothingUpdatable')."
    \n"; } $db->commit(); } else { - print $langs->trans('MigrationPaymentsNothingToUpdate')."
    \n"; + print $langs->trans('MigrationPaymentsNothingUpdatable')."
    \n"; } print ''; diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 9e93a7f4b81..da1702de319 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -110,6 +110,7 @@ CharacterSetDatabase=Character set for database CharacterSetDatabaseComment=Choose character set wanted for database creation.
    This parameter can't be defined if database already exists. YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. +OrphelinsPaymentsDetectedByMethod=Orphelins payment detected by method %s ######### # upgrade @@ -126,6 +127,7 @@ MigrationPaymentsUpdate=Payment data correction MigrationPaymentsNumberToUpdate=%s payment(s) to update MigrationProcessPaymentUpdate=Update payment(s) %s MigrationPaymentsNothingToUpdate=No more things to do +MigrationPaymentsNothingUpdatable=No more payments that can be corrected # Contracts Update MigrationContractsUpdate=Contract data correction diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index 45b863959e0..d30c2ee920f 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -110,7 +110,8 @@ CharacterSetDatabase=Codage utilis CharacterSetDatabaseComment=Veuillez choisir le codage que vous désirez choisir pour la création de la base de données.
    Ce paramètre n'est pas sélectionnable si votre base est déjà créée. YouAskDatabaseCreationSoDolibarrNeedToConnect=Vous avez demandé la création du login de base de donnée %s, mais pour cela, Dolibarr doit se connecter sur le serveur %s via le super utilisateur %s. BecauseConnectionFailedParametersMayBeWrong=La connexion ayant échoué, les paramètres du serveur ou du super utilisateur sont peut-etre incorrects. - +OrphelinsPaymentsDetectedByMethod=Paiement orphelins detectés par la méthode %s + ######### # upgrade ######### @@ -126,6 +127,7 @@ MigrationPaymentsUpdate=Mise a jour des paiments (lien n-n paiements-factures) MigrationPaymentsNumberToUpdate=%s paiement(s) à mettre à jour MigrationProcessPaymentUpdate=Mise a jour paiement(s) %s MigrationPaymentsNothingToUpdate=Pas ou plus de paiements orphelins à corriger. +MigrationPaymentsNothingUpdatable=Pas ou plus de paiements orphelins corrigeable. # Contracts Update MigrationContractsUpdate=Mise a jour des contrats sans details (gestion du contrat + detail de contrat)