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

diff --git a/templates/layout.html b/templates/layout.html
index 29f0045..fff1187 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -8,6 +8,7 @@
     <link rel="shortcut icon" href="favicon.ico"> -->
     <!-- ma template.css -->
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/bootstrap.css') }}">
+    <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/cavote.css') }}">
     <!-- css javascript -->
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/jquery.ui.all.css') }}">
     <!-- javascript -->
@@ -19,38 +20,40 @@
 <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('votes', votes='current') }}">Votes en cours</a>
+      <a class="btn {% if active_button == 'archive' %}active{% endif %}" href="{{ url_for('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_vote_add') }}">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_user_add') }}">Nouvel utilisateur</a></li>
+        <li><a href="{{ url_for('admin_users') }}">Administrer les utilisateurs</a></li>
+        <li><a href="{{ url_for('admin_groups') }}">Administrer les groupes</a></li>
       </ul>
       {% endif %}
     </div>
     <div class="btn-group pull-right">
       {% 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="{{ url_for('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.user.id) }}"><i class="icon-cog"></i> Paramètres</a></li>
+        <li><a href="{{ url_for('votes', votes='waiting') }}"><i class="icon-comment"></i> Votes en attente</a></li>
+        <li><a href="{{ url_for('user_edit', 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>
+        <li><a href="{{ url_for('logout', continue=request.url) }}"><i class="icon-off"></i> Déconnexion</a></li>
       </ul>
       {% else %}
-      <a class="btn btn-primary" href="{{ url_for('login') }}"><i class="icon-user icon-white"></i> Connexion</a>
+      <a class="btn btn-primary" href="{{ url_for('login', continue=request.url) }}"><i class="icon-user icon-white"></i> Connexion</a>
       {% endif %}
     </div>
   </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 +65,9 @@
   {% endif %}
 {% endwith %}
 
+<div class="container">
 {% block body %}{% endblock %}
+</div>
 
 </div> <!-- container -->   
   <script src="{{ url_for('static', filename='js/jquery.js') }}"></script>