X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Flayout.html;h=cbcef4990caa67103cdbc659afcb618fc9867e15;hb=4517694972e64e0b3a26b6bc9a7fc39d7ac8af38;hp=e3f83725bab97f00112f05563568a7f1a14ae711;hpb=00a6f73a96b004e9323779ab42fa0eb435be12dd;p=cavote.git

diff --git a/templates/layout.html b/templates/layout.html
index e3f8372..cbcef49 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -22,7 +22,7 @@
       <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('add_vote') }}">Nouveau vote</a></li>
@@ -33,12 +33,12 @@
       {% endif %}
     </div>
     <div class="btn-group pull-right">
-      {% if 'userid' in session %}
-      <a href="{{ url_for('show_user', userid=session.userid) }}" 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', userid=session.userid) }}"><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>