Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Single Image Block #50

Merged
merged 7 commits into from
Nov 23, 2022
Merged

Single Image Block #50

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bcc7c6c
Add basics for image block
conatus Nov 21, 2022
5106873
Added styling
conatus Nov 21, 2022
97a59c2
Merge branch 'main' into feature/hot-222-single-image-block
conatus Nov 22, 2022
00ac8cd
Merge branch 'main' into feature/hot-222-single-image-block
conatus Nov 23, 2022
dc734c3
Use internal Wagtail attribution methodology
conatus Nov 23, 2022
c63a9ac
Merge branch 'main' into feature/hot-222-single-image-block
conatus Nov 23, 2022
901213f
Mix migrations
conatus Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/wagtail/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ class Meta:

class ImageBlock(blocks.StructBlock):
class Meta:
# TODO:
template = "app/blocks/dummy_block.html"
template = "app/blocks/image_block.html"
icon = "fa fa-picture-o"

image = ImageChooserBlock(required=True)
caption = blocks.CharBlock(required=False)
credit = blocks.CharBlock(required=False)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have an attribution property on the image model. It seems fitting to use the database-level credits, rather than have to re-input credit each time an image is used. The editor may not know, and in any case will have to enter credits when they upload the image.

So delete this line, and then use value.image.attribution in the template below.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. I didn't know that. Thanks.



class InternalLinkValue(StructValue):
Expand Down
8 changes: 8 additions & 0 deletions app/templates/app/blocks/image_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% load wagtailimages_tags %}
<section class="my-24">
{% image value.image width-500 class="rounded-xl" %}
<div class="flex flex-row mt-2 lg:mt-4">
conatus marked this conversation as resolved.
Show resolved Hide resolved
<div class="text-xs font-medium text-gray-90 mr-2 lg:text-sm">{{ value.caption }}</div>
<div class="text-xs font-medium text-gray-300 lg:text-sm">{{ value.credit }}</div>
</div>
</section>