Merge branch 'Kerl/descriptions_spectacles' into 'master'

Corrections/améliorations

Améliorations du template qui affiche les descriptions des spectacles.

See merge request !78
This commit is contained in:
Martin Pepin 2016-09-08 12:52:50 +02:00
commit 5138618e9b

View file

@ -20,6 +20,7 @@
.descTable{ .descTable{
width: auto; width: auto;
margin: 0 auto 1em; margin: 0 auto 1em;
border-bottom: 2px solid;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
font-size: 14px; font-size: 14px;
@ -46,10 +47,7 @@
<td><p style="text-align: left;">{{ show.location }}</p></td><td class="column-2"><p style="text-align: right;">{{ show.category }}</p></td> <td><p style="text-align: left;">{{ show.location }}</p></td><td class="column-2"><p style="text-align: right;">{{ show.category }}</p></td>
</tr> </tr>
<tr> <tr>
<td><p style="text-align: left;">{{ show.date }}</p></td><td class="column-2"><p style="text-align: right;">{{ show.slots }} place{{ show.slots|pluralize}} {% if show.slots_description != "" %}({{ show.slots_description }}){% endif %}- {{ show.price }}</p></td> <td><p style="text-align: left;">{{ show.date|date:"l j F Y - H\hi" }}</p></td><td class="column-2"><p style="text-align: right;">{{ show.slots }} place{{ show.slots|pluralize}} {% if show.slots_description != "" %}({{ show.slots_description }}){% endif %} - {{ show.price }} euro{{ show.price|pluralize}}</p></td>
</tr>
<tr>
<td colspan="2"><p style="text-align: justify;">{{ show.category }}</p></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
@ -61,7 +59,7 @@
</tr> </tr>
{% if show.image %} {% if show.image %}
<tr> <tr>
<td colspan="2"><p style="text-align:center;"><a href="{{ show.ext_link }}"><img style="display: inline;" src="{{ MEDIA_URL }}{{ show.image }}" alt="{{ show.title }}" width="200px"></a></p></td> <td colspan="2"><p style="text-align:center;"><a href="{{ show.ext_link }}"><img style="display: inline;" src="{{ MEDIA_URL }}{{ show.image }}" alt="{{ show.title }}" height="500px"></a></p></td>
</tr> </tr>
{% endif %} {% endif %}
</tbody> </tbody>