better integration of notes, templates clean up

This commit is contained in:
Arthur Gerbaud
2016-08-06 19:28:15 +02:00
parent b3ca132a73
commit aefeb2e349
12 changed files with 101 additions and 63 deletions

View File

@@ -1,6 +1,9 @@
<div class="col-md-6">
{% if maraude.est_terminee %}
{% include "compte_rendu/compterendu.html" with maraude=compte_rendu %}
{% else %}
{% if user.is_superuser %}<a class="btn btn-primary" href="{% url 'maraudes:create' maraude.pk %}">Écrire le compte-rendu</a>
{% else %} <p class="alert alert-info">Le compte-rendu n'a pas encore été écrit</p>{% endif %}
{% endif %}
</div>
{% include 'maraudes/panel_dernieres_maraudes.html' %}

View File

@@ -15,21 +15,7 @@
</div>
</div>
{% if dernieres_maraudes %}<div class="col-md-6" id="dernieres-maraudes">
<div class="panel panel-default">
<div class="panel-heading">
<p>Dernières maraudes
<span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
</div>
<div class="list-group">
{% for maraude in dernieres_maraudes %}
<a href="{% url 'maraudes:details' maraude.pk %}" class="list-group-item">
<strong>{{ maraude }}</strong> <small>{{maraude.binome}} & {{maraude.referent}}</small>
</a>
{% endfor %}
</div>
</div>
</div>{% endif %}
{% include 'maraudes/panel_dernieres_maraudes.html' %}
{% if user.is_superuser %}<div class="col-md-6" id="administration">
<div class="panel panel-danger">

View File

@@ -0,0 +1,16 @@
{% if dernieres_maraudes %}
<div class="col-md-6" id="dernieres-maraudes">
<div class="panel panel-default">
<div class="panel-heading">
<p>Dernières maraudes
<span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
</div>
<div class="list-group">
{% for maraude in dernieres_maraudes %}
<a href="{% url 'maraudes:details' maraude.pk %}" class="list-group-item">
<strong>{{ maraude }}</strong> <small>{{maraude.binome}} & {{maraude.referent}}</small>
</a>
{% endfor %}
</div>
</div>
</div>{% endif %}