Browse Source

#1210 accessibilite du process d'install amelioree

spip-2.0
Cerdic 15 years ago
parent
commit
f98eec4b06
  1. 2
      dist/minipres.css
  2. 3
      ecrire/inc/install.php
  3. 4
      ecrire/install/etape_2.php
  4. 4
      ecrire/install/etape_3.php
  5. 2
      ecrire/install/etape_4.php

2
dist/minipres.css vendored

@ -31,6 +31,8 @@ label {}
.formo { width: 100%; display: block; background-color: #FFF; background-position: center bottom; margin-bottom: 1em; padding: 3px; border: 1px solid #333; behavior: url(win_width.htc); font-size: 1em; font-family: Verdana, Geneva, Sans, sans-serif; }
p.resultat { background-color: #fcaf3e; padding: 0.2em 0.1em; border: 1px solid #f57900; text-align: center; color: #FFF; font-weight: bold; }
p.resultat.ok {background-color:#73d216;border-color:#C2EF95;}
p.resultat.echec {background-color:#d60c0c;border-color:#f57900;}
#etapes { display: block; position: absolute; top: 10px; left: 10px; }
#etapes span { margin-top: -0.5em; display: block; padding: 12px 14px; margin-bottom: 5px; }

3
ecrire/inc/install.php

@ -160,6 +160,7 @@ function info_progression_etape($en_cours,$phase,$dir){
$liste = find_all_in_path($dir,$phase.'(([0-9])+|fin)[.]php$');
$debut = 1; $etat = "ok";
$last = count($liste);
$texte_etat = array('ok'=>'OK','encours'=>_L('en cours'),'todo'=>_L('à venir'));
$aff_etapes = "<span id='etapes'>";
foreach($liste as $etape=>$fichier){
@ -167,7 +168,7 @@ function info_progression_etape($en_cours,$phase,$dir){
$etat = "encours";
}
$aff_etapes .= ($debut<$last)
? "<span class='$etat'><em>$debut</em><span>,</span> </span>"
? "<span class='$etat'><span>Etape </span><em>$debut</em><span> " . $texte_etat[$etat] . ",<br /></span> </span>"
: '';
if ($etat == "encours")
$etat = 'todo';

4
ecrire/install/etape_2.php

@ -60,7 +60,7 @@ function install_etape_2_dist()
//echo "\n-->\n";
if (($db_connect=="0") && $link) {
echo "<p class='resultat'><b>"._T('info_connexion_ok')."</b></p>\n";
echo "<p class='resultat ok'><b>"._T('info_connexion_ok')."</b></p>\n";
echo info_etape(_T('menu_aide_installation_choix_base').aide ("install2"));
spip_connect_db($adresse_db, 0, $login_db, $pass_db, '',$server_db);
@ -76,7 +76,7 @@ function install_etape_2_dist()
echo install_etape_2_form($hidden, $checked, $res, 3);
} else {
echo info_etape(_T('info_connexion_base'));
echo "<p class='resultat'><b>",
echo "<p class='resultat echec'><b>",
# _T('avis_connexion_echec_1'),
_L('La connexion &agrave; la base de donn&eacute;es a &eacute;chou&eacute;.'),
"</b></p>";

4
ecrire/install/etape_3.php

@ -238,7 +238,7 @@ function install_etape_3_dist()
$res = install_bases($adresse_db, $login_db, $pass_db, $server_db, $choix_db, $sel_db, $chmod_db);
if ($res)
$res .= "<p class='resultat'><b>"._T('avis_operation_echec')."</b></p>"._T('texte_operation_echec');
$res .= "<p class='resultat echec'><b>"._T('avis_operation_echec')."</b></p>"._T('texte_operation_echec');
} else {
$res = '';
@ -260,7 +260,7 @@ function install_etape_3_dist()
$hidden = predef_ou_cache($adresse_db, $login_db, $pass_db, $server_db)
. (defined('_INSTALL_NAME_DB') ? ''
: "\n<input type='hidden' name='sel_db' value='$sel_db' />");
$res = "<p class='resultat'><b>"
$res = "<p class='resultat ok'><b>"
. _T('info_base_installee')
. "</b></p>"
. install_premier_auteur(_request('email'),

2
ecrire/install/etape_4.php

@ -38,7 +38,7 @@ function install_etape_4_dist()
echo minipres(
'AUTO',
"<h2>$echec</h2>\n".
"<p class='resultat'>"._T('avis_connexion_echec_2')."</p>"
"<p class='resultat echec'>"._T('avis_connexion_echec_2')."</p>"
);
exit;
}

Loading…
Cancel
Save