DGNum/gestioCOF
16
2
Fork 2
Code Issues 78 Pull requests 15 Projects Releases 12 Packages Wiki Activity

Merge branch 'thubrecht/embed' into 'master'

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gestioncof/cms/templates/cofcms/base.html
View file

@ -16,7 +16,7 @@
<link rel="stylesheet" type="text/css" href="{% static "fonts/SourceSansPro/sourceSansPro.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "fonts/SourceSansPro/sourceSansPro.css" %}"/>
<link rel="stylesheet" type="text/css" href="{% static "cofcms/css/screen.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "cofcms/css/screen.css" %}"/>
{% block extra_head %}{% endblock %} {% block extra_head %}{% endblock %}
<meta name="viewport" content="width=device-width, initial-scale=1.0; minimum-scale=1.0;"> <meta name="viewport" content="width=device-width, initial-scale=1.0; minimum-scale=1.0;">
</head> </head>
@ -32,27 +32,27 @@
<section class="bottom-menu"> <section class="bottom-menu">
<nav> <nav>
{% flat_menu "cof-nav-int" template="cofcms/base_nav.html" apply_active_classes=True %} {% flat_menu "cof-nav-int" template="cofcms/base_nav.html" apply_active_classes=True %}
{% get_current_language as curlang %}
<div class="lang-select"> {% get_current_language as curlang %}
<div class="lang-select">
{% if curlang == 'en' %} {% if curlang == 'en' %}
{% language 'fr' %} {% language 'fr' %}
<a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a> <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
{% endlanguage %} {% endlanguage %}
{% else %} {% else %}
{% language 'en' %} {% language 'en' %}
<a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a> <a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a>
{% endlanguage %} {% endlanguage %}
{% endif %} {% endif %}
</div> </div>
</nav> </nav>
</section> </section>
</header> </header>
<div class="container"> <div class="container">
{% block superaside %}{% endblock %} {% block superaside %}{% endblock %}
<div class="content"> <div class="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>

22
gestioncof/cms/templates/cofcms/cof_actu_index_page.html
View file

@ -17,17 +17,17 @@
{% block content %} {% block content %}
<section class="intro"> <section class="intro">
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
<div>{{ page.introduction|safe }}</div> <div>{{ page.introduction|richtext }}</div>
</section> </section>
<section class="actulist"> <section class="actulist">
{% if actus.has_previous %} {% if actus.has_previous %}
<a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a> <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
{% endif %} {% endif %}
{% if actus.has_next %} {% if actus.has_next %}
<a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a> <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
{% endif %} {% endif %}
{% for actu in page.actus %} {% for actu in page.actus %}
<article class="actu"> <article class="actu">
<div class="actu-image" {% if actu.image %}{% image actu.image fill-400x200 as img %}style="background-image:url('{{ img.url }}');"{% endif %}></div> <div class="actu-image" {% if actu.image %}{% image actu.image fill-400x200 as img %}style="background-image:url('{{ img.url }}');"{% endif %}></div>
@ -36,7 +36,7 @@
{% if actu.is_event %} {% if actu.is_event %}
<p><span class="actu-dates">{{ actu|dates|capfirst }}</span><br />{{ actu.chapo }}</p> <p><span class="actu-dates">{{ actu|dates|capfirst }}</span><br />{{ actu.chapo }}</p>
{% else %} {% else %}
{{ actu.body|safe|truncatewords_html:15 }} {{ actu.body|richtext|truncatewords_html:15 }}
{% endif %} {% endif %}
<a href="{% pageurl actu %}">{% trans "Lire plus" %} &gt;</a> <a href="{% pageurl actu %}">{% trans "Lire plus" %} &gt;</a>
</div> </div>
@ -44,10 +44,10 @@
{% endfor %} {% endfor %}
{% if actus.has_previous %} {% if actus.has_previous %}
<a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a> <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
{% endif %} {% endif %}
{% if actus.has_next %} {% if actus.has_next %}
<a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a> <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
{% endif %} {% endif %}
</section> </section>
{% endblock %} {% endblock %}

4
gestioncof/cms/templates/cofcms/cof_actu_page.html
View file

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

6
gestioncof/cms/templates/cofcms/cof_directory_page.html
View file

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

6
gestioncof/cms/templates/cofcms/cof_page.html
View file

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

4
gestioncof/cms/templates/cofcms/cof_root_page.html
View file

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