Support more than 2 images

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 1fff0a586981ac5fc4cb3713841c48d6c79c71eb..152543b91668f3cc49c67d556eb2e5021caeefef 100644 (file)
--- 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 7a06d3372614eed9851f2ec5fa45e64147350b44..1a8648d189faf407a6a871e1bacf62c13d481e6c 100644 (file)
--- a/view/templates/content/image_grid.tpl
+++ b/view/templates/content/image_grid.tpl
@@ -2,13 +2,17 @@
 
 <div id="row" class="row">
        <div class="column">
-        {{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}}
        </div>
        <div class="column">
-        {{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}}
        </div>
 </div>
\ No newline at end of file