From 109c849250f2cc522e902ac6758ed3b456159b05 Mon Sep 17 00:00:00 2001
From: Igor <ihor.mandzyuk@magefan.com>
Date: Fri, 9 Jul 2021 16:59:33 +0300
Subject: [PATCH 1/2] add width an height attribute to image

---
 view/frontend/layout/blog_default.xml            | 16 ++++++++++++++++
 view/frontend/layout/blog_post_list.xml          |  4 ++++
 view/frontend/layout/blog_post_view.xml          | 11 ++++++++++-
 view/frontend/templates/post/list/item.phtml     |  9 +++++++--
 .../templates/post/list/toolbar/lazyload.phtml   | 11 +++++++++--
 view/frontend/templates/post/view-modern.phtml   |  7 ++++++-
 view/frontend/templates/post/view.phtml          |  9 +++++++--
 .../templates/post/view/comments/magefan.phtml   |  8 +++++++-
 .../post/view/comments/magefan/comment.phtml     |  8 +++++++-
 view/frontend/templates/post/view/gallery.phtml  |  9 ++++++++-
 view/frontend/templates/sidebar/recent.phtml     | 11 +++++++----
 view/frontend/templates/sidebar/rss.phtml        |  9 +++++++--
 view/frontend/templates/widget/recent.phtml      |  9 +++++++--
 13 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/view/frontend/layout/blog_default.xml b/view/frontend/layout/blog_default.xml
index 6605c99c..e2d1a7b2 100755
--- a/view/frontend/layout/blog_default.xml
+++ b/view/frontend/layout/blog_default.xml
@@ -25,6 +25,10 @@
                     <action method="setBlockTitle">
                         <argument name="time" xsi:type="string">Recent Posts</argument>
                     </action>
+                    <arguments>
+                        <argument name="width" xsi:type="number">60</argument>
+                        <argument name="height" xsi:type="number">40</argument>
+                    </arguments>
                 </block>
                 <block class="Magefan\Blog\Block\Sidebar\Featured" name="blog.sidebar.featured" template="sidebar/recent.phtml">
                     <action method="setCacheLifetime">
@@ -33,6 +37,10 @@
                     <action method="setBlockTitle">
                         <argument name="time" xsi:type="string">Featured Posts</argument>
                     </action>
+                    <arguments>
+                        <argument name="width" xsi:type="number">60</argument>
+                        <argument name="height" xsi:type="number">40</argument>
+                    </arguments>
                 </block>
                 <block class="Magefan\Blog\Block\Sidebar\Popular" name="blog.sidebar.popular" template="sidebar/recent.phtml">
                     <action method="setCacheLifetime">
@@ -41,6 +49,10 @@
                     <action method="setBlockTitle">
                         <argument name="time" xsi:type="string">Popular Posts</argument>
                     </action>
+                    <arguments>
+                        <argument name="width" xsi:type="number">300</argument>
+                        <argument name="height" xsi:type="number">200</argument>
+                    </arguments>
                 </block>
                 <block class="Magefan\Blog\Block\Sidebar\Archive" name="blog.sidebar.archive" template="sidebar/archive.phtml">
                     <action method="setCacheLifetime">
@@ -55,6 +67,10 @@
                 <block class="Magefan\Blog\Block\Sidebar\Custom" name="blog.sidebar.custom" template="sidebar/custom.phtml" />
                 <block class="Magefan\Blog\Block\Sidebar\CustomTwo" name="blog.sidebar.custom2" template="sidebar/custom.phtml" />
                 <block class="Magefan\Blog\Block\Sidebar\Rss" name="blog.sidebar.rss" template="sidebar/rss.phtml">
+                    <arguments>
+                        <argument name="width" xsi:type="number">20</argument>
+                        <argument name="height" xsi:type="number">20</argument>
+                    </arguments>
                     <action method="setCacheLifetime">
                         <argument name="time" xsi:type="string">86400</argument>
                     </action>
diff --git a/view/frontend/layout/blog_post_list.xml b/view/frontend/layout/blog_post_list.xml
index 1303d023..fc30502a 100755
--- a/view/frontend/layout/blog_post_list.xml
+++ b/view/frontend/layout/blog_post_list.xml
@@ -15,6 +15,10 @@
                 <argument name="style_view_model" xsi:type="object">Magefan\Blog\ViewModel\Style</argument>
             </arguments>
             <block class="Magefan\Blog\Block\Post\PostList\Item" name="blog.posts.list.item" template="post/list/item.phtml">
