Task #227: Block > add description

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 (file)
index 0000000..bcb2d6c
--- /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 05556a0ee5e6601fa2d03e6a05ba1c61099da6b3..66fd2e7764d6a64f8aabce1d1a8186487e4a453b 100644 (file)
--- 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 0a0985f8a81d1ea22120514993a8d52f8e9c6e8e..2e270fdfd76d1fe01617e024aa605b5b72523e24 100644 (file)
--- 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>