diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php index 98f9debb65b673b368cb37b5e09ad474e078bd6e..84418ca0bea83f0540349d92160bec3cf1a8c3f6 100644 --- a/ecrire/exec/accueil.php +++ b/ecrire/exec/accueil.php @@ -437,7 +437,7 @@ function exec_accueil_dist() $id_rubrique = intval($id_rubrique); pipeline('exec_init',array('args'=>array('exec'=>'accueil','id_rubrique'=>$id_rubrique),'data'=>'')); - debut_page(_T('titre_page_index'), "asuivre", "asuivre"); + debut_page(_T('titre_page_index'), "accueil", "accueil"); debut_gauche(); diff --git a/ecrire/exec/admin_effacer.php b/ecrire/exec/admin_effacer.php index 0af2190f4dc9d41322727278950775c1b8921c9e..be3401f65eb1e095be716cddedec0c86c97246d8 100644 --- a/ecrire/exec/admin_effacer.php +++ b/ecrire/exec/admin_effacer.php @@ -18,7 +18,7 @@ function exec_admin_effacer_dist() { global $connect_statut, $connect_toutes_rubriques, $couleur_foncee; -debut_page(_T('titre_page_admin_effacer'), "administration", "base"); +debut_page(_T('titre_page_admin_effacer'), "configuration", "base"); echo "<br><br><br>"; diff --git a/ecrire/exec/admin_plugin.php b/ecrire/exec/admin_plugin.php index 488318653841d93dfd8a439348ad6d7091cc5f46..8b751d72319b23e9ac77ddaed252090ee9c56dee 100644 --- a/ecrire/exec/admin_plugin.php +++ b/ecrire/exec/admin_plugin.php @@ -15,7 +15,7 @@ function exec_admin_plugin() { $surligne = ""; if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) { - debut_page(_T('icone_admin_plugin'), "administration", "plugin"); + debut_page(_T('icone_admin_plugin'), "configuration", "plugin"); echo _T('avis_non_acces_page'); fin_page(); exit; @@ -34,7 +34,7 @@ function exec_admin_plugin() { if (isset($_GET['surligne'])) $surligne = $_GET['surligne']; global $couleur_claire; - debut_page(_T('icone_admin_plugin'), "administration", "plugin"); + debut_page(_T('icone_admin_plugin'), "configuration", "plugin"); echo "<style type='text/css'>\n"; echo <<<EOF div.cadre-padding ul li { @@ -95,7 +95,7 @@ EOF; echo "<br/><br/><br/>"; gros_titre(_T('icone_admin_plugin')); - // barre_onglets("administration", "plugin"); // a creer dynamiquement en fonction des plugin charges qui utilisent une page admin ? + // barre_onglets("configuration", "plugin"); // a creer dynamiquement en fonction des plugin charges qui utilisent une page admin ? debut_gauche(); debut_boite_info(); diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php index 31ad520d5862399c0ab643d0848f389097f87053..2a6ffc1d94f752173cd0932b035c52cd9b148585 100644 --- a/ecrire/exec/admin_tech.php +++ b/ecrire/exec/admin_tech.php @@ -18,7 +18,7 @@ function exec_admin_tech_dist() { global $connect_statut, $connect_login, $connect_toutes_rubriques, $couleur_foncee, $flag_gz, $options; - debut_page(_T('titre_admin_tech'), "administration", "base"); + debut_page(_T('titre_admin_tech'), "configuration", "base"); echo "<br />"; diff --git a/ecrire/exec/admin_vider.php b/ecrire/exec/admin_vider.php index 0d5d5bdcaa61e1738e78dae9a982e085e3377616..17a8c65cc7a88c29d2c0027792f92843b27beb6c 100644 --- a/ecrire/exec/admin_vider.php +++ b/ecrire/exec/admin_vider.php @@ -25,7 +25,7 @@ function exec_admin_vider_dist() $quota_cache, $spip_lang; -debut_page(_T('onglet_vider_cache'), "administration", "cache"); +debut_page(_T('onglet_vider_cache'), "configuration", "cache"); echo "<br><br><br>"; diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 3d55c0bbedebe373f304c1567a5d2f3d405b7b8e..967ac600fdd3b0657cff04f54e08c21295e022fd 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -43,7 +43,7 @@ function exec_articles_dist() if (!$row) { // cas du numero hors table $titre = _T('public:aucun_article'); - debut_page("« $titre »", "documents", "articles"); + debut_page("« $titre »", "naviguer", "articles"); debut_grand_cadre(); fin_grand_cadre(); echo $titre; @@ -104,10 +104,10 @@ function exec_articles_dist() $id_trad = $row["id_trad"]; $id_version = $row["id_version"]; - // aucun doc implicitement inclus au départ. + // aucun doc implicitement inclus au depart. inclus_non_articles($id_article); - debut_page("« $titre »", "documents", "articles", "", "", $id_rubrique); + debut_page("« $titre »", "naviguer", "articles", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php index e7250eddc5a636e392899f08af01f7b593f203e8..0a6f4e60273da043e500e88f59bfe1f2a420d8f2 100644 --- a/ecrire/exec/articles_edit.php +++ b/ecrire/exec/articles_edit.php @@ -293,7 +293,7 @@ function exec_articles_edit_dist() if ($id_version) $titre.= ' ('._T('version')." $id_version)"; debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), - "documents", "articles", "hauteurTextarea();", + "naviguer", "articles", "hauteurTextarea();", "", $id_rubrique); diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php index 87ddaa5444bcabcea1929848a7a9059e863613ef..6e8e4aa5c4d5b97369a5a6a99f7bce94a05e3ff2 100644 --- a/ecrire/exec/articles_forum.php +++ b/ecrire/exec/articles_forum.php @@ -35,7 +35,7 @@ function exec_articles_forum_dist() pipeline('exec_init',array('args'=>array('exec'=>'articles_forum','id_article'=>$id_article),'data'=>'')); - debut_page($titre, "documents", "articles", "", "", $id_rubrique); + debut_page($titre, "naviguer", "articles", "", "", $id_rubrique); articles_forum_cadres($id_rubrique, $titre, 'articles', "id_article=$id_article"); diff --git a/ecrire/exec/articles_page.php b/ecrire/exec/articles_page.php index 2302e17013e381d9a925374bab69cda2c0157b5d..4903c7da365a76fb1e552e6dd553fb1204991d4e 100644 --- a/ecrire/exec/articles_page.php +++ b/ecrire/exec/articles_page.php @@ -22,7 +22,7 @@ function exec_articles_page_dist() global $connect_statut, $connect_id_auteur; pipeline('exec_init',array('args'=>array('exec'=>'articles_page'),'data'=>'')); - debut_page(_T('titre_page_articles_page'), "documents", "articles"); + debut_page(_T('titre_page_articles_page'), "naviguer", "articles"); debut_gauche(); diff --git a/ecrire/exec/articles_tous.php b/ecrire/exec/articles_tous.php index 30569f73db707a46e08ff267e257856c032912d0..634eeaf9e297682bbd5e709d9cdfcce5acad31af 100644 --- a/ecrire/exec/articles_tous.php +++ b/ecrire/exec/articles_tous.php @@ -23,7 +23,7 @@ function exec_articles_tous_dist() pipeline('exec_init',array('args'=>array('exec'=>'articles_tous'),'data'=>'')); list($enfant, $first_couche, $last_couche) = arbo_articles_tous(); - debut_page(_T('titre_page_articles_tous'), "asuivre", "tout-site"); + debut_page(_T('titre_page_articles_tous'), "accueil", "tout-site"); debut_gauche(); if (($GLOBALS['meta']['multi_rubriques'] == 'oui' OR $GLOBALS['meta']['multi_articles'] == 'oui') AND $GLOBALS['meta']['gerer_trad'] == 'oui') diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php index 036f4253dd88d914be3edf9fedd60e8fddc7e71b..c7ff0a5981d5716cdcc3e869fd092e7c012be0ea 100644 --- a/ecrire/exec/articles_versions.php +++ b/ecrire/exec/articles_versions.php @@ -106,7 +106,7 @@ foreach ($textes as $var => $t) $$var = $t; -debut_page(_T('info_historique')." « $titre »", "documents", "articles", "", "", $id_rubrique); +debut_page(_T('info_historique')." « $titre »", "naviguer", "articles", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/breves.php b/ecrire/exec/breves.php index 0e8bad11f5ffad423aeffe201dd126675f240dbc..7949419c31fa4626b01104f8d33961075fad8ce1 100644 --- a/ecrire/exec/breves.php +++ b/ecrire/exec/breves.php @@ -21,7 +21,7 @@ function exec_breves_dist() charger_generer_url(); pipeline('exec_init',array('args'=>array('exec'=>'breves'),'data'=>'')); - debut_page(_T('titre_page_breves'), "documents", "breves"); + debut_page(_T('titre_page_breves'), "naviguer", "breves"); debut_gauche(); echo pipeline('affiche_gauche',array('args'=>array('exec'=>'breves'),'data'=>'')); creer_colonne_droite(); diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php index 87aa42c3bc8a5813e892f2c58381457db4b0c61b..745f974b48ebea687a83028c95979d0fb714b655 100644 --- a/ecrire/exec/breves_edit.php +++ b/ecrire/exec/breves_edit.php @@ -60,7 +60,7 @@ else { pipeline('exec_init',array('args'=>array('exec'=>'breves_edit','id_breve'=>$id_breve),'data'=>'')); -debut_page(_T('titre_page_breves_edit', array('titre' => $titre)), "documents", "breves", "", "", $id_rubrique); +debut_page(_T('titre_page_breves_edit', array('titre' => $titre)), "naviguer", "breves", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php index 4738114610303bb90d876298dc28ded5324b75f0..32da0419bcf21360c4a34193b50926bd142d9dd4 100644 --- a/ecrire/exec/breves_voir.php +++ b/ecrire/exec/breves_voir.php @@ -42,7 +42,7 @@ $flag_editable = (($connect_statut == '0minirezo' AND acces_rubrique($id_rubriqu pipeline('exec_init',array('args'=>array('exec'=>'breves_voir','id_breve'=>$id_breve),'data'=>'')); -debut_page("« $titre_breve »", "documents", "breves", "", "", $id_rubrique); +debut_page("« $titre_breve »", "naviguer", "breves", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/brouteur.php b/ecrire/exec/brouteur.php index c8eb11007ccdc93121fbee848d6ce0246747bc44..fbe2181193691c0ccac0d8fc125ac3257daf1727 100644 --- a/ecrire/exec/brouteur.php +++ b/ecrire/exec/brouteur.php @@ -31,7 +31,7 @@ function exec_brouteur_dist() } $largeur_col = round($largeur_table/$nb_col); - debut_page(_T('titre_page_articles_tous'), "asuivre", "tout-site", " hauteurFrame($nb_col);"); + debut_page(_T('titre_page_articles_tous'), "accueil", "tout-site", " hauteurFrame($nb_col);"); echo "\n<div> </div>"; diff --git a/ecrire/exec/calendrier.php b/ecrire/exec/calendrier.php index 4941a451caaedf26ac0d16e99489b7f8d85c7d24..16809716253a6b3d73390f3858a5fbac9d271087 100644 --- a/ecrire/exec/calendrier.php +++ b/ecrire/exec/calendrier.php @@ -40,7 +40,7 @@ function exec_calendrier_dist() array('nom_mois' => nom_mois($date), 'annee' => annee($date))); } - debut_page($titre, "redacteurs", "calendrier","",$css); + debut_page($titre, "accueil", "calendrier","",$css); echo "<div> </div>" ; echo http_calendrier_init('', $type, '','',generer_url_ecrire('calendrier', ($type ? "type=$type" : ''))); fin_page(); diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php index f05702a2de9cc350b08177b9d69b931ee32c4b7e..40f3507954885a36539a72cb869d4d0d18c108c6 100644 --- a/ecrire/exec/config_contenu.php +++ b/ecrire/exec/config_contenu.php @@ -35,7 +35,7 @@ if ($changer_config == 'oui') { lire_metas(); pipeline('exec_init',array('args'=>array('exec'=>'config_contenu'),'data'=>'')); -debut_page(_T('titre_page_config_contenu'), "administration", "configuration"); +debut_page(_T('titre_page_config_contenu'), "configuration", "configuration"); echo "<br><br><br>"; gros_titre(_T('titre_page_config_contenu')); diff --git a/ecrire/exec/config_fonctions.php b/ecrire/exec/config_fonctions.php index d0a46b195e6477e0c69f75f15ec133acda75b4c8..2bedb0e275f840503da0b0e950f736287260235e 100644 --- a/ecrire/exec/config_fonctions.php +++ b/ecrire/exec/config_fonctions.php @@ -30,7 +30,7 @@ function exec_config_fonctions_dist() global $flag_revisions, $options ; pipeline('exec_init',array('args'=>array('exec'=>'config_fonctions'),'data'=>'')); - debut_page(_T('titre_page_config_fonctions'), "administration", "configuration"); + debut_page(_T('titre_page_config_fonctions'), "configuration", "configuration"); echo "<br><br><br>"; gros_titre(_T('titre_config_fonctions')); diff --git a/ecrire/exec/config_lang.php b/ecrire/exec/config_lang.php index 2b472921721fc3bb546b8920cbc443d28ef4235b..a315b911b7037a29dee9015298082f8f9f7af38e 100644 --- a/ecrire/exec/config_lang.php +++ b/ecrire/exec/config_lang.php @@ -21,7 +21,7 @@ function exec_config_lang_dist() global $connect_statut, $connect_toutes_rubriques, $options, $spip_lang_right, $all_langs, $changer_config; pipeline('exec_init',array('args'=>array('exec'=>'config_lang'),'data'=>'')); -debut_page(_T('titre_page_config_contenu'), "administration", "langues"); +debut_page(_T('titre_page_config_contenu'), "configuration", "langues"); echo "<br><br><br>"; gros_titre(_T('info_langues')); diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php index 2fac7df017a9228051df2217d9444ac456b99ea1..cd279a61ec2e4f80c6bfccde74dda798cd84fbcd 100644 --- a/ecrire/exec/config_multilang.php +++ b/ecrire/exec/config_multilang.php @@ -23,7 +23,7 @@ function exec_config_multilang_dist() lire_metas(); pipeline('exec_init',array('args'=>array('exec'=>'config_multilang'),'data'=>'')); -debut_page(_T('titre_page_config_contenu'), "administration", "langues"); +debut_page(_T('titre_page_config_contenu'), "configuration", "langues"); echo "<br><br><br>"; gros_titre(_T('info_langues')); diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php index 43befe7153ced6b6f01ab6f8629d43ccaa680fc8..4c9d66ea0371cd023895bcd693ac83cc34f54fa9 100644 --- a/ecrire/exec/configuration.php +++ b/ecrire/exec/configuration.php @@ -47,7 +47,7 @@ lire_metas(); pipeline('exec_init',array('args'=>array('exec'=>'configuration'),'data'=>'')); -debut_page(_T('titre_page_configuration'), "administration", "configuration"); +debut_page(_T('titre_page_configuration'), "configuration", "configuration"); echo "<br><br><br>"; gros_titre(_T('titre_configuration')); diff --git a/ecrire/exec/controle_forum.php b/ecrire/exec/controle_forum.php index ab546dc66d56f192002b8f4cef292b8dc692b093..cdd090e1fa258340f505e1c4b49f999fe0fdecde 100644 --- a/ecrire/exec/controle_forum.php +++ b/ecrire/exec/controle_forum.php @@ -196,7 +196,7 @@ function exec_controle_forum_dist() global $page, $debut, $debut_id_forum, $id_rubrique, $connect_statut, $connect_toutes_rubriques; - debut_page(_T('titre_page_forum_suivi'), "redacteurs", "forum-controle"); + debut_page(_T('titre_page_forum_suivi'), "forum", "forum-controle"); if (!preg_match('/^\w+$/', $page)) $page = "public"; diff --git a/ecrire/exec/controle_petition.php b/ecrire/exec/controle_petition.php index e93fa2321ac655e03eb89a24ceb9054c5b2e28da..2d63950368eee0c043857de54f17d106b00d4d8b 100644 --- a/ecrire/exec/controle_petition.php +++ b/ecrire/exec/controle_petition.php @@ -29,7 +29,7 @@ function exec_controle_petition_dist() $supp_petition = intval($supp_petition); $debut = intval($debut); - debut_page(_T('titre_page_controle_petition'), "redacteurs", "suivi-petition"); + debut_page(_T('titre_page_controle_petition'), "forum", "suivi-petition"); debut_gauche(); // diff --git a/ecrire/exec/documents_liste.php b/ecrire/exec/documents_liste.php index a393fb1f96501ca4453bc7014c3555ea84477068..0c79e4aa845c449545fd8643967b00513ad2a995 100644 --- a/ecrire/exec/documents_liste.php +++ b/ecrire/exec/documents_liste.php @@ -21,7 +21,7 @@ function exec_documents_liste_dist() // Recupere les donnees // -debut_page(_T('titre_page_documents_liste'), "documents", "documents"); +debut_page(_T('titre_page_documents_liste'), "naviguer", "documents"); debut_gauche(); diff --git a/ecrire/exec/forum.php b/ecrire/exec/forum.php index 4dd9b3d5a1d7ff0aab5d60fc4a2815962448e6fb..00856ac0142cf068995fdd7405ac71219a657ec1 100644 --- a/ecrire/exec/forum.php +++ b/ecrire/exec/forum.php @@ -37,12 +37,12 @@ function exec_forum_dist() $debut = intval($debut); if ($admin) { - debut_page(_T('titre_page_forum'), "redacteurs", "privadm"); + debut_page(_T('titre_page_forum'), "forum", "privadm"); $statutforum = 'privadm'; $logo = "forum-admin-24.gif"; $script = 'forum_admin'; } else { - debut_page(_T('titre_forum'), "redacteurs", "forum-interne"); + debut_page(_T('titre_forum'), "forum", "forum-interne"); $statutforum = 'privrac'; $logo = "forum-interne-24.gif"; $script = 'forum'; diff --git a/ecrire/exec/forum_envoi.php b/ecrire/exec/forum_envoi.php index 4b04c5ce062b64c9df8a90cf282a230555a9ba7c..31fb9742d54567c45f75c05ce26060a30a122e81 100644 --- a/ecrire/exec/forum_envoi.php +++ b/ecrire/exec/forum_envoi.php @@ -63,8 +63,8 @@ if ($valider_forum AND ($statut!='')) { redirige_par_entete(rawurldecode($url)); } -if ($id_message) debut_page(_T('titre_page_forum_envoi'), "asuivre", "messagerie"); -else debut_page(_T('titre_page_forum_envoi'), "redacteurs"); +if ($id_message) debut_page(_T('titre_page_forum_envoi'), "accueil", "messagerie"); +else debut_page(_T('titre_page_forum_envoi'), "accueil"); debut_gauche(); debut_droite(); diff --git a/ecrire/exec/lang_raccourcis.php b/ecrire/exec/lang_raccourcis.php index 0fa1f61ef40df4065522b69d86936cc5cc47f183..077efbd8b198da8504157b0a42278d3152ee16e0 100644 --- a/ecrire/exec/lang_raccourcis.php +++ b/ecrire/exec/lang_raccourcis.php @@ -33,7 +33,7 @@ function exec_lang_raccourcis_dist() { $module = 'public'; debut_page(_T('module_fichier_langue').": $module", - "administration", "langues"); + "configuration", "langues"); echo "<br><br><br>"; gros_titre(_T('module_fichier_langue').": $module"); diff --git a/ecrire/exec/message.php b/ecrire/exec/message.php index 3e649226fdb38ba96acff2c710f30ea1eeb350c8..f36161f36a9d78d39168177631b2a5b70fdec95c 100644 --- a/ecrire/exec/message.php +++ b/ecrire/exec/message.php @@ -492,7 +492,7 @@ function exec_affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur, $ if ($type != "affich") spip_query("UPDATE spip_auteurs_messages SET vu='oui' WHERE id_message='$id_message' AND id_auteur='$connect_id_auteur'"); - debut_page($titre, "redacteurs", "messagerie"); + debut_page($titre, "accueil", "messagerie"); debut_gauche(); diff --git a/ecrire/exec/message_edit.php b/ecrire/exec/message_edit.php index a1f82ceeb45c1aae6ed20cc82886b63055f607e9..c21bd927c851fdc32fc19ff835f3287a009096bd 100644 --- a/ecrire/exec/message_edit.php +++ b/ecrire/exec/message_edit.php @@ -93,7 +93,7 @@ $statut = $row["statut"]; $rv = $row["rv"]; $expediteur = $row["id_auteur"]; -debut_page(_T('titre_page_message_edit'), "redacteurs", "messagerie"); +debut_page(_T('titre_page_message_edit'), "accueil", "messagerie"); if (!($expediteur = $connect_id_auteur OR ($type == 'affich' AND $connect_statut == '0minirezo'))) die(); diff --git a/ecrire/exec/messagerie.php b/ecrire/exec/messagerie.php index f05843313d967731f37405896bdd0ddfaab74a13..1c786157f1e7003b937db0b6ea62770670c04ef5 100644 --- a/ecrire/exec/messagerie.php +++ b/ecrire/exec/messagerie.php @@ -34,7 +34,7 @@ if ($detruire_message) { spip_query("DELETE FROM spip_forum WHERE id_message=$detruire_message"); } -debut_page(_T('titre_page_messagerie'), "redacteurs", "messagerie"); +debut_page(_T('titre_page_messagerie'), "accueil", "messagerie"); debut_gauche("messagerie"); diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php index 2f5deba40786f058e3167eaec9bb297604695dc6..fcc1106ade24122a402a6e9ef39d47ce548232b9 100644 --- a/ecrire/exec/mots_edit.php +++ b/ecrire/exec/mots_edit.php @@ -114,7 +114,7 @@ if ($redirect_ok == 'oui' && $redirect) { } pipeline('exec_init',array('args'=>array('exec'=>'mots_edit','id_mot'=>$id_mot),'data'=>'')); -debut_page("« $titre_mot »", "documents", "mots"); +debut_page("« $titre_mot »", "naviguer", "mots"); debut_gauche(); diff --git a/ecrire/exec/mots_tous.php b/ecrire/exec/mots_tous.php index 44d83c8bd1ac1c253809d1b7d98df225e9d77045..85d57bf4aadef834d76c66368ab71e5d7e95cf3f 100644 --- a/ecrire/exec/mots_tous.php +++ b/ecrire/exec/mots_tous.php @@ -78,7 +78,7 @@ function exec_mots_tous_dist() pipeline('exec_init',array('args'=>array('exec'=>'mots_tous'),'data'=>'')); -debut_page(_T('titre_page_mots_tous'), "documents", "mots"); +debut_page(_T('titre_page_mots_tous'), "naviguer", "mots"); debut_gauche(); echo pipeline('affiche_gauche',array('args'=>array('exec'=>'mots_tous'),'data'=>'')); diff --git a/ecrire/exec/mots_type.php b/ecrire/exec/mots_type.php index da0a8c0b2ffd644df5331089a99a012079bd2657..fef7d00442cb8ded9caa74b9cd9c02297e562daf 100644 --- a/ecrire/exec/mots_type.php +++ b/ecrire/exec/mots_type.php @@ -58,7 +58,7 @@ if ($connect_statut == '0minirezo' AND $new == "oui") { } pipeline('exec_init',array('args'=>array('exec'=>'mots_types','id_groupe'=>$id_groupe),'data'=>'')); -debut_page("« $titre »", "documents", "mots"); +debut_page("« $titre »", "naviguer", "mots"); debut_gauche(); diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php index d63a33b4b79bb1bd0537bdbaccca5e207014694f..1f6d2ea6faf73b51f1151c4466113035adab8e6e 100644 --- a/ecrire/exec/naviguer.php +++ b/ecrire/exec/naviguer.php @@ -78,7 +78,7 @@ function exec_naviguer_dist() debut_page(($titre ? ("« ".textebrut(typo($titre))." »") : _T('titre_naviguer_dans_le_site')), - "documents", + "naviguer", "rubriques", '', '', diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php index 54170da6245928d2374ad300e1fc6afc1b252994..cb2c916c96c65e981f3f1fc5275e25885a0734cb 100644 --- a/ecrire/exec/rubriques_edit.php +++ b/ecrire/exec/rubriques_edit.php @@ -53,7 +53,7 @@ else { } pipeline('exec_init',array('args'=>array('exec'=>'rubriques_edit','id_rubrique'=>$id_rubrique),'data'=>'')); - debut_page(_T('info_modifier_titre', array('titre' => $titre)), "documents", "rubriques", '', '', $id_rubrique); + debut_page(_T('info_modifier_titre', array('titre' => $titre)), "naviguer", "rubriques", '', '', $id_rubrique); if ($id_parent == 0) $ze_logo = "secteur-24.gif"; else $ze_logo = "rubrique-24.gif"; diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php index bad37ad61fa67beac23b2eec84f90f06c769bc6e..bf489e1990bf1ba3e403eba930e8d608ea2da491 100644 --- a/ecrire/exec/sites.php +++ b/ecrire/exec/sites.php @@ -221,7 +221,7 @@ else pipeline('exec_init',array('args'=>array('exec'=>'sites','id_syndic'=>$id_syndic),'data'=>'')); -debut_page("$titre_page","documents","sites", "", "", $id_rubrique); +debut_page("$titre_page","naviguer","sites", "", "", $id_rubrique); //////// parents diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php index c9ed5d21569d7710d2bd7b5c4057e25726b68056..431120e65688d86960c5cabd5cb3aaf5ceeca79e 100644 --- a/ecrire/exec/sites_edit.php +++ b/ecrire/exec/sites_edit.php @@ -39,7 +39,7 @@ else { } pipeline('exec_init',array('args'=>array('exec'=>'sites_edit','id_syndic'=>$id_syndic),'data'=>'')); -debut_page(_T('info_site_reference_2'), "documents", "sites", "", "", $id_rubrique); +debut_page(_T('info_site_reference_2'), "naviguer", "sites", "", "", $id_rubrique); debut_grand_cadre(); diff --git a/ecrire/exec/sites_tous.php b/ecrire/exec/sites_tous.php index 324b8b21b20f513c4cd0731aa2d1400627e09537..54ce96e4784b7622af9d0bb00fd3b758b129be9e 100644 --- a/ecrire/exec/sites_tous.php +++ b/ecrire/exec/sites_tous.php @@ -20,7 +20,7 @@ function exec_sites_tous_dist() global $connect_statut, $options; pipeline('exec_init',array('args'=>array('exec'=>'sites_tous'),'data'=>'')); -debut_page(_T('titre_page_sites_tous'),"documents","sites"); +debut_page(_T('titre_page_sites_tous'),"naviguer","sites"); debut_gauche(); echo pipeline('affiche_gauche',array('args'=>array('exec'=>'sites_tous'),'data'=>'')); creer_colonne_droite(); diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php index b17db17da9ecd572c881842ad4f318fcd4c864e9..a7416cfb2434c121d05cb8dcd3336f12fc055f93 100644 --- a/ecrire/exec/statistiques_lang.php +++ b/ecrire/exec/statistiques_lang.php @@ -18,7 +18,7 @@ function exec_statistiques_lang_dist() { global $connect_statut, $couleur_foncee, $critere, $spip_ecran, $spip_lang_right; - debut_page(_T('onglet_repartition_lang'), "suivi", "repartition-langues"); + debut_page(_T('onglet_repartition_lang'), "statistiques_visites", "repartition-langues"); if ($spip_ecran == "large") { $largeur_table = 974; diff --git a/ecrire/exec/statistiques_referers.php b/ecrire/exec/statistiques_referers.php index 249cab3b204c72561085088345ce216b95b82e15..f6b035fb9aa41f98d25699ebeedc827e40f09467 100644 --- a/ecrire/exec/statistiques_referers.php +++ b/ecrire/exec/statistiques_referers.php @@ -34,7 +34,7 @@ else { } } -debut_page(_T('titre_page_statistiques_referers'), "suivi", "referers"); +debut_page(_T('titre_page_statistiques_referers'), "statistiques_visites", "referers"); echo "<br /><br /><br />"; gros_titre(_T('titre_liens_entrants')); diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php index e824608d2e95166549d7195a1725889c384ed387..f99e75d690c152468087aaa13c65d47563513185 100644 --- a/ecrire/exec/statistiques_repartition.php +++ b/ecrire/exec/statistiques_repartition.php @@ -129,7 +129,7 @@ function exec_statistiques_repartition_dist() global $connect_statut, $connect_toutes_rubriques, $spip_ecran, $taille, $abs_total, $nombre_vis, $critere; - debut_page(_T('titre_page_statistiques'), "suivi", "repartition"); + debut_page(_T('titre_page_statistiques'), "statistiques_visites", "repartition"); if (($connect_statut != '0minirezo')|| !$connect_toutes_rubriques) { echo _T('avis_non_acces_page'); diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php index 834af1a8ed052c7dd25f4b9864922d495cce7898..ddfcf82d3abad721f4f1297a49358c8ec1881023 100644 --- a/ecrire/exec/statistiques_visites.php +++ b/ecrire/exec/statistiques_visites.php @@ -76,7 +76,7 @@ else { if ($titre) $pourarticle = " "._T('info_pour')." « $titre »"; if ($origine) { - debut_page(_T('titre_page_statistiques_referers'), "suivi", "statistiques"); + debut_page(_T('titre_page_statistiques_referers'), "statistiques_visites", "statistiques"); echo "<br /><br />"; gros_titre(_T('titre_liens_entrants')); barre_onglets("statistiques", "referers"); @@ -90,7 +90,7 @@ if ($origine) { } else { - debut_page(_T('titre_page_statistiques_visites').$pourarticle, "suivi", "statistiques"); + debut_page(_T('titre_page_statistiques_visites').$pourarticle, "statistiques_visites", "statistiques"); echo "<br /><br />"; gros_titre(_T('titre_evolution_visite')."<html>".aide("confstat")."</html>"); // barre_onglets("statistiques", "evolution"); diff --git a/ecrire/exec/synchro.php b/ecrire/exec/synchro.php index f4bf3aa7dc835a635a4e829461cca0e9c54f05ad..1dfe2f52d159d61c89460d59dd69491159b42801 100644 --- a/ecrire/exec/synchro.php +++ b/ecrire/exec/synchro.php @@ -34,7 +34,7 @@ function exec_synchro_dist() { global $connect_id_auteur; ///// debut de la page -debut_page(_T("icone_suivi_activite"), "asuivre", "synchro"); +debut_page(_T("icone_suivi_activite"), "accueil", "synchro"); echo "<br><br><br>"; gros_titre(_T("icone_suivi_activite")); diff --git a/ecrire/img_pack/layer.js b/ecrire/img_pack/layer.js index a31bfad11b4d2545a9d01ac4db471b3c0bd5e15c..0833cf455bebedcde4e71eece91dd900baed60ba 100644 --- a/ecrire/img_pack/layer.js +++ b/ecrire/img_pack/layer.js @@ -1,62 +1,56 @@ -var vis = new Array(); +var memo_obj = new Array(); +function findObj_test_forcer(n, forcer) { + var p,i,x; - var memo_obj = new Array(); - - function findObj_test_forcer(n, forcer) { - var p,i,x; + // Voir si on n'a pas deja memoriser cet element + if (memo_obj[n] && !forcer) { + return memo_obj[n]; + } - // Voir si on n'a pas deja memoriser cet element - if (memo_obj[n] && !forcer) { - return memo_obj[n]; - } - - d = document; - if((p = n.indexOf("?"))>0 && parent.frames.length) { - d = parent.frames[n.substring(p+1)].document; - n = n.substring(0,p); - } - if(!(x = d[n]) && d.all) { - x = d.all[n]; - } - for (i = 0; !x && i<d.forms.length; i++) { - x = d.forms[i][n]; - } - for(i=0; !x && d.layers && i<d.layers.length; i++) x = findObj(n,d.layers[i].document); - if(!x && document.getElementById) x = document.getElementById(n); - - // Memoriser l'element - if (!forcer) memo_obj[n] = x; - - return x; + d = document; + if((p = n.indexOf("?"))>0 && parent.frames.length) { + d = parent.frames[n.substring(p+1)].document; + n = n.substring(0,p); } - - function findObj(n) { - return findObj_test_forcer(n, false); + if(!(x = d[n]) && d.all) { + x = d.all[n]; } - // findObj sans memorisation de l'objet - avec Ajax, les elements se deplacent dans DOM - function findObj_forcer(n) { - return findObj_test_forcer(n, true); + for (i = 0; !x && i<d.forms.length; i++) { + x = d.forms[i][n]; } - - function hide_obj(obj) { - element = findObj(obj); - if(element) { - if (element.style.visibility != "hidden") element.style.visibility = "hidden"; - } + for(i=0; !x && d.layers && i<d.layers.length; i++) x = findObj(n,d.layers[i].document); + if(!x && document.getElementById) x = document.getElementById(n); + + // Memoriser l'element + if (!forcer) memo_obj[n] = x; + return x; +} + +function findObj(n) { + return findObj_test_forcer(n, false); +} +// findObj sans memorisation de l'objet - avec Ajax, les elements se deplacent dans DOM +function findObj_forcer(n) { + return findObj_test_forcer(n, true); +} + +function hide_obj(obj) { + element = findObj(obj); + if(element) { + if (element.style.visibility != "hidden") element.style.visibility = "hidden"; } - +} + function swap_couche(couche, rtl, dir, no_swap) { triangle = findObj('triangle' + couche); if (!(layer = findObj('Layer' + couche))) return; - if (vis[couche] == 'hide'){ + if (layer.style.display == "none"){ if (!no_swap && triangle) triangle.src = dir + 'deplierbas.gif'; layer.style.display = 'block'; - vis[couche] = 'show'; } else { if (!no_swap && triangle) triangle.src = dir + 'deplierhaut' + rtl + '.gif'; layer.style.display = 'none'; - vis[couche] = 'hide'; } } function ouvrir_couche(couche, rtl,dir) { @@ -64,14 +58,12 @@ function ouvrir_couche(couche, rtl,dir) { if (!(layer = findObj('Layer' + couche))) return; if (triangle) triangle.src = dir + 'deplierbas.gif'; layer.style.display = 'block'; - vis[couche] = 'show'; } function fermer_couche(couche, rtl, dir) { triangle = findObj('triangle' + couche); if (!(layer = findObj('Layer' + couche))) return; if (triangle) triangle.src = dir + 'deplierhaut' + rtl + '.gif'; layer.style.display = 'none'; - vis[couche] = 'hide'; } function manipuler_couches(action,rtl,first,last, dir) { if (action=='ouvrir') { diff --git a/ecrire/inc/auth.php b/ecrire/inc/auth.php index 4a3a13fa88dd351c335a81f7f52c937ccfd72631..2a2145b360f8d6c24d5d0d6cee5488a7809b6e64 100644 --- a/ecrire/inc/auth.php +++ b/ecrire/inc/auth.php @@ -110,12 +110,12 @@ function inc_auth_dist() { $_SERVER['PHP_AUTH_PW'] = ''; } - } else if ($GLOBALS['_SERVER']['REMOTE_USER']) + } else if ($_SERVER['REMOTE_USER']) // Authentification .htaccess old style, car .htaccess semble // souvent definir *aussi* PHP_AUTH_USER et PHP_AUTH_PW - $connect_login = $GLOBALS['_SERVER']['REMOTE_USER']; + $connect_login = $_SERVER['REMOTE_USER']; } $where = $connect_id_auteur ? @@ -176,11 +176,11 @@ function inc_auth_dist() { function auth_prefs() { - if (!$GLOBALS['set_disp'] = $GLOBALS['_COOKIE']['spip_display']) + if (!$GLOBALS['set_disp'] = $_COOKIE['spip_display']) $GLOBALS['set_disp'] = 2; - if (!$GLOBALS['set_couleur'] = $GLOBALS['_COOKIE']['spip_couleur']) + if (!$GLOBALS['set_couleur'] = $_COOKIE['spip_couleur']) $GLOBALS['set_couleur'] = 6; - if (!$GLOBALS['set_options'] = $GLOBALS['_COOKIE']['spip_options']) + if (!$GLOBALS['set_options'] = $_COOKIE['spip_options']) $GLOBALS['set_options'] = 'basiques'; } diff --git a/ecrire/inc/boutons.php b/ecrire/inc/boutons.php index 87c151dd73b7af56ec7cabccb41a62e648c7cca3..e174a3a295272a1d6d452344599f05b195414631 100644 --- a/ecrire/inc/boutons.php +++ b/ecrire/inc/boutons.php @@ -68,16 +68,19 @@ function definir_barre_boutons() { $boutons_admin['statistiques_visites']= new Bouton('statistiques-48.png', 'icone_statistiques_visites'); } - if ($GLOBALS['connect_statut'] == '0minirezo') { + if ($GLOBALS['connect_statut'] == '0minirezo') { $boutons_admin['configuration']= new Bouton('administration-48.png', 'icone_configuration_site'); } + $boutons_admin['espacement']=null; + $urlAide= generer_url_ecrire('aide_index')."&var_lang=$spip_lang"; $boutons_admin['aide_index']= new Bouton('aide-48'.$spip_lang_rtl.'.png', 'icone_aide_ligne', $urlAide, null, "javascript:window.open('$urlAide', 'aide_spip', 'scrollbars=yes,resizable=yes,width=740,height=580');", 'aide_spip'); + $boutons_admin['visiter']= new Bouton("visiter-48$spip_lang_rtl.png", 'icone_visiter_site', "$adresse_site/"); diff --git a/ecrire/inc/gadgets.php b/ecrire/inc/gadgets.php index 750e7d0b32a511614b1853850df51b37917e8bb6..92d3b6c78a797682286b99382b9deecf0a75efaa 100644 --- a/ecrire/inc/gadgets.php +++ b/ecrire/inc/gadgets.php @@ -448,28 +448,30 @@ function gadget_messagerie() { function dessiner_gadgets($id_rubrique) { - $script = - http_script("document.getElementById('gadget-rubriques').innerHTML = \"" + if ($_COOKIE['spip_accepte_ajax'] != -1) { + return "\n<!-- javascript gadgets -->\n" . + http_script( + "document.getElementById('gadget-rubriques').innerHTML = \"" . addslashes(strtr(gadget_rubriques($id_rubrique),"\n\r"," ")) - . "\";") - . http_script("document.getElementById('gadget-navigation').innerHTML = \"" + . "\";\n" . + "document.getElementById('gadget-navigation').innerHTML = \"" . addslashes(strtr(gadget_navigation($id_rubrique),"\n\r"," ")) - . "\";") -# . http_script("document.getElementById('gadget-recherche').innerHTML = \"" + . "\";\n" . +# "document.getElementById('gadget-recherche').innerHTML = \"" # . addslashes(strtr(gadget_recherche($id_rubrique),"\n\r"," ")) -# . "\";") - . http_script("document.getElementById('gadget-agenda').innerHTML = \"" +# . "\";\n" . + "document.getElementById('gadget-agenda').innerHTML = \"" . addslashes(strtr(gadget_agenda($id_rubrique),"\n\r"," ")) - . "\";") - . http_script("document.getElementById('gadget-messagerie').innerHTML = \"" + . "\";\n" . + "document.getElementById('gadget-messagerie').innerHTML = \"" . addslashes(strtr(gadget_messagerie($id_rubrique),"\n\r"," ")) - . "\";") -# . http_script("document.getElementById('gadget-suivi').innerHTML = \"" + . "\";\n" . +# "document.getElementById('gadget-suivi').innerHTML = \"" # . addslashes(strtr(gadget_suivi($id_rubrique),"\n\r"," ")) -# . "\";") - ; +# . "\";\n" . - return $script; + ''); + } } ?> \ No newline at end of file diff --git a/ecrire/inc/import.php b/ecrire/inc/import.php index 0e4673bf42eb8c8eb25501993439113707ebdd1e..3b231556adc9e33635cd95e742c6598f74e0688c 100644 --- a/ecrire/inc/import.php +++ b/ecrire/inc/import.php @@ -356,7 +356,7 @@ function import_all_continue() $archive = $dir . $request['archive']; $affiche_progression_pourcent = @filesize($archive); - debut_page(_T('titre_page_index'), "asuivre", "asuivre"); + debut_page(_T('titre_page_index'), "accueil", "accueil"); debut_gauche(); diff --git a/ecrire/inc/layer.php b/ecrire/inc/layer.php index 074ceb14b339147b1e1dfd3c0453376fb04f58e0..52465d90fc07547ccf8fee2016ac48e6ec77e7c4 100644 --- a/ecrire/inc/layer.php +++ b/ecrire/inc/layer.php @@ -32,9 +32,11 @@ function debut_block_invisible($nom_block){ if (!$a = debut_block_visible($nom_block)) return ''; - return $a . - http_script("vis['".$numero_block[$nom_block]."'] = 'hide'; - document.getElementById('Layer".$numero_block["$nom_block"]."').style.display=\"none\";",'',''); + // si on n'accepte pas js, ne pas fermer + if ($_COOKIE['spip_accepte_ajax'] == -1) + return $a; + else + return inserer_attribut($a, 'style', 'display:none;'); } function fin_block() { diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php index 0a6d32e4379d0050f156d626d80e7aea1ced602c..3c9b5b0b8abb3302608d919df6b318d63a0558a1 100644 --- a/ecrire/inc/minipres.php +++ b/ecrire/inc/minipres.php @@ -130,9 +130,20 @@ function exec_info_dist() { // Tester si Ajax fonctionne pour ce brouteur // (si on arrive la c'est que c'est bon, donc poser le cookie) -function exec_test_ajax_dist() -{ - spip_setcookie('spip_accepte_ajax', 1); +function exec_test_ajax_dist() { + switch (_request('js')) { + // on est appele par <noscript> + case -1: + spip_setcookie('spip_accepte_ajax', -1); + redirige_par_entete(_DIR_IMG_PACK.'puce-orange-anim.gif'); + break; + + // ou par ajax + case 1: + default: + spip_setcookie('spip_accepte_ajax', 1); + break; + } } // Afficher le bouton "preview" dans l'espace public diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index dddab3b8c802471f522d1bce33c197f7e4ad4aee..8bacf65a5f0e729bd6aabce7b832d1676c36b77d 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -1635,23 +1635,28 @@ function debut_javascript($admin, $stat) include_spip('inc/charsets'); - # teste la capacite ajax : on envoie un cookie -1 - # et un script ajax ; si le script reussit le cookie passera a +1 - if (!isset($GLOBALS['_COOKIE']['spip_accepte_ajax'])) { - spip_setcookie('spip_accepte_ajax', -1); - $ajax = "if (a = createXmlHttp()) { - a.open('GET', '" . generer_url_ecrire('test_ajax', true) . + // tester les capacites JS : + + // On envoie un script ajah ; si le script reussit le cookie passera a +1 + // on installe egalement un <noscript></noscript> qui charge une image qui + // pose un cookie valant -1 + if ($_COOKIE['spip_accepte_ajax'] < 1) { + $tester_javascript = "if (a = createXmlHttp()) { + a.open('GET', '" . generer_url_ecrire('test_ajax', 'js=1') . "', true) ; a.send(null); }"; - } else $ajax = ""; + } + if ($_COOKIE['spip_accepte_ajax'] != -1) { + define('_TESTER_NOSCRIPT', + "<noscript><div style='display:none;'><img src='".generer_url_ecrire('test_ajax', 'js=-1')."' width='1' height='1' alt='' /></div></noscript>\n"); // pour le pied de page + } return // envoi le fichier JS de config si browser ok. $GLOBALS['browser_layer'] . http_script( - # tester la capacite ajax si ce n'est pas deja fait - $ajax . + $tester_javascript . "\nvar ajax_image_searching = '<div style=\"float: ".$GLOBALS['spip_lang_right'].";\"><img src=\"".url_absolue(_DIR_IMG_PACK."searching.gif")."\" /></div>';" . "\nvar admin = " . ($admin ? 1 : 0) . "\nvar stat = " . ($stat ? 1 : 0) . @@ -1990,7 +1995,7 @@ function lien_change_var($lien, $set, $couleur, $coords, $titre, $mouseOver="") // Presentation de l'interface privee, debut du HTML // -function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre", $onLoad = "", $css="", $id_rubrique = "") { +function debut_page($titre = "", $rubrique = "accueil", $sous_rubrique = "accueil", $onLoad = "", $css="", $id_rubrique = "") { init_entete($titre, $rubrique, $css); definir_barre_boutons(); @@ -2023,7 +2028,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='', $id_rubrique='') { +function init_body($rubrique='accueil', $sous_rubrique='accueil', $onLoad='', $id_rubrique='') { global $couleur_foncee, $couleur_claire, $adresse_site; global $connect_id_auteur; global $connect_statut; @@ -2116,8 +2121,9 @@ function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='', $i $decal=0; $largitem_moy = 85; $largeur_maxi_menu = $largeur-100; + foreach($GLOBALS['boutons_admin'] as $page => $detail) { - if ($rubrique == $page) { + if (($rubrique == $page) AND ($_COOKIE['spip_accepte_ajax']==-1)) { $class = "visible_au_chargement"; } else { $class = "invisible_au_chargement"; @@ -2147,12 +2153,6 @@ function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='', $i $decal += largeur_icone_bandeau_principal(_T($detail->libelle)); } - // Refermer tout de suite le bandeau deroule par defaut - echo " - <script type='text/javascript'><!-- - changestyle('-', '-', '-'); - // --></script>\n"; - echo "</div>"; echo "</td></tr></table>"; @@ -2401,7 +2401,7 @@ function fin_cadre_formulaire(){ // Debut de la colonne de gauche // -function debut_gauche($rubrique = "asuivre") { +function debut_gauche($rubrique = "accueil") { global $connect_statut; global $options, $spip_display; global $connect_id_auteur; @@ -2555,6 +2555,8 @@ function fin_html() { if (function_exists('dessiner_gadgets')) echo dessiner_gadgets($GLOBALS['id_rubrique_gadgets']); + if (defined('_TESTER_NOSCRIPT')) + echo _TESTER_NOSCRIPT; echo "</body></html>\n"; }