From d710f4b22b2278e2bc1f03f52157b851156dbf6e Mon Sep 17 00:00:00 2001
From: Emilie <zawadzki@ircam.fr>
Date: Fri, 21 Oct 2016 14:55:54 +0200
Subject: [PATCH] Task #227: Block > add description

---
 .../migrations/0012_auto_20161021_1449.py     | 25 +++++++++++++++++++
 app/organization/pages/translation.py         |  2 +-
 app/templates/core/inc/block.html             |  5 ++--
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 app/organization/pages/migrations/0012_auto_20161021_1449.py

diff --git a/app/organization/pages/migrations/0012_auto_20161021_1449.py b/app/organization/pages/migrations/0012_auto_20161021_1449.py
new file mode 100644
index 00000000..bcb2d6cf
--- /dev/null
+++ b/app/organization/pages/migrations/0012_auto_20161021_1449.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 12:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-pages', '0011_pagelink_title'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='pageblock',
+            name='description_en',
+            field=models.TextField(blank=True, null=True, verbose_name='description'),
+        ),
+        migrations.AddField(
+            model_name='pageblock',
+            name='description_fr',
+            field=models.TextField(blank=True, null=True, verbose_name='description'),
+        ),
+    ]
diff --git a/app/organization/pages/translation.py b/app/organization/pages/translation.py
index 05556a0e..66fd2e77 100644
--- a/app/organization/pages/translation.py
+++ b/app/organization/pages/translation.py
@@ -37,7 +37,7 @@ class CustomPageTranslationOptions(TranslationOptions):
 @register(PageBlock)
 class PageBlockTranslationOptions(TranslationOptions):
 
-    fields = ('title', 'content')
+    fields = ('title', 'description', 'content')
 
 
 @register(PageImage)
diff --git a/app/templates/core/inc/block.html b/app/templates/core/inc/block.html
index 0a0985f8..2e270fdf 100644
--- a/app/templates/core/inc/block.html
+++ b/app/templates/core/inc/block.html
@@ -11,10 +11,11 @@
                     <div class="row" data-summary-content>
                         <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
                             <h2 class="dotted">{{ block.title }}</h2>
+                                {% if block.description %}
+                            <p>{{ block.description }}</p>
+                            {% endif %}
                             {% if block.content %}
                                  {{ block.content|richtext_filters|safe }}
-                            {% else %}
-                                {% lorem 3 p %}
                             {% endif %}
                         </div>
                     </div>
-- 
2.39.5