+                <arguments>
+                    <argument name="width" xsi:type="string">800</argument>
+                    <argument name="height" xsi:type="string">500</argument>
+                </arguments>
                 <block class="Magefan\Blog\Block\Post\Info" name="blog.post.info" template="post/info.phtml" />
                 <action method="setPostInfoBlockName">
                     <argument name="name" xsi:type="string">blog.post.info</argument>
diff --git a/view/frontend/layout/blog_post_view.xml b/view/frontend/layout/blog_post_view.xml
index a7f1f4d5..2c89eecc 100755
--- a/view/frontend/layout/blog_post_view.xml
+++ b/view/frontend/layout/blog_post_view.xml
@@ -18,12 +18,21 @@
         <referenceContainer name="content">
             <block class="Magefan\Blog\Block\Post\View\ViewsCount" name="blog.posts.views.count" template="post/view/views_count.phtml"></block>
             <block class="Magefan\Blog\Block\Post\View" name="blog.post" template="post/view.phtml">
+                <arguments>
+                    <argument name="width" xsi:type="number">800</argument>
+                    <argument name="height" xsi:type="number">500</argument>
+                </arguments>
                 <block class="Magefan\Blog\Block\Post\Info" name="blog.post.info" template="post/info.phtml" />
                 <action method="setPostInfoBlockName">
                     <argument name="name" xsi:type="string">blog.post.info</argument>
                 </action>
                 <container name="blog.post.bottom" label="Blog Post Bottom Container" >
-                    <block class="Magefan\Blog\Block\Post\View\Gallery" name="blog.post.gallery" as="gallery"  template="Magefan_Blog::post/view/gallery.phtml" />
+                    <block class="Magefan\Blog\Block\Post\View\Gallery" name="blog.post.gallery" as="gallery"  template="Magefan_Blog::post/view/gallery.phtml" >
+                        <arguments>
+                            <argument name="width" xsi:type="number">300</argument>
+                            <argument name="height" xsi:type="number">300</argument>
+                        </arguments>
+                    </block>
                     <block class="Magefan\Blog\Block\Post\View\NextPrev" name="blog.post.nextprev" as="nextprev"  template="Magefan_Blog::post/view/nextprev.phtml" />
                     <block class="Magefan\Blog\Block\Post\View\RelatedPosts" name="blog.post.relatedposts" as="relatedposts"  template="Magefan_Blog::post/view/relatedposts.phtml" />
                     <block class="Magefan\Blog\Block\Post\View\RelatedProducts" name="blog.post.relatedproducts" as="relatedproducts"  template="Magefan_Blog::post/view/relatedproducts.phtml" />
diff --git a/view/frontend/templates/post/list/item.phtml b/view/frontend/templates/post/list/item.phtml
index 46557a10..cabfdcbe 100644
--- a/view/frontend/templates/post/list/item.phtml
+++ b/view/frontend/templates/post/list/item.phtml
@@ -17,6 +17,8 @@
 $_post = $block->getPost();
 $_postUrl = $block->escapeUrl($_post->getPostUrl());
 $_postName = $block->escapeHtml($_post->getTitle());
+$width = (int)$block->getWidth() ?: 800;
+$height = (int)$block->getHeight() ?: 500;
 ?>
 <li class="post-holder post-holder-<?= (int)$_post->getId() ?>">
     <div class="post-header">
@@ -59,7 +61,10 @@ $_postName = $block->escapeHtml($_post->getTitle());
                     <a href="<?= /*@noEscape*/ $_postUrl ?>"
                        title="<?= /*@noEscape*/ $_postName ?>">
                         <img src="<?= $block->escapeUrl($featuredImage) ?>"
-                             alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
+                             alt="<?= $block->escapeHtml($featuredImgAlt) ?>"
+                             width="<?= $width ?>"
+                             height="<?= $height ?>"
+                        />
                     </a>
                 </div>
             <?php } ?>
@@ -76,4 +81,4 @@ $_postName = $block->escapeHtml($_post->getTitle());
     <div class="post-footer">
 
     </div>
