diff --git a/.gitattributes b/.gitattributes
index c2ee70b7ff80d07b3069311deb92513162eeb106..f58ebbd1ea97f3b6e0bb1937189ee41416d548ed 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
Binary files a/dist/images/logo-spip.gif and b/dist/images/logo-spip.gif differ
diff --git a/dist/minipres.css b/dist/minipres.css
new file mode 100644
index 0000000000000000000000000000000000000000..4eda4c8c91c593b0e1c4538efea7bdd62113e121
--- /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 5dfdf8a378dd1a6cbc9bb0adbffef35adea5d63b..0fc6a747f2e5ba65e95aba5dfa0d8c5cc422bae7 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 efacec1e90db334da91026dd5b2fc8e5a804c24b..3d5a0a01b46b5825e8672e793524bdfd346d412c 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 26f3688c420fa09cdd7b3d59cd17ed462c22a741..644b49dfecc80739d6203ae227207c95de43e166 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 0f72249690c6828ca9059446a874e8fca5d2dd76..8deebefffbb48d581c13b88b530b75b72266541d 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 22fda58c4a6386890328b18cbdf83732e55ab4e8..34921b20b6005a6097bde95e791e5de487ce83e2 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 763c789a0976e776676f3c7d7ffc89829ca3fd17..c1f1b586400ea88d342c5382c77a75d8995c4a4d 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 b352129d1b324f5c82655e9528727956f821b4ff..7109ee579f0a6792737db70cf7a03f36e7899064 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 04278a5474b4332980156952ecedd3394547b129..d4b5728badf2ee07033ef6c8548364e6c5f13a01 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 3bd4b2f8411cc396198cde5baa66d4cc7e828cdc..55ab94f40bf71eb12105fd0b8514f45335b3da43 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 0a905891d5c0270ea96fc3089503e27de15b4215..a3813776e1fdff3ff7eab01fadf520e384c3ecd6 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 a1bcb6c1b17257edaadd934ef03236b2e46c4b50..12659bb19d90b4a849bcd3013198f42d6ed06656 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 f3520ce07984f944f4af89d7dc556451d4784433..15725af53b36efaed89761bd320c79fe9a32affb 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 7697516264c1b62a3d23b99d8c4bf4de1b95b97d..65e0bd7076c522b4a0e62685c27fca556f4d8557 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 c47cfc7ffd6a98e84eb70bd7615bf31b612787d7..122044630e1d765d513511dba7a689c27dde416c 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();
}