<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 -->
<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('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('new_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('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 'username' in session %}
- <a href="#" class="btn"><i class="icon-user"></i> {{ session.username }}</a>
+ {% if 'user' in session %}
+ <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=""><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>
-{% with messages = get_flashed_messages() %}
+<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 message in messages %}
- <div class="alert alert-info fade in">
+ {% for category, message in messages %}
+ <div class="alert alert-{{ category }} fade in">
<button class="close" data-dismiss="alert">×</button>
{{ message }}
</div>
{% endfor %}
{% endif %}
{% endwith %}
+
+<div class="container">
{% block body %}{% endblock %}
+</div>
</div> <!-- container -->
<script src="{{ url_for('static', filename='js/jquery.js') }}"></script>