-</li>
\ No newline at end of file
+</li>
diff --git a/view/frontend/templates/post/list/toolbar/lazyload.phtml b/view/frontend/templates/post/list/toolbar/lazyload.phtml
index 6b7a27aa..ec71778f 100755
--- a/view/frontend/templates/post/list/toolbar/lazyload.phtml
+++ b/view/frontend/templates/post/list/toolbar/lazyload.phtml
@@ -13,6 +13,10 @@
  * @var $block \Magefan\Blog\Block\Post\PostList\Toolbar\Pager
  */
 ?>
+<?php
+$width = 220;
+$height = 150;
+?>
 <?php if ($block->useLazyload()) { ?>
     <?php
         $config = $block->getLazyloadConfig([
@@ -28,6 +32,9 @@
         </button>
         <img class="posts-loader mfblog-show-onload"
              src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-2.gif')) ?>"
-             alt="<?= $block->escapeHtml(__('Posts loader')) ?>" />
+             alt="<?= $block->escapeHtml(__('Posts loader')) ?>"
+             width="<?= $width ?>"
+             height="<?= $height ?>"
+        />
     </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
diff --git a/view/frontend/templates/post/view-modern.phtml b/view/frontend/templates/post/view-modern.phtml
index 6c50bfe3..43039527 100644
--- a/view/frontend/templates/post/view-modern.phtml
+++ b/view/frontend/templates/post/view-modern.phtml
@@ -17,6 +17,8 @@
     $_post = $block->getPost();
     $_postUrl = $_post->getPostUrl();
     $_postName = $block->escapeHtml($_post->getTitle(), null);
+    $width = (int)$block->getWidth() ?: 800;
+    $height = (int)$block->getHeight() ?: 500;
 ?>
 <?= $block->getStyleViewModel()->getStyle('Magefan_Blog::css/bootstrap-4.4.1-custom-min.css') ?>
 <div class="_post-view">
@@ -99,7 +101,10 @@
                     ?>
                     <div class="post-featured-image">
                         <img src="<?= $block->escapeUrl($featuredImage) ?>"
-                             alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
+                             alt="<?= $block->escapeHtml($featuredImgAlt) ?>"
+                             width="<?= $width ?>"
+                             height="<?= $height ?>"
+                        />
                     </div>
                 <?php } ?>
 
diff --git a/view/frontend/templates/post/view.phtml b/view/frontend/templates/post/view.phtml
index c526a656..ef8c97e3 100644
--- a/view/frontend/templates/post/view.phtml
+++ b/view/frontend/templates/post/view.phtml
@@ -17,6 +17,8 @@
 $_post = $block->getPost();
 $_postUrl = $_post->getPostUrl();
 $_postName = $block->escapeHtml($_post->getTitle(), null);
+$width = (int)$block->getWidth() ?: 800;
+$height = (int)$block->getHeight() ?: 500;
 ?>
 <div class="post-view">
     <div class="post-holder post-holder-<?= (int)$_post->getId() ?>">
@@ -41,7 +43,10 @@ $_postName = $block->escapeHtml($_post->getTitle(), null);
                     ?>
                     <div class="post-ftimg-hld">
                         <img src="<?= $block->escapeUrl($featuredImage) ?>"
-                             alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
+                             alt="<?= $block->escapeHtml($featuredImgAlt) ?>"
+                             width="<?= $width ?>"
+                             height="<?= $height ?>"
+                        />
                     </div>
                 <?php } ?>
                 <div class="post-text-hld">
@@ -55,4 +60,4 @@ $_postName = $block->escapeHtml($_post->getTitle(), null);
             <?= $block->getChildHtml('blog.post.bottom') ?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/post/view/comments/magefan.phtml b/view/frontend/templates/post/view/comments/magefan.phtml
index 4d59c1fc..935942da 100644
--- a/view/frontend/templates/post/view/comments/magefan.phtml
+++ b/view/frontend/templates/post/view/comments/magefan.phtml
@@ -19,6 +19,8 @@
     $session = $block->getCustomerSession();
 
     $canPost = $block->canPost();
+    $width = 200;
+    $height = 200;
 ?>
 <div id="post-comments">
     <div class="c-count">
@@ -28,7 +30,11 @@
     <div class="c-reply cf">
         <?php if ($image = $block->getCustomerImage()) { ?>
         <div class="c-img">
-            <img src="<?= $block->escapeUrl($image) ?>" alt="<?= $block->escapeHtml($block->getCustomerName()) ?>">
+            <img src="<?= $block->escapeUrl($image) ?>"
+                 alt="<?= $block->escapeHtml($block->getCustomerName()) ?>"
+                 width="<?= $width ?>"
+                 height="<?= $height ?>"
+            >
         </div>
         <?php } ?>
         <div class="c-replyform <?php if ($canPost) {  echo 'no-active'; } ?>">
diff --git a/view/frontend/templates/post/view/comments/magefan/comment.phtml b/view/frontend/templates/post/view/comments/magefan/comment.phtml
index 83809652..6701ef1e 100644
--- a/view/frontend/templates/post/view/comments/magefan/comment.phtml
+++ b/view/frontend/templates/post/view/comments/magefan/comment.phtml
@@ -16,12 +16,18 @@
 <?php
     $comment = $block->getComment();
     $numberOfCommentsToDisplay = $block->getNumberOfReplies();
+    $width = 200;
+    $height = 200;
 ?>
 <div class="c-comment c-comment-parent-<?= (int)$comment->getParentId() ?>"
     <?php if ($comment->getIsHidden()) { echo 'style="display:none"'; } ?>>
     <?php if ($authorImage = $comment->getAuthorImage()) { ?>
     <div class="c-img">
-        <img src="<?= $block->escapeUrl($authorImage) ?>" alt="<?= $block->escapeHtml($comment->getAuthorName()) ?>">
+        <img src="<?= $block->escapeUrl($authorImage) ?>"
+             alt="<?= $block->escapeHtml($comment->getAuthorName()) ?>"
+             width="<?= $width ?>"
+             height="<?= $height ?>"
+        >
     </div>
     <?php } ?>
     <div class="c-post c-post-<?= (int)$comment->getId() ?>" id="c-post-<?= (int)$comment->getId() ?>">
diff --git a/view/frontend/templates/post/view/gallery.phtml b/view/frontend/templates/post/view/gallery.phtml
index 87d9bdf0..e8cbf20d 100644
--- a/view/frontend/templates/post/view/gallery.phtml
+++ b/view/frontend/templates/post/view/gallery.phtml
@@ -18,6 +18,8 @@
     $post = $block->getPost();
     $galleryImages = $post->getGalleryImages();
     $viewFileUrl = $block->getViewFileUrl("Magefan_Blog::css/jquery.fancybox.min.css");
+    $width = (int)$block->getWidth() ?: 300;
+    $height = (int)$block->getHeight() ?: 300;
 ?>
 
 <?php if (count($galleryImages)) { ?>
@@ -27,7 +29,12 @@
                data-fancybox="gallery"
                href="<?= $block->escapeUrl($image) ?>"
                rel="nofollow">
-                <img class="gallery-image" src="<?= $block->escapeUrl($image->resize(200)) ?>" alt="" />
+                <img class="gallery-image"
+                     src="<?= $block->escapeUrl($image->resize(200)) ?>"
+                     alt=""
+                     width="<?= $width ?>"
+                     height="<?= $height ?>"
+                />
             </a>
         <?php } ?>
     </div>
diff --git a/view/frontend/templates/sidebar/recent.phtml b/view/frontend/templates/sidebar/recent.phtml
index baf3a331..78c15483 100755
--- a/view/frontend/templates/sidebar/recent.phtml
+++ b/view/frontend/templates/sidebar/recent.phtml
@@ -18,8 +18,8 @@
     $_postCollection = $block->getPostCollection();
 ?>
 <?php
-    $width = (int)$block->getBlockImageWidth() ?: 300;
-    $height = (int)$block->getBlockImageheight() ?: 200;
+    $width = (int)$block->getWidth() ?: 300;
+    $height = (int)$block->getHeight() ?: 200;
     $imageHelper = $this->helper(\Magefan\Blog\Helper\Image::class);
 ?>
 <?php if ($_postCollection->count()) { ?>
@@ -51,8 +51,11 @@
                                     $featuredImageUrl = $this->getViewFileUrl('Magefan_Blog::images/default-no-image.png');
                                 }
                             ?>
-                            <img data-width-amp="<?= $width ?>" data-height-amp="<?= $height ?>" layout="responsive" src="<?= $block->escapeUrl($featuredImageUrl) ?>"
-                                 alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
+                            <img src="<?= $block->escapeUrl($featuredImageUrl) ?>"
+                                 alt="<?= $block->escapeHtml($featuredImgAlt) ?>"
+                                 width="<?= $width ?>"
+                                 height="<?= $height ?>"
+                            />
                         </a>
                     </div>
                 <?php } ?>
