From 95b07343a9b565ce05fc83a177a1aacf3a4911be Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Sat, 25 Sep 2021 23:32:56 +0200
Subject: [PATCH 1/4] repeat adapting to com_categories

---
 .../tmpl/categories/default_items.php         | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/components/com_weblinks/tmpl/categories/default_items.php b/src/components/com_weblinks/tmpl/categories/default_items.php
index 6417cc4..fad8cd7 100644
--- a/src/components/com_weblinks/tmpl/categories/default_items.php
+++ b/src/components/com_weblinks/tmpl/categories/default_items.php
@@ -16,18 +16,20 @@ use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
 
 if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
-	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
-	<?php if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
-		<div class="com-weblinks-categories__items">
-			<h3 class="page-header item-title">
+	<div class="com-content-categories__items">
+		<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+			<?php if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
+			<div class="com-content-categories__item">
+				<div>
 				<a href="<?php echo Route::_(RouteHelper::getCategoryRoute($item->id, $item->language)); ?>">
 					<?php echo $this->escape($item->title); ?></a>
-				<?php if ($this->params->get('show_cat_num_links_cat') == 1) :?>
-					<span class="badge bg-info">
-							<?php echo Text::_('COM_WEBLINKS_NUM_ITEMS'); ?>&nbsp;
-							<?php echo $item->numitems; ?>
+					<?php if ($this->params->get('show_cat_num_links_cat') == 1) :?>
+						<span class="badge bg-info">
+								<?php echo Text::_('COM_WEBLINKS_NUM_ITEMS'); ?>&nbsp;
+								<?php echo $item->numitems; ?>
 						</span>
-				<?php endif; ?>
+					<?php endif; ?>
+				</div>
 				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 					<button
 							type="button"
@@ -40,28 +42,30 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 						<span class="icon-plus" aria-hidden="true"></span>
 					</button>
 				<?php endif; ?>
-			</h3>
-			<?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'); ?>
+				<?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
+						$this->items[$item->id] = $item->getChildren();
+						$this->parent = $item;
+						$this->maxLevelcat--;
+						echo $this->loadTemplate('items');
+						$this->parent = $item->getParent();
+						$this->maxLevelcat++;
+						?>
 					</div>
 				<?php endif; ?>
+			</div>
 			<?php endif; ?>
-
-			<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
-				<div class="com-weblinks-categories__children" id="category-<?php echo $item->id; ?>" hidden>
-					<?php
-					$this->items[$item->id] = $item->getChildren();
-					$this->parent = $item;
-					$this->maxLevelcat--;
-					echo $this->loadTemplate('items');
-					$this->parent = $item->getParent();
-					$this->maxLevelcat++;
-					?>
-				</div>
-			<?php endif; ?>
-		</div>
-	<?php endif; ?>
-<?php endforeach; ?>
+		<?php endforeach; ?>
+	</div>
 <?php endif; ?>

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 2/4] 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 fad8cd7..8857aeb 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 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 						</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 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 						<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

From 859fb5a2a0f72ca568f0231757efb082399f385e Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Sun, 26 Sep 2021 10:51:30 +0200
Subject: [PATCH 3/4] fix alt description for image

---
 .../tmpl/categories/default_items.php         | 34 +++++++++++++------
 1 file changed, 23 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 8857aeb..8bccc81 100644
--- a/src/components/com_weblinks/tmpl/categories/default_items.php
+++ b/src/components/com_weblinks/tmpl/categories/default_items.php
@@ -21,8 +21,8 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 			<?php if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
 			<div class="com-content-categories__item">
 				<div>
-				<a href="<?php echo Route::_(RouteHelper::getCategoryRoute($item->id, $item->language)); ?>">
-					<?php echo $this->escape($item->title); ?></a>
+					<a href="<?php echo Route::_(RouteHelper::getCategoryRoute($item->id, $item->language)); ?>">
+						<?php echo $this->escape($item->title); ?></a>
 					<?php if ($this->params->get('show_cat_num_links_cat') == 1) :?>
 						<span class="badge bg-info">
 								<?php echo Text::_('COM_WEBLINKS_NUM_ITEMS'); ?>&nbsp;
