diff --git a/.gitignore b/.gitignore index 5e5d652d1942a14e5f9d7ede032324ddfec73cf7..3e8d8fb33e3eed1a5337ff1995bb72cb64e9a955 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,6 @@ cython_debug/ # direnv .envrc + +media/ +static/ diff --git a/senator/migrations/0003_senatornewspage_image.py b/senator/migrations/0003_senatornewspage_image.py new file mode 100644 index 0000000000000000000000000000000000000000..7abee7d6e0e9d2ca44c08486a205be2c77c7a8a2 --- /dev/null +++ b/senator/migrations/0003_senatornewspage_image.py @@ -0,0 +1,24 @@ +# Generated by Django 3.0.5 on 2020-04-16 22:05 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("wagtailimages", "0001_squashed_0021"), + ("senator", "0002_senatornewsindexpage_senatornewspage"), + ] + + operations = [ + migrations.AddField( + model_name="senatornewspage", + name="image", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.SET_NULL, + to="wagtailimages.Image", + ), + ), + ] diff --git a/senator/migrations/0004_auto_20200417_0018.py b/senator/migrations/0004_auto_20200417_0018.py new file mode 100644 index 0000000000000000000000000000000000000000..7be9924f7be2cdf57c22997f033f527cdc0ce8a6 --- /dev/null +++ b/senator/migrations/0004_auto_20200417_0018.py @@ -0,0 +1,25 @@ +# Generated by Django 3.0.5 on 2020-04-16 22:18 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("wagtailimages", "0001_squashed_0021"), + ("senator", "0003_senatornewspage_image"), + ] + + operations = [ + migrations.AlterField( + model_name="senatornewspage", + name="image", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + to="wagtailimages.Image", + ), + ), + ] diff --git a/senator/models.py b/senator/models.py index e1438b96ea8aaa81ccde64e95ea1eb1af4b8ab10..e4a8296829ee9a36c80daad6f1e215bac092bf4b 100644 --- a/senator/models.py +++ b/senator/models.py @@ -2,6 +2,7 @@ from django.db import models from wagtail.admin.edit_handlers import FieldPanel from wagtail.core.fields import RichTextField from wagtail.core.models import Page +from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.search import index @@ -34,6 +35,9 @@ class SenatorNewsPage(Page): date = models.DateField("datum") perex = models.TextField("perex") body = RichTextField("článek", blank=True) + image = models.ForeignKey( + "wagtailimages.Image", on_delete=models.SET_NULL, null=True, blank=True + ) search_fields = Page.search_fields + [ index.SearchField("perex"), @@ -44,4 +48,5 @@ class SenatorNewsPage(Page): FieldPanel("date"), FieldPanel("perex"), FieldPanel("body", classname="full"), + ImageChooserPanel("image"), ] diff --git a/senator/templates/senator/senator_news_index_page.html b/senator/templates/senator/senator_news_index_page.html index c09728687c6fc7dafcb0f8f04840e6b4db6e71a8..25acf6875d88b22c790cad590a1ace09568e37df 100644 --- a/senator/templates/senator/senator_news_index_page.html +++ b/senator/templates/senator/senator_news_index_page.html @@ -1,6 +1,7 @@ {% extends "senator/base.html" %} {% load wagtailcore_tags %} +{% load wagtailimages_tags %} {% block titlebar %} @@ -39,6 +40,9 @@ <div class="w-blog-post-h"> <a href="{% pageurl article %}" aria-label="{{ article.title }}"> <div class="w-blog-post-preview"> + {% if article.specific.image %} + {% image article.specific.image width-374 class="attachment-medium_large size-medium_large wp-post-image" %} + {% endif %} <span class="w-blog-post-preview-icon"></span> </div> </a> diff --git a/senator/templates/senator/senator_news_page.html b/senator/templates/senator/senator_news_page.html index 4f226098fd3e13a8f2bacefbb7c52c2d6a6a63c3..b9143a904a6a491b7c8c7d1e2f8e58bc81b7fc39 100644 --- a/senator/templates/senator/senator_news_page.html +++ b/senator/templates/senator/senator_news_page.html @@ -1,6 +1,7 @@ {% extends "senator/base.html" %} {% load wagtailcore_tags %} +{% load wagtailimages_tags %} {% block titlebar %} @@ -41,6 +42,11 @@ <div class="l-section-h i-cf" itemprop="text"> {{ page.body|richtext }} </div> + + {% if page.image %} + {% image page.image width-450 class="aligncenter" %} + {% endif %} + </section> {% endblock %}