From 70bb5399310cbe0e1bd154ce431904953da8f68b Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Sat, 10 Jul 2021 17:28:40 +0700
Subject: [PATCH] Basic category layout (base on layout from com_contact)

---
 .../com_weblinks/tmpl/category/default.php    | 11 ++-
 .../tmpl/category/default_children.php        | 77 ++++++++-----------
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/components/com_weblinks/tmpl/category/default.php b/src/components/com_weblinks/tmpl/category/default.php
index 0c6a3dd..a5990da 100644
--- a/src/components/com_weblinks/tmpl/category/default.php
+++ b/src/components/com_weblinks/tmpl/category/default.php
@@ -9,5 +9,12 @@
 
 defined('_JEXEC') or die;
 
-$this->subtemplatename = 'items';
-echo JLayoutHelper::render('joomla.content.category_default', $this);
+use Joomla\CMS\Layout\LayoutHelper;
+
+?>
+<div class="com-weblinks-category">
+	<?php
+	$this->subtemplatename = 'items';
+	echo LayoutHelper::render('joomla.content.category_default', $this);
+	?>
+</div>
\ No newline at end of file
diff --git a/src/components/com_weblinks/tmpl/category/default_children.php b/src/components/com_weblinks/tmpl/category/default_children.php
index 24e94ce..6cb5b97 100644
--- a/src/components/com_weblinks/tmpl/category/default_children.php
+++ b/src/components/com_weblinks/tmpl/category/default_children.php
@@ -14,49 +14,40 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
 
-$class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
-<ul>
-<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
-	<?php
-	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
-	if (!isset($this->children[$this->category->id][$id + 1]))
-	{
-		$class = ' class="last"';
-	}
-	?>
-	<li<?php echo $class; ?>>
-		<?php $class = ''; ?>
-			<span class="item-title"><a href="<?php echo Route::_(RouteHelper::getCategoryRoute($child->id));?>">
-				<?php echo $this->escape($child->title); ?></a>
-			</span>
+    <ul class="com-weblinks-category__children list-striped list-condensed">
+		<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+			<?php if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : ?>
+                <li>
+                    <h4 class="item-title">
+                        <a href="<?php echo Route::_(RouteHelper::getCategoryRoute($child->id, $child->language)); ?>">
+							<?php echo $this->escape($child->title); ?>
+                        </a>
 
-			<?php if ($this->params->get('show_subcat_desc') == 1) :?>
-			<?php if ($child->description) : ?>
-				<div class="category-desc">
-					<?php echo HTMLHelper::_('content.prepare', $child->description, '', 'com_weblinks.category'); ?>
-				</div>
+						<?php if ($this->params->get('show_cat_items') == 1) : ?>
+                            <span class="badge bg-info float-end" title="<?php echo Text::_('COM_WEBLINKS_CAT_NUM'); ?>"><?php echo $child->numitems; ?></span>
+						<?php endif; ?>
+                    </h4>
+
+					<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+						<?php if ($child->description) : ?>
+                            <div class="category-desc">
+								<?php echo HTMLHelper::_('content.prepare', $child->description, '', 'com_weblinks.category'); ?>
+                            </div>
+						<?php endif; ?>
+					<?php endif; ?>
+
+					<?php if (count($child->getChildren()) > 0 ) :
+						$this->children[$child->id] = $child->getChildren();
+						$this->category = $child;
+						$this->maxLevel--;
+						echo $this->loadTemplate('children');
+						$this->category = $child->getParent();
+						$this->maxLevel++;
+					endif; ?>
+                </li>
 			<?php endif; ?>
-			<?php endif; ?>
-
-			<?php if ($this->params->get('show_cat_num_links') == 1) :?>
-			<dl class="weblink-count"><dt>
-				<?php echo Text::_('COM_WEBLINKS_NUM'); ?></dt>
-				<dd><?php echo $child->numitems; ?></dd>
-			</dl>
-		<?php endif; ?>
-
-			<?php if (count($child->getChildren()) > 0 ) :
-				$this->children[$child->id] = $child->getChildren();
-				$this->category = $child;
-				$this->maxLevel--;
-				echo $this->loadTemplate('children');
-				$this->category = $child->getParent();
-				$this->maxLevel++;
-			endif; ?>
-		</li>
-	<?php endif; ?>
-	<?php endforeach; ?>
-	</ul>
-<?php endif;
+		<?php endforeach; ?>
+    </ul>
+<?php endif; ?>