From 9f53917bf7985daa0e9c288a3b0213451b84a226 Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Sat, 25 Sep 2021 23:46:01 +0200
Subject: [PATCH] move expand button to the end of a category description

---
 .../tmpl/categories/default_items.php         | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/com_weblinks/tmpl/categories/default_items.php b/src/components/com_weblinks/tmpl/categories/default_items.php
index fad8cd7621c..8857aeb94c0 100644
--- a/src/components/com_weblinks/tmpl/categories/default_items.php
+++ b/src/components/com_weblinks/tmpl/categories/default_items.php
@@ -30,7 +30,16 @@
 						</span>
 					<?php endif; ?>
 				</div>
-				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
+				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
+					<?php if ($item->description) : ?>
+						<div class="category-desc">
+							<?php echo HTMLHelper::_('content.prepare', $item->description, '', 'com_weblinks.categories'); ?>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+				<?php if ($this->params->get('show_description_image') && $item->getParams()->get('image')) : ?>
+					<img src="<?php echo $item->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($item->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?>">
+				<?php endif; ?>				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 					<button
 							type="button"
 							id="category-btn-<?php echo $item->id; ?>"
@@ -42,16 +51,6 @@ class="btn btn-secondary btn-sm float-end"
 						<span class="icon-plus" aria-hidden="true"></span>
 					</button>
 				<?php endif; ?>
-				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
-					<?php if ($item->description) : ?>
-						<div class="category-desc">
-							<?php echo HTMLHelper::_('content.prepare', $item->description, '', 'com_weblinks.categories'); ?>
-						</div>
-					<?php endif; ?>
-				<?php endif; ?>
-				<?php if ($this->params->get('show_description_image') && $item->getParams()->get('image')) : ?>
-					<img src="<?php echo $item->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($item->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?>">
-				<?php endif; ?>
 				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 					<div class="com-content-categories__children" id="category-<?php echo $item->id; ?>" hidden>
 						<?php