X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fskin%2Fcommon.header.tpl;h=7b9bc47637b23e3b93b0c50c8ed816bd85c22b18;hb=2ebe2e686a87338a11602f70ef60851ab5399c81;hp=92a44bd9c56b8b7573fb82e1d04ca7a940540831;hpb=b5a8c86f4bc140f60a65c222aaee5d4d4d49c155;p=platal.git

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 92a44bd..7b9bc47 100644
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -23,12 +23,18 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="description" content="Le Portail des Polytechniciens" />
     <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="stylesheet" type="text/css" href="css/base.css" media="all"/>
+    <link rel="stylesheet" type="text/css" href="css/print.css" media="print"/>
+
     <link rel="index"  href="" />
     <link rel="author" href="changelog" />
     <link rel="search" href="search" />
-    {if $smarty.session.perms->hasFlag('user')}
+    {if hasPerm('user')}
     <link rel="search" type="application/opensearchdescription+xml" href="http://www.polytechnique.org/xorg.opensearch.xml" title="Annuaire Polytechnique.org" />
     {/if}
     <link rel="help"   href="Xorg/FAQ" />
@@ -39,35 +45,6 @@
     <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" />
 
-    <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:"Anciens eleves Polytechnique, annuaire email, Alumni"}</title>
+    {include core=plpage.header.tpl}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}