From 33801e8aabfdc4ee46f1da29f26a753c08d8e867 Mon Sep 17 00:00:00 2001
From: James <james@rezo.net>
Date: Mon, 6 Nov 2006 12:45:50 +0000
Subject: [PATCH] =?UTF-8?q?du=20xhtml=20dans=20les=20pages=20d'admin=20et?=
=?UTF-8?q?=20une=20r=C3=A9ponse=20pour=20le=20ticket=20#291=20:=20on=20ap?=
=?UTF-8?q?puie=20sur=20entr=C3=A9e=20pour=20passer=20les=20=C3=A9tapes=20?=
=?UTF-8?q?d'info=20(celles=20qui=20disent=20que=20jusque-l=C3=A0,=20tout?=
=?UTF-8?q?=20va=20bien)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/minipres.php | 6 +++---
ecrire/install/etape_.php | 2 +-
ecrire/install/etape_1.php | 8 ++++----
ecrire/install/etape_2.php | 14 +++++++-------
ecrire/install/etape_3.php | 32 ++++++++++++++++----------------
ecrire/install/etape_4.php | 6 +++---
ecrire/install/etape_5.php | 2 +-
ecrire/install/etape_6.php | 2 +-
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index aa2753cc03..17261b9e77 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -19,7 +19,7 @@ include_spip('inc/lang');
//
// http://doc.spip.org/@install_debut_html
-function install_debut_html($titre = 'AUTO') {
+function install_debut_html($titre = 'AUTO', $onLoad = '') {
global $spip_lang_right;
include_spip('inc/filtres');
@@ -73,7 +73,7 @@ function install_debut_html($titre = 'AUTO') {
font-family: Verdana,Arial,Sans,sans-serif; }\n",
"\n\n]]>\n--></style>\n\n
</head>
-<body>
+<body".$onLoad.">
<div id='minipres'>
<h1>",
$titre ,
@@ -108,7 +108,7 @@ function fieldset($legend, $champs = array()) {
// http://doc.spip.org/@bouton_suivant
function bouton_suivant($code = 'bouton_suivant') {
- return "\n<span class='suivant'><input type='submit' class='fondl' value=\"" .
+ return "\n<span class='suivant'><input id='suivant' type='submit' class='fondl' value=\"" .
_T($code) .
" >>\" /></span>\n";
}
diff --git a/ecrire/install/etape_.php b/ecrire/install/etape_.php
index 583ec7107f..1ae37c0642 100644
--- a/ecrire/install/etape_.php
+++ b/ecrire/install/etape_.php
@@ -22,7 +22,7 @@ function install_etape__dist()
install_debut_html();
echo "<div><img alt='SPIP' src='" . _DIR_IMG_PACK . "logo-spip.gif' /></div>\n",
"<div class='petit-centre'><p>",info_copyright(),"</p></div>\n",
- "<p>" . _T('install_select_langue'),"</p>",
+ "<p>",_T('install_select_langue'),"</p>",
"<div>",$menu_langues,"</div>\n",
"<form action='", generer_url_action('test_dirs'),"'>\n",
'<input type="hidden" name="action" value="test_dirs" />',
diff --git a/ecrire/install/etape_1.php b/ecrire/install/etape_1.php
index 30b3767125..d9e25a4496 100644
--- a/ecrire/install/etape_1.php
+++ b/ecrire/install/etape_1.php
@@ -46,9 +46,9 @@ function install_etape_1_dist()
}
}
echo generer_url_post_ecrire('install');
- echo "<INPUT TYPE='hidden' NAME='etape' VALUE='2' />";
- echo "<INPUT TYPE='hidden' NAME='chmod' VALUE='$chmod' />";
- echo fieldset(_T('entree_base_donnee_1'),
+ echo "<input type='hidden' name='etape' value='2' />";
+ echo "<input type='hidden' name='chmod' value='$chmod' />";
+ echo fieldset(_t('entree_base_donnee_1'),
array(
'adresse_db' => array(
'label' => _T('entree_base_donnee_2'),
@@ -76,7 +76,7 @@ function install_etape_1_dist()
);
echo bouton_suivant();
- echo "</FORM>";
+ echo "</form>";
install_fin_html();
}
diff --git a/ecrire/install/etape_2.php b/ecrire/install/etape_2.php
index 8044895dc0..6f7ff959b0 100644
--- a/ecrire/install/etape_2.php
+++ b/ecrire/install/etape_2.php
@@ -15,7 +15,7 @@ function install_etape_2_dist()
{
global $adresse_db, $login_db, $pass_db, $spip_lang_right,$chmod;
- install_debut_html();
+ install_debut_html('AUTO', ' onLoad="document.getElementById(\'suivant\').focus();return false;"');
echo info_etape(_T('info_connexion_base'));
@@ -28,14 +28,14 @@ function install_etape_2_dist()
echo "<p><b>"._T('info_connexion_ok')."</b></p><p> "._T('info_etape_suivante_2')."</p>";
echo generer_url_post_ecrire('install');
- echo "<INPUT TYPE='hidden' NAME='etape' VALUE='3' />";
- echo "<INPUT TYPE='hidden' NAME='chmod' VALUE='$chmod' />";
- echo "<INPUT TYPE='hidden' NAME='adresse_db' VALUE=\"$adresse_db\" />";
- echo "<INPUT TYPE='hidden' NAME='login_db' VALUE=\"$login_db\" />";
- echo "<INPUT TYPE='hidden' NAME='pass_db' VALUE=\"$pass_db\" />";
+ echo "<input type='hidden' name='etape' value='3' />";
+ echo "<input type='hidden' name='chmod' value='$chmod' />";
+ echo "<input type='hidden' name='adresse_db' value=\"$adresse_db\" />";
+ echo "<input type='hidden' name='login_db' value=\"$login_db\" />";
+ echo "<input type='hidden' name='pass_db' value=\"$pass_db\" />";
echo bouton_suivant();
- echo "</FORM>";
+ echo "</form>";
}
else {
echo "<p><b>"._T('avis_connexion_echec_1')."</b></p>";
diff --git a/ecrire/install/etape_3.php b/ecrire/install/etape_3.php
index 9e6c9494ae..2ad1f7ce9b 100644
--- a/ecrire/install/etape_3.php
+++ b/ecrire/install/etape_3.php
@@ -20,11 +20,11 @@ function install_etape_3_dist()
echo info_etape(_T('info_choix_base')." "._T('menu_aide_installation_choix_base').aide ("install2"));
echo generer_url_post_ecrire('install');
- echo "<INPUT TYPE='hidden' NAME='etape' VALUE='4' />";
- echo "<INPUT TYPE='hidden' NAME='chmod' VALUE='$chmod' />";
- echo "<INPUT TYPE='hidden' NAME='adresse_db' VALUE=\"$adresse_db\" />";
- echo "<INPUT TYPE='hidden' NAME='login_db' VALUE=\"$login_db\" />";
- echo "<INPUT TYPE='hidden' NAME='pass_db' VALUE=\"$pass_db\" />\n";
+ echo "<input type='hidden' name='etape' value='4' />";
+ echo "<input type='hidden' name='chmod' value='$chmod' />";
+ echo "<input type='hidden' name='adresse_db' value=\"$adresse_db\" />";
+ echo "<input type='hidden' name='login_db' value=\"$login_db\" />";
+ echo "<input type='hidden' name='pass_db' value=\"$pass_db\" />\n";
$link = mysql_connect("$adresse_db","$login_db","$pass_db");
$result = @mysql_list_dbs();
@@ -37,22 +37,22 @@ function install_etape_3_dist()
$bases = "";
for ($i = 0; $i < $n; $i++) {
$table_nom = mysql_dbname($result, $i);
- $base = "<li><INPUT NAME=\"choix_db\" VALUE=\"".$table_nom."\" TYPE=Radio id='tab$i'";
+ $base = "<li><input name=\"choix_db\" value=\"".$table_nom."\" type='radio' id='tab$i'";
$base_fin = " /><label for='tab$i'>".$table_nom."</label></li>\n\n";
if ($table_nom == $login_db) {
- $bases = "$base CHECKED$base_fin".$bases;
+ $bases = "$base checked='checked'$base_fin".$bases;
$checked = true;
}
else {
$bases .= "$base$base_fin\n";
}
}
- echo $bases."</UL>";
+ echo $bases."</ul>";
echo _T('info_ou')." ";
}
else {
- echo "<B>"._T('avis_lecture_noms_bases_1')."</B>
- "._T('avis_lecture_noms_bases_2')."<P>";
+ echo "<b>"._T('avis_lecture_noms_bases_1')."</b>
+ "._T('avis_lecture_noms_bases_2')."<p>";
if ($login_db) {
// Si un login comporte un point, le nom de la base est plus
// probablement le login sans le point -- testons pour savoir
@@ -67,21 +67,21 @@ function install_etape_3_dist()
if ($ok) {
echo _T('avis_lecture_noms_bases_3');
echo "<ul>";
- echo "<li><INPUT NAME=\"choix_db\" VALUE=\"".$test_base."\" TYPE=Radio id='stand' CHECKED>";
+ echo "<li><input name=\"choix_db\" value=\"".$test_base."\" type='radio' id='stand' checked='checked' />";
echo "<label for='stand'>".$test_base."</label></li>\n";
- echo "</UL>";
+ echo "</ul>";
echo _T('info_ou')." ";
$checked = true;
}
}
}
- echo "<INPUT NAME=\"choix_db\" VALUE=\"new_spip\" TYPE=Radio id='nou'";
- if (!$checked) echo " CHECKED";
+ echo "<input name=\"choix_db\" value=\"new_spip\" type='radio' id='nou'";
+ if (!$checked) echo " checked";
echo " /> <label for='nou'>"._T('info_creer_base')."</label> ";
- echo "<INPUT TYPE='text' NAME='table_new' CLASS='fondl' VALUE=\"spip\" SIZE='20' /></fieldset>";
+ echo "<input type='text' name='table_new' class='fondl' value=\"spip\" size='20' /></fieldset>";
echo bouton_suivant();
- echo "</FORM>";
+ echo "</form>";
install_fin_html();
}
diff --git a/ecrire/install/etape_4.php b/ecrire/install/etape_4.php
index 358b5a9b3c..74f4d6debf 100644
--- a/ecrire/install/etape_4.php
+++ b/ecrire/install/etape_4.php
@@ -15,7 +15,7 @@ function install_etape_4_dist()
{
global $adresse_db, $choix_db, $login_db, $pass_db, $spip_lang_right, $spip_version, $table_new, $chmod;
- install_debut_html();
+ install_debut_html('AUTO', ' onLoad="document.getElementById(\'suivant\').focus();return false;"');
echo info_etape(_T('info_creation_tables'));
@@ -96,11 +96,11 @@ function install_etape_4_dist()
echo "<p><b>"._T('info_base_installee')."</b></p><p>\n"._T('info_etape_suivante_1');
echo generer_url_post_ecrire('install');
- echo "<INPUT TYPE='hidden' NAME='etape' VALUE='5' />";
+ echo "<input type='hidden' name='etape' value='5' />";
echo bouton_suivant();
- echo "</FORM>";
+ echo "</form>";
}
else if ($result_ok) {
echo _T('alerte_maj_impossible', array('version' => $spip_version));
diff --git a/ecrire/install/etape_5.php b/ecrire/install/etape_5.php
index ef64ffc05c..739c6f2125 100644
--- a/ecrire/install/etape_5.php
+++ b/ecrire/install/etape_5.php
@@ -37,7 +37,7 @@ function install_etape_5_dist()
echo generer_url_post_ecrire('install');
- echo "<INPUT TYPE='hidden' NAME='etape' VALUE='6' />";
+ echo "<input type='hidden' name='etape' value='6' />";
echo fieldset(_T('info_identification_publique'),
array(
diff --git a/ecrire/install/etape_6.php b/ecrire/install/etape_6.php
index d40f18e81f..cd272e1c28 100644
--- a/ecrire/install/etape_6.php
+++ b/ecrire/install/etape_6.php
@@ -15,7 +15,7 @@ function install_etape_6_dist()
{
global $email,$login,$nom,$pass,$spip_lang_right;
- install_debut_html();
+ install_debut_html('AUTO', ' onLoad="document.getElementById(\'suivant\').focus();return false;"');
echo info_etape(_T('info_derniere_etape'),
"<b>"._T('info_code_acces')."</b></p><p>" .
--
GitLab