Nettoyage dates et calendrier

This commit is contained in:
Evarin 2018-10-14 15:50:55 +02:00
parent 954a6fdb53
commit 1e3850bb6b
8 changed files with 54 additions and 51 deletions

View file

@ -1,4 +1,4 @@
{% load wagtailcore_tags wagtailroutablepage_tags static %}
{% load wagtailcore_tags wagtailroutablepage_tags static i18n %}
<table class="calendar">
<tbody>
<tr>
@ -6,7 +6,7 @@
<th colspan="5">{{ this_month|date:"F Y" }}</th>
<th><a href="javascript:void(0);" cal-dest="{{ next_month }}" class="cal-btn">&gt;</a></th>
</tr>
<tr><th>L</th><th>M</th><th>M</th><th>J</th><th>V</th><th>S</th><th>D</th></tr>
<tr>{% blocktrans %}<th>L</th><th>M</th><th>M</th><th>J</th><th>V</th><th>S</th><th>D</th>{% endblocktrans %}</tr>
{% for week in weeks %}
<tr>
{% for day in week %}
@ -14,7 +14,7 @@
{% if day.events %}
<a href="javascript:void(0)">{{ day.day }}</a>
<ul class="cal-events">
<li class="datename">Le {{ day.date|date:"d F Y" }}</li>
<li class="datename">{% trans "Le " %}{{ day.date|date }}</li>
{% for event in day.events %}
<li><a href="{% pageurl event %}">{{ event.title }}</a></li>
{% endfor %}

View file

@ -15,7 +15,6 @@
{% endblock %}
{% block content %}
{% get_current_language as curlang %}
<section class="intro">
<h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div>
@ -35,7 +34,7 @@
<div class="actu-infos">
<h2><a href="{% pageurl actu %}">{{ actu.title }}</a></h2>
{% if actu.is_event %}
<p><span class="actu-dates">{{ actu|dates:curlang|capfirst }}</span><br />{{ actu.chapo }}</p>
<p><span class="actu-dates">{{ actu|dates|capfirst }}</span><br />{{ actu.chapo }}</p>
{% else %}
{{ actu.body|safe|truncatewords_html:15 }}
{% endif %}

View file

@ -2,10 +2,9 @@
{% load wagtailimages_tags cofcms_tags i18n %}
{% block content %}
{% get_current_language as curlang %}
<section class="intro">
<h1>{{ page.title }}</h1>
<p class="date">A lieu {{ page|dates:curlang }}</p>
<p class="date">A lieu {{ page|dates }}</p>
<p>{{ page.chapo }}</p>
</section>

View file

@ -16,7 +16,6 @@
{% endblock %}
{% block content %}
{% get_current_language as curlang %}
<section class="intro">
<h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div>
@ -30,7 +29,7 @@
</div>
<div class="actu-misc">
{% if actu.is_event %}
<span class="actu-minical">{% mini_calendar actu %}</span><span class="actu-dates">{{ actu|dates:curlang }}</span>
<span class="actu-minical">{% mini_calendar actu %}</span><span class="actu-dates">{{ actu|dates }}</span>
{% else %}
{{ actu.body|safe|truncatewords_html:10 }}
{% endif %}