Finishes to move functions from geoloc.inc.php to geocoding.inc.php,

[platal.git] / templates / skin / common.header.tpl

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 3461ce7..aa133a5 100644 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -25,6 +25,7 @@
     <meta name="keywords" content="Ecole polytechnique, anciens eleves, portail, alumni, AX, X, routage, reroutage, e-mail, email, mail" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="/images/favicon.png" type="image/png" />
+    <link rel="apple-touch-icon" href="images/logo.png" type="image/png" />
     <link rel="index"  href="" />
     <link rel="author" href="changelog" />
     <link rel="search" href="search" />
@@ -39,35 +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=$xorg_css item=css}
-    <link rel="stylesheet" type="text/css" href="css/{$css}" media="all"/>
-    {/foreach}
-    {foreach from=$xorg_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"/>
     <script type="text/javascript">
       var platal_baseurl = "{$globals->baseurl}/";
     </script>
-    {foreach from=$xorg_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 $xorg_rss}
-    <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />
-    {/if}
-
-    {if $xorg_extra_header}
-    {$xorg_extra_header|smarty:nodefaults}
-    {/if}
-
-    <title>{$xorg_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: *}