X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fskin%2Fcommon.menu.tpl;h=9b61516a35403a1fe74b7f92861b1b07d6328b33;hb=c67b874fd8d442bfded35295a819e7ce11a2d6dc;hp=29b2fc56292baab12d509621a76a87b995cfb29c;hpb=5f30b30e8b2657ade5c727e98de286386ee002d8;p=platal.git

diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index 29b2fc5..9b61516 100644
--- a/templates/skin/common.menu.tpl
+++ b/templates/skin/common.menu.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -24,16 +24,15 @@
 <div class="menu_title">Polytechniciens</div>
 <div class="menu_item"><a href="login">Me connecter !</a></div>
 <div class="menu_item"><a href="register">M'inscrire</a></div>
-<div class="menu_item"><a href="Xorg/PourquoiMInscrire">Pourquoi m'inscrire ?</a></div>
+<div class="menu_item"><a href="Xorg/PourquoiMInscrire">Pourquoi m'inscrire&nbsp;?</a></div>
 
 <div class="menu_title">Visiteurs</div>
 <div class="menu_item"><a href="search">Annuaire de l'X</a></div>
 <div class="menu_item"><a href="http://www.polytechnique.net/">Associations X</a></div>
 <div class="menu_item"><a href="http://www.manageurs.com/">Recrutement</a></div>
-<div class="menu_item"><a href="survey">Sondages</a></div>
 
 <div class="menu_title">Informations</div>
-<div class="menu_item"><a href="Equipe/APropos">A propos du site</a></div>
+<div class="menu_item"><a href="Equipe/APropos">À propos du site</a></div>
 <div class="menu_item"><a href="Xorg/NousContacter">Nous contacter</a></div>
 <div class="menu_item"><a href="Xorg/FAQ">FAQ</a></div>
 
@@ -54,8 +53,11 @@
 <div class="menu_item"><a href="prefs">Mes préférences</a></div>
 
 <div class="menu_title">Services</div>
-<div class="menu_item"><a href="emails/send">Envoyer un mail</a></div>
+<div class="menu_item"><a href="emails/send">Envoyer un email</a></div>
 <div class="menu_item"><a href="banana/">Forums &amp; PA</a></div>
+{if $smarty.session.user->googleapps}
+<div class="menu_item"><a href="http://gmail.polytechnique.org/">Emails Google Apps</a></div>
+{/if}
 <div class="menu_item"><a href="lists">Listes de diffusion</a></div>
 <div class="menu_item"><a href="payment">Télépaiements</a></div>
 <div class="menu_item"><a href="emails/antispam/submit">Soumettre un spam</a></div>
@@ -63,8 +65,7 @@
 
 <div class="menu_title">Communauté X</div>
 <div class="menu_item"><a href="search">Annuaire</a></div>
-<div class="menu_item"><a href="geoloc">Planisphère</a></div>
-<div class="menu_item"><a href="emploi">Emploi &amp; Carrières</a></div>
+<div class="menu_item"><a href="jobs">Emploi &amp; Carrières</a></div>
 <div class="menu_item"><a href="groupes-x">Mes groupes X</a></div>
 <div class="menu_item"><a href="survey">Sondages</a></div>
 
@@ -73,19 +74,19 @@
 <div class="menu_item"><a href="nl">Lettres mensuelles</a></div>
 <div class="menu_item"><a href="ax">Lettres de l'AX</a></div>
 <div class="menu_item"><a href="Xorg/NousContacter">Nous contacter</a></div>
-<div class="menu_item"><a href="send_bug" class="popup2">Signaler un bug</a></div>
+<div class="menu_item"><a href="send_bug/{ $smarty.server.REQUEST_URI }" class="popup2">Signaler un bug</a></div>
 
 {if hasPerm('admin')}
 <div class="menu_title">***</div>
 <div class="menu_item"><a href="marketing">Marketing</a></div>
 <div class="menu_item"><a href="admin/">Administration</a></div>
-<div class="menu_item"><a href="purge_cache">Clear cache</a></div>
+<div class="menu_item"><a href="purge_cache?token={xsrf_token}">Clear cache</a></div>
 <div class="menu_item"><a href="get_rights/user">Devenir utilisateur</a></div>
 <div class="menu_item"><a href="http://trackers.polytechnique.org">Trackers</a></div>
 <div class="menu_item"><a href="http://support.polytechnique.org">Support</a></div>
 
 <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
-  <tr><th>Valid</th></tr>
+  <tr><th>Validations</th></tr>
   <tr class="impair">
     <td>
       <a href="admin/validate">