Merge remote branch 'origin/xorg/maint' into xorg/master

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

diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index 575fe0a..d069fe0 100644 (file)
--- a/templates/skin/common.menu.tpl
+++ b/templates/skin/common.menu.tpl
@@ -45,13 +45,13 @@
 {/if}
 
 <div class="menu_title">Personnaliser</div>
-{if $smarty.session.user->checkPerms('mail')}
+{if hasPerm('mail')}
 <div class="menu_item"><a href="emails">Mes emails</a></div>
 {/if}
 {if $smarty.session.user->hasProfile()}
 <div class="menu_item"><a href="profile/edit">Mon profil</a></div>
 {/if}
-{if $smarty.session.user->checkPerms('directory_private')}
+{if hasPerm('directory_private')}
 <div class="menu_item"><a href="carnet/contacts">Mes contacts</a></div>
 <div class="menu_item"><a href="carnet">Mon carnet</a></div>
 {/if}
@@ -59,28 +59,30 @@
 <div class="menu_item"><a href="prefs">Mes préférences</a></div>
 
 <div class="menu_title">Services</div>
-{if $smarty.session.user->checkPerms('mail')}
+{if hasPerm('mail')}
 <div class="menu_item"><a href="emails/send">Envoyer un email</a></div>
 {/if}
-{if $smarty.session.user->checkPerms('forums')}
+{if hasPerm('forums')}
 <div class="menu_item"><a href="banana/">Forums &amp; PA</a></div>
 {/if}
 {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>
-{if $smarty.session.user->checkPerms('payment')}
+{if hasPerm('payment')}
 <div class="menu_item"><a href="payment">Télépaiements</a></div>
 {/if}
+{if hasPerm('mail')}
 <div class="menu_item"><a href="emails/antispam/submit">Soumettre un spam</a></div>
+{/if}
 <div class="menu_item"><a href="emails/broken">Patte cassée</a></div>
 
 <div class="menu_title">Communauté X</div>
 <div class="menu_item"><a href="search">Annuaire</a></div>
-{if $smarty.session.user->checkPerms('directory_private')}
+{if hasPerm('directory_private')}
 <div class="menu_item"><a href="jobs">Emploi &amp; Carrières</a></div>
 {/if}
-{if $smarty.session.user->checkPerms('groups')}
+{if hasPerm('groups')}
 <div class="menu_item"><a href="groupes-x">Mes groupes X</a></div>
 {/if}
 <div class="menu_item"><a href="survey">Sondages</a></div>
@@ -99,11 +101,25 @@
 <div class="menu_item"><a href="purge_cache?token={xsrf_token}">Clear cache</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>
+<form method="post" action="set_skin">
+  {xsrf_token_field}
+  <div class="menu_item" style="clear: both">
+    Skin
+    <select name="change_skin" onchange="this.form.submit()" style="margin: 0; padding: 0; float:
+    right">
+      {foreach from=$skin_list item=name key=tpl}
+      <option value="{$tpl}" {if $smarty.session.skin eq $tpl}selected="selected"{/if}>{$name}</option>
+      {/foreach}
+    </select>
+  </div>
+</form>
 <form method="post" action="get_rights">
   {xsrf_token_field}
-  <div>
-    <select name="account_type" onChange="this.form.submit()" style="margin: 0; padding: 0">
-      <option value="admin">Administrateur</option>
+  <div class="menu_item" style="clear: both">
+    Droits
+    <select name="account_type" onchange="this.form.submit()" style="margin: 0; padding: 0; float:
+    right">
+      <option value="admin">Admin</option>
       {foreach from=$account_types_list item=type}
       <option value="{$type}">{$type}</option>
       {/foreach}