Use custom grappelli-safe (need to clone it into lib/ before up)

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index 264754443bcb10aaaba21820f2ebe9e5142cfde3..015508c6410ced3a67c2fe89de6c739de14ce5fb 100644 (file)
--- 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 d9e9106bcaf280ec11e0ac76e53df5f964be5984..c7f27712567a3f430d02e66c2013c07681473498 100644 (file)
--- 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 7fa19e2b53d6ba0dae8312e49f5cf89d58828adb..703f0871b259a3c3f00ab597eaa189f067f5e161 100644 (file)
--- 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/