common.content.tpl and common.devel.tpl have been moved to the core.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index f020535..f23cac2 100644 (file)
--- 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 (file)
--- 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 (submodule)
--- 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 (file)
--- 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}<!-- failed login code //-->
-{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"}
 <br />
 {/if}
 

diff --git a/templates/core/password_prompt_logged.tpl b/templates/core/password_prompt_logged.tpl
index c980627..ab3e410 100644 (file)
--- a/templates/core/password_prompt_logged.tpl
+++ b/templates/core/password_prompt_logged.tpl
@@ -68,7 +68,7 @@
 </form>
 <br />
 {if $smarty.request.response}<!-- failed login code -->
-{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}
 
 <!-- Set up the form with the challenge value and an empty reply value -->

diff --git a/templates/skin/common.content.tpl b/templates/skin/common.content.tpl
deleted file mode 100644 (file)
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]).*$/":""}
-<h1>ATTENTION !</h1>
-
-<p class="erreur">
-Netscape 4 et certains autres navigateurs très anciens ne sont pas supportés par ce site !!!
-</p>
-<p>
-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.
-</p>
-<p>
-Nous conseillons très vivement d'utiliser des navigateurs récents, tels
-<a href="http://www.mozilla.org/products/firefox/">Firefox</a>
-</p>
-<br />
-{/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 (file)
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}
-  <div id="dev">
-    @HOOK@
-    Validation&nbsp;:
-    <a href="http://jigsaw.w3.org/css-validator/validator?uri={#globals.baseurl#}/valid.html">CSS</a>
-    &nbsp;&nbsp;|&nbsp;&nbsp;
-    références&nbsp;:
-    <a href="http://www.w3schools.com/xhtml/xhtml_reference.asp">XHTML</a>
-    <a href="http://www.w3schools.com/css/css_reference.asp">CSS2</a>
-  </div>
-{/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 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -40,38 +40,15 @@
     <link rel="bookmark" href="http://www.polytechnique.org/"       title="| Polytechnique.org" />
     <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
 
+    {include core=plpage.header.tpl}
     <link rel="stylesheet" type="text/css" href="css/base.css" media="all"/>
-    {foreach from=$pl_css item=css}
-    <link rel="stylesheet" type="text/css" href="css/{$css}" media="all"/>
-    {/foreach}
-    {foreach from=$pl_inline_css item=css}
-    <style type="text/css">
-    {$css|smarty:nodefaults}
-    </style>
-    {/foreach}
     <link rel="stylesheet" type="text/css" href="css/print.css" media="print"/>
-    {foreach from=$pl_link item=link}
-    <link rel="{$link.rel}" href="{$link.href}" />
-    {/foreach}
     <script type="text/javascript">
       var platal_baseurl = "{$globals->baseurl}/";
     </script>
-    {foreach from=$pl_js item=js}
-    <script type="text/javascript" src="javascript/{$js}"></script>
-    {/foreach}
     {javascript name=overlib}
     {javascript name=md5}
     {javascript name=sha1}
     {javascript name=secure_hash}
 
-    {if $pl_rss}
-    <link rel="alternate" type="application/rss+xml" title="{$pl_rss.title}" href="{$pl_rss.href}" />
-    {/if}
-
-    {if $pl_extra_header}
-    {$pl_extra_header|smarty:nodefaults}
-    {/if}
-
-    <title>{$pl_title|default:"Polytechnique.org&nbsp;: le site des élèves et anciens élèves de l'École polytechnique"}</title>
-
 {* 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 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -41,7 +41,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -62,7 +62,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-          {include file="skin/common.content.tpl"}
+          {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index 0dc1684..68fafa2 100644 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -63,7 +63,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 42a6b00..f6db00d 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -62,7 +62,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/keynote.tpl b/templates/skin/keynote.tpl
index f77d251..364bca9 100644 (file)
--- a/templates/skin/keynote.tpl
+++ b/templates/skin/keynote.tpl
@@ -41,7 +41,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -61,7 +61,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-          {include file="skin/common.content.tpl"}
+          {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index d1de067..ad04343 100644 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -63,7 +63,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index 21ba9e1..a8e73e2 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -62,7 +62,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index 730fbee..8e324db 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -63,7 +63,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index 035c0c5..5fc9889 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -62,7 +62,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index 5c9914b..0e60baf 100644 (file)
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -43,7 +43,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -66,7 +66,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index 9c424f1..e285464 100644 (file)
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
   <div id="body">
-    {include file="skin/common.content.tpl"}
+    {include core=plpage.content.tpl}
   </div>
 
   {else}
@@ -63,7 +63,7 @@
         </td>
         <td style="vertical-align: top">
           <div id="content">
-          {include file="skin/common.content.tpl"}
+          {include core=plpage.content.tpl}
           </div>
         </td>
       </tr>

diff --git a/templates/skin/register.tpl b/templates/skin/register.tpl
index 8988cfd..0946122 100644 (file)
--- a/templates/skin/register.tpl
+++ b/templates/skin/register.tpl
@@ -40,7 +40,7 @@
 
   {if $simple}
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
   {else}
     <table id="body" cellpadding="0" cellspacing="0">
@@ -53,7 +53,7 @@
       </tr>
       <tr>
         <td id="content">
-          {include file="skin/common.content.tpl"}
+          {include core=plpage.content.tpl}
         </td>
       </tr>
     </table>

diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index 33c893b..00a2401 100644 (file)
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -43,7 +43,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -65,7 +65,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 8a0e715..b492c0a 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -63,7 +63,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index 0a11efd..c7eab7a 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -42,7 +42,7 @@
   {if $simple}
 
     <div id="content">
-      {include file="skin/common.content.tpl"}
+      {include core=plpage.content.tpl}
     </div>
 
   {else}
@@ -63,7 +63,7 @@
         {include file=skin/common.menu.tpl}
         </td>
         <td id="content">
-        {include file="skin/common.content.tpl"}
+        {include core=plpage.content.tpl}
         </td>
       </tr>
       <tr>

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 4bf4f96..f90a53e 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -39,40 +39,17 @@
     <link rel="bookmark" href="http://www.polytechnique.org/"       title="| Polytechnique.org" />
     <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
 
-    {foreach from=$pl_css item=css}
-    <link rel="stylesheet" type="text/css" href="css/{$css}" />
-    {/foreach}
-    {foreach from=$pl_inline_css item=css} 
-    <style type="text/css"> 
-    {$css|smarty:nodefaults} 
-    </style> 
-    {/foreach} 
-    {foreach from=$pl_link item=link}
-    <link rel="{$link.rel}" href="{$link.href}" />
-    {/foreach}
+    {include core=plpage.header.tpl}
     <script type="text/javascript">
     var platal_baseurl = "{$globals->baseurl}/"
     if (window.top != window)
       document.write('<link rel="stylesheet" type="text/css" href="css/onlycontent.css" media="all"/>');
     </script>
-    {foreach from=$pl_js item=js}
-    <script type="text/javascript" src="javascript/{$js}"></script>
-    {/foreach}
     {javascript name=overlib}
-
-    {if $pl_rss}
-    <link rel="alternate" type="application/rss+xml" title="{$pl_rss.title}" href="{$pl_rss.href}" />
-    {/if}
-
-    {if $pl_extra_header}
-    {$pl_extra_header|smarty:nodefaults}
-    {/if}
-
-    <title>Les associations polytechniciennes</title>
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body>
-    {include file=skin/common.devel.tpl}
+    {include core=plpage.devel.tpl}
     {if !$simple}
       {include file=skin/common.bandeau.tpl}
     {/if}
@@ -158,13 +135,13 @@
           {/if}
         </td>
         <td id="body">
-          {include file="skin/common.content.tpl"}
+          {include core=plpage.content.tpl}
         </td>
       </tr>
       {else}
       <tr>
         <td colspan="2">
-          {include file="skin/common.content.tpl"}
+          {include core=plpage.content.tpl}
         </td>
       </tr>
       {if !$simple}