From 50ead13dad8f7291c5e2bdb76c5c9d5df399fc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20Gerg=C5=91?= <gergo85@gmail.com>
Date: Thu, 14 Jul 2022 21:44:17 +0200
Subject: [PATCH] Improved the Tag list component

---
 components/Tags.php         | 17 ++++++++++-------
 components/tags/default.htm |  6 ++----
 lang/en/lang.php            |  8 ++++----
 lang/hu/lang.php            |  8 ++++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/components/Tags.php b/components/Tags.php
index 2dcb3e0..428c578 100644
--- a/components/Tags.php
+++ b/components/Tags.php
@@ -32,8 +32,8 @@ public function defineProperties()
                 'showExternalParam' => false
             ],
             'tagPage' => [
-                'title'       => 'indikator.news::lang.settings.tag_page_title',
-                'description' => 'indikator.news::lang.settings.tag_page_description',
+                'title'       => 'indikator.news::lang.settings.tags_page_title',
+                'description' => 'indikator.news::lang.settings.tags_page_description',
                 'type'        => 'dropdown',
                 'default'     => ''
             ]
@@ -51,11 +51,14 @@ public function onRun()
         $news = Posts::where('status', 1)->where('published_at', '<=', date('Y-m-d H:i:00'))->get()->all();
 
         foreach ($news as $post) {
-            foreach ($post['tags'] as $tag) {
-                if (! in_array($tag, $tags)) {
-                    $tags[] = $tag;
-                }
-            }
+	    if ($post['tags'] !== null) {
+            	$post['tags'] = explode(',', $post['tags']);
+            	foreach ($post['tags'] as $tag) {
+                    if (! in_array($tag, $tags)) {
+                        $tags[] = $tag;
+                    }
+            	}
+	    }
         }
 
         usort($tags, function($item1, $item2) {
diff --git a/components/tags/default.htm b/components/tags/default.htm
index d3ed8d9..e028c94 100644
--- a/components/tags/default.htm
+++ b/components/tags/default.htm
@@ -1,10 +1,8 @@
-{% set tags = __SELF__.tags %}
-
 {% for tag in tags %}
     {% if loop.first %}
-        <ul>
+        <ul class="tags">
     {% endif %}
-            <li><a href="/{{ tagPage }}/{{ tag }}">{{ tag }}</a></li>
+            <li><a href="{{ tagPage }}/{{ tag }}">{{ tag }}</a></li>
     {% if loop.last %}
         </ul>
     {% endif %}
diff --git a/lang/en/lang.php b/lang/en/lang.php
index c5a1764..d0914f4 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -247,10 +247,10 @@
         'category_filter_description' => 'Enter a category slug or URL parameter to filter the posts by. Leave empty to show all posts.',
         'nested_category_posts_title' => 'Nested Posts',
         'nested_category_posts_description' => 'Display posts which are in a nested category.',
-        'tag_slug_title' => 'Tag slug',
-        'tag_slug_description' => 'Look up the tag using the supplied slug value. This property is used by the default component partial for marking the currently active tag.',
-        'tag_page_title' => 'Tag page',
-        'tag_page_description' => 'Name of the tag page file for the tag links. This property is used by the default component partial.',
+        'tags_slug_title' => 'Tag slug',
+        'tags_slug_description' => 'Look up the tag using the supplied slug value. This property is used by the default component partial for marking the currently active tag.',
+        'tags_page_title' => 'Tag page',
+        'tags_page_description' => 'Name of the tag page file for the tag links. This property is used by the default component partial.',
         'links' => 'Links'
     ],
     'sorting' => [
diff --git a/lang/hu/lang.php b/lang/hu/lang.php
index 0bc88bd..a917531 100644
--- a/lang/hu/lang.php
+++ b/lang/hu/lang.php
@@ -245,10 +245,10 @@
         'category_filter_description' => 'Adja meg a kategória webcímét, ami alapján szűrve lesznek a bejegyzések. Üresen hagyva minden bejegyzés meg fog jelenni.',
         'nested_category_posts_title' => 'Alkategória',
         'nested_category_posts_description' => 'Alkategóriához tartozó bejegyzések megjelenítése.',
-        'tag_slug_title' => 'Címke webcím',
-        'tag_slug_description' => '',
-        'tag_page_title' => 'Címke aloldal',
-        'tag_page_description' => 'Adja meg a címke fájl nevét. Ennek alapján lesznek generálva a címke linkek webcíme.',
+        'tags_slug_title' => 'Címke webcím',
+        'tags_slug_description' => '',
+        'tags_page_title' => 'Címke aloldal',
+        'tags_page_description' => 'Adja meg a címke fájl nevét. Ennek alapján lesznek generálva a címke linkek webcíme.',
         'links' => 'Linkek'
     ],
     'sorting' => [