From 4446ba92be5fb79ee176640a5f53b7639e8e3485 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 10 Jul 2006 20:08:59 +0000
Subject: [PATCH] pipeline affiche_gauche et affiche_droite
---
ecrire/exec/accueil.php | 3 +++
ecrire/exec/articles_forum.php | 3 +++
ecrire/exec/articles_page.php | 3 +++
ecrire/exec/articles_tous.php | 3 +++
ecrire/exec/auteurs.php | 3 +++
ecrire/exec/breves.php | 3 +++
ecrire/exec/breves_edit.php | 3 +++
ecrire/exec/breves_voir.php | 3 +++
ecrire/exec/config_contenu.php | 3 +++
ecrire/exec/config_fonctions.php | 3 +++
ecrire/exec/config_multilang.php | 3 +++
ecrire/exec/configuration.php | 3 +++
ecrire/exec/mots_edit.php | 3 +++
ecrire/exec/mots_tous.php | 3 +++
ecrire/exec/mots_type.php | 3 +++
ecrire/exec/naviguer.php | 7 +++++--
ecrire/exec/rubriques_edit.php | 3 +++
ecrire/exec/sites_edit.php | 3 +++
ecrire/exec/sites_tous.php | 3 +++
19 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php
index b5b9ca4a6f..cb02719e7b 100644
--- a/ecrire/exec/accueil.php
+++ b/ecrire/exec/accueil.php
@@ -443,6 +443,9 @@ function exec_accueil_dist()
personnel_accueil();
etat_base_accueil();
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'accueil','id_rubrique'=>$id_rubrique),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'accueil','id_rubrique'=>$id_rubrique),'data'=>''));
debut_droite();
//
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index 3e3111bd6c..87ddaa5444 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -77,6 +77,9 @@ function articles_forum_cadres($id_rubrique, $titre, $script, $args)
fin_boite_info();
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'articles_forum','id_article'=>$id_article),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'articles_forum','id_article'=>$id_article),'data'=>''));
debut_droite();
echo "\n<table cellpadding=0 cellspacing=0 border=0 width='100%'>";
diff --git a/ecrire/exec/articles_page.php b/ecrire/exec/articles_page.php
index 5355c95fec..2302e17013 100644
--- a/ecrire/exec/articles_page.php
+++ b/ecrire/exec/articles_page.php
@@ -43,6 +43,9 @@ function exec_articles_page_dist()
}
}
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'articles_page'),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'articles_page'),'data'=>''));
debut_droite();
//
diff --git a/ecrire/exec/articles_tous.php b/ecrire/exec/articles_tous.php
index 21f6db8a05..2a833570cd 100644
--- a/ecrire/exec/articles_tous.php
+++ b/ecrire/exec/articles_tous.php
@@ -86,6 +86,9 @@ if ($text_article)
formulaire_affiche_tous($aff_art, $aff_statut, $sel_lang);
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'articles_tous'),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'articles_tous'),'data'=>''));
debut_droite();
if ($enfant AND $browser_layer)
diff --git a/ecrire/exec/auteurs.php b/ecrire/exec/auteurs.php
index 3b024bbfd4..cc753244cd 100644
--- a/ecrire/exec/auteurs.php
+++ b/ecrire/exec/auteurs.php
@@ -106,6 +106,9 @@ if ($connect_statut == '0minirezo') {
}
fin_raccourcis();
}
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'auteurs'),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'auteurs'),'data'=>''));
debut_droite();
echo "<br>";
diff --git a/ecrire/exec/breves.php b/ecrire/exec/breves.php
index 5e051e546d..0e8bad11f5 100644
--- a/ecrire/exec/breves.php
+++ b/ecrire/exec/breves.php
@@ -23,6 +23,9 @@ function exec_breves_dist()
debut_page(_T('titre_page_breves'), "documents", "breves");
debut_gauche();
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'breves'),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'breves'),'data'=>''));
debut_droite();
$result=spip_query("SELECT * FROM spip_rubriques WHERE id_parent=0 ORDER BY 0+titre, titre");
diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php
index 6fcaed61a7..746d872714 100644
--- a/ecrire/exec/breves_edit.php
+++ b/ecrire/exec/breves_edit.php
@@ -74,6 +74,9 @@ if ($new != 'oui' AND ($connect_statut=="0minirezo" OR $statut=="prop")) {
if (isset($texte)) document_a_voir($texte);
afficher_documents_colonne($id_breve, "breve", true);
}
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'breves_edit','id_breve'=>$id_breve),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'breves_edit','id_breve'=>$id_breve),'data'=>''));
debut_droite();
debut_cadre_formulaire();
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 2e1164343c..1f6c97a567 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -79,6 +79,9 @@ debut_raccourcis();
icone_horizontale(_T('icone_nouvelle_breve'), generer_url_ecrire("breves_edit","new=oui&id_rubrique=$id_rubrique"), "breve-24.gif","creer.gif");
fin_raccourcis();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'breves_voir','id_breve'=>$id_breve),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'breves_voir','id_breve'=>$id_breve),'data'=>''));
debut_droite();
debut_cadre_relief("breve-24.gif");
diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php
index 35b09d5115..4f1fc69a7d 100644
--- a/ecrire/exec/config_contenu.php
+++ b/ecrire/exec/config_contenu.php
@@ -44,6 +44,9 @@ barre_onglets("configuration", "interactivite");
debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'config_contenu'),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'config_contenu'),'data'=>''));
debut_droite();
echo generer_url_post_ecrire("config_contenu");
diff --git a/ecrire/exec/config_fonctions.php b/ecrire/exec/config_fonctions.php
index b9271fb0c2..5772e9ea26 100644
--- a/ecrire/exec/config_fonctions.php
+++ b/ecrire/exec/config_fonctions.php
@@ -37,6 +37,9 @@ function exec_config_fonctions_dist()
barre_onglets("configuration", "fonctions");
debut_gauche();
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'config_fonctions'),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'config_fonctions'),'data'=>''));
debut_droite();
lire_metas();
diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php
index 753107a520..2fac7df017 100644
--- a/ecrire/exec/config_multilang.php
+++ b/ecrire/exec/config_multilang.php
@@ -49,6 +49,9 @@ debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'config_multilang'),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'config_multilang'),'data'=>''));
debut_droite();
echo generer_url_post_ecrire('config_multilang');
diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php
index d57568e11f..5f4c784955 100644
--- a/ecrire/exec/configuration.php
+++ b/ecrire/exec/configuration.php
@@ -64,6 +64,9 @@ if ($spip_display != 4)
afficher_boite_logo('id_syndic', 0, _T('logo_site'), _T('logo_survol'), 'configuration');
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'configuration'),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'configuration'),'data'=>''));
debut_droite();
avertissement_config();
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index 0461b85de8..f360affe45 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -157,6 +157,9 @@ debut_raccourcis();
fin_raccourcis();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'mots_edit','id_mot'=>$id_mot),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'mots_edit','id_mot'=>$id_mot),'data'=>''));
debut_droite();
debut_cadre_relief("mot-cle-24.gif");
diff --git a/ecrire/exec/mots_tous.php b/ecrire/exec/mots_tous.php
index 48919c1b01..5583afee6e 100644
--- a/ecrire/exec/mots_tous.php
+++ b/ecrire/exec/mots_tous.php
@@ -81,6 +81,9 @@ pipeline('exec_init',array('args'=>array('exec'=>'mots_tous'),'data'=>''));
debut_page(_T('titre_page_mots_tous'), "documents", "mots");
debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'mots_tous'),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'mots_tous'),'data'=>''));
debut_droite();
gros_titre(_T('titre_mots_tous'));
diff --git a/ecrire/exec/mots_type.php b/ecrire/exec/mots_type.php
index faf08ea302..da0a8c0b2f 100644
--- a/ecrire/exec/mots_type.php
+++ b/ecrire/exec/mots_type.php
@@ -64,6 +64,9 @@ debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'mots_types','id_groupe'=>$id_groupe),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'mots_types','id_groupe'=>$id_groupe),'data'=>''));
debut_droite();
debut_cadre_relief("groupe-mot-24.gif");
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index bbe87fe958..8b7ca96195 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -113,8 +113,11 @@ function exec_naviguer_dist()
//
raccourcis_naviguer($id_rubrique, $id_parent);
}
-
- debut_droite();
+
+ echo pipeline('affiche_gauche',array('args'=>array('exec'=>'naviguer','id_rubrique'=>$id_rubrique),'data'=>''));
+ creer_colonne_droite();
+ echo pipeline('affiche_droite',array('args'=>array('exec'=>'naviguer','id_rubrique'=>$id_rubrique),'data'=>''));
+ debut_droite();
debut_cadre_relief($ze_logo);
diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php
index 738684bd6b..af7b5d2f56 100644
--- a/ecrire/exec/rubriques_edit.php
+++ b/ecrire/exec/rubriques_edit.php
@@ -79,6 +79,9 @@ debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'rubriques_edit','id_rubrique'=>$id_rubrique),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'rubriques_edit','id_rubrique'=>$id_rubrique),'data'=>''));
debut_droite();
debut_cadre_formulaire();
diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php
index d3de2fded0..8db1d9a30e 100644
--- a/ecrire/exec/sites_edit.php
+++ b/ecrire/exec/sites_edit.php
@@ -48,6 +48,9 @@ afficher_hierarchie($id_rubrique);
fin_grand_cadre();
debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'sites_edit','id_syndic'=>$id_syndic),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'sites_edit','id_syndic'=>$id_syndic),'data'=>''));
debut_droite();
debut_cadre_formulaire();
diff --git a/ecrire/exec/sites_tous.php b/ecrire/exec/sites_tous.php
index c9d88f6ef4..324b8b21b2 100644
--- a/ecrire/exec/sites_tous.php
+++ b/ecrire/exec/sites_tous.php
@@ -22,6 +22,9 @@ function exec_sites_tous_dist()
pipeline('exec_init',array('args'=>array('exec'=>'sites_tous'),'data'=>''));
debut_page(_T('titre_page_sites_tous'),"documents","sites");
debut_gauche();
+echo pipeline('affiche_gauche',array('args'=>array('exec'=>'sites_tous'),'data'=>''));
+creer_colonne_droite();
+echo pipeline('affiche_droite',array('args'=>array('exec'=>'sites_tous'),'data'=>''));
debut_droite();
afficher_sites(_T('titre_sites_tous'), array("FROM" => 'spip_syndic', 'WHERE' => "syndication='non' AND statut='publie'", 'ORDER BY'=> "nom_site"));
--
GitLab