X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Flayout.html;h=29f0045776ab768dc44f763611e67fdd6c4fb438;hb=e39a423e56697a035ea099e1f0ab4af1917a5d9e;hp=fe444edca787d55c21d09026a1c497c9629a0c1e;hpb=36ca5927bad5d375c596d5c187cc5b7eb4e62038;p=cavote.git

diff --git a/templates/layout.html b/templates/layout.html
index fe444ed..29f0045 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -22,20 +22,24 @@
       <a class="btn active" href="/">Accueil</a>
       <a class="btn" href="{{ url_for('show_votes', votes='current') }}">Votes en cours</a>
       <a class="btn" href="{{ url_for('show_votes', votes='archive') }}">Archives</a>
-      {% if session.is_admin %}
+      {% if session.user and session.user.is_admin %}
       <a href="#" class="btn btn-warning dropdown-toggle" data-toggle="dropdown">Admin <b class="caret"></b></a>
       <ul class="dropdown-menu pull-right">
-        <li><a href="{{ url_for('new_vote') }}">Nouveau vote</a></li>
+        <li><a href="{{ url_for('add_vote') }}">Nouveau vote</a></li>
+        <li class="divider"></li>
+        <!--<li><a href="404">Utilisateurs</a></li>-->
+        <li><a href="{{ url_for('show_roles') }}">Groupes</a></li>
+        <li><a href="{{ url_for('add_user') }}">Nouvel utilisateur</a></li>
       </ul>
       {% endif %}
     </div>
     <div class="btn-group pull-right">
-      {% if 'username' in session %}
-      <a href="{{ url_for('show_user', username=session.username) }}" class="btn"><i class="icon-user"></i> {{ session.username }}</a>
+      {% if 'user' in session %}
+      <a href="{{ url_for('show_user', userid=session.user.id) }}" class="btn"><i class="icon-user"></i> {{ session.user.name }}</a>
       <a href="#" class="btn dropdown-toggle" data-toggle="dropdown"><b class="caret"></b></a>
       <ul class="dropdown-menu pull-right">
         <li><a href=""><i class="icon-comment"></i> Votes en attente</a></li>
-        <li><a href="{{ url_for('user_settings', username=session.username) }}"><i class="icon-cog"></i> Paramètres</a></li>
+        <li><a href="{{ url_for('user_settings', userid=session.user.id) }}"><i class="icon-cog"></i> Paramètres</a></li>
         <li class="divider"></li>
         <li><a href="{{ url_for('logout') }}"><i class="icon-off"></i> Déconnexion</a></li>
       </ul>