From 8b1d8694205bb2a872195f54a22a2156c093cfc9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 25 Aug 2016 20:11:10 +0200 Subject: [PATCH] Use custom grappelli-safe (need to clone it into lib/ before up) --- app/templates/agenda/event_detail.html | 16 +++++++++++++--- docker-compose.yml | 1 + requirements-dev.txt | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html index 26475444..015508c6 100644 --- a/app/templates/agenda/event_detail.html +++ b/app/templates/agenda/event_detail.html @@ -67,9 +67,19 @@ {% endif %} {% block event_detail_content %} -{% editable event.content %} -{{ event.content|richtext_filters|safe }} -{% endeditable %} +{% if event.content %} + {% editable event.content %} + {{ event.content|richtext_filters|safe }} + {% endeditable %} +{% else %} + {% lorem 3 p %} +{% endif %} +{% endblock %} + +{% block event_sub_content %} + {% with event.blocks.all as blocks %} + {% include "core/inc/block.html" %} + {% endwith %} {% endblock %} {% if event.brochure %} diff --git a/docker-compose.yml b/docker-compose.yml index d9e9106b..c7f27712 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,7 @@ app: - ./app/:/srv/app - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda # - ./lib/mezzanine/:/srv/lib/mezzanine + - ./lib/grappelli-safe/:/srv/lib/grappelli-safe volumes_from: - data expose: diff --git a/requirements-dev.txt b/requirements-dev.txt index 7fa19e2b..703f0871 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2 -e git+https://github.com/yomguy/mezzanine.git@jquery#egg=mezzanine-4.2-dev --e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2 +-e git+https://github.com/yomguy/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2 https://forge.ircam.fr/p/django-eve/source/download/dev/ -- 2.39.5