X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fskin%2Fcommon.header.tpl;h=da39c5e6bb02418bbc7740745877febcd8db6e7e;hb=006819700381ba35f121b83b1c55828dd7b4d66e;hp=162357edc4a3ae1469b791cffd3ea20d8657cafc;hpb=7f8bf077b7a297957678912e5772098143f8ac74;p=platal.git

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 162357e..da39c5e 100644
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,36 +20,46 @@
 {*                                                                        *}
 {**************************************************************************}
 
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <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="icon" type="image/png" href="images/favicon.png" />
-
+    <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" />
-    <link rel="help"   href="Docs/FAQ" />
-    <link rel="bookmark" href="http://www.polytechnique.fr/"        title="| École polytechnique" />
+    {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" />
+    <link rel="bookmark" href="http://www.polytechnique.fr/"        title="| École polytechnique" />
     <link rel="bookmark" href="http://www.polytechnique.edu/"       title="| Institutionnal site" />
     <link rel="bookmark" href="http://www.fondationx.org/"          title="| FX" />
     <link rel="bookmark" href="http://www.polytechniciens.com/"     title="| AX" />
     <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="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
 
-		<link rel="stylesheet" type="text/css" href="css/flyspray.css" />
+    <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}" />
+    <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="{$js}"></script>
+    <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}
-    <script type="text/javascript" src="javascript/overlib.js"></script>
-    <script type="text/javascript" src="javascript/md5.js"></script>
-    <script type="text/javascript" src="javascript/sha1.js"></script>
-    <script type="text/javascript" src="javascript/secure_hash.js"></script>
-    {if $smarty.session.auth}
-    <script type="text/javascript" src="javascript/flyspray.js"></script>
-    {/if}
+    {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}" />
@@ -59,6 +69,6 @@
     {$xorg_extra_header|smarty:nodefaults}
     {/if}
 
-    <title>{$xorg_title|default:"Anciens eleves Polytechnique, annuaire email, Alumni"}</title>
+    <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: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}