Merge branch 'master' into 'master'

Fixed images not showing up in petitscours

See merge request klub-dev-ens/gestioCOF!406
This commit is contained in:
Ludovic Stephan 2020-01-09 10:40:14 +01:00
commit 3088098a0a
3 changed files with 3 additions and 3 deletions

View file

@ -13,7 +13,7 @@
{% include "petitscours/details_demande_infos.html" %}
<hr />
<table class="table table-striped">
<tr><td><strong>Traitée</strong></td><td> <img src="{% if demande.traitee %}{% static "images/yes.png" %}{% else %}{% static "images/no.png" %}{% endif %}" /></td></tr>
<tr><td><strong>Traitée</strong></td><td> <img src="{% if demande.traitee %}{% static "gestioncof/vendor/font-awesome/images/yes.png" %}{% else %}{% static "gestioncof/vendor/font-awesome/images/no.png" %}{% endif %}" /></td></tr>
{% if demande.traitee %}
<tr><td><strong>Traitée par</strong></td><td> {{ demande.traitee_par }}</td></tr>
<tr><td><strong>Traitée le</strong></td><td> {{ demande.processed }}</td></tr>

View file

@ -19,7 +19,7 @@
<td>{{ demande.name }}</td>
<td>{% for matiere in demande.matieres.all %}{% if forloop.counter0 > 0 %}, {% endif %}{{ matiere }}{% endfor %}</td>
<td>{{ demande.created|date:"d E Y" }}</td>
<td style="text-align: center;"><img src="{% if demande.traitee %}{% static "images/yes.png" %}{% else %}{% static "images/no.png" %}{% endif %}" /></td>
<td style="text-align: center;"><img src="{% if demande.traitee %}{% static "gestioncof/vendor/font-awesome/images/yes.png" %}{% else %}{% static "gestioncof/vendor/font-awesome/images/no.png" %}{% endif %}" /></td>
<td>{% if demande.traitee_par %}{{ demande.traitee_par.username }}{% else %}<span class="glyphicon glyphicon-ban-circle"></span>{% endif %}</td>
<td><a href="{% url "petits-cours-demande-details" demande.id %}" class="see_detail">Détails</a></td>
</tr>

View file

@ -9,6 +9,6 @@
<tr><td><strong>Fréquence</strong></td><td> {{ demande.freq }}</td></tr>
<tr><td><strong>Matières</strong></td><td> {% for matiere in demande.matieres.all %}{% if forloop.counter0 > 0 %}, {% endif %}{{ matiere }}{% endfor %}</td></tr>
<tr><td><strong>Niveau souhaité</strong></td><td> {{ demande.get_niveau_display }}</td></tr>
<tr><td><strong>Agrégé requis</strong></td><td> <img src="{% if demande.agrege_requis %}{% static "images/yes.png" %}{% else %}{% static "images/no.png" %}{% endif %}" /></td></tr>
<tr><td><strong>Agrégé requis</strong></td><td> <img src="{% if demande.agrege_requis %}{% static "gestioncof/vendor/font-awesome/images/yes.png" %}{% else %}{% static "gestioncof/vendor/font-awesome/images/no.png" %}{% endif %}" /></td></tr>
<tr><td><strong>Remarques</strong></td><td> {{ demande.remarques }}</td></tr>
</table>