From ded45bbb34b41e8881df9dec92cc9e6eff1ef870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com> Date: Fri, 17 Apr 2020 00:53:20 +0200 Subject: [PATCH] WIP news page image --- .gitignore | 3 +++ .../migrations/0003_senatornewspage_image.py | 24 ++++++++++++++++++ senator/migrations/0004_auto_20200417_0018.py | 25 +++++++++++++++++++ senator/models.py | 5 ++++ .../senator/senator_news_index_page.html | 4 +++ .../templates/senator/senator_news_page.html | 6 +++++ 6 files changed, 67 insertions(+) create mode 100644 senator/migrations/0003_senatornewspage_image.py create mode 100644 senator/migrations/0004_auto_20200417_0018.py diff --git a/.gitignore b/.gitignore index 5e5d652d..3e8d8fb3 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 00000000..7abee7d6 --- /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 00000000..7be9924f --- /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 e1438b96..e4a82968 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 c0972868..25acf687 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 4f226098..b9143a90 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 %} -- GitLab