Merge branch 'thubrecht/embed' into 'master'

On utilise |richtext pour les champs RichText, ce qui permet de bien faire les rendus

Closes #274

See merge request klub-dev-ens/gestioCOF!500
This commit is contained in:
Martin Pepin 2021-10-22 21:04:20 +02:00
commit 4d1ae8f540
6 changed files with 32 additions and 32 deletions

View file

@ -17,7 +17,7 @@
{% block content %}
<section class="intro">
<h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div>
<div>{{ page.introduction|richtext }}</div>
</section>
<section class="actulist">
@ -36,7 +36,7 @@
{% if actu.is_event %}
<p><span class="actu-dates">{{ actu|dates|capfirst }}</span><br />{{ actu.chapo }}</p>
{% else %}
{{ actu.body|safe|truncatewords_html:15 }}
{{ actu.body|richtext|truncatewords_html:15 }}
{% endif %}
<a href="{% pageurl actu %}">{% trans "Lire plus" %} &gt;</a>
</div>

View file

@ -1,5 +1,5 @@
{% extends "cofcms/base.html" %}
{% load wagtailimages_tags cofcms_tags i18n %}
{% load wagtailcore_tags wagtailimages_tags cofcms_tags i18n %}
{% block content %}
<section class="intro">
@ -11,7 +11,7 @@
<section class="pagecontent">
<div class="image">{% image page.image width-700 %}</div>
<article>
{{ page.body|safe }}
{{ page.body|richtext }}
</article>
</section>
{% endblock %}

View file

@ -1,5 +1,5 @@
{% extends "cofcms/base_aside.html" %}
{% load wagtailimages_tags cofcms_tags static i18n %}
{% load wagtailcore_tags wagtailimages_tags cofcms_tags static i18n %}
{% block extra_head %}
{{ block.super }}
@ -18,7 +18,7 @@
{% block content %}
<section class="intro">
<h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div>
<div>{{ page.introduction|richtext }}</div>
</section>
<section class="directory">
@ -28,7 +28,7 @@
<div class="entry-image">{% image entry.image width-150 class="entry-img" %}</div>
{% endif %}
<h2>{{ entry.title }}</h2>
<div class="desc">{{ entry.body|safe }}</div>
<div class="desc">{{ entry.body|richtext }}</div>
{% if entry.links %}
<ul class="links">
{% for block in entry.links %}

View file

@ -1,10 +1,10 @@
{% extends "cofcms/base.html" %}
{% load wagtailimages_tags cofcms_tags %}
{% load wagtailcore_tags wagtailimages_tags cofcms_tags %}
{% block content %}
<section class="intro">
<h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div>
<div>{{ page.introduction|richtext }}</div>
</section>
<section class="pagecontent">
@ -13,7 +13,7 @@
<h2>{{ block.value }}</h2>
{% elif block.block_type == "paragraph" %}
<article class="paragraph">
{{ block.value|safe }}
{{ block.value|richtext }}
</article>
{% elif block.block_type == "image" %}
<div class="image">

View file

@ -18,7 +18,7 @@
{% block content %}
<section class="intro">
<h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div>
<div>{{ page.introduction|richtext }}</div>
</section>
<section class="actuhome">
@ -31,7 +31,7 @@
{% if actu.is_event %}
<span class="actu-minical">{% mini_calendar actu %}</span><span class="actu-dates">{{ actu|dates }}</span>
{% else %}
{{ actu.body|safe|truncatewords_html:10 }}
{{ actu.body|richtext|truncatewords_html:10 }}
{% endif %}
</div>
<a href="{% pageurl actu %}" class="actu-overlay"></a>