diff --git a/view/frontend/templates/sidebar/rss.phtml b/view/frontend/templates/sidebar/rss.phtml
index bfcf1f09..4dde876e 100755
--- a/view/frontend/templates/sidebar/rss.phtml
+++ b/view/frontend/templates/sidebar/rss.phtml
@@ -13,6 +13,10 @@
  * @var $block \Magefan\Blog\Block\Sidebar\Rss
  */
 ?>
+<?php
+$width = (int)$block->getWidth() ?: 20;
+$height = (int)$block->getHeight() ?: 20;
+?>
 <div class="widget block block-rss" data-bind="scope: 'blog-rss'">
     <div class="block-title">
         <strong>
@@ -21,8 +25,9 @@
                 <?= $block->escapeHtml(__('RSS Feed')) ?>
             </a>
         </strong>
-        <img width="17" height="17" class="rss-icon"
+        <img width="<?= $width ?>" height="<?= $height ?>" class="rss-icon"
              src="<?= $block->escapeUrl($block->getViewFileUrl('Magefan_Blog::images/rss-icon.png')) ?>"
-             alt="<?= $block->escapeHtml(__('RSS Feed')) ?>" >
+             alt="<?= $block->escapeHtml(__('RSS Feed')) ?>"
+        >
     </div>
 </div>
