diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 9825b90d93a645e68b775f2ea46b5b362b84e70a..969add82d0f2355d5fc35cd43e8bf260192bf9a3 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -77,11 +77,11 @@ if (ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2})", $date, $regs) $jour = $regs[3]; $heure = $regs[4]; $minute = $regs[5]; - } +} -debut_page("« $titre_article »", "documents", "articles"); +debut_page("« $titre_article »", "documents", "articles", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php index d4d8824d137ee4c90e39135047220b60dc1111b4..d216f48c1217eedb94f30333850c6ab5df1db974 100644 --- a/ecrire/exec/articles_edit.php +++ b/ecrire/exec/articles_edit.php @@ -275,7 +275,7 @@ echo "<P><HR><P>"; function exec_affiche_articles_edit_dist($flag_editable, $id_article, $id_rubrique, $titre, $soustitre, $surtitre, $descriptif, $url, $chapo, $texte, $ps, $new, $nom_site, $url_site, $extra, $id_secteur, $date, $onfocus, $lier_trad, $champs_article) { global $champs_extra; -debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles", "hauteurTextarea();"); +debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles", "hauteurTextarea();", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php index 0690d4cdd9e7ada72d4bc6055815d87cfc8bb5f7..d8b9b7a9476f5be0ee92a8aa0aa0738027e25b2f 100644 --- a/ecrire/exec/articles_forum.php +++ b/ecrire/exec/articles_forum.php @@ -33,7 +33,7 @@ function exec_articles_forum_dist() $id_rubrique = $row["id_rubrique"]; } - debut_page($titre, "documents", "articles"); + debut_page($titre, "documents", "articles", "", "", $id_rubrique); articles_forum_cadres($id_rubrique, $titre, 'articles', "id_article=$id_article"); diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php index 6466e8c7795c00e2766454414633cd9239b8302d..9f803a367a4af723258f3b286fcc689aa1c69745 100644 --- a/ecrire/exec/articles_versions.php +++ b/ecrire/exec/articles_versions.php @@ -111,7 +111,7 @@ foreach ($textes as $var => $t) $$var = $t; -debut_page(_T('info_historique')." « $titre »", "documents", "articles"); +debut_page(_T('info_historique')." « $titre »", "documents", "articles", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php index c9d9819df01040e51d0fda1d7e2faa38b921266f..67575c13d555f3f26c1466845a40bbfcdbad015e 100644 --- a/ecrire/exec/breves_edit.php +++ b/ecrire/exec/breves_edit.php @@ -58,7 +58,7 @@ else { } -debut_page(_T('titre_page_breves_edit', array('titre' => $titre)), "documents", "breves"); +debut_page(_T('titre_page_breves_edit', array('titre' => $titre)), "documents", "breves", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php index 20796ba2fcf345eb48a55d5224cf0e5132a565a0..b2a43cf37eba78e55f766f749dee642a11f6b2f8 100644 --- a/ecrire/exec/breves_voir.php +++ b/ecrire/exec/breves_voir.php @@ -43,7 +43,7 @@ while ($row = spip_fetch_array($result)) { $flag_editable = (($connect_statut == '0minirezo' AND acces_rubrique($id_rubrique)) OR $statut == 'prop'); -debut_page("« $titre_breve »", "documents", "breves"); +debut_page("« $titre_breve »", "documents", "breves", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php index db359a0d664920d7d3ff852fd6f2c18c46eba5d6..bc493f8551bcb411b7bcb4a4a12b83ca384e28e4 100644 --- a/ecrire/exec/sites.php +++ b/ecrire/exec/sites.php @@ -265,7 +265,7 @@ else -debut_page("$titre_page","documents","sites"); +debut_page("$titre_page","documents","sites", "", "", $id_rubrique); //////// parents diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php index a6b9696c8b524ad49857391d2c74751dae59d9df..c674565ce5a782f3d72402272218bf28c46b793c 100644 --- a/ecrire/exec/sites_edit.php +++ b/ecrire/exec/sites_edit.php @@ -37,7 +37,7 @@ else { } -debut_page(_T('info_site_reference_2'), "documents", "sites"); +debut_page(_T('info_site_reference_2'), "documents", "sites", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index c4f4e0bdcb87f1c9ae53aaca13ba7a8327c234b6..b9b9574d0cb7debaa5c289e6990b6167df0bb8a1 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -2138,11 +2138,11 @@ document.write(\"" . addslashes(strtr($html, "\n\r", " "))."\")"); // Presentation de l'interface privee, debut du HTML // -function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre", $onLoad = "", $css="") { +function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre", $onLoad = "", $css="", $id_rubrique = "") { init_entete($titre, $rubrique, $css); definir_barre_boutons(); - init_body($rubrique, $sous_rubrique, $onLoad); + init_body($rubrique, $sous_rubrique, $onLoad, $id_rubrique); debut_corps_page(); } @@ -2172,7 +2172,7 @@ function init_entete($titre, $rubrique, $css='') { } // fonction envoyant la double serie d'icones de redac -function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='') { +function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='', $id_rubrique='') { global $couleur_foncee, $couleur_claire, $adresse_site; global $connect_id_auteur; global $connect_statut; @@ -2181,7 +2181,6 @@ function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='') { global $options, $spip_display, $spip_ecran; global $spip_lang, $spip_lang_rtl, $spip_lang_left, $spip_lang_right; global $browser_verifForm; - global $id_rubrique; $id_rubrique = intval($id_rubrique);