Merge commit 'origin/master' into fusionax

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

diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index c26852e..e7e00f9 100644 (file)
--- 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-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -53,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.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>
@@ -62,7 +65,6 @@
 
 <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="groupes-x">Mes groupes X</a></div>
 <div class="menu_item"><a href="survey">Sondages</a></div>
@@ -72,7 +74,7 @@
 <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>
@@ -84,7 +86,7 @@
 <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">