@@ -30,16 +30,28 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 						</span>
 					<?php endif; ?>
 				</div>
-				<?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 if ($this->params->get('show_subcat_desc_cat') == 1 && !empty($item->description)) : ?>
+					<div class="category-desc">
+						<?php echo HTMLHelper::_('content.prepare', $item->description, '', 'com_weblinks.categories'); ?>
+					</div>
 				<?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) : ?>
+
+				<?php if ($this->params->get('show_description_image') && !empty($item->getParams()->get('image'))) : ?>
+					<?php
+						$params = $item->getParams();
+						$img = HTMLHelper::cleanImageURL($params->get('image'));
+						$alt = '';
+						if (!empty($params->get('image_alt'))) :
+							$alt = 'alt="' . htmlspecialchars($params->get('image_alt'), ENT_COMPAT, 'UTF-8') . '"';
+						elseif (!empty($params->get('image_alt_empty'))) :
+							$alt = 'alt=""';
+						endif;
+					?>
+					<img src="<?php echo htmlspecialchars($img->url, ENT_COMPAT, 'UTF-8'); ?>"<?php echo $alt; ?>>
+				<?php endif; ?>
+
+				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 					<button
 							type="button"
 							id="category-btn-<?php echo $item->id; ?>"

From e01ce0337d879ff34ba8acbf46f5a2f2669b86cc Mon Sep 17 00:00:00 2001
From: chmst <dev@chmst.de>
Date: Wed, 6 Oct 2021 13:50:05 +0200
Subject: [PATCH 4/4] move expand button to first line of a category

---
 .../tmpl/categories/default_items.php         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/com_weblinks/tmpl/categories/default_items.php b/src/components/com_weblinks/tmpl/categories/default_items.php
index 8bccc81..200094d 100644
--- a/src/components/com_weblinks/tmpl/categories/default_items.php
+++ b/src/components/com_weblinks/tmpl/categories/default_items.php
@@ -20,15 +20,27 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 		<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 			<?php if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
 			<div class="com-content-categories__item">
-				<div>
+				<div class="w-100">
 					<a href="<?php echo Route::_(RouteHelper::getCategoryRoute($item->id, $item->language)); ?>">
 						<?php echo $this->escape($item->title); ?></a>
 					<?php if ($this->params->get('show_cat_num_links_cat') == 1) :?>
-						<span class="badge bg-info">
+						<span class="badge bg-info ">
 								<?php echo Text::_('COM_WEBLINKS_NUM_ITEMS'); ?>&nbsp;
 								<?php echo $item->numitems; ?>
 						</span>
 					<?php endif; ?>
+					<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
+						<button
+								type="button"
+								id="category-btn-<?php echo $item->id; ?>"
+								data-category-id="<?php echo $item->id; ?>"
+								class="btn btn-secondary btn-sm float-end"
+								aria-expanded="false"
+								aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"
+						>
+							<span class="icon-plus" aria-hidden="true"></span>
+						</button>
+					<?php endif; ?>
 				</div>
 
 				<?php if ($this->params->get('show_subcat_desc_cat') == 1 && !empty($item->description)) : ?>
@@ -51,18 +63,7 @@ if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 					<img src="<?php echo htmlspecialchars($img->url, ENT_COMPAT, 'UTF-8'); ?>"<?php echo $alt; ?>>
 				<?php endif; ?>
 
-				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
-					<button
-							type="button"
-							id="category-btn-<?php echo $item->id; ?>"
-							data-category-id="<?php echo $item->id; ?>"
-							class="btn btn-secondary btn-sm float-end"
-							aria-expanded="false"
-							aria-label="<?php echo Text::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"
-					>
-						<span class="icon-plus" aria-hidden="true"></span>
-					</button>
-				<?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