From b996b09473d4be5ce15fedec6bcfb7e13f3b66a9 Mon Sep 17 00:00:00 2001
From: Rick R2H <rick@r2h.nl>
Date: Wed, 25 Sep 2024 12:52:01 +0200
Subject: [PATCH 1/6] transfer params from module to item

---
 modules/mod_articles/tmpl/default_items.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index c3c1a293c765b..652e561334454 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -22,7 +22,7 @@
 <ul class="mod-articles-items <?php echo ($params->get('articles_layout') == 1 ? 'mod-articles-grid ' . $gridCols : ''); ?> mod-list">
     <?php foreach ($items as $item) : ?>
         <?php
-            $displayInfo = $item->displayHits || $item->displayAuthorName || $item->displayCategoryTitle || $item->displayDate;
+        $displayInfo = $item->displayHits || $item->displayAuthorName || $item->displayCategoryTitle || $item->displayDate;
         ?>
         <li>
             <article class="mod-articles-item" itemscope itemtype="https://schema.org/Article">
@@ -105,6 +105,12 @@
                         <?php endif; ?>
 
                         <?php if ($params->get('show_readmore')) : ?>
+                            <?php if ($params->get('show_readmore_title') === 0) : ?>
+                                <?php $item->params->set('show_readmore_title', 0); ?>
+                            <?php endif; ?>
+                            <?php if ($params->get('readmore_limit') >= 0) : ?>
+                                <?php $item->params->set('readmore_limit', $params->get('readmore_limit')); ?>
+                            <?php endif; ?>
                             <?php echo LayoutHelper::render('joomla.content.readmore', ['item' => $item, 'params' => $item->params, 'link' => $item->link]); ?>
                         <?php endif; ?>
                     </div>

From 1885bfc31a31c4729e9b7ce5e99bc28c77167f58 Mon Sep 17 00:00:00 2001
From: Rick R2H <rick@r2h.nl>
Date: Wed, 25 Sep 2024 15:27:18 +0200
Subject: [PATCH 2/6] Read more without jlayout

---
 modules/mod_articles/tmpl/default_items.php | 28 +++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index 652e561334454..d5e68d85e9241 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -10,6 +10,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -18,8 +19,10 @@
     $gridCols = 'grid-cols-' . $params->get('layout_columns');
 }
 
+// Get the language direction
+$direction = Factory::getApplication()->getLanguage()->isRtl() ? 'left' : 'right';
 ?>
-<ul class="mod-articles-items <?php echo ($params->get('articles_layout') == 1 ? 'mod-articles-grid ' . $gridCols : ''); ?> mod-list">
+<ul class="mod-articles-items<?php echo ($params->get('articles_layout') == 1 ? ' mod-articles-grid ' . $gridCols : ''); ?> mod-list">
     <?php foreach ($items as $item) : ?>
         <?php
         $displayInfo = $item->displayHits || $item->displayAuthorName || $item->displayCategoryTitle || $item->displayDate;
@@ -28,7 +31,7 @@
             <article class="mod-articles-item" itemscope itemtype="https://schema.org/Article">
 
                 <?php if ($params->get('item_title') || $displayInfo || $params->get('show_tags') || $params->get('show_introtext') || $params->get('show_readmore')) : ?>
-                    <div class="mod-articles-item-content">
+                    <div class="mod-articles-item-content<?php echo $item->active ? ' $item->active' : ''; ?>">
 
                         <?php if ($params->get('item_title')) : ?>
                             <?php $item_heading = $params->get('item_heading', 'h4'); ?>
@@ -87,7 +90,6 @@
                                     </dd>
                                 <?php endif; ?>
                             </dl>
-
                         <?php endif; ?>
 
                         <?php if (in_array($params->get('img_intro_full'), ['intro', 'full']) && !empty($item->imageSrc)) : ?>
@@ -105,13 +107,19 @@
                         <?php endif; ?>
 
                         <?php if ($params->get('show_readmore')) : ?>
-                            <?php if ($params->get('show_readmore_title') === 0) : ?>
-                                <?php $item->params->set('show_readmore_title', 0); ?>
-                            <?php endif; ?>
-                            <?php if ($params->get('readmore_limit') >= 0) : ?>
-                                <?php $item->params->set('readmore_limit', $params->get('readmore_limit')); ?>
-                            <?php endif; ?>
-                            <?php echo LayoutHelper::render('joomla.content.readmore', ['item' => $item, 'params' => $item->params, 'link' => $item->link]); ?>
+                            <p class="mod-articles-category-readmore">
+                                <a class="mod-articles-category-title btn btn-secondary" href="<?php echo $item->link; ?>">
+                                    <?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
+                                    <?php if ($item->alternative_readmore) : ?>
+                                        <?php echo $item->alternative_readmore; ?>
+                                    <?php else : ?>
+                                        <?php echo Text::_('JGLOBAL_READ_MORE'); ?>
+                                    <?php endif; ?>
+                                    <?php if ($params->get('show_readmore_title', 0)) : ?>
+                                        <?php echo HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+                                    <?php endif; ?>
+                                </a>
+                            </p>
                         <?php endif; ?>
                     </div>
                 <?php endif; ?>

From e00e280cbe469df783545b43b9291643ee9643d3 Mon Sep 17 00:00:00 2001
From: Rick R2H <rick@r2h.nl>
Date: Wed, 25 Sep 2024 18:01:09 +0200
Subject: [PATCH 3/6] Fix colon

---
 modules/mod_articles/tmpl/default_items.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index d5e68d85e9241..bbbeb46ea6b7b 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -107,17 +107,19 @@
                         <?php endif; ?>
 
                         <?php if ($params->get('show_readmore')) : ?>
