|
|
@@ -99,7 +99,7 @@
|
|
|
<td>
|
|
|
<a href="{{ path('videotheque_voirfilm', {'id': film.id}) }}"><span data-bs-toggle="tooltip" data-placement="right" title="{{ film.information }}">{{ film.titre }}</span></a>
|
|
|
{% if film.new %}<span class="badge bg-success">New</span>{% endif %}
|
|
|
- {% if film.nbComs %}<span class="badge bg-warning rounded-pill" data-bs-toggle="tooltip" title="{{ film.nbComs }} commentaire(s)">{{ film.nbComs }}</span>{% endif %}
|
|
|
+ {% if film.nbComs %}<span class="badge bg-info rounded-pill" data-bs-toggle="tooltip" title="{{ film.nbComs }} commentaire(s)">{{ film.nbComs }}</span>{% endif %}
|
|
|
|
|
|
</td>
|
|
|
<td>
|
|
|
@@ -109,11 +109,26 @@
|
|
|
{% endfor %}
|
|
|
{% endif %}
|
|
|
</td>
|
|
|
+<<<<<<< HEAD
|
|
|
<td>
|
|
|
{% if film.realisateurs is defined %}
|
|
|
{% for realisateur in film.realisateurs %}
|
|
|
<a href="{{ path('videotheque_listeparreal', {"id": realisateur.id}) }}"><span class="badge bg-info">{{ realisateur.nomComplet }}</span></a>
|
|
|
{% endfor %}
|
|
|
+=======
|
|
|
+ {% endif %}
|
|
|
+ <td>
|
|
|
+ <a href="{{ path('videotheque_voirfilm', {'id': film.id}) }}"><span data-bs-toggle="tooltip" data-placement="right" title="{{ film.information }}">{{ film.titre }}</span></a>
|
|
|
+ {% if film.new %}<span class="badge bg-success">New</span>{% endif %}
|
|
|
+ {% if film.nbComs %}<span class="badge bg-info rounded-pill" data-bs-toggle="tooltip" title="{{ film.nbComs }} commentaire(s)">{{ film.nbComs }}</span>{% endif %}
|
|
|
+
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ {% if film.genres is defined %}
|
|
|
+ {% for genre in film.genres %}
|
|
|
+ <a href="{{ path("videotheque_listepargenre", {"id": genre.id}) }}"><span class="badge bg-secondary">{{ genre.name }}</span></a>
|
|
|
+ {% endfor %}
|
|
|
+>>>>>>> develop
|
|
|
{% endif %}
|
|
|
</td>
|
|
|
<td>
|
