From 1b2873a76055fce4f0899db0081cf6e16dcf1c20 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 26 Jul 2008 11:45:22 +0000
Subject: [PATCH] #1210 : accessibilite de l'install
---
ecrire/inc/install.php | 5 +++++
ecrire/inc/lang.php | 5 ++++-
ecrire/install/etape_1.php | 5 -----
ecrire/install/etape_4.php | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ecrire/inc/install.php b/ecrire/inc/install.php
index b7528ebeb3..dbb8bb86aa 100644
--- a/ecrire/inc/install.php
+++ b/ecrire/inc/install.php
@@ -317,6 +317,11 @@ function install_connexion_form($db, $login, $pass, $predef, $hidden, $etape)
: ('<fieldset><legend>'
._T('install_select_type_db')
. "</legend>"
+ .'<label for="sql_serveur_db">'
+ . _T('install_types_db_connus')
+ // Passer l'avertissement SQLIte en commentaire, on pourra facilement le supprimer par la suite sans changer les traductions.
+ . "<br /><small>(". _T('install_types_db_connus_avertissement') .')</small>'
+ .'</label>'
. "\n<div style='text-align: center;'><select name='server_db' id='sql_serveur_db' >"
. ($mysql
? "\n<option value='mysql'>"._T('install_select_type_mysql')."</option>"
diff --git a/ecrire/inc/lang.php b/ecrire/inc/lang.php
index 4b70ecc650..0e1eb8b679 100644
--- a/ecrire/inc/lang.php
+++ b/ecrire/inc/lang.php
@@ -131,7 +131,10 @@ function menu_langues($nom_select) {
function select_langues($nom_select, $change, $options)
{
static $cpt = 0;
- return "<select name='$nom_select' id='menu_langues" . $cpt++ . "' "
+ $id = "menu_langues" . $cpt++;
+ return
+ "<label for='$id'>"._T('info_langues')."</label> "
+ . "<select name='$nom_select' id='$id' "
. ((!test_espace_prive()) ?
("class='forml menu_langues'") :
(($nom_select == 'var_lang_ecrire') ?
diff --git a/ecrire/install/etape_1.php b/ecrire/install/etape_1.php
index 7e34d34ea4..c6ddb319b1 100644
--- a/ecrire/install/etape_1.php
+++ b/ecrire/install/etape_1.php
@@ -55,11 +55,6 @@ function install_etape_1_dist()
'<p>'
. _T('texte_connexion_mysql')
.'</p>'
- .'<p>'
- . _T('install_types_db_connus')
- // Passer l'avertissement SQLIte en commentaire, on pourra facilement le supprimer par la suite sans changer les traductions.
- . "<br /><small>(". _T('install_types_db_connus_avertissement') .')</small>'
- .'</p>'
);
echo install_connexion_form($db, $login, $pass, $predef, "\n<input type='hidden' name='chmod' value='$chmod' />", 2);
echo install_fin_html();
diff --git a/ecrire/install/etape_4.php b/ecrire/install/etape_4.php
index ec1bd3dc3d..a4c94be078 100644
--- a/ecrire/install/etape_4.php
+++ b/ecrire/install/etape_4.php
@@ -30,7 +30,7 @@ function install_etape_4_dist()
if($login) {
$echec = ($pass!=$pass_verif) ?
_T('info_passes_identiques')
- : ((strlen($pass)<5) ?
+ : ((strlen($pass)<6) ?
_T('info_passe_trop_court')
: ((strlen($login)<3) ?
_T('info_login_trop_court')
--
GitLab