From 32a46b4df326247e3c03b2cbe99fd967d55fabe1 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Thu, 1 Sep 2005 14:59:20 +0000
Subject: [PATCH] Corrections d'affichage: charset, et pb d'effacement Mozilla
---
ecrire/ajax_page.php | 5 +++--
ecrire/articles_edit.php3 | 2 +-
ecrire/inc_presentation.php3 | 5 +++--
ecrire/js_menu_rubriques.php | 4 ++--
ecrire/presentation.js | 2 +-
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ecrire/ajax_page.php b/ecrire/ajax_page.php
index d099846897..6b3609004d 100644
--- a/ecrire/ajax_page.php
+++ b/ecrire/ajax_page.php
@@ -12,7 +12,8 @@
include ("inc.php3");
$charset = lire_meta("charset");
-echo "<"."?xml version='1.0' encoding='$charset'?>";
+@header('Content-type: text/html; charset=$charset');
+echo "<"."?xml version='1.0' encoding='$charset'?>\n";
if ($fonction == "aff_rub") {
include_ecrire("inc_mini_nav.php");
@@ -24,7 +25,7 @@ echo "<"."?xml version='1.0' encoding='$charset'?>";
}
else if ($fonction == "aff_rubrique") {
include_ecrire("inc_mini_nav.php");
- echo mini_nav ($id_rubrique, "choix-parent", "this.form.id_rubrique.value=::sel::;this.form.titreparent.value='::sel2::';findObj('selection_rubrique').style.display='none';", 0, $aff_racine=false);
+ echo mini_nav ($id_rubrique, "choix_parent", "this.form.id_rubrique.value=::sel::;this.form.titreparent.value='::sel2::';findObj('selection_rubrique').style.display='none';", 0, $aff_racine=false);
}
else if ($fonction == "aff_nav_recherche") {
include_ecrire("inc_mini_nav.php");
diff --git a/ecrire/articles_edit.php3 b/ecrire/articles_edit.php3
index c689cab680..141dc4ce39 100644
--- a/ecrire/articles_edit.php3
+++ b/ecrire/articles_edit.php3
@@ -399,7 +399,7 @@ echo "<P><HR><P>";
} else {
echo "<table width='100%'><tr width='100%'><td width='45'>";
- echo "<a href=\"#\" onClick=\"javascript:if(findObj('selection_rubrique').style.display=='none') {charger_id_url_si_vide('ajax_page.php?fonction=aff_rubrique&id_rubrique=$id_rubrique','selection_rubrique');} else {findObj('selection_rubrique').style.display='none';} return true;\"><img src='img_pack/loupe.png' style='border: 0px; vertical-align: middle;' /></a> ";
+ echo "<a href=\"#\" onClick=\"javascript:if(findObj('selection_rubrique').style.display=='none') {charger_id_url_si_vide('ajax_page.php?fonction=aff_rubrique&id_rubrique=$id_rubrique','selection_rubrique');} else {findObj('selection_rubrique').style.display='none';}\"><img src='img_pack/loupe.png' style='border: 0px; vertical-align: middle;' /></a> ";
echo "<img src='img_pack/searching.gif' id='img_selection_rubrique' style='visibility: hidden;'>";
echo "</td><td>";
echo "<input type='text' id='titreparent' name='titreparent' disabled='disabled' class='forml' value=\"$titre_parent\" />";
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index a0d013bc14..2e3596cf55 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -1848,6 +1848,7 @@ function debut_html($titre = "", $rubrique="", $onLoad="") {
if ($activer_breves != "non")
echo "<link rel='alternate' type='application/rss+xml' title='".addslashes($nom_site_spip)." ("._T("info_breves_03").")' href='$adresse_site/backend-breves.php3' />";
}
+
echo "\n",'<link rel="stylesheet" type="text/css" href="', _DIR_RESTREINT;
$link = new Link('spip_style.php3');
@@ -2710,9 +2711,9 @@ else {
echo "<div id='bandeautoutsite' class='bandeau_couleur_sous' style='$spip_lang_left: 0px;'>";
echo "<a href='articles_tous.php3' class='lien_sous'>"._T('icone_site_entier')."</a>";
echo "<img src='"._DIR_IMG_PACK."searching.gif' id='img_nav-recherche' style='border:0px; visibility: hidden' />";
-// afficher_menu_rubriques();
+ afficher_menu_rubriques();
- echo "<div id='nav-recherche' style='width: 450px; visibility: hidden;'></div>";
+// echo "<div id='nav-recherche' style='width: 450px; visibility: hidden;'></div>";
echo "</div>";
// FIN GADGET Menu rubriques
diff --git a/ecrire/js_menu_rubriques.php b/ecrire/js_menu_rubriques.php
index b74367b11f..4b2f1d0b03 100644
--- a/ecrire/js_menu_rubriques.php
+++ b/ecrire/js_menu_rubriques.php
@@ -15,8 +15,8 @@ include_once("inc.php3");
if (http_last_modified(@filemtime("js_menu_rubriques.php"), time() + 24 * 3600))
exit;
-
-@Header ("Content-Type: text/javascript");
+$charset = lire_meta("charset");
+@header('Content-type: text/javascript; charset=$charset');
function extraire_article($id_p) {
if (array_key_exists($id_p, $GLOBALS['db_art_cache'])) {
diff --git a/ecrire/presentation.js b/ecrire/presentation.js
index e641f8aed7..bad8da3dfd 100644
--- a/ecrire/presentation.js
+++ b/ecrire/presentation.js
@@ -15,7 +15,7 @@ function changestyle(id_couche, element, style) {
hide_obj("bandeauagenda");
hide_obj("bandeaumessagerie");
hide_obj("bandeausynchro");
- hide_obj("resultats_recherche");
+ hide_obj("nav-recherche");
hide_obj("bandeaurecherche");
hide_obj("bandeauinfoperso");
hide_obj("bandeaudisplay");
--
GitLab