From 389a69f5ad0bf0688f25ef06a2126b9c482442e1 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Sat, 8 Jan 2005 14:43:43 +0000 Subject: [PATCH] no more head hacks * XOrgPage::addJsLink to add javascript links * XOrgPage::addCssLink to add css links git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-247 --- ChangeLog | 1 + htdocs/admin/newsletter_edit.php | 3 +- htdocs/banana/index.php | 3 +- .../css/lists.archives.css | 40 ++++++++----------- .../banana/index.head.tpl => htdocs/css/profil.css | 24 ++++++++--- .../javascript/do_challenge_response_logged.js | 35 +++++++++------- .../javascript/motdepassemd5.js | 30 +++++--------- htdocs/listes/archives.php | 3 +- htdocs/motdepassemd5.php | 4 +- htdocs/newsletter/show.php | 3 +- htdocs/newsletter/submit.php | 3 +- htdocs/profil.php | 3 +- include/xorg.inc.php | 15 ++++--- include/xorg/page.inc.php | 21 +++++++++- include/xorg/session.inc.php | 7 ++-- install.d/platal/files | 3 -- templates/newsletter/head.tpl | 23 ----------- templates/password_prompt.head.tpl | 24 ----------- templates/profil.head.tpl | 46 ---------------------- templates/skin/common.header.tpl | 16 ++++---- templates/skin/default.tpl | 9 ++--- templates/skin/espace.tpl | 11 ++---- templates/skin/humlinux.tpl | 11 ++---- templates/skin/linux.tpl | 11 ++---- templates/skin/liteskin.tpl | 9 ++--- templates/skin/nbviolet.tpl | 9 ++--- templates/skin/newxorg.tpl | 9 ++--- templates/skin/oldtimes.tpl | 9 ++--- templates/skin/openweb.tpl | 9 ++--- templates/skin/sharky.tpl | 9 ++--- templates/skin/spectral.tpl | 9 ++--- templates/skin/trapped.tpl | 9 ++--- 32 files changed, 159 insertions(+), 262 deletions(-) rename templates/listes/archives.head.tpl => htdocs/css/lists.archives.css (70%) rename templates/banana/index.head.tpl => htdocs/css/profil.css (62%) rename templates/password_prompt_logged.head.tpl => htdocs/javascript/do_challenge_response_logged.js (70%) rename templates/motdepassemd5.head.tpl => htdocs/javascript/motdepassemd5.js (77%) delete mode 100644 templates/newsletter/head.tpl delete mode 100644 templates/password_prompt.head.tpl delete mode 100644 templates/profil.head.tpl diff --git a/ChangeLog b/ChangeLog index 935ff9d..0b94c15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ New : - Drop cache algorithm (was complex for no gain). -MC - Enhancements wrt COOKIE. -MC - More homogenous date formating (use %x / %X everywhere). -MC + - No more .head.tpl. (thanks to JM for the tip). -MC * Contacts : - Brand new PDF of the contact list (using FPDF). -MC diff --git a/htdocs/admin/newsletter_edit.php b/htdocs/admin/newsletter_edit.php index 9ba916f..3e5cc7e 100644 --- a/htdocs/admin/newsletter_edit.php +++ b/htdocs/admin/newsletter_edit.php @@ -20,7 +20,8 @@ ***************************************************************************/ require_once("xorg.inc.php"); -new_admin_page('admin/newsletter_edit.tpl', 'newsletter/head.tpl'); +new_admin_page('admin/newsletter_edit.tpl'); +$page->addCssLink('css/nl.css'); require_once("newsletter.inc.php"); $nid = Get::get('nid', 'last'); diff --git a/htdocs/banana/index.php b/htdocs/banana/index.php index bf0433d..af59d9a 100644 --- a/htdocs/banana/index.php +++ b/htdocs/banana/index.php @@ -8,7 +8,8 @@ ********************************************************************************/ require_once('xorg.inc.php'); -new_skinned_page('banana/index.tpl', AUTH_COOKIE, 'banana/index.head.tpl'); +new_skinned_page('banana/index.tpl', AUTH_COOKIE); +$page->addCssLink('banana/css/style.css'); require_once('banana.inc.php'); $res = PlatalBanana::run(); diff --git a/templates/listes/archives.head.tpl b/htdocs/css/lists.archives.css similarity index 70% rename from templates/listes/archives.head.tpl rename to htdocs/css/lists.archives.css index 3470f46..0039827 100644 --- a/templates/listes/archives.head.tpl +++ b/htdocs/css/lists.archives.css @@ -1,4 +1,4 @@ -{*************************************************************************** +/*************************************************************************** * Copyright (C) 2003-2004 Polytechnique.org * * http://opensource.polytechnique.org/ * * * @@ -16,36 +16,30 @@ * along with this program; if not, write to the Free Software * * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} + ***************************************************************************/ -{literal} - -{/literal} - -{* vim:set et sw=2 sts=2 sws=2: *} +} diff --git a/templates/banana/index.head.tpl b/htdocs/css/profil.css similarity index 62% rename from templates/banana/index.head.tpl rename to htdocs/css/profil.css index 1dbee56..5c85de9 100644 --- a/templates/banana/index.head.tpl +++ b/htdocs/css/profil.css @@ -1,4 +1,4 @@ -{*************************************************************************** +/*************************************************************************** * Copyright (C) 2003-2004 Polytechnique.org * * http://opensource.polytechnique.org/ * * * @@ -16,8 +16,22 @@ * along with this program; if not, write to the Free Software * * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} + ***************************************************************************/ - - -{* vim:set et sw=2 sts=2 sws=2: *} +div.blocunite {margin: 1em 0em 2em 0em;} +div.blocunite_tab {margin: 0em 0em 2em 0em;} +div.erreur {background-color: #FF3300; padding-left=0.5em; margin: 2px;} +table.bicol td.cold,td.col {padding-right: 0.5em;} +table.bicol td.colm {} +table.bicol td.colg,td.col {padding-left: 0.5em;} +table.bicol td.dcolm, td.dcolg, td.dcold {padding-bottom: 0.5em;} +table.bicol td.dcolg {padding-left: 0.5em;} +table.bicol td.dcold {padding-right: 0.5em;} +table.bicol td.pflags {} +table.bicol td.flags {padding-top: 0.5em;} +table.bicol tr.top {vertical-align: top;} +table.bicol span.titre {font-weight: bold;} +table.bicol span.comm {font-size: smaller;} +table.bicol span.nom {} +table.bicol span.valeur {font-weight: bold;} +table.bicol span.lien {font-size: smaller;} diff --git a/templates/password_prompt_logged.head.tpl b/htdocs/javascript/do_challenge_response_logged.js similarity index 70% rename from templates/password_prompt_logged.head.tpl rename to htdocs/javascript/do_challenge_response_logged.js index 4d3ccc2..0621019 100644 --- a/templates/password_prompt_logged.head.tpl +++ b/htdocs/javascript/do_challenge_response_logged.js @@ -1,4 +1,4 @@ -{*************************************************************************** +/*************************************************************************** * Copyright (C) 2003-2004 Polytechnique.org * * http://opensource.polytechnique.org/ * * * @@ -16,21 +16,28 @@ * along with this program; if not, write to the Free Software * * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} + ***************************************************************************/ +function readCookie(name) +{ + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + for(var i=0;i < ca.length;i++) + { + var c = ca[i]; + while (c.charAt(0)==' ') c = c.substring(1,c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); + } + return null; +} - - - -{* vim:set et sw=2 sts=2 sws=2: *} + document.forms.loginsub.response.value = MD5(str); + document.forms.login.password.value = ""; + document.forms.loginsub.submit(); +} diff --git a/templates/motdepassemd5.head.tpl b/htdocs/javascript/motdepassemd5.js similarity index 77% rename from templates/motdepassemd5.head.tpl rename to htdocs/javascript/motdepassemd5.js index 6c54c2c..8474f8c 100644 --- a/templates/motdepassemd5.head.tpl +++ b/htdocs/javascript/motdepassemd5.js @@ -1,4 +1,4 @@ -{*************************************************************************** +/*************************************************************************** * Copyright (C) 2003-2004 Polytechnique.org * * http://opensource.polytechnique.org/ * * * @@ -16,34 +16,24 @@ * along with this program; if not, write to the Free Software * * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} + ***************************************************************************/ - - -{literal} - -{/literal} - -{* vim:set et sw=2 sts=2 sws=2: *} +} diff --git a/htdocs/listes/archives.php b/htdocs/listes/archives.php index 555d9c5..89b1aa7 100644 --- a/htdocs/listes/archives.php +++ b/htdocs/listes/archives.php @@ -23,7 +23,8 @@ require_once("xorg.inc.php"); if (!Env::has('liste')) header('Location: index.php'); $liste = strtolower(Env::get('liste')); -new_skinned_page('listes/archives.tpl', AUTH_COOKIE, 'listes/archives.head.tpl'); +new_skinned_page('listes/archives.tpl', AUTH_COOKIE); +$page->addCssLink('css/lists.archives.css'); require_once('lists.inc.php'); $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password')); diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php index ce034ac..23be59f 100644 --- a/htdocs/motdepassemd5.php +++ b/htdocs/motdepassemd5.php @@ -37,6 +37,8 @@ if (Env::has('response2')) { $page->run(); } -new_skinned_page('motdepassemd5.tpl', AUTH_MDP, 'motdepassemd5.head.tpl'); +new_skinned_page('motdepassemd5.tpl', AUTH_MDP); +$page->addJsLink('javascript/md5.js'); +$page->addJsLink('javascript/motdepassemd5.js'); $page->run(); ?> diff --git a/htdocs/newsletter/show.php b/htdocs/newsletter/show.php index bbee019..18cba2a 100644 --- a/htdocs/newsletter/show.php +++ b/htdocs/newsletter/show.php @@ -20,7 +20,8 @@ ***************************************************************************/ require_once("xorg.inc.php"); -new_skinned_page('newsletter/show.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); +new_skinned_page('newsletter/show.tpl', AUTH_COOKIE); +$page->addCssLink('css/nl.css'); require_once("newsletter.inc.php"); $nid = Get::get('nid', 'last'); diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php index 509436a..a311482 100644 --- a/htdocs/newsletter/submit.php +++ b/htdocs/newsletter/submit.php @@ -20,7 +20,8 @@ ***************************************************************************/ require_once("xorg.inc.php"); -new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); +new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE); +$page->addCssLink('css/nl.css'); require_once("newsletter.inc.php"); if (Post::has('see')) { diff --git a/htdocs/profil.php b/htdocs/profil.php index b84d20f..8a4d0f4 100644 --- a/htdocs/profil.php +++ b/htdocs/profil.php @@ -20,7 +20,8 @@ ***************************************************************************/ require_once("xorg.inc.php"); -new_skinned_page('profil.tpl',AUTH_MDP, 'profil.head.tpl'); +new_skinned_page('profil.tpl',AUTH_MDP); +$page->addCssLink('css/profil.css'); require_once('tabs.inc.php'); require_once('profil.func.inc.php'); diff --git a/include/xorg.inc.php b/include/xorg.inc.php index 0d78f58..5245c0e 100644 --- a/include/xorg.inc.php +++ b/include/xorg.inc.php @@ -73,7 +73,7 @@ if (ini_get("magic_quotes_gpc")) { // }}} // {{{ function _new_page() -function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false) +function _new_page($type, $tpl_name, $min_auth, $admin=false) { global $page,$globals; require_once("xorg/page.inc.php"); @@ -92,25 +92,24 @@ function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false) $page = new XorgAuth($tpl_name, $type); } - $page->assign('xorg_head', $tpl_head); $page->assign('xorg_tpl', $tpl_name); } // }}} // {{{ function new_skinned_page() -function new_skinned_page($tpl_name, $min_auth, $tpl_head="") +function new_skinned_page($tpl_name, $min_auth) { - _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); + _new_page(SKINNED, $tpl_name, $min_auth); } // }}} // {{{ function new_simple_page() -function new_simple_page($tpl_name, $min_auth, $tpl_head="") +function new_simple_page($tpl_name, $min_auth) { global $page,$globals; - _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); + _new_page(SKINNED, $tpl_name, $min_auth); $page->assign('simple', true); } @@ -125,9 +124,9 @@ function new_nonhtml_page($tpl_name, $min_auth) // }}} // {{{ function new_admin_page() -function new_admin_page($tpl_name, $tpl_head="") +function new_admin_page($tpl_name) { - _new_page(SKINNED, $tpl_name, $tpl_head, AUTH_MDP, true); + _new_page(SKINNED, $tpl_name, AUTH_MDP, true); } // }}} diff --git a/include/xorg/page.inc.php b/include/xorg/page.inc.php index 0d53255..38927ff 100644 --- a/include/xorg/page.inc.php +++ b/include/xorg/page.inc.php @@ -72,6 +72,7 @@ class XorgPage extends DiogenesCorePage $this->DiogenesCorePage(); $this->register_prefilter('at_to_globals'); + $this->addJsLink('javascript/xorg.js'); $this->doAuth(); } @@ -98,12 +99,12 @@ class XorgPage extends DiogenesCorePage function run() { global $globals, $TIME_BEGIN; - $this->assign_by_ref("xorg_error", $this->_errors); + $this->assign("xorg_error", $this->_errors); if ($this->_page_type == NO_SKIN) { $this->display($this->_tpl); } else { - $this->assign_by_ref('menu', $globals->menu->menu()); + $this->assign('menu', $globals->menu->menu()); if ($globals->debug) { $this->assign('db_trace', $globals->db->trace_format($this, 'database-debug.tpl')); $this->assign('validate', urlencode($globals->baseurl.'/valid.html')); @@ -191,6 +192,22 @@ class XorgPage extends DiogenesCorePage } // }}} + // {{{ function addJsLink + + function addJsLink($path) + { + $this->append('xorg_js', $path); + } + + // }}} + // {{{ function addCssLink + + function addCssLink($path) + { + $this->append('xorg_css', $path); + } + + // }}} } // }}} diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index dee75da..ebe935f 100644 --- a/include/xorg/session.inc.php +++ b/include/xorg/session.inc.php @@ -147,16 +147,15 @@ class XorgSession extends DiogenesCoreSession */ function doLogin(&$page, $new_name=false) { + $page->addJsLink('javascript/md5.js'); if (logged() and !$new_name) { $page->changeTpl('password_prompt_logged.tpl'); - $page->caching = false; - $page->assign("xorg_head", "password_prompt_logged.head.tpl"); + $page->addJsLink('javascript/do_challenge_response_logged.js'); $page->assign("xorg_tpl", "password_prompt_logged.tpl"); $page->run(); } else { $page->changeTpl('password_prompt.tpl'); - $page->caching = false; - $page->assign("xorg_head", "password_prompt.head.tpl"); + $page->addJsLink('javascript/do_challenge_response.js'); $page->assign("xorg_tpl", "password_prompt.tpl"); $page->run(); } diff --git a/install.d/platal/files b/install.d/platal/files index fd0077f..c9baa83 100644 --- a/install.d/platal/files +++ b/install.d/platal/files @@ -299,11 +299,8 @@ templates/cookie_on.tpl templates/deconnexion.tpl templates/index.tpl templates/logger-view.tpl -templates/motdepassemd5.head.tpl templates/motdepassemd5.success.tpl templates/motdepassemd5.tpl -templates/password_prompt.head.tpl -templates/password_prompt_logged.head.tpl templates/password_prompt_logged.tpl templates/password_prompt.tpl templates/preferences.tpl diff --git a/templates/newsletter/head.tpl b/templates/newsletter/head.tpl deleted file mode 100644 index 3b2ccac..0000000 --- a/templates/newsletter/head.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{*************************************************************************** - * Copyright (C) 2003-2004 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} - - - -{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/password_prompt.head.tpl b/templates/password_prompt.head.tpl deleted file mode 100644 index 09df2ca..0000000 --- a/templates/password_prompt.head.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{*************************************************************************** - * Copyright (C) 2003-2004 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} - - - - -{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/profil.head.tpl b/templates/profil.head.tpl deleted file mode 100644 index 55c2588..0000000 --- a/templates/profil.head.tpl +++ /dev/null @@ -1,46 +0,0 @@ -{*************************************************************************** - * Copyright (C) 2003-2004 Polytechnique.org * - * http://opensource.polytechnique.org/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ***************************************************************************} - - -{literal} - -{/literal} - -{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl index a867e87..1130dc1 100644 --- a/templates/skin/common.header.tpl +++ b/templates/skin/common.header.tpl @@ -35,13 +35,13 @@ - - {if $xorg_title} - {$xorg_title} - {else} - Anciens eleves Polytechnique, annuaire email, Alumni - {/if} - - + {foreach from=$xorg_css item=css} + + {/foreach} + {foreach from=$xorg_js item=js} + + {/foreach} + + {$xorg_title|default:"Anciens eleves Polytechnique, annuaire email, Alumni"} {* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl index 06e8b35..feb71c2 100644 --- a/templates/skin/default.tpl +++ b/templates/skin/default.tpl @@ -22,11 +22,8 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -36,8 +33,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl index 4e03ed1..c35f845 100644 --- a/templates/skin/espace.tpl +++ b/templates/skin/espace.tpl @@ -22,12 +22,9 @@ + + {include file=skin/common.header.tpl} - - - {if $xorg_head} - {include file=$xorg_head} - {/if} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl index bbef65a..b4f40c1 100644 --- a/templates/skin/humlinux.tpl +++ b/templates/skin/humlinux.tpl @@ -22,12 +22,9 @@ + + {include file=skin/common.header.tpl} - - - {if $xorg_head} - {include file=$xorg_head} - {/if} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl index 1687bfb..8b02aa9 100644 --- a/templates/skin/linux.tpl +++ b/templates/skin/linux.tpl @@ -22,12 +22,9 @@ + + {include file=skin/common.header.tpl} - - - {if $xorg_head} - {include file=$xorg_head} - {/if} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl index f8e40e7..cecf488 100644 --- a/templates/skin/liteskin.tpl +++ b/templates/skin/liteskin.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl index fd4c75f..02bebf0 100644 --- a/templates/skin/nbviolet.tpl +++ b/templates/skin/nbviolet.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl index e5e7faf..fba2b8c 100644 --- a/templates/skin/newxorg.tpl +++ b/templates/skin/newxorg.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl index c4862cd..c12002f 100644 --- a/templates/skin/oldtimes.tpl +++ b/templates/skin/oldtimes.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl index 3c657e7..68f2b1c 100644 --- a/templates/skin/openweb.tpl +++ b/templates/skin/openweb.tpl @@ -22,11 +22,8 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -36,8 +33,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl index 2b18b8e..a546ba4 100644 --- a/templates/skin/sharky.tpl +++ b/templates/skin/sharky.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl index c6313b4..191ae87 100644 --- a/templates/skin/spectral.tpl +++ b/templates/skin/spectral.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl index ed19129..704e416 100644 --- a/templates/skin/trapped.tpl +++ b/templates/skin/trapped.tpl @@ -22,12 +22,9 @@ - {include file=skin/common.header.tpl} - {if $xorg_head} - {include file=$xorg_head} - {/if} + {include file=skin/common.header.tpl} {include file=skin/common.bandeau.head.tpl} @@ -37,8 +34,8 @@
- {$smarty.session.suid} ({$smarty.session.forlife}) - [exit] + {$smarty.session.suid} ({$smarty.session.forlife}) + [exit]
-- 2.1.4