From 25a1be033a1bfe90da9dbdaa1d85c06bff2e998e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 25 Mar 2011 11:17:39 +0000
Subject: [PATCH] squeletiser le pied de page, et en profiter pour eviter
double appel du debusqueur quand on est dans un exec en squelette (le
debusqueur est deja appele par public.php)
---
ecrire/inc/presentation_mini.php | 37 ++++++++++--------------------
prive/squelettes/inclure/pied.html | 12 ++++++----
2 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/ecrire/inc/presentation_mini.php b/ecrire/inc/presentation_mini.php
index e0ea24f0ff..b7309183fa 100644
--- a/ecrire/inc/presentation_mini.php
+++ b/ecrire/inc/presentation_mini.php
@@ -144,7 +144,16 @@ function fin_page()
if ($debug) {
$chrono = erreur_squelette();
} else $chrono = '';
-
+
+ return debut_grand_cadre(true)
+ . recuperer_fond('prive/squelettes/inclure/pied')
+ . fin_grand_cadre(true)
+ . "</div>\n" // cf. div centered ouverte dans conmmencer_page()
+ . $chrono
+ . "</body></html>\n";
+}
+
+function html_tests_js(){
if (_SPIP_AJAX AND !defined('_TESTER_NOSCRIPT')) {
// pour le pied de page (deja defini si on est validation XML)
define('_TESTER_NOSCRIPT',
@@ -152,33 +161,11 @@ function fin_page()
. generer_url_ecrire('test_ajax', 'js=-1')
. "' width='1' height='1' alt='' /></div></noscript>\n");
}
-
- return debut_grand_cadre(true)
- . (($spip_display == 4)
- ? ("<div><a href='"
- . generer_action_auteur('preferer','display:2', self('&'))
- . "'>"
- . _T("access_interface_graphique")
- . "</a></div>")
- : ("<div id='copyright'>"
-
- . info_maj_spip()
- . info_copyright()
- . "<br />"
- . _T('info_copyright_doc',
- array('spipnet' => $GLOBALS['home_server']
- . '/' . $GLOBALS['spip_lang']))
- . '</div>'))
-
- . fin_grand_cadre(true)
- . "</div>\n" // cf. div centered ouverte dans conmmencer_page()
- . $GLOBALS['rejoue_session']
+ return $GLOBALS['rejoue_session']
. '<div style="background-image: url(\''
. generer_url_action('cron')
. '\');"></div>'
- . (defined('_TESTER_NOSCRIPT') ? _TESTER_NOSCRIPT : '')
- . $chrono
- . "</body></html>\n";
+ . (defined('_TESTER_NOSCRIPT') ? _TESTER_NOSCRIPT : '');
}
function info_maj_spip(){
diff --git a/prive/squelettes/inclure/pied.html b/prive/squelettes/inclure/pied.html
index 15b5faea1f..9f5e99f416 100644
--- a/prive/squelettes/inclure/pied.html
+++ b/prive/squelettes/inclure/pied.html
@@ -1,5 +1,7 @@
-<?php
-include_spip('inc/presentation_mini');
-echo fin_page();
-
-?>
\ No newline at end of file
+<div id='copyright'>
+ [(#REM|info_maj_spip)]
+ [(#REM|info_copyright)]
+ [(#SET{home_server,#EVAL{$GLOBALS}|table_valeur{home_server}|concat{'/',#EVAL{$GLOBALS}|table_valeur{spip_lang}}})]
+ <p><:info_copyright_doc{spipnet=#GET{home_server}}:></p>
+</div>
+[(#REM**|html_tests_js)]
\ No newline at end of file
--
GitLab