Merge pull request #722 from OpenTechFund/feature/intro-text-news-index-page

Add introduction text to news index pages.

opentech/public/news/migrations/0007_newsindex_introduction.py

+# Generated by Django 2.0.9 on 2018-11-16 09:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0006_newspage_drupal_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='newsindex',
+            name='introduction',
+            field=models.TextField(blank=True),
+        ),
+    ]

opentech/public/news/models.py

@@ -128,6 +128,12 @@ class NewsIndex(BasePage):
     subpage_types = ['NewsPage']
     parent_page_types = ['home.HomePage']
 
+    introduction = models.TextField(blank=True)
+
+    content_panels = BasePage.content_panels + [
+        FieldPanel('introduction')
+    ]
+
     def get_context(self, request, *args, **kwargs):
         news = NewsPage.objects.live().public().descendant_of(self).annotate(
             date=Coalesce('publication_date', 'first_published_at')

opentech/public/news/templates/news/news_index.html

@@ -5,6 +5,10 @@
 {% block content %}
 <div class="wrapper wrapper--small wrapper--inner-space-medium">
 
+        {% if page.introduction %}
+            <h4 class="heading heading--listings-introduction">{{ page.introduction }}</h4>
+        {% endif %}
+
         <form class="form" method="GET">
             <div class="form__select form__select--narrow form__select--inline">
                 <select name="news_type">