diff --git a/view/frontend/templates/widget/recent.phtml b/view/frontend/templates/widget/recent.phtml
index cd316902..432c27c9 100755
--- a/view/frontend/templates/widget/recent.phtml
+++ b/view/frontend/templates/widget/recent.phtml
@@ -16,6 +16,8 @@
 
 <?php
     $_postCollection = $block->getPostCollection();
+    $width = (int)$block->getWidth() ?: 500;
+    $height = (int)$block->getHeight() ?: 400;
 ?>
 <?php if ($_postCollection->count()) { ?>
 <div class="post-list-wrapper blog-widget-recent">
@@ -74,7 +76,10 @@
                             <div class="post-ftimg-hld">
                                 <a href="<?= /*@noEscape*/ $_postUrl ?>" title="<?= /*@noEscape*/ $_postName ?>">
                                     <img src="<?= $block->escapeHtml($featuredImage) ?>"
-                                         alt="<?= $block->escapeHtml($featuredImgAlt) ?>" />
+                                         alt="<?= $block->escapeHtml($featuredImgAlt) ?>"
+                                         width="<?= $width ?>"
+                                         height="<?= $height ?>"
+                                    />
                                 </a>
                             </div>
                         <?php } ?>
@@ -97,4 +102,4 @@
         <?php } ?>
     </ul>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>

From cb36a0904cf4c9fe7c416d10d4312b60367cf1bb Mon Sep 17 00:00:00 2001
From: ihormandzyuk <75434014+ihormandzyuk@users.noreply.github.com>
Date: Mon, 12 Jul 2021 09:52:25 +0300
Subject: [PATCH 2/2] Update rss.phtml

---
 view/frontend/templates/sidebar/rss.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/frontend/templates/sidebar/rss.phtml b/view/frontend/templates/sidebar/rss.phtml
index 4dde876e..5bd513c3 100755
--- a/view/frontend/templates/sidebar/rss.phtml
+++ b/view/frontend/templates/sidebar/rss.phtml
@@ -14,8 +14,8 @@
  */
 ?>
 <?php
-$width = (int)$block->getWidth() ?: 20;
-$height = (int)$block->getHeight() ?: 20;
+$width = (int)$block->getWidth() ?: 17;
+$height = (int)$block->getHeight() ?: 17;
 ?>
 <div class="widget block block-rss" data-bind="scope: 'blog-rss'">
     <div class="block-title">