X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Flayout.html;h=de19320d46be722ae35af319997fd653f1b4a16e;hb=2c48c6a1923496c3d7ee79ea8e1c397db1399f85;hp=29f0045776ab768dc44f763611e67fdd6c4fb438;hpb=09d46c3c1c476da11f48f953d257c9fc6e31b8cd;p=cavote.git

diff --git a/templates/layout.html b/templates/layout.html
index 29f0045..de19320 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -19,17 +19,19 @@
 <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>
+      <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('add_vote') }}">Nouveau vote</a></li>
+        <li><a href="{{ url_for('admin_votes') }}">Administrer les votes</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>
+        <li><a href="{{ url_for('admin_users') }}">Administrer les utilisateurs</a></li>
+        <li><a href="{{ url_for('show_roles') }}">Administrer les groupes</a></li>
       </ul>
       {% endif %}
     </div>
@@ -50,7 +52,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 %}
@@ -62,7 +64,9 @@
   {% endif %}
 {% endwith %}
 
+<div class="container">
 {% block body %}{% endblock %}
+</div>
 
 </div> <!-- container -->   
   <script src="{{ url_for('static', filename='js/jquery.js') }}"></script>