From 481fca74492a9346507538de5e95868e3b9c58f3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 25 Apr 2007 21:45:28 +0000
Subject: [PATCH] "homogeneiser l'install, l'install ldap et les premiers pas
une css specifique pour minipres corriger les defaut d'accessibilite sur
l'install"
---
.gitattributes | 1 +
dist/images/logo-spip.gif | Bin 12174 -> 12976 bytes
dist/minipres.css | 78 ++++++++++++++++++++++++
ecrire/exec/install.php | 25 +-------
ecrire/inc/commencer_page.php | 35 ++++++-----
ecrire/inc/minipres.php | 107 +++++++--------------------------
ecrire/inc/premiers_pas.php | 66 +++-----------------
ecrire/inc/presentation.php | 6 +-
ecrire/install/etape_1.php | 2 +
ecrire/install/etape_3.php | 9 +--
ecrire/install/etape_5.php | 5 +-
ecrire/install/etape_6.php | 4 +-
ecrire/install/etape_ldap1.php | 1 +
ecrire/install/etape_ldap2.php | 11 ++--
ecrire/install/etape_ldap3.php | 1 +
ecrire/install/etape_ldap4.php | 7 ++-
ecrire/install/etape_ldap5.php | 1 +
17 files changed, 163 insertions(+), 196 deletions(-)
create mode 100644 dist/minipres.css
diff --git a/.gitattributes b/.gitattributes
index c2ee70b7ff..f58ebbd1ea 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -238,6 +238,7 @@ dist/javascript/jquery.js -text
dist/javascript/multilang.js -text
dist/javascript/pause.js -text
dist/jquery.js.html -text
+dist/minipres.css -text
dist/modeles/article_mots.html -text
dist/modeles/article_traductions.html -text
dist/modeles/doc.html -text
diff --git a/dist/images/logo-spip.gif b/dist/images/logo-spip.gif
index 9a6c69cb00fe74ea3010fe9e07d535dc6fcf3974..5302cca81caf95a02ab88bc420e7834aefcd1a44 100644
GIT binary patch
literal 12976
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
literal 12174
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
JAF%@z{twVj4o?68
diff --git a/dist/minipres.css b/dist/minipres.css
new file mode 100644
index 0000000000..4eda4c8c91
--- /dev/null
+++ b/dist/minipres.css
@@ -0,0 +1,78 @@
+body {
+ background: #F8F7F3;
+ color: #000;
+ font-family: Verdana,Arial,Sans,sans-serif;
+ font-size:0.9em;
+}
+h1 {
+ color: #970038;
+ margin:1em 0 1em 0;
+ font-family: Verdana;
+ font-weigth: bold;
+ font-size: 1.3em;
+}
+h2 {
+ font-weigth: normal;
+ font-size: 1.2em;
+ margin:0.8em 0 0.8em 0;
+}
+a { color: #E86519; text-decoration: none; }
+a:visited { color: #6E003A; }
+a:active { color: #FF9900; }
+img { border: 0; }
+p { text-align: justify; }
+ul { text-align: justify; list-style-type: none; }
+fieldset, .fieldset {
+ text-align:left;
+ border: none;
+ padding: 0px;
+ margin-top: 1em;
+ font-size:0.9em;
+}
+legend { font-weight: bold; font-size:1.1em;color:#0033cc;}
+label {}
+#minipres {
+ border:2px solid #888888;
+ width: 30em;
+ text-align: center;
+ margin: 1em auto 1em auto;
+ padding:1em;
+ background:#fff;
+}
+.petit-centre { font-family: Verdana,Arial,Sans,sans-serif; font-size: 1em; }
+.petit-centre p { text-align: center; }
+.suivant { text-align: right; display: block; margin-top: 1em; }
+.toile_foncee { background: #777; }
+.fondl {
+ padding: 3px; background-color: #eee; border: 1px solid #333;
+ background-position: center bottom;
+ font-size: 0.9em;
+ font-family: Verdana,Arial,Sans,sans-serif;
+}
+.formo {
+ width: 100%; display: block; padding: 3px;
+ margin-bottom: 1em;
+ background-color: #FFF;
+ border: 1px solid #333;
+ background-position: center bottom;
+ behavior: url(win_width.htc);
+ font-size: 1em;
+ font-family: Verdana,Arial,Sans,sans-serif;
+}
+p.resultat { background:#000;color:#fff;padding:0.2em 0.1em;}
+#etapes { display:block;position:absolute;top:10px;left:10px;}
+#etapes span {
+ margin-top:-0.5em;
+ display:block;
+ padding:12px 14px;
+ margin-bottom:5px;
+}
+#etapes span em{
+ font-size:2em;
+ font-weight:bold;
+}
+#etapes span span{position:absolute;top:-100px;left:-100px;}
+#etapes span.ok {background:url(images/etape-ok.gif) center no-repeat;}
+#etapes span.encours {background:url(images/etape-encours.gif) center no-repeat;}
+#etapes span.todo {background:url(images/etape-todo.gif) center no-repeat;}
+.nettoyeur {clear:both;height:0px;line-height:0px;font-size:0px;padding:0;margin:0;}
\ No newline at end of file
diff --git a/ecrire/exec/install.php b/ecrire/exec/install.php
index 5dfdf8a378..0fc6a747f2 100644
--- a/ecrire/exec/install.php
+++ b/ecrire/exec/install.php
@@ -112,27 +112,8 @@ function login_hebergeur() {
// http://doc.spip.org/@info_etape
function info_etape($titre, $complement = ''){
- $en_cours = _request('etape')?_request('etape'):"";
- $liste = find_all_in_path('install/','etape_([0-9])+[.]php');
- $debut = 1; $etat = "ok";
- $last = count($liste);
-
- $aff_etapes = "<span id='etapes'>";
- foreach($liste as $etape=>$fichier){
- if ($etape=="etape_{$en_cours}.php"){
- if ($debut<$last)
- $etat = "encours";
- else
- $etat = "ok";
- }
- $aff_etapes .= "<span class='$etat'>".(($debut<$last)?$debut:"go")."</span>";
- if ($etat == "encours")
- $etat = 'todo';
- $debut++;
- }
- $aff_etapes .= "<br class='nettoyeur' /> </span>\n";
-
- return $aff_etapes."\n<h2>".$titre."</h2>\n" .
+ return "<h2>".$titre."</h2>\n" .
($complement ? "<br />".$complement."\n":'');
}
-?>
+
+?>
\ No newline at end of file
diff --git a/ecrire/inc/commencer_page.php b/ecrire/inc/commencer_page.php
index efacec1e90..3d5a0a01b4 100644
--- a/ecrire/inc/commencer_page.php
+++ b/ecrire/inc/commencer_page.php
@@ -17,7 +17,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
//
// http://doc.spip.org/@inc_commencer_page_dist
-function inc_commencer_page_dist($titre = "", $rubrique = "accueil", $sous_rubrique = "accueil", $id_rubrique = "",$menu=true) {
+function inc_commencer_page_dist($titre = "", $rubrique = "accueil", $sous_rubrique = "accueil", $id_rubrique = "",$menu=true,$minipres=false) {
global $spip_ecran;
include_spip('inc/headers');
@@ -26,7 +26,7 @@ function inc_commencer_page_dist($titre = "", $rubrique = "accueil", $sous_rubri
if ($spip_ecran == "large") $largeur = 974; else $largeur = 750;
- return init_entete($titre, $id_rubrique)
+ return init_entete($titre, $id_rubrique, $minipres)
. init_body($rubrique, $sous_rubrique, $id_rubrique,$menu)
. "<div id='page'>"
. avertissement_messagerie()
@@ -35,7 +35,7 @@ function inc_commencer_page_dist($titre = "", $rubrique = "accueil", $sous_rubri
// envoi du doctype et du <head><title>...</head>
// http://doc.spip.org/@init_entete
-function init_entete($titre='', $id_rubrique=0) {
+function init_entete($titre='', $id_rubrique=0, $minipres=false) {
include_spip('inc/gadgets');
if (!$nom_site_spip = textebrut(typo($GLOBALS['meta']["nom_site"])))
@@ -48,7 +48,7 @@ function init_entete($titre='', $id_rubrique=0) {
. (($c = $GLOBALS['meta']['charset']) ?
"; charset=$c" : '')
. "' />\n"
- . envoi_link($nom_site_spip);
+ . envoi_link($nom_site_spip,$minipres);
// anciennement verifForm
$head .= '
@@ -87,12 +87,13 @@ function init_body($rubrique='accueil', $sous_rubrique='accueil', $id_rubrique='
$res = pipeline('body_prive',"<body class='$rubrique $sous_rubrique'"
. ($GLOBALS['spip_lang_rtl'] ? " dir='rtl'" : "")
- .'>')
- . "\n<div><map name='map_layout' id='map_layout'>"
- . lien_change_var (self(), 'set_disp', 1, '1,0,18,15', _T('lien_afficher_texte_seul'), "onmouseover=\"changestyle('bandeauvide');\" onfocus=\"changestyle('bandeauvide');\" onblur=\"changestyle('bandeauvide');\"")
- . lien_change_var (self(), 'set_disp', 2, '19,0,40,15', _T('lien_afficher_texte_icones'), "onmouseover=\"changestyle('bandeauvide');\" onfocus=\"changestyle('bandeauvide');\" onblur=\"changestyle('bandeauvide');\"")
- . lien_change_var (self(), 'set_disp', 3, '41,0,59,15', _T('lien_afficher_icones_seuls'), "onmouseover=\"changestyle('bandeauvide');\" onfocus=\"changestyle('bandeauvide');\" onblur=\"changestyle('bandeauvide');\"")
- . "\n</map></div>";
+ .'>');
+ if ($menu)
+ $res .= "\n<div><map name='map_layout' id='map_layout'>"
+ . lien_change_var (self(), 'set_disp', 1, '1,0,18,15', _T('lien_afficher_texte_seul'), "onmouseover=\"changestyle('bandeauvide');\" onfocus=\"changestyle('bandeauvide');\" onblur=\"changestyle('bandeauvide');\"")
+ . lien_change_var (self(), 'set_disp', 2, '19,0,40,15', _T('lien_afficher_texte_icones'), "onmouseover=\"changestyle('bandeauvide');\" onfocus=\"changestyle('bandeauvide');\" onblur=\"changestyle('bandeauvide');\"")
+ . lien_change_var (self(), 'set_disp', 3, '41,0,59,15', _T('lien_afficher_icones_seuls'), "onmouseover=\"changestyle('bandeauvide');\" onfocus=\"changestyle('bandeauvide');\" onblur=\"changestyle('bandeauvide');\"")
+ . "\n</map></div>";
if ($spip_display == "4") {
$res .= "<ul>"
@@ -175,15 +176,13 @@ function init_body($rubrique='accueil', $sous_rubrique='accueil', $id_rubrique='
$res .= "</div></li>"
. "</ul></div>";
+ // <div> pour la barre des gadgets
+ // (elements invisibles qui s'ouvrent sous la barre precedente)
+
+ $res .= bandeau_gadgets($largeur, true, $id_rubrique);
} // fin bandeau colore
-
- // <div> pour la barre des gadgets
- // (elements invisibles qui s'ouvrent sous la barre precedente)
-
- $res .= bandeau_gadgets($largeur, true, $id_rubrique)
- . "</div>"
- . "</div>\n";
-
+ $res .= "</div>"
+ . "</div>\n";
return $res;
}
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index 26f3688c42..644b49dfec 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -43,90 +43,9 @@ function install_debut_html($titre = 'AUTO', $onLoad = '') {
"<head>\n".
"<title>".
textebrut($titre).
- "</title>".<<<styles
-<style type='text/css'><!--
-/*<![CDATA[*/
-body {
- background: #FFF;
- color: #000;
- font-family: Verdana,Arial,Sans,sans-serif;
- font-size:0.9em;
-}
-h1 {
- color: #970038;
- margin:1em 0 1em 0;
- font-family: Verdana;
- font-weigth: bold;
- font-size: 1.3em;
-}
-h2 {
- font-weigth: normal;
- font-size: 1.2em;
- margin:0.8em 0 0.8em 0;
-}
-a { color: #E86519; text-decoration: none; }
-a:visited { color: #6E003A; }
-a:active { color: #FF9900; }
-img { border: 0; }
-p { text-align: justify; }
-ul { text-align: justify; list-style-type: none; }
-fieldset, .fieldset {
- text-align:$spip_lang_left;
- border: none;
- padding: 0px;
- margin-top: 1em;
- font-size:0.9em;
-}
-legend { font-weight: bold; font-size:1.1em;color:#0033cc;}
-label {}
-#minipres {
- border:2px solid #888888;
- width: 30em;
- text-align: center;
- margin: 1em auto 1em auto;
- padding:1em;
- background:#ffffcc;
-}
-.petit-centre { font-family: Verdana,Arial,Sans,sans-serif; font-size: 1em; }
-.petit-centre p { text-align: center; }
-.suivant { text-align: $spip_lang_right; display: block; margin-top: 1em; }
-.toile_foncee { background: #777; }
-.fondl {
- padding: 3px; background-color: #eee; border: 1px solid #333;
- background-position: center bottom;
- font-size: 0.9em;
- font-family: Verdana,Arial,Sans,sans-serif;
-}
-.formo {
- width: 100%; display: block; padding: 3px;
- margin-bottom: 1em;
- background-color: #FFF;
- border: 1px solid #333;
- background-position: center bottom;
- behavior: url(../dist/win_width.htc);
- font-size: 1em;
- font-family: Verdana,Arial,Sans,sans-serif;
-}
-#etapes { display:block;}
-#etapes span {
- display:block;
- float:$spip_lang_left;
- width:48px;
- height:42px;
- margin-right:5px;
- font-size:26px;
- font-weight:bold;
- padding-top:6px;
-}
-#etapes span.ok {background:url($dir_img_pack/etape-ok.gif)}
-#etapes span.encours {background:url($dir_img_pack/etape-encours.gif)}
-#etapes span.todo {background:url($dir_img_pack/etape-todo.gif)}
-.nettoyeur {clear:both;height:0px;line-height:0px;font-size:0px;padding:0;margin:0;}
-
-]]>
---></style>
-styles
- . "<script type='text/javascript' src='" . _DIR_JAVASCRIPT . "spip_barre.js'></script>\n". // cet appel permet d'assurer un copier-coller du nom du repertoire a creer dans tmp (esj)
+ "</title>
+ <link rel='stylesheet' href='".find_in_path('minipres.css')."' type='text/css' media='all' />
+ <script type='text/javascript' src='" . _DIR_JAVASCRIPT . "spip_barre.js'></script>\n". // cet appel permet d'assurer un copier-coller du nom du repertoire a creer dans tmp (esj)
# "<script type='text/javascript' src='" . _DIR_JAVASCRIPT . "jquery.js'></script>".
"</head>
<body".$onLoad.">
@@ -346,4 +265,24 @@ function http_style_background($img, $att='')
return " style='background: url(\"".http_wrapper($img)."\")" .
($att ? (' ' . $att) : '') . ";'";
}
+function info_progression_etape($en_cours,$phase,$dir){
+ //$en_cours = _request('etape')?_request('etape'):"";
+ $liste = find_all_in_path($dir,$phase.'(([0-9])+|fin)[.]php');
+ $debut = 1; $etat = "ok";
+ $last = count($liste);
+
+ $aff_etapes = "<span id='etapes'>";
+ foreach($liste as $etape=>$fichier){
+ if ($etape=="$phase$en_cours.php"){
+ $etat = "encours";
+ }
+ $aff_etapes .= "<span class='$etat'><em>".(($debut<$last)?$debut:"go")."</em><span>"
+ .(($debut<$last)?", ":" !")."</span></span>";
+ if ($etat == "encours")
+ $etat = 'todo';
+ $debut++;
+ }
+ $aff_etapes .= "<br class='nettoyeur' /> </span>\n";
+ return $aff_etapes;
+}
?>
diff --git a/ecrire/inc/premiers_pas.php b/ecrire/inc/premiers_pas.php
index 0f72249690..8deebefffb 100644
--- a/ecrire/inc/premiers_pas.php
+++ b/ecrire/inc/premiers_pas.php
@@ -10,8 +10,10 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
+include_spip('inc/minipres');
// http://doc.spip.org/@premiers_pas_etapes
function premiers_pas_etapes($etape,$titre,$texte){
+ global $spip_lang_left;
if (!autoriser('administrer','spip')) {
echo _T('avis_non_acces_page');
echo fin_gauche(), fin_page();
@@ -21,10 +23,11 @@ function premiers_pas_etapes($etape,$titre,$texte){
lire_metas();
$commencer_page = charger_fonction('commencer_page', 'inc');
- echo $commencer_page(_T('titre_page_premiers_pas'), "premiers_pas", "premiers_pas","",false);
-
- echo premiers_pas_barre_etapes($etape);
+ echo $commencer_page(_T('titre_page_premiers_pas'), "premiers_pas", "premiers_pas","",false,true);
+ echo "<div id='minipres' style='width:750px;text-align:$spip_lang_left;'>";
+ if ($etape!=='fin')
+ echo "<input type='submit' class='fondl' name='cancel' style='cursor:pointer;pointer:hand;' value='"._L("Utiliser directement SPIP")."' />";
echo debut_gauche();
creer_colonne_droite();
debut_droite();
@@ -47,67 +50,18 @@ function premiers_pas_etapes($etape,$titre,$texte){
. "<input type='hidden' name='pas' value='1' />";
echo redirige_action_auteur('premiers_pas', $etape, 'accueil', '',$res);
- echo fin_gauche(), fin_page();
+ echo fin_gauche(),
+ "</div>",
+ info_progression_etape($etape,'pas_','premiers_pas/'),
+ fin_page();
}
-// http://doc.spip.org/@premiers_pas_barre_etapes
-function premiers_pas_barre_etapes($etape){
- $liste = find_all_in_path('premiers_pas/',"pas_[^.]*[.]php");
- echo "<style type='text/css'>\n";
- echo <<<EOF
-ul.etapes {
- width:100% ;
- height:3em;
- font-size:large;
- font-weight:bold;
-}
-ul.etapes li.etape{
- display:block;
- float:left;
- width:2em;
- height:2em;
- padding-top:0.7em;
- text-align:center;
- border:2px solid #3874b0; /* couleur foncee a remettre */
- margin:0 0.5em 0 0;
-}
-ul.etapes li.etape.on{
- background-color:#edf3fe; /* couleur claire a remettre */
-}
-ul.etapes li.etape.off{
- color:#aaa;
- border:2px solid #888;
-}
-ul.etapes li.etape.encours{
- background-color:#3874b0; /* couleur foncee a remettre */
- border:2px solid #edf3fe; /* couleur claire a remettre */
- color:#fff;
-}
-EOF;
- echo "</style>\n";
- echo "<ul class='etapes'>";
- $todo = false;
- $npas = 1;
- foreach($liste as $pas=>$chemin){
- if ($todo) $class = 'off';
- else $class='on';
- if ($pas == "pas_{$etape}.php"){
- $class = 'encours';
- $todo = true;
- }
- echo "<li class='etape $class'>$npas</li>";
- $npas++;
- }
- echo "</ul>";
-
-}
// http://doc.spip.org/@premiers_pas_boutons_bas
function premiers_pas_boutons_bas($etape){
global $spip_lang_right,$spip_lang_left;
$res = "<div class='verdana3' style='margin-top:2em;text-align:$spip_lang_right'>";
if ($etape!=='fin'){
- $res .= "<input type='submit' class='fondl' name='cancel' style='cursor:pointer;position:absolute;left:376px;top:40px;' value='"._L("Pas de premiers pas, utiliser directement SPIP")."' />";
$res .= "<input type='submit' name='submit' class='fondo' value='"._L("Etape suivante")."' />";
}
else
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 22fda58c4a..34921b20b6 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -1244,7 +1244,7 @@ function afficher_forum_4($compteur_forum, $nb_forum, $thread)
// http://doc.spip.org/@envoi_link
-function envoi_link($nom_site_spip) {
+function envoi_link($nom_site_spip, $minipres=false) {
global $auteur_session, $connect_toutes_rubriques, $spip_display, $spip_lang;
$couleurs = charger_fonction('couleurs', 'inc');
@@ -1281,6 +1281,10 @@ function envoi_link($nom_site_spip) {
. (_SPIP_AJAX ? 'invisible' : 'visible')
. '.css')
.'" />' . "\n"
+
+ // CSS optionelle minipres
+ . ($minipres?'<link rel="stylesheet" type="text/css" href="'
+ . find_in_path('minipres.css').'" />' . "\n":"")
// favicon.ico
. '<link rel="shortcut icon" href="'
diff --git a/ecrire/install/etape_1.php b/ecrire/install/etape_1.php
index 763c789a09..c1f1b58640 100644
--- a/ecrire/install/etape_1.php
+++ b/ecrire/install/etape_1.php
@@ -82,6 +82,8 @@ function install_etape_1_dist()
)
. bouton_suivant()));
+
+ echo info_progression_etape(1,'etape_','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_3.php b/ecrire/install/etape_3.php
index b352129d1b..7109ee579f 100644
--- a/ecrire/install/etape_3.php
+++ b/ecrire/install/etape_3.php
@@ -28,7 +28,7 @@ function install_etape_3_dist()
if (($db_connect=="0") && $link){
- echo "<p><b>"._T('info_connexion_ok')."</b></p>";
+ echo "<p class='resultat'><b>"._T('info_connexion_ok')."</b></p>";
echo info_etape(_T('info_choix_base')." "._T('menu_aide_installation_choix_base').aide ("install2"));
$link = mysql_connect("$adresse_db","$login_db","$pass_db");
@@ -94,16 +94,17 @@ function install_etape_3_dist()
. "<fieldset><legend>"._T('texte_choix_table_prefix')."</legend>\n"
. "<p><label for='table_prefix'>"._T('info_table_prefix')."</label></p><p>"
. "\n<input type='text' id='table_prefix' name='table_prefix' class='fondl' value='" .
- $table_prefix . "' size='10' /></p></fieldset>"
+ $table_prefix . "' size='20' /></p></fieldset>"
. bouton_suivant()));
}
else {
echo info_etape(_T('info_connexion_base'));
- echo "<p><b>"._T('avis_connexion_echec_1')."</b></p>";
+ echo "<p class='resultat'><b>"._T('avis_connexion_echec_1')."</b></p>";
echo "<p>"._T('avis_connexion_echec_2')."</p>";
echo "<p style='font-size: small;'>"._T('avis_connexion_echec_3')."</p>";
}
-
+
+ echo info_progression_etape(3,'etape_','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_5.php b/ecrire/install/etape_5.php
index 04278a5474..d4b5728bad 100644
--- a/ecrire/install/etape_5.php
+++ b/ecrire/install/etape_5.php
@@ -112,7 +112,7 @@ function install_etape_5_dist()
echo install_debut_html();
$result_ok = install_bases();
if ($result_ok) {
- echo "<p><b>"._T('info_base_installee')."</b></p>";
+ echo "<p class='resultat'><b>"._T('info_base_installee')."</b></p>";
if (@file_exists(_FILE_CONNECT_INS . _FILE_TMP . '.php'))
include(_FILE_CONNECT_INS . _FILE_TMP . '.php');
@@ -185,9 +185,10 @@ function install_etape_5_dist()
echo _T('alerte_maj_impossible', array('version' => $spip_version));
}
else {
- echo "<b>"._T('avis_operation_echec')."</b> "._T('texte_operation_echec');
+ echo "<p class='resultat'><b>"._T('avis_operation_echec')."</b></p>"._T('texte_operation_echec');
}
+ echo info_progression_etape(5,'etape_','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_6.php b/ecrire/install/etape_6.php
index 3bd4b2f841..55ab94f40b 100644
--- a/ecrire/install/etape_6.php
+++ b/ecrire/install/etape_6.php
@@ -23,7 +23,7 @@ function install_etape_6_dist()
echo minipres(
'AUTO',
"<h2>"._T('info_passes_identiques')."</h2>\n".
- "<p>"._T('avis_connexion_echec_2')."</p>"
+ "<p class='resultat'>"._T('avis_connexion_echec_2')."</p>"
);
exit;
}
@@ -106,6 +106,8 @@ function install_etape_6_dist()
echo "<form action='", generer_url_ecrire(), "' method='post'><div>";
echo bouton_suivant();
echo "</div></form>";
+
+ echo info_progression_etape(6,'etape_','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_ldap1.php b/ecrire/install/etape_ldap1.php
index 0a905891d5..a3813776e1 100644
--- a/ecrire/install/etape_ldap1.php
+++ b/ecrire/install/etape_ldap1.php
@@ -79,6 +79,7 @@ function install_etape_ldap1_dist()
. bouton_suivant()));
+ echo info_progression_etape(1,'etape_ldap','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_ldap2.php b/ecrire/install/etape_ldap2.php
index a1bcb6c1b1..12659bb19d 100644
--- a/ecrire/install/etape_ldap2.php
+++ b/ecrire/install/etape_ldap2.php
@@ -53,14 +53,15 @@ function install_etape_ldap2_dist()
. bouton_suivant()));
}
else {
- echo info_etape(_T('titre_connexion_ldap'),
- _T('avis_connexion_ldap_echec_1').
- "<br />"._T('avis_connexion_ldap_echec_2').
+ echo info_etape(_T('titre_connexion_ldap')),
+ "<p class='resultat'>"._T('avis_connexion_ldap_echec_1')."</p>",
+ "<p>"._T('avis_connexion_ldap_echec_2').
"<br />\n"._T('avis_connexion_ldap_echec_3') .
- '<br /><br />'. $erreur. '<b> ?</b>'
- );
+ '<br /><br />'. $erreur. '<b> ?</b></p>'
+ ;
}
+ echo info_progression_etape(2,'etape_ldap','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_ldap3.php b/ecrire/install/etape_ldap3.php
index f3520ce079..15725af53b 100644
--- a/ecrire/install/etape_ldap3.php
+++ b/ecrire/install/etape_ldap3.php
@@ -72,6 +72,7 @@ function install_etape_ldap3_dist()
. "\n</fieldset>"
. bouton_suivant()));
+ echo info_progression_etape(3,'etape_ldap','install/');
echo install_fin_html();
}
diff --git a/ecrire/install/etape_ldap4.php b/ecrire/install/etape_ldap4.php
index 7697516264..65e0bd7076 100644
--- a/ecrire/install/etape_ldap4.php
+++ b/ecrire/install/etape_ldap4.php
@@ -27,9 +27,9 @@ function install_etape_ldap4_dist()
$fail = (ldap_errno($ldap_link) == 32);
if ($fail) {
- info_etape(_T('info_chemin_acces_annuaire'),
- "<b>"._T('avis_operation_echec')."</b> "._T('avis_chemin_invalide_1')." (<tt>".htmlspecialchars($base_ldap)."</tt>) "._T('avis_chemin_invalide_2')
- );
+ echo info_etape(_T('info_chemin_acces_annuaire')),
+ "<p class='resultat'><b>"._T('avis_operation_echec')."</b></p><p>"._T('avis_chemin_invalide_1'),
+ " (<tt>".htmlspecialchars($base_ldap)."</tt>) "._T('avis_chemin_invalide_2')."</p>";
}
else {
info_etape(_T('info_reglage_ldap'));
@@ -73,6 +73,7 @@ function install_etape_ldap4_dist()
. bouton_suivant()));
}
+ echo info_progression_etape(4,'etape_ldap','install/');
echo install_fin_html();
}
?>
diff --git a/ecrire/install/etape_ldap5.php b/ecrire/install/etape_ldap5.php
index c47cfc7ffd..122044630e 100644
--- a/ecrire/install/etape_ldap5.php
+++ b/ecrire/install/etape_ldap5.php
@@ -37,6 +37,7 @@ function install_etape_ldap5_dist()
"<input type='hidden' name='etape' value='5' />"
. bouton_suivant()));
+ echo info_progression_etape(5,'etape_ldap','install/');
echo install_fin_html();
}
--
GitLab