Merge 6d87630 into df9d974

apps/cms/news/migrations/0003_add_translatable_image_caption.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.4 on 2019-08-13 15:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('a4_candy_cms_news', '0002_max_length_teaser_and_rm_demo_link'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='newspage',
+            name='image_caption_de',
+            field=models.TextField(blank=True, max_length=400, null=True, verbose_name='Image Caption'),
+        ),
+        migrations.AddField(
+            model_name='newspage',
+            name='image_caption_en',
+            field=models.TextField(blank=True, max_length=400, null=True, verbose_name='Image Caption'),
+        ),
+    ]

apps/cms/news/models.py

@@ -79,6 +79,11 @@ class NewsPage(Page):
                   "and the news index page"
     )
 
+    image_caption_de = models.TextField(
+        max_length=400, blank=True, null=True, verbose_name="Image Caption")
+    image_caption_en = models.TextField(
+        max_length=400, blank=True, null=True, verbose_name="Image Caption")
+
     title_de = models.CharField(
         max_length=250, blank=True, verbose_name="Title")
     title_en = models.CharField(
@@ -104,6 +109,11 @@ class NewsPage(Page):
         ('html', blocks.RawHTMLBlock())
     ], blank=True)
 
+    image_caption = TranslatedField(
+        'image_caption_de',
+        'image_caption_en'
+    )
+
     subtitle = TranslatedField(
         'title_de',
         'title_en'
@@ -122,12 +132,14 @@ class NewsPage(Page):
     en_content_panels = [
         FieldPanel('title_en'),
         FieldPanel('teaser_en'),
+        FieldPanel('image_caption_en'),
         StreamFieldPanel('body_streamfield_en')
     ]
 
     de_content_panels = [
         FieldPanel('title_de'),
         FieldPanel('teaser_de'),
+        FieldPanel('image_caption_de'),
         StreamFieldPanel('body_streamfield_de')
     ]
 

apps/cms/news/templates/a4_candy_cms_news/news_index_page.html

@@ -10,7 +10,7 @@
     <div class="container">
         <div class="row justify-content-md-center">
             <div class="col-12 col-md-10">
-                <h1 class="cms__title--serif cms__title--underlined text-center">{{ page.title }}</h1>
+                <h1 class="cms__title--serif cms__title--underlined text-center">{{ page.subtitle }}</h1>
                 <div class="row justify-content-start">
                 {% for post in news %}
                     <div class="col-12 col-md-6 cms-news__tile">

apps/cms/news/templates/a4_candy_cms_news/news_page.html

@@ -21,6 +21,9 @@ <h1 class="cms__title--bold cms-page__header-margin">{{ page.subtitle }}</h1>
         <div class="row justify-content-md-center">
             <div class="col-12">
                 <img src="{{ image.url }}" alt="{{ image.alt }}" class="cms-page__hero-image" />
+                {% if page.image_caption %}
+                <div class="mt-3 text-muted">{{ page.image_caption }}</div>
+                {% endif %}
             </div>
         </div>
         {% endif %}

apps/cms/use_cases/migrations/0006_add_translatable_image_caption.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.4 on 2019-08-14 10:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('a4_candy_cms_use_cases', '0005_add_example_block'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='usecasepage',
+            name='image_caption_de',
+            field=models.TextField(blank=True, max_length=400, null=True, verbose_name='Image Caption'),
+        ),
+        migrations.AddField(
+            model_name='usecasepage',
+            name='image_caption_en',
+            field=models.TextField(blank=True, max_length=400, null=True, verbose_name='Image Caption'),
+        ),
+    ]

apps/cms/use_cases/models.py

@@ -119,6 +119,11 @@ class UseCasePage(Page):
                   "and the use case index page"
     )
 
+    image_caption_de = models.TextField(
+        max_length=400, blank=True, null=True, verbose_name="Image Caption")
+    image_caption_en = models.TextField(
+        max_length=400, blank=True, null=True, verbose_name="Image Caption")
+
     title_de = models.CharField(
         max_length=250, blank=True, verbose_name="German Title")
     title_en = models.CharField(
@@ -136,6 +141,11 @@ class UseCasePage(Page):
         ('examples', ExampleBlock())
     ], blank=True)
 
+    image_caption = TranslatedField(
+        'image_caption_de',
+        'image_caption_en'
+    )
+
     subtitle = TranslatedField(
         'title_de',
         'title_en'
@@ -153,11 +163,13 @@ class UseCasePage(Page):
 
     en_content_panels = [
         FieldPanel('title_en'),
+        FieldPanel('image_caption_en'),
         StreamFieldPanel('body_streamfield_en')
     ]
 
     de_content_panels = [
         FieldPanel('title_de'),
+        FieldPanel('image_caption_de'),
         StreamFieldPanel('body_streamfield_de')
     ]
 

apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_page.html

@@ -21,6 +21,9 @@ <h1 class="cms__title--bold cms-page__header-margin">{{ page.title }}</h1>
         <div class="row justify-content-md-center">
             <div class="col-12">
                 <img src="{{ image.url }}" alt="{{ image.alt }}" class="cms-page__hero-image" />
+                {% if page.image_caption %}
+                <div class="mt-3 text-muted">{{ page.image_caption }}</div>
+                {% endif %}
             </div>
         </div>
         {% endif %}