website restyling, minor fixes

This commit is contained in:
Arthur Gerbaud
2016-08-13 16:40:43 +02:00
parent 8bac5d8bd4
commit 46b807ec1e
36 changed files with 390 additions and 407 deletions

View File

@@ -1,25 +1,45 @@
{% load bootstrap3 %}{% load staticfiles %}
<nav class="navbar navbar-inverse navbar-static-top" role="navigation" id="menu">
<nav class="navbar navbar-inverse navbar-fixed-side" role="navigation" id="menu">
<div class="container">
<ul class="nav navbar-nav navbar-left">{% for app in apps %}
<li {% if app == active_app %} class="active" {%endif%}>
<a href="/{{app.label}}/">{{ app.name|title }}</a>
</li>{%endfor%}
</ul>
{% if prochaine_maraude_abs %}<p class="navbar-text">{% bootstrap_icon "calendar" %} <b>Prochaine maraude :</b>
{% if prochaine_maraude_abs.date == now.date %} Aujourd'hui {% else %} {{ prochaine_maraude_abs.date }} {% endif %}
- {{ prochaine_maraude_abs.heure_debut.hour }}h</p>{%endif%}
<!-- Navbar Right Aligned elements -->
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a id="UserMenu" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{% bootstrap_icon "user" %} {{user}} <span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="UserMenu">
{% if user.is_authenticated %}{% if user.is_superuser %}<li><a href="/admin/">Administration</a></li>
<li role="separator" class="divider"></li>{% endif %}
<li><a href="{% url 'logout' %}">Déconnecter</a></li>{% endif %}
</ul>
</li>
</ul>
<div class="navbar-header">
<button class="navbar-toggle" data-target=".navbar-collapse" data-toggle="collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'index' %}">La Maraude ALSA</a>
</div>{% if user.is_authenticated %}
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">{% for app in apps %}
<li {% if app == active_app %} class="active" {%endif%}>
<a href="/{{app.label}}/"><strong style="color:#fff;">{{ app.name|title }}</strong></a>
</li>
{% if app == active_app %}{% for t in app_menu %}{% include t %}{% endfor %}{% endif %}
{%endfor%}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a id="UserMenu" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{% bootstrap_icon "user" %} {{user}} <span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="UserMenu">
{% if user.is_superuser %}<li><a href="/admin/">Administration {% bootstrap_icon "new-window" %} </a></li>{% endif %}
<li><a href="{% url 'logout' %}">Déconnecter {% bootstrap_icon "log-out" %}</a></li>
</ul>
</li>
</ul>
</div>
{% else %}
<div class="collapse navbar-collapse">
<div class="text-center navbar-text"><h4 style="color:#fff;">Connexion</h4></div>
<form class="navbar-form navbar-left" method="post" action="{% url 'login' %}">
<div class="form-group text-center">{% csrf_token %}
<input autofocus="" class="form-control" id="id_username" maxlength="254" name="username" placeholder="Nom d&#39;utilisateur" title="" type="text" required />
<input class="form-control" id="id_password" name="password" placeholder="Mot de passe" title="" type="password" required />
<input type="hidden" name="next" value="{{ next|default:'/maraudes/' }}" /><br />
<button class="btn btn-default" type="submit">Se connecter</button>
</div>
</form>
</div>{% endif %}
</div>
</nav>