From fbd4b5465606b3930489f91edcd3ef83026372a1 Mon Sep 17 00:00:00 2001 From: Marek Bachmann Date: Mon, 5 Dec 2022 04:23:34 +0100 Subject: [PATCH] Support more than 2 images --- src/Model/Item.php | 16 ++++++++++++---- view/templates/content/image_grid.tpl | 12 ++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 1fff0a5869..152543b916 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -3137,7 +3137,9 @@ class Item if ($item['has-media']) { $attachments = Post\Media::splitAttachments($item['uri-id'], [], $item['has-media'] ?? false); if (count($attachments['visual']) > 1) { - $img_tags = array(); + $img_tags_fc = array(); + $img_tags_sc = array(); + $count = 0; foreach ($attachments['visual'] as $attachment) { $src_url = Post\Media::getUrlForId($attachment['id']); $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE); @@ -3147,12 +3149,18 @@ class Item 'preview' => $preview_url, 'attachment' => $attachment, ]); - $img_tags[] = $img_tag; + if ($count % 2 == 0) { + $img_tags_fc[] = $img_tag; + } else { + $img_tags_sc[] = $img_tag; + } + ++$count; } + $img_grid = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [ 'columns' => [ - 'fc' => $img_tags[0], - 'sc' => $img_tags[1], + 'fc' => $img_tags_fc, + 'sc' => $img_tags_sc, ], ]); return $img_grid; diff --git a/view/templates/content/image_grid.tpl b/view/templates/content/image_grid.tpl index 7a06d33726..1a8648d189 100644 --- a/view/templates/content/image_grid.tpl +++ b/view/templates/content/image_grid.tpl @@ -2,13 +2,17 @@
- {{foreach $columns.fc as $img}} - {{include file="content/image.tpl" image=$img}} + {{foreach $columns.fc as $fc}} + {{foreach $fc as $img}} + {{include file="content/image.tpl" image=$img}} + {{/foreach}} {{/foreach}}
- {{foreach $columns.sc as $img}} - {{include file="content/image.tpl" image=$img}} + {{foreach $columns.sc as $sc}} + {{foreach $sc as $img}} + {{include file="content/image.tpl" image=$img}} + {{/foreach}} {{/foreach}}
\ No newline at end of file