From ff996dd21f4d62adfe80ff9c0d29e43f516a142d Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 2 Nov 2008 17:43:54 +0100 Subject: [PATCH] common.content.tpl and common.devel.tpl have been moved to the core. Signed-off-by: Florent Bruneau --- classes/xnetpage.php | 1 + classes/xorgpage.php | 1 + core | 2 +- templates/core/password_prompt.tpl | 2 +- templates/core/password_prompt_logged.tpl | 2 +- templates/skin/common.content.tpl | 46 ------------------------------- templates/skin/common.devel.tpl | 39 -------------------------- templates/skin/common.header.tpl | 25 +---------------- templates/skin/default.tpl | 4 +-- templates/skin/espace.tpl | 4 +-- templates/skin/humlinux.tpl | 4 +-- templates/skin/keynote.tpl | 4 +-- templates/skin/linux.tpl | 4 +-- templates/skin/liteskin.tpl | 4 +-- templates/skin/nbviolet.tpl | 4 +-- templates/skin/newxorg.tpl | 4 +-- templates/skin/oldtimes.tpl | 4 +-- templates/skin/openweb.tpl | 4 +-- templates/skin/register.tpl | 4 +-- templates/skin/sharky.tpl | 4 +-- templates/skin/spectral.tpl | 4 +-- templates/skin/trapped.tpl | 4 +-- templates/xnet/skin.tpl | 31 +++------------------ 23 files changed, 38 insertions(+), 167 deletions(-) delete mode 100644 templates/skin/common.content.tpl delete mode 100644 templates/skin/common.devel.tpl diff --git a/classes/xnetpage.php b/classes/xnetpage.php index f020535..f23cac2 100644 --- a/classes/xnetpage.php +++ b/classes/xnetpage.php @@ -42,6 +42,7 @@ class XnetPage extends PlPage $this->assign('is_member', is_member()); } $this->addJsLink('xorg.js'); + $this->setTitle('Les associations polytechniciennes'); } // }}} diff --git a/classes/xorgpage.php b/classes/xorgpage.php index d2bb501..3db3379 100644 --- a/classes/xorgpage.php +++ b/classes/xorgpage.php @@ -28,6 +28,7 @@ class XorgPage extends PlPage // Set the default page $this->changeTpl('platal/index.tpl'); $this->addJsLink('xorg.js'); + $this->setTitle('le site des Ã©lÃ¨ves et anciens Ã©lÃ¨ves de l\'Ãcole polytechnique'); } public function run() diff --git a/core b/core index 906b45b..f734e82 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 906b45bbf7130955dc65a34445b53390d6460b49 +Subproject commit f734e828ef90b48ba709a84de92f5f95154cb111 diff --git a/templates/core/password_prompt.tpl b/templates/core/password_prompt.tpl index 3e55236..c5d0b45 100644 --- a/templates/core/password_prompt.tpl +++ b/templates/core/password_prompt.tpl @@ -44,7 +44,7 @@ Si tu n'es pas {insert name="getName"}, change le login ci-dessous, ou rends-toi {/if} {if $smarty.request.response} -{include file="include/triggers.tpl" text="Erreur d'identification. Essaie Ã nouveau !" type="errors"} +{include core=triggers.tpl text="Erreur d'identification. Essaie Ã nouveau !" type="errors"}
{/if} diff --git a/templates/core/password_prompt_logged.tpl b/templates/core/password_prompt_logged.tpl index c980627..ab3e410 100644 --- a/templates/core/password_prompt_logged.tpl +++ b/templates/core/password_prompt_logged.tpl @@ -68,7 +68,7 @@
{if $smarty.request.response} -{include file="include/triggers.tpl" text="Erreur d'identification. Essaie Ã nouveau !" type="errors"} +{include core=triggers.tpl text="Erreur d'identification. Essaie Ã nouveau !" type="errors"} {/if} diff --git a/templates/skin/common.content.tpl b/templates/skin/common.content.tpl deleted file mode 100644 index 7823905..0000000 --- a/templates/skin/common.content.tpl +++ /dev/null @@ -1,46 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 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 *} -{* *} -{**************************************************************************} - -{if !$smarty.server.HTTP_USER_AGENT|regex_replace:"/^Mozilla\/(3|4\.[^0]).*$/":""} -

ATTENTION !

- -

-Netscape 4 et certains autres navigateurs trÃ¨s anciens ne sont pas supportÃ©s par ce site !!! -

-En effet, ils ne comprenent qu'une trop faible partie des standards du web. -Il faut donc s'attendre Ã ce que nombre des fonctionnalitÃ©s de ce site soient de ce fait indisponnibles. -

-Nous conseillons trÃ¨s vivement d'utiliser des navigateurs rÃ©cents, tels -Firefox -

-
-{/if} - -{if !$pl_no_errors || $pl_failure} -{include core=triggers.tpl} -{/if} - -{if !$pl_failure && $pl_tpl}{include file=$pl_tpl}{/if} - -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/skin/common.devel.tpl b/templates/skin/common.devel.tpl deleted file mode 100644 index 029f04b..0000000 --- a/templates/skin/common.devel.tpl +++ /dev/null @@ -1,39 +0,0 @@ -{**************************************************************************} -{* *} -{* Copyright (C) 2003-2008 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 *} -{* *} -{**************************************************************************} - -{if #globals.debug#} -@@BACKTRACE@@ - -{if $validate} -

- @HOOK@ - Validation : - CSS - | - rÃ©fÃ©rences : - XHTML - CSS2 -

-{/if} -{/if} - -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl index 6e0abeb..97811c5 100644 --- a/templates/skin/common.header.tpl +++ b/templates/skin/common.header.tpl @@ -40,38 +40,15 @@ + {include core=plpage.header.tpl} - {foreach from=$pl_css item=css} - - {/foreach} - {foreach from=$pl_inline_css item=css} - - {/foreach} - {foreach from=$pl_link item=link} - - {/foreach} - {foreach from=$pl_js item=js} - - {/foreach} {javascript name=overlib} {javascript name=md5} {javascript name=sha1} {javascript name=secure_hash} - {if $pl_rss} - - {/if} - - {if $pl_extra_header} - {$pl_extra_header|smarty:nodefaults} - {/if} - - {$pl_title|default:"Polytechnique.org : le site des Ã©lÃ¨ves et anciens Ã©lÃ¨ves de l'Ãcole polytechnique"} - {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl index 9b509dc..35088bb 100644 --- a/templates/skin/default.tpl +++ b/templates/skin/default.tpl @@ -41,7 +41,7 @@ {if $simple}