Merge pull request #323 from danesjenovdan/v3-dev

Pulling refs/heads/v3-dev into v3-k8s

djnd/home/migrations/0078_newsletterpage_short_description.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.15 on 2024-09-02 11:25
+
+from django.db import migrations
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0077_bloglistingpage_meta_image_blogpage_meta_image_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='newsletterpage',
+            name='short_description',
+            field=wagtail.fields.RichTextField(blank=True, null=True),
+        ),
+    ]

djnd/home/models/pages.py

@@ -261,6 +261,7 @@ class NewsletterPage(BasePage):
         on_delete=models.SET_NULL,
         related_name="+",
     )
+    short_description = RichTextField(blank=True, null=True)
     introduction = RichTextField(blank=True, null=True)
     published_at = models.DateField(blank=True, null=True)
     pillar_page = ParentalManyToManyField(
@@ -317,6 +318,7 @@ class NewsletterPage(BasePage):
 
     content_panels = BasePage.content_panels + [
         FieldPanel("thumbnail"),
+        FieldPanel("short_description"),
         FieldPanel("published_at"),
         FieldPanel("pillar_page", widget=forms.CheckboxSelectMultiple),
         FieldPanel("category", widget=forms.CheckboxSelectMultiple),

djnd/home/templates/home/partials/newsletter_activity.html

@@ -26,6 +26,7 @@
         "
       >{{ activity.title }}</a>
     </div>
+    {{ activity.short_description|richtext }}
     {% if activity.published_at %}
     <p class="font-mono mt-4">{{ activity.published_at|date:"E Y" }}</p>
     {% endif %}