-                            <p class="mod-articles-category-readmore">
-                                <a class="mod-articles-category-title btn btn-secondary" href="<?php echo $item->link; ?>">
+                            <p class="mod-articles-item-readmore">
+                                <a class="mod-articles-item-title btn btn-secondary" href="<?php echo $item->link; ?>">
                                     <?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
                                     <?php if ($item->alternative_readmore) : ?>
                                         <?php echo $item->alternative_readmore; ?>
+                                    <?php elseif ($params->get('show_readmore_title', 0)) : ?>
+                                        <?php echo sprintf(
+                                            Text::_('JGLOBAL_READ_MORE_TITLE'),
+                                            HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit'))
+                                        ); ?>
                                     <?php else : ?>
                                         <?php echo Text::_('JGLOBAL_READ_MORE'); ?>
                                     <?php endif; ?>
-                                    <?php if ($params->get('show_readmore_title', 0)) : ?>
-                                        <?php echo HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
-                                    <?php endif; ?>
                                 </a>
                             </p>
                         <?php endif; ?>

From a81d79c2c72604fb6fe1a72371361648da1bb422 Mon Sep 17 00:00:00 2001
From: Rick R2H <rick@r2h.nl>
Date: Fri, 27 Sep 2024 09:55:30 +0200
Subject: [PATCH 4/6] Update read more to use jlayout

---
 modules/mod_articles/tmpl/default_items.php | 24 ++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index bbbeb46ea6b7b..22d61b21904ab 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -31,7 +31,7 @@
             <article class="mod-articles-item" itemscope itemtype="https://schema.org/Article">
 
                 <?php if ($params->get('item_title') || $displayInfo || $params->get('show_tags') || $params->get('show_introtext') || $params->get('show_readmore')) : ?>
-                    <div class="mod-articles-item-content<?php echo $item->active ? ' $item->active' : ''; ?>">
+                    <div class="mod-articles-item-content<?php echo $item->active ? ' active' : ''; ?>">
 
                         <?php if ($params->get('item_title')) : ?>
                             <?php $item_heading = $params->get('item_heading', 'h4'); ?>
@@ -106,22 +106,12 @@
                             <?php echo $item->displayIntrotext; ?>
                         <?php endif; ?>
 
-                        <?php if ($params->get('show_readmore')) : ?>
-                            <p class="mod-articles-item-readmore">
-                                <a class="mod-articles-item-title btn btn-secondary" href="<?php echo $item->link; ?>">
-                                    <?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
-                                    <?php if ($item->alternative_readmore) : ?>
-                                        <?php echo $item->alternative_readmore; ?>
-                                    <?php elseif ($params->get('show_readmore_title', 0)) : ?>
-                                        <?php echo sprintf(
-                                            Text::_('JGLOBAL_READ_MORE_TITLE'),
-                                            HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit'))
-                                        ); ?>
-                                    <?php else : ?>
-                                        <?php echo Text::_('JGLOBAL_READ_MORE'); ?>
-                                    <?php endif; ?>
-                                </a>
-                            </p>
+                        <?php if (isset($item->link) && $item->readmore != 0 && $params->get('show_readmore')) : ?>
+                            <?php if ($params->get('show_readmore_title', '') !== '') : ?>
+                                <?php $item->params->set('show_readmore_title', $params->get('show_readmore_title')); ?>
+                                <?php $item->params->set('readmore_limit', $params->get('readmore_limit')); ?>
+                            <?php endif; ?>
+                            <?php echo LayoutHelper::render('joomla.content.readmore', ['item' => $item, 'params' => $item->params, 'link' => $item->link]); ?>
                         <?php endif; ?>
                     </div>
                 <?php endif; ?>

From d2ca323cbacd001b59ff1a3b7413a4a59e630b5d Mon Sep 17 00:00:00 2001
From: Hannes Papenberg <info@joomlager.de>
Date: Sat, 28 Sep 2024 15:08:08 +0200
Subject: [PATCH 5/6] Removing active class from default_items.php

---
 modules/mod_articles/tmpl/default_items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index 36b41d06dd5b5..03c01d594243d 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -31,7 +31,7 @@
             <article class="mod-articles-item" itemscope itemtype="https://schema.org/Article">
 
                 <?php if ($params->get('item_title') || $displayInfo || $params->get('show_tags') || $params->get('show_introtext') || $params->get('show_readmore')) : ?>
-                    <div class="mod-articles-item-content<?php echo $item->active ? ' active' : ''; ?>">
+                    <div class="mod-articles-item-content">
 
                         <?php if ($params->get('item_title')) : ?>
                             <?php $item_heading = $params->get('item_heading', 'h4'); ?>

From 20557ef880d9e0966c64bbde921a2009a34a90fe Mon Sep 17 00:00:00 2001
From: Rick R2H <rick@r2h.nl>
Date: Sun, 29 Sep 2024 08:55:36 +0200
Subject: [PATCH 6/6] Remove obsolete language direction parameter

---
 modules/mod_articles/tmpl/default_items.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index 03c01d594243d..f0ea8afc4ec5c 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -19,8 +18,6 @@
     $gridCols = 'grid-cols-' . $params->get('layout_columns');
 }
 
-// Get the language direction
-$direction = Factory::getApplication()->getLanguage()->isRtl() ? 'left' : 'right';
 ?>
 <ul class="mod-articles-items<?php echo ($params->get('articles_layout') == 1 ? ' mod-articles-grid ' . $gridCols : ''); ?> mod-list">
     <?php foreach ($items as $item) : ?>