diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php index 4ab64f1e901286183bd6bd8f692e8cbc3367d3cd..6eda2f8e0b490fb0ea7be35662cbde2e99fc11ec 100644 --- a/ecrire/exec/accueil.php +++ b/ecrire/exec/accueil.php @@ -458,6 +458,6 @@ function exec_accueil_dist() echo afficher_suivi_versions (0, 0, false, "", true); } - echo fin_page(); + echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/admin_effacer.php b/ecrire/exec/admin_effacer.php index 1c503d534a05f59bee2102d73ffc984523f7fe8f..1eee5af17fbebc2d3f9fa637bd15b031aa2f9df2 100644 --- a/ecrire/exec/admin_effacer.php +++ b/ecrire/exec/admin_effacer.php @@ -40,7 +40,7 @@ debut_droite(); if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -91,7 +91,7 @@ echo "<br />"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/admin_plugin.php b/ecrire/exec/admin_plugin.php index a0e5b129afea314a2af84cbda745d2ce71c34cd1..fbabf9af48661a2ae5de55ecc154d995f5e2b3af 100644 --- a/ecrire/exec/admin_plugin.php +++ b/ecrire/exec/admin_plugin.php @@ -20,7 +20,7 @@ function exec_admin_plugin() { $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('icone_admin_plugin'), "configuration", "plugin"); echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -168,7 +168,7 @@ EOF; echo "<br />"; - echo fin_page(); + echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php index 889cfc5d6b02a2dc20b77a3bd3d56a392bdf3adb..67c9fb3d761966c1671a947f9f4baa24da394e5e 100644 --- a/ecrire/exec/admin_tech.php +++ b/ecrire/exec/admin_tech.php @@ -26,7 +26,7 @@ function exec_admin_tech_dist() if ($connect_statut != '0minirezo' ){ echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } echo "<br /><br />"; @@ -187,7 +187,7 @@ fin_cadre_relief(); echo "<br />"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/admin_vider.php b/ecrire/exec/admin_vider.php index 84008af8a4b20fef5957f473b0a56246b093e137..e0ed5e318ad338d0b79035aec85ee115295e5300 100644 --- a/ecrire/exec/admin_vider.php +++ b/ecrire/exec/admin_vider.php @@ -85,7 +85,7 @@ debut_droite(); if (!$connect_toutes_rubriques) { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -176,7 +176,7 @@ fin_cadre_trait_couleur(); echo "<br />"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 6bd4e9a15369451a039e02c3dd32d8d03215a413..4144471681ad9a1e36c5e8e8a01883b914bc6ebd 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -49,6 +49,7 @@ function exec_articles_dist() afficher_hierarchie($row['id_rubrique']), fin_grand_cadre(true), $res, + fin_gauche(), fin_page(); } diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php index 4af7890d01d4dcb5c2df68457b20fec962381832..7440dc95d15562d955a6cfebb14fd530f29a19d0 100644 --- a/ecrire/exec/articles_edit.php +++ b/ecrire/exec/articles_edit.php @@ -87,7 +87,7 @@ function articles_edit($id_article, $id_rubrique,$lier_trad, $id_version, $new, echo $editer_article($new, $id_rubrique, $lier_trad, generer_url_ecrire("articles"), $config_fonc, $row); fin_cadre_formulaire(); - echo fin_page(); + echo fin_gauche(), fin_page(); } // http://doc.spip.org/@articles_edit_presentation diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php index 10c0d042a823f3e6861381d5bbd2355f4d733a0e..213c2b0b9d94ff9b9b881ea16cd7bb065eaca9a3 100644 --- a/ecrire/exec/articles_forum.php +++ b/ecrire/exec/articles_forum.php @@ -64,7 +64,7 @@ function exec_articles_forum_dist() echo $mess; echo '</div>'; - echo fin_page(); + echo fin_gauche(), fin_page(); } // http://doc.spip.org/@articles_forum_cadres diff --git a/ecrire/exec/articles_page.php b/ecrire/exec/articles_page.php index 56995b2249126b44b4013d77cf75e13e8bf07f15..aa1db6e835064f1882a68b86e7f9b4575f89426d 100644 --- a/ecrire/exec/articles_page.php +++ b/ecrire/exec/articles_page.php @@ -76,7 +76,7 @@ echo "</p>"; echo "<p>", afficher_articles(_T('info_refuses'), array('FROM' =>"spip_articles AS articles, spip_auteurs_articles AS lien ", "WHERE" => "articles.id_article=lien.id_article AND lien.id_auteur=\"$connect_id_auteur\" AND articles.statut='refuse'", 'ORDER BY' => "articles.date DESC")); echo "</p>"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/articles_tous.php b/ecrire/exec/articles_tous.php index 66802642457f8dd926c2f9b4d3965aa2cd988a68..e47ea0ed428e0adf597b6a536b8aa4d67a7ec966 100644 --- a/ecrire/exec/articles_tous.php +++ b/ecrire/exec/articles_tous.php @@ -76,7 +76,7 @@ var img_deplierbas = "'._DIR_IMG_PACK.'noeud_moins.gif"; $arbre .= "</ul></li></ul>\n"; echo $arbre; - echo fin_page(); + echo fin_gauche(), fin_page(); } // Voir inc_layer pour les 2 globales utilisees diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php index 607a0e8a249c5bb25be79a93398f970a1da56d80..98df6dc7a445cb920ceb5bd7be89e6b3ede65b97 100644 --- a/ecrire/exec/articles_versions.php +++ b/ecrire/exec/articles_versions.php @@ -316,7 +316,7 @@ if ($id_version) { fin_cadre_relief(); -echo fin_page(); +echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/auteur_infos.php b/ecrire/exec/auteur_infos.php index b5558c77d7d7262d4c6983e99e781061097273d2..907dbdc1cfcf2e21eaca01c5ea046af417392df0 100644 --- a/ecrire/exec/auteur_infos.php +++ b/ecrire/exec/auteur_infos.php @@ -103,7 +103,8 @@ function exec_auteur_infos_dist() auteurs_interventions($id_auteur, $auteur['statut']); echo fin_cadre_relief(true), - fin_page(); + fin_gauche(), + fin_page(); } // http://doc.spip.org/@cadre_auteur_infos diff --git a/ecrire/exec/auteurs.php b/ecrire/exec/auteurs.php index 7d7b372e38bb81a50753103f7a589bae075662a2..11571213bffb82bd5473d4178247a4f63f19fece 100644 --- a/ecrire/exec/auteurs.php +++ b/ecrire/exec/auteurs.php @@ -39,7 +39,7 @@ function exec_auteurs_dist() bandeau_auteurs($tri, $statut); - echo "<div id='auteurs'>", $res, "</div>", fin_page(); + echo "<div id='auteurs'>", $res, "</div>", fin_gauche(), fin_page(); } // http://doc.spip.org/@lettres_d_auteurs diff --git a/ecrire/exec/breves.php b/ecrire/exec/breves.php index 84771b66aa535b7f11a999fdcf65b7c27536835a..a54142dbae2a243665ad4bb36b0800a99c06a834 100644 --- a/ecrire/exec/breves.php +++ b/ecrire/exec/breves.php @@ -56,7 +56,7 @@ function exec_breves_dist() } - echo fin_page(); + echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php index 5aace4096777ce620e57015e7b9eec5d5c899dc7..db0e54ab6834dd35d6602a71007838cf63171cc8 100644 --- a/ecrire/exec/breves_edit.php +++ b/ecrire/exec/breves_edit.php @@ -185,7 +185,7 @@ else echo "<h2>"._T('info_page_interdite')."</h2>"; fin_cadre_formulaire(); -echo fin_page(); +echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php index ed00161ae7f16f26d2c5595e96b12b7e41d9a16b..37a54df684a571721945ec87b48b8803d01457ba 100644 --- a/ecrire/exec/breves_voir.php +++ b/ecrire/exec/breves_voir.php @@ -237,7 +237,7 @@ function afficher_breves_voir($id_breve, $cherche_mot, $select_groupe) echo afficher_forum(spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_breve='$id_breve' AND id_parent=0 ORDER BY date_heure DESC LIMIT 20"), "breves_voir", "id_breve=$id_breve"); - echo fin_page(); + echo fin_gauche(), fin_page(); } // http://doc.spip.org/@exec_breves_voir_dist diff --git a/ecrire/exec/brouteur.php b/ecrire/exec/brouteur.php index 52d987ea65a1e4f5c5d1b6bff8b8221c1b5833e9..f91b389821a3f42690ab8ce36b2b0f138f7d0c2a 100644 --- a/ecrire/exec/brouteur.php +++ b/ecrire/exec/brouteur.php @@ -104,7 +104,7 @@ function exec_brouteur_dist() $dest[0] = '0'; } - echo "\n<tr width='$largeur_table'>"; + echo "\n<tr>"; for ($i=0; $i < $nb_col; $i++) { echo "\n<td valign='top' width='$largeur_col'>"; diff --git a/ecrire/exec/brouteur_frame.php b/ecrire/exec/brouteur_frame.php index cacfc9d6789d8bf313e88e7e6c0c193723601ea5..775b5dc9364ede1e58d8d3591be88097d1239994 100644 --- a/ecrire/exec/brouteur_frame.php +++ b/ecrire/exec/brouteur_frame.php @@ -16,8 +16,12 @@ include_spip('inc/presentation'); // http://doc.spip.org/@exec_brouteur_frame_dist function exec_brouteur_frame_dist() { - global $connect_statut,$connect_id_auteur, $spip_ecran, $spip_lang_left, $frame, $effacer_suivant, $special; + global $connect_statut,$connect_id_auteur, $spip_ecran, $spip_lang_left; + $id_rubrique = is_numeric(_request('rubrique')) ? intval(_request('rubrique')) : ""; + $frame = _request('frame'); + $effacer_suivant = _request('effacer_suivant'); + $special = _request('special'); include_spip('inc/headers'); http_no_cache(); @@ -31,8 +35,7 @@ function exec_brouteur_frame_dist() { . "' />\n" . envoi_link(_T('info_mon_site_spip')) . pipeline('header_prive', $head) - . "</head>\n"; - + . "</head>\n<body>"; if ($spip_ecran == "large") { $nb_col = 4; @@ -41,25 +44,25 @@ function exec_brouteur_frame_dist() { } if ($effacer_suivant == "oui" && $frame < $nb_col) { - echo '<script>'; + echo '<script type="text/javascript">'; for ($i = $frame+1; $i < $nb_col; $i++) { echo "\nparent.iframe$i.location.href='", generer_url_ecrire('brouteur_frame',"frame=$i"), "'"; } echo '</script>'; } - echo "<div class='arial2'>"; + echo "\n<div class='arial2'>"; if ($special == "redac") { $result=spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur GROUP BY id_article ORDER BY articles.date DESC"); if (spip_num_rows($result)>0) { - echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T("info_cours_edition")."</b></div>"; - echo "<div class='plan-articles'>"; + echo "\n<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T("info_cours_edition")."</b></div>"; + echo "\n<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_article=$row['id_article']; $titre = typo($row['titre']); $statut = $row['statut']; - echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article"),"\"'>",$titre,"</a>"; + echo "<a class='$statut'\nhref='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article"),"\"'>",$titre,"</a>"; } echo "</div>"; } @@ -68,8 +71,8 @@ function exec_brouteur_frame_dist() { else if ($special == "valider") { $result=spip_query("SELECT id_article, id_rubrique, titre, statut FROM spip_articles WHERE statut = 'prop' ORDER BY date DESC"); if (spip_num_rows($result)>0) { - echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T("info_articles_proposes")."</b></div>"; - echo "<div class='plan-articles'>"; + echo "\n<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T("info_articles_proposes")."</b></div>"; + echo "\n<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_article=$row['id_article']; $titre = typo($row['titre']); @@ -81,8 +84,8 @@ function exec_brouteur_frame_dist() { $result=spip_query("SELECT * FROM spip_breves WHERE statut = 'prop' ORDER BY date_heure DESC LIMIT 20"); if (spip_num_rows($result)>0) { - echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T("info_breves_valider")."</b></div>"; - echo "<div class='plan-articles'>"; + echo "\n<div style='padding-top: 6px;'><b class='verdana2'>"._T("info_breves_valider")."</b></div>"; + echo "\n<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_breve=$row['id_breve']; $titre = typo($row['titre']); @@ -104,11 +107,11 @@ function exec_brouteur_frame_dist() { if ($id_parent == 0) $icone = "secteur-24.gif"; else $icone = "rubrique-24.gif"; - echo "<div style='background-color: #cccccc; border: 1px solid #444444;'>"; + echo "\n<div style='background-color: #cccccc; border: 1px solid #444444;'>"; icone_horizontale($titre, "javascript:window.parent.location=\"" . generer_url_ecrire('naviguer',"id_rubrique=$id_rubrique") .'"', $icone); echo "</div>"; } else if ($frame == 0) { - echo "<div style='background-color: #cccccc; border: 1px solid #444444;'>"; + echo "\n<div style='background-color: #cccccc; border: 1px solid #444444;'>"; icone_horizontale(_T('info_racine_site'), "javascript:window.parent.location=\"" . generer_url_ecrire('naviguer') . '"', "racine-site-24.gif",""); echo "</div>"; } @@ -120,22 +123,22 @@ function exec_brouteur_frame_dist() { $titre = typo($row['titre']); $id_parent=$row['id_parent']; - echo "<div class='brouteur_rubrique' -onMouseOver=\"changeclass(this, 'brouteur_rubrique_on');\" -onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; + echo "\n<div class='brouteur_rubrique' +onmouseover=\"changeclass(this, 'brouteur_rubrique_on');\" +onmouseout=\"changeclass(this, 'brouteur_rubrique');\">"; if ($id_parent == '0') { - echo "<div style='", frame_background_image("secteur-24.gif"), ";'><a href='", generer_url_ecrire('brouteur_frame', "rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui"), "' target='iframe", ($frame+1), "'>", + echo "\n<div style='", frame_background_image("secteur-24.gif"), ";'><a href='", generer_url_ecrire('brouteur_frame', "rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui"), "' target='iframe", ($frame+1), "'>", $titre, "</a></div>"; } else { if ($frame+1 < $nb_col) - echo "<div style='", + echo "\n<div style='", frame_background_image("rubrique-24.gif"), ";'><a href='", generer_url_ecrire('brouteur_frame', "rubrique=$ze_rubrique&frame=".($frame+1)."&effacer_suivant=oui"), "' target='iframe", ($frame+1), "'>$titre</a></div>"; - else echo "<div style='", + else echo "\n<div style='", frame_background_image("rubrique-24.gif"), ";'><a href='javascript:window.parent.location=\"" . generer_url_ecrire('brouteur',"id_rubrique=$ze_rubrique")."\"'>",$titre,"</a></div>"; } echo "</div>\n"; @@ -149,8 +152,8 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; $result = spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_rubrique=$id_rubrique AND (articles.statut = 'publie' OR articles.statut = 'prop' OR (articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur)) GROUP BY id_article ORDER BY articles.date DESC"); if (spip_num_rows($result)>0) { - echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T('info_articles')."</b></div>"; - echo "<div class='plan-articles'>"; + echo "\n<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T('info_articles')."</b></div>"; + echo "\n<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_article=$row['id_article']; $titre = typo($row['titre']); @@ -162,8 +165,8 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; $result=spip_query("SELECT * FROM spip_breves WHERE id_rubrique=$id_rubrique ORDER BY date_heure DESC LIMIT 20"); if (spip_num_rows($result)>0) { - echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T('info_breves_02')."</b></div>"; - echo "<div class='plan-articles'>"; + echo "\n<div style='padding-top: 6px;'><b class='verdana2'>"._T('info_breves_02')."</b></div>"; + echo "\n<div class='plan-articles'>"; while($row=spip_fetch_array($result)){ $id_breve=$row['id_breve']; $titre = typo($row['titre']); @@ -177,12 +180,12 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; $result=spip_query("SELECT * FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND statut!='refuse' ORDER BY nom_site"); if (spip_num_rows($result)>0) { - echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T('icone_sites_references')."</b></div>"; + echo "\n<div style='padding-top: 6px;'><b class='verdana2'>"._T('icone_sites_references')."</b></div>"; while($row=spip_fetch_array($result)){ $id_syndic=$row['id_syndic']; $titre = typo($row['nom_site']); $statut = $row['statut']; - echo "<div " . http_style_background('site-24.gif', "$spip_lang_left center no-repeat; margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px") . "><b><a href='javascript:window.parent.location=\"", generer_url_ecrire('sites',"id_syndic=$id_syndic"),"\"'>",$titre,"</a></b></div>"; + echo "\n<div " . http_style_background('site-24.gif', "$spip_lang_left center no-repeat; margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px") . "><b><a href='javascript:window.parent.location=\"", generer_url_ecrire('sites',"id_syndic=$id_syndic"),"\"'>",$titre,"</a></b></div>"; } } } @@ -193,7 +196,7 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; $cpt=spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur GROUP BY articles.id_article")); if ($cpt['n']) { - echo "<div ", http_style_background('article-24.gif', "$spip_lang_left center no-repeat; margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px"), + echo "\n<div ", http_style_background('article-24.gif', "$spip_lang_left center no-repeat; margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px"), "><b class='verdana2'><a href='", generer_url_ecrire('brouteur_frame', "special=redac&frame=".($frame+1)."&effacer_suivant=oui"), "' target='iframe",($frame+1),"'>", _T("info_cours_edition"),"</a></b></div>"; } @@ -202,7 +205,7 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; if (!$cpt['n']) $cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_breves WHERE statut = 'prop'")); if ($cpt['n']) - echo "<div ", http_style_background('article-24.gif', "$spip_lang_left center no-repeat; margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px"), + echo "\n<div ", http_style_background('article-24.gif', "$spip_lang_left center no-repeat; margin:3px; padding-top: 5px; padding-bottom: 5px; padding-$spip_lang_left: 28px"), "><b class='verdana2'><a href='", generer_url_ecrire('brouteur_frame', "special=valider&frame=".($frame+1)."&effacer_suivant=oui"), "' target='iframe", ($frame+1)."'>", _T("info_articles_proposes"), @@ -212,7 +215,7 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">"; } echo "</div>"; -echo "</body></html>"; + echo "</body></html>"; } // http://doc.spip.org/@frame_background_image diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php index c6b9714be7ea0413ac09e527326c7749a69f85ef..78b26450b6da7515f7ad728c135297ca7f57aa6d 100644 --- a/ecrire/exec/config_contenu.php +++ b/ecrire/exec/config_contenu.php @@ -24,7 +24,7 @@ function exec_config_contenu_dist() if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -356,6 +356,6 @@ echo pipeline('affiche_milieu',array('args'=>array('exec'=>'config_contenu'),'da echo "</form>"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/config_fonctions.php b/ecrire/exec/config_fonctions.php index 06693ee63baf228539ed4a87edbe926739dffa6e..1d394c0418061f4e2a98f5d26869c3318449ea0a 100644 --- a/ecrire/exec/config_fonctions.php +++ b/ecrire/exec/config_fonctions.php @@ -102,7 +102,7 @@ function exec_config_fonctions_dist() echo pipeline('affiche_milieu',array('args'=>array('exec'=>'config_fonctions'),'data'=>'')); echo "</form>"; - echo fin_page(); + echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/config_lang.php b/ecrire/exec/config_lang.php index 7260bcab03593e87c865c77ea63f3b0022118006..6804fa9f57ecc28339d44876af8efad17be06a99 100644 --- a/ecrire/exec/config_lang.php +++ b/ecrire/exec/config_lang.php @@ -118,6 +118,6 @@ $charset = $GLOBALS['meta']["charset"]; echo "</form>"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php index 8aa67c64bc29e5e49cb75cd09a0116981cd6a016..317dd18c0190f8693f82604be2a2337ab667de2f 100644 --- a/ecrire/exec/config_multilang.php +++ b/ecrire/exec/config_multilang.php @@ -33,7 +33,7 @@ gros_titre(_T('info_langues')); if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -189,6 +189,6 @@ fin_cadre_couleur(); echo "</form>"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php index d6818c518bdb8d509c8188d017c87901075a8653..97e2606bae8a88752f62acfc5fede7813a99debe 100644 --- a/ecrire/exec/configuration.php +++ b/ecrire/exec/configuration.php @@ -22,7 +22,7 @@ include_spip('inc/config'); if ($connect_statut != '0minirezo') { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -559,7 +559,7 @@ echo pipeline('affiche_milieu',array('args'=>array('exec'=>'configuration'),'dat echo "</form>"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/controle_forum.php b/ecrire/exec/controle_forum.php index d43dd7b82f7d3fae434833af2014e2146dc030c2..3bdad3b68d806e7d2614aadc8f760c1529613e5d 100644 --- a/ecrire/exec/controle_forum.php +++ b/ecrire/exec/controle_forum.php @@ -279,7 +279,7 @@ function exec_controle_forum_dist() echo "<div id='$ancre' class='serif2'>$mess</div>"; - echo fin_page(); + echo fin_gauche(), fin_page(); } } } diff --git a/ecrire/exec/controle_petition.php b/ecrire/exec/controle_petition.php index c18744cf11420e0b7bb2af257c4621dbde1374f4..3b7649783ab9956216945c7d79408a49f00b2142 100644 --- a/ecrire/exec/controle_petition.php +++ b/ecrire/exec/controle_petition.php @@ -57,7 +57,7 @@ function exec_controle_petition_dist() $a = "editer_signature-" . $id_article; - echo "<div id='", $a, "' class='serif2'>", $r, "</div>", fin_page(); + echo "<div id='", $a, "' class='serif2'>", $r, "</div>", fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/demande_mise_a_jour.php b/ecrire/exec/demande_mise_a_jour.php index 396fe2e12cfdc3e2d6b145197010343210e1b586..cd2a0657b762e496051b831f964a8e3badfc0429 100644 --- a/ecrire/exec/demande_mise_a_jour.php +++ b/ecrire/exec/demande_mise_a_jour.php @@ -26,7 +26,7 @@ function exec_demande_mise_a_jour_dist() { _T('info_administrateur_site_01'), " <a href='" . generer_url_ecrire("upgrade","reinstall=non") . "'>", _T('info_administrateur_site_02'), - "</a></blockquote></blockquote><p>"; + "</a></blockquote></blockquote>"; echo fin_page(); } ?> diff --git a/ecrire/exec/documents_liste.php b/ecrire/exec/documents_liste.php index 2aa867a5a6706f73852a043ce983c885a4c37a90..910839336937398af9872ed73cfc0523b74dce38 100644 --- a/ecrire/exec/documents_liste.php +++ b/ecrire/exec/documents_liste.php @@ -72,6 +72,6 @@ debut_droite(); } -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/forum.php b/ecrire/exec/forum.php index 8e243a8249ccfeacd948582d6de3d849abcb7dfe..b55ab9b951e749b99cd3605a3d308eafbba99891 100644 --- a/ecrire/exec/forum.php +++ b/ecrire/exec/forum.php @@ -86,6 +86,6 @@ function exec_forum_dist() echo "</p></div>"; - echo fin_page(); + echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/forum_envoi.php b/ecrire/exec/forum_envoi.php index a9f0aac2f526189a309007dbf4c7aaff61b5fd8a..ccded7b42e849e641b4fd207855688fe63de6827 100644 --- a/ecrire/exec/forum_envoi.php +++ b/ecrire/exec/forum_envoi.php @@ -164,6 +164,7 @@ function forum_envoi( "\n<div> </div>" . redirige_action_auteur('poster_forum_prive',$cat, $script, "$objet=$id", $corps, "") . "<a id='formulaire'></a>" + . fin_gauche() . fin_page(); } diff --git a/ecrire/exec/lang_raccourcis.php b/ecrire/exec/lang_raccourcis.php index 9745ab10478d1d8570da291b32e709aaf1a56691..5c9ef59233c92b49846d3bb6683abeb51150bd7d 100644 --- a/ecrire/exec/lang_raccourcis.php +++ b/ecrire/exec/lang_raccourcis.php @@ -62,7 +62,7 @@ function exec_lang_raccourcis_dist() { afficher_raccourcis($module); - echo fin_page(); + echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/message.php b/ecrire/exec/message.php index 6952212042ef5743e28e95e312c262d2eda28709..958354c4fd7bc3e60f6a607812d5381844f7abff 100644 --- a/ecrire/exec/message.php +++ b/ecrire/exec/message.php @@ -59,7 +59,7 @@ if ($row['type'] != "affich"){ debut_gauche(); debut_droite(); echo "<b>"._T('avis_non_acces_message')."</b><p>"; - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } } @@ -546,7 +546,7 @@ function exec_affiche_message_dist($id_message, $cherche_auteur, $nouv_auteur, $ http_afficher_forum_perso($id_message); } - echo fin_page(); + echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/message_edit.php b/ecrire/exec/message_edit.php index 50ab82695a245f485c202b13f57425c407915703..493f085af1edaec7c09ddccb7b995da43fda7750 100644 --- a/ecrire/exec/message_edit.php +++ b/ecrire/exec/message_edit.php @@ -111,7 +111,7 @@ function exec_message_edit_dist() echo "\n<p align='right'><input type='submit' name='valider' value='"._T('bouton_valider')."' class='fondo'/></p>"; echo "</form>"; echo "\n</div>"; - echo fin_page(); + echo fin_gauche(), fin_page(); } // http://doc.spip.org/@afficher_si_rdv diff --git a/ecrire/exec/messagerie.php b/ecrire/exec/messagerie.php index 37003c0562c2e62e765affe9a69ff014f0fc6a40..f652fd1af3282199f6ddfd68063c0ccf1a769c75 100644 --- a/ecrire/exec/messagerie.php +++ b/ecrire/exec/messagerie.php @@ -149,7 +149,7 @@ if (spip_num_rows($result) > 0) { echo afficher_messages('<b>' . _T('info_tous_redacteurs') . '</b>', '', "statut='publie' AND type='affich' AND (date_fin > DATE_SUB(NOW(), INTERVAL 1 DAY) OR rv != 'oui')", $messages_vus, false, false); -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php index 2b12398a47c4a47a37cdd2e66d39fc4171bec79b..e93e53b47e24515a1ee814b5f2c18088c4f5465e 100644 --- a/ecrire/exec/mots_edit.php +++ b/ecrire/exec/mots_edit.php @@ -233,7 +233,7 @@ global fin_cadre_formulaire(); } - echo fin_page(); + echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/mots_tous.php b/ecrire/exec/mots_tous.php index ba285365c75369270eab8fb00b05a79ea7224988..f9830567e1e31d9e30b22caf2bb9028e36c00b18 100644 --- a/ecrire/exec/mots_tous.php +++ b/ecrire/exec/mots_tous.php @@ -147,7 +147,7 @@ function exec_mots_tous_dist() } - echo fin_page(); + echo fin_gauche(), fin_page(); } // http://doc.spip.org/@confirmer_mot diff --git a/ecrire/exec/mots_type.php b/ecrire/exec/mots_type.php index c02e09bf586faa6c9bb9b092b2c64ec261e0b6dd..911567ebb954ea1ad46ebf1d2b40a92e69af0e27 100644 --- a/ecrire/exec/mots_type.php +++ b/ecrire/exec/mots_type.php @@ -186,6 +186,7 @@ function exec_mots_type_dist() . "</div>"; echo redirige_action_auteur('instituer_groupe_mots', $id_groupe, "mots_tous", "id_groupe=$id_groupe", $res), + fin_gauche(), fin_page(); } diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php index ac3c21fb547526e0db96ee0452f66c7960670db8..7fc711fe0667cb546bfb1e5d3c8d875f315c0180 100644 --- a/ecrire/exec/naviguer.php +++ b/ecrire/exec/naviguer.php @@ -127,7 +127,7 @@ function exec_naviguer_dist() bouton_supprimer_naviguer($id_rubrique, $id_parent, $ze_logo, $flag_editable); - echo fin_page(); + echo fin_gauche(), fin_page(); } // http://doc.spip.org/@infos_naviguer diff --git a/ecrire/exec/recherche.php b/ecrire/exec/recherche.php index 45aa387cca7f43a1a2e6f64d0c6ddb0e779f7c49..95561ea89faa653bc610f36c1bd78cf1b38002de 100644 --- a/ecrire/exec/recherche.php +++ b/ecrire/exec/recherche.php @@ -130,7 +130,7 @@ function exec_recherche_dist() echo "<font face='Verdana,Arial,Sans,sans-serif'>"._T('avis_aucun_resultat')."</font><p>"; } } -echo fin_page(); +echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php index 294f7878d931ca2472ec271b51bbce5584123403..ef66a67e8a69e4b3e2c6e685ca6cf1a21d46b88a 100644 --- a/ecrire/exec/rubriques_edit.php +++ b/ecrire/exec/rubriques_edit.php @@ -172,6 +172,6 @@ function exec_rubriques_edit_dist() fin_cadre_formulaire(); - echo fin_page(); + echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php index f3e5d4ee07eb39624d62067d7bfdf1685bfdb0fb..271fc4702122e9fc9e4b292cdc0c8846d4939b0b 100644 --- a/ecrire/exec/sites.php +++ b/ecrire/exec/sites.php @@ -438,7 +438,7 @@ fin_cadre_relief(); echo afficher_forum($result_forum, "sites","id_syndic=$id_syndic"); - echo fin_page(); + echo fin_gauche(), fin_page(); } diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php index 015f3be538d52bb6e3702da7dfea9fdd0ff6523b..d58e70176c2fb05a3f8dc3c86bcc17e6e0f32289 100644 --- a/ecrire/exec/sites_edit.php +++ b/ecrire/exec/sites_edit.php @@ -216,6 +216,6 @@ echo $form; echo fin_cadre_formulaire(true); -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/sites_tous.php b/ecrire/exec/sites_tous.php index ad44ec7a9237a83daa3ba09b730885ea70b74f68..22fccd782308e2f3709ad4430fc95ab94737ba7b 100644 --- a/ecrire/exec/sites_tous.php +++ b/ecrire/exec/sites_tous.php @@ -49,7 +49,7 @@ if ($options == 'avancees' AND $connect_statut == '0minirezo') { echo afficher_syndic_articles('<b>' . _T('titre_dernier_article_syndique') . '</b>', array('FROM' => 'spip_syndic_articles', 'ORDER BY' => "date DESC", 'LIMIT' => "50")); -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php index bae236e9665ba90a87f99f311f3b2e9136f6a2ec..8c31d482c1f5d7a2c80866ed45c40d5e910fc040 100644 --- a/ecrire/exec/statistiques_lang.php +++ b/ecrire/exec/statistiques_lang.php @@ -17,70 +17,68 @@ include_spip('inc/presentation'); // http://doc.spip.org/@exec_statistiques_lang_dist function exec_statistiques_lang_dist() { - global $connect_statut, $couleur_foncee, $critere, $spip_ecran, $spip_lang_right; + global $connect_statut, $couleur_foncee, $critere, $spip_ecran, $spip_lang_right; - $commencer_page = charger_fonction('commencer_page', 'inc'); - echo $commencer_page(_T('onglet_repartition_lang'), "statistiques_visites", "repartition-langues"); + $commencer_page = charger_fonction('commencer_page', 'inc'); + echo $commencer_page(_T('onglet_repartition_lang'), "statistiques_visites", "repartition-langues"); - if ($spip_ecran == "large") { + if ($spip_ecran == "large") { $largeur_table = 974; - } else { + } else { $largeur_table = 750; - } - $taille = $largeur_table - 200; -echo "<center><table width='$largeur_table'><tr width='$largeur_table'><td width='$largeur_table' class='verdana2'>"; - - -echo "<br /><br />"; -echo "<center>"; -gros_titre(_T('onglet_repartition_lang')); -echo "</center>"; + } + $taille = $largeur_table - 200; + echo "<center><table width='$largeur_table'><tr><td width='$largeur_table' class='verdana2'>"; + echo "<br /><br />"; + echo "<center>"; + gros_titre(_T('onglet_repartition_lang')); + echo "</center>"; //barre_onglets("repartition", "langues"); -if ($critere == "debut") { - $critere = "visites"; + if ($critere == "debut") { + $critere = "visites"; // gros_titre(_T('onglet_repartition_debut')); -} -else { - $critere = "popularite"; + } else { + $critere = "popularite"; // gros_titre(_T('onglet_repartition_actuelle')); } - echo ($critere == "popularite") ? barre_onglets("rep_depuis", "popularite"): barre_onglets("rep_depuis", "debut"); + echo ($critere == "popularite") ? barre_onglets("rep_depuis", "popularite"): barre_onglets("rep_depuis", "debut"); -if ($connect_statut != '0minirezo') { - echo _T('avis_non_acces_page'); - echo fin_page(); - exit; -} + if ($connect_statut != '0minirezo') { + echo _T('avis_non_acces_page'); + echo fin_gauche(), fin_page(); + exit; + } // // Statistiques par langue // -debut_cadre_enfonce("langues-24.gif"); + debut_cadre_enfonce("langues-24.gif"); -$result = spip_query("SELECT SUM(".$critere.") AS total_visites FROM spip_articles"); + $result = spip_query("SELECT SUM(".$critere.") AS total_visites FROM spip_articles"); - $visites = 1; - if ($row = spip_fetch_array($result)) + $visites = 1; + if ($row = spip_fetch_array($result)) $total_visites = $row['total_visites']; - else + else $total_visites = 1; - $result = spip_query("SELECT lang, SUM(".$critere.") AS cnt FROM spip_articles WHERE statut='publie' GROUP BY lang"); + $result = spip_query("SELECT lang, SUM(".$critere.") AS cnt FROM spip_articles WHERE statut='publie' GROUP BY lang"); - echo "\n<table cellpadding = 2 cellspacing = 0 border = 0 width='100%' style='border: 1px solid #aaaaaa;'>"; - $ifond = 1; + echo "\n<table cellpadding='2' cellspacing='0' border='0' width='100%' style='border: 1px solid #aaaaaa;'>"; + $ifond = 1; - while ($row = spip_fetch_array($result)) { - $lang = $row['lang']; - $visites = round($row['cnt'] / $total_visites * $taille); - $pourcent = round($row['cnt'] / $total_visites * 100); + while ($row = spip_fetch_array($result)) { + + $lang = $row['lang']; + $visites = round($row['cnt'] / $total_visites * $taille); + $pourcent = round($row['cnt'] / $total_visites * 100); - if ($visites > 0) { + if ($visites > 0) { if ($ifond==0){ $ifond=1; @@ -92,31 +90,28 @@ $result = spip_query("SELECT SUM(".$critere.") AS total_visites FROM spip_articl echo "\n<tr bgcolor='$couleur'>"; $dir=lang_dir($lang,'',' dir=rtl'); - echo "<td width='100%' style='border-bottom: 1px solid #cccccc;'><span class='verdana2'$dir><div style='float: $spip_lang_right;'>$pourcent%</div>".traduire_nom_langue($lang)."</span></td>"; + echo "<td width='100%' style='border-bottom: 1px solid #cccccc;'><span class='verdana2'$dir><span style='float: $spip_lang_right;'>$pourcent%</span>".traduire_nom_langue($lang)."</span></td>"; echo "<td style='border-bottom: 1px solid #cccccc;'>"; - echo "\n<table cellpadding='0' cellspacing='0' border='0' width='".($taille+5)."' height=8>"; + echo "\n<table cellpadding='0' cellspacing='0' border='0' width='".($taille+5)."'>"; echo "\n<tr><td style='align:$spip_lang_right; background-color: #eeeeee; border: 1px solid #999999; white-space: nowrap;'>"; - if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='$visites_abs' height='8' />"; - if ($visites>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$visites' height='8' border='0' />"; + if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='$visites_abs' height='8' alt=' ' />"; + if ($visites>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$visites' height='8' border='0' alt=' ' />"; echo "</td></tr></table>\n"; echo "</td>"; echo "</tr>"; - $visites_abs += $visites; - } + $visites_abs += $visites; } - echo "</table>\n"; + } + echo "</table>\n"; //echo "<p><font face='Verdana,Arial,Sans,sans-serif' size='3'>"._T('texte_signification')."</font>"; + fin_cadre_enfonce(); -fin_cadre_enfonce(); - - - -echo "</td></tr></table></center>"; + echo "</td></tr></table></center>"; + echo fin_page(); } - ?> diff --git a/ecrire/exec/statistiques_referers.php b/ecrire/exec/statistiques_referers.php index 2798cb14e7a766b007452e82e5bd40c7d197cf9a..42a3de142872aaf5054476b1273ac7e004022884 100644 --- a/ecrire/exec/statistiques_referers.php +++ b/ecrire/exec/statistiques_referers.php @@ -53,7 +53,7 @@ debut_droite(); if ($connect_statut != '0minirezo') { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -81,7 +81,7 @@ echo barre_onglets("stat_referers", $jour); echo "</div><br />"; - echo fin_page(); + echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php index c1c1a168106aed85f06067312082a652bb071fbb..e08ddeecdb829957532469a2d642e5db572c3d0b 100644 --- a/ecrire/exec/statistiques_repartition.php +++ b/ecrire/exec/statistiques_repartition.php @@ -78,7 +78,7 @@ function enfants_aff($id_parent,$decalage, $critere, $gauche=0) { $couleur="white"; } echo "<table cellpadding='2' cellspacing='0' border='0' width='100%'>"; - echo "\n<tr bgcolor='$couleur' background='" . _DIR_IMG_PACK . "rien.gif' width='100%'>"; + echo "\n<tr bgcolor='$couleur'>"; echo "\n<td style='border-bottom: 1px solid #aaaaaa; padding-$spip_lang_left: ".($niveau*20+5)."px;'>"; if ($niveau==0 OR 1==1){ $pourcent = round($nombre_vis[$id_rubrique]/$abs_total*1000)/10; @@ -98,13 +98,13 @@ function enfants_aff($id_parent,$decalage, $critere, $gauche=0) { echo "</td>\n<td align='right' width='".($taille+5)."' style='border-bottom: 1px solid #aaaaaa;'>"; - echo "\n<table cellpadding='0' cellspacing='0' border='0' width='".($decalage+1+$gauche)."' height='8'>"; + echo "\n<table cellpadding='0' cellspacing='0' border='0' width='".($decalage+1+$gauche)."'>"; echo "\n<tr>"; if ($gauche > 0) echo "<td width='".$gauche."'></td>"; echo "\n<td style='background-color: #eeeeee; border: 1px solid #999999; white-space: nowrap;'>"; - if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='".$visites_abs."' height='8' border='0' />"; - if ($largeur_rouge>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$largeur_rouge' height='8' border='0' />"; - if ($largeur_vert>0) echo "<IMG src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_claire;' width='$largeur_vert' height='8' border='0' />"; + if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='".$visites_abs."' height='8' border='0' alt= ' '/>"; + if ($largeur_rouge>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$largeur_rouge' height='8' border='0' alt=' ' />"; + if ($largeur_vert>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_claire;' width='$largeur_vert' height='8' border='0' alt=' ' />"; echo "</td></tr></table>\n"; echo "</td></tr></table>"; @@ -145,7 +145,7 @@ function exec_statistiques_repartition_dist() $taille = 400; } - echo "\n<br /><br /><center><table width='$largeur_table'><tr width='$largeur_table'><td width='$largeur_table' class='verdana2' style='text-align: center'>"; + echo "\n<br /><br /><center><table width='$largeur_table'><tr><td width='$largeur_table' class='verdana2' style='text-align: center'>"; gros_titre(_T('titre_page_statistiques')); if ($critere == "debut") { diff --git a/ecrire/exec/statistiques_svg.php b/ecrire/exec/statistiques_svg.php index 20b2524a45e62c492901c71f8747f4fc9b8f6bc5..c018ca132116b48711f2405bd884da250cd4ccde 100644 --- a/ecrire/exec/statistiques_svg.php +++ b/ecrire/exec/statistiques_svg.php @@ -27,7 +27,7 @@ global if ($connect_statut != '0minirezo') { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } $date = date("U"); diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php index b5ec3ee353e13a780a7e9555fefdd730d2e0539b..8ec05f4611dd1f692ad063aff7caf93a0f681219 100644 --- a/ecrire/exec/statistiques_visites.php +++ b/ecrire/exec/statistiques_visites.php @@ -265,7 +265,7 @@ else { if ($connect_statut != '0minirezo') { echo _T('avis_non_acces_page'); - echo fin_page(); + echo fin_gauche(), fin_page(); exit; } @@ -835,6 +835,6 @@ echo "<div style='font-family:Verdana,Arial,Sans,sans-serif; font-size:small;ove echo aff_referers ($result, $limit, generer_url_ecrire('statistiques_visites', ('limit=' . strval($limit+200)))); echo "<br /></div>"; -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/suivi_revisions.php b/ecrire/exec/suivi_revisions.php index 23cfed9719cb5d258ce728cb83089ab6ebaf0b6a..dc0825fe6909e6f6ea287530cf21bf6d2d3a19ee 100644 --- a/ecrire/exec/suivi_revisions.php +++ b/ecrire/exec/suivi_revisions.php @@ -121,7 +121,7 @@ echo debut_droite("", true); echo afficher_suivi_versions ($debut, $id_secteur, $id_auteur, $lang_choisie); -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/exec/synchro.php b/ecrire/exec/synchro.php index 0a6fc5b36827093102b4c4cabb54ef4cb6fa261c..66fdfb3001fbb58071885c19d9b794f9825126e5 100644 --- a/ecrire/exec/synchro.php +++ b/ecrire/exec/synchro.php @@ -170,6 +170,6 @@ echo propre('<code> fin_cadre_relief(); -echo fin_page(); +echo fin_gauche(), fin_page(); } ?> diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index 678dfc6c1158dd1b61ced083b2752275d2b89a6b..366f49972da34c24833c5c2a492f319f9cea06ec 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -1614,6 +1614,9 @@ function debut_gauche($rubrique = "accueil", $return=false) { $rspan = ''; } + // table fermee par fin_gauche() + // div fermee par debut_droite() + $res = "<br /><table width='$largeur_ecran' cellpadding='0' cellspacing='0' border='0'> <tr>\n<td width='$largeur' class='colonne_etroite serif' valign='top' $rspan> \n<div style='width: ${largeur}px; overflow:hidden;'> @@ -1624,6 +1627,10 @@ function debut_gauche($rubrique = "accueil", $return=false) { if ($return) return $res; else echo $res; } +function fin_gauche() +{ + return "</td></tr></table>"; +} // // Presentation de l''interface privee, marge de droite @@ -1741,11 +1748,11 @@ function liste_articles_bloques() // Elle comporte une image invisble declenchant une tache de fond // http://doc.spip.org/@fin_page -function fin_page() { +function fin_page() +{ global $spip_display; - return "</td></tr></table>" - . debut_grand_cadre(true) + return debut_grand_cadre(true) . "\n" . (($spip_display == 4) ? ("<div><a href='./?set_disp=2'>"