X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Flayout.html;h=66fd8e5d2b7bc030993f200537ffcfaa1db28a1e;hb=0fb98decd67ec695937480b4d5448adbcd508565;hp=7dddad372e4b6be78e1b58b611eb390c174f72ca;hpb=16118385bb1df5fe65a3a57d7ed7550dead1e040;p=cavote.git

diff --git a/templates/layout.html b/templates/layout.html
index 7dddad3..66fd8e5 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -19,23 +19,27 @@
 <header>
   <div class="btn-toolbar">
     <div class="btn-group">
-      <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 %}
+      <a class="btn {% if active_button == 'home' %}active{% endif %}" href="/">Accueil</a>
+      <a class="btn {% if active_button == 'current' %}active{% endif %}" href="{{ url_for('show_votes', votes='current') }}">Votes en cours</a>
+      <a class="btn {% if active_button == 'archive' %}active{% endif %}" href="{{ url_for('show_votes', votes='archive') }}">Archives</a>
+      {% 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('show_user', 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>
@@ -46,7 +50,7 @@
   </div>
 </header>
 
-<h1 class="page-header">Outil de vote du CA FFDN</h1>
+<h1 class="page-header">Outil de vote du CA FFDN <small>{% block subtitle %}{% endblock %}</small></h1>
 {% with messages = get_flashed_messages(with_categories="true") %}
   {% if messages %}
     {% for category, message in messages %}
@@ -58,7 +62,9 @@
   {% endif %}
 {% endwith %}
 
+<div class="container">
 {% block body %}{% endblock %}
+</div>
 
 </div> <!-- container -->   
   <script src="{{ url_for('static', filename='js/jquery.js') }}"></script>