refactor(widget): taxonomy widget (#763)

* Add link to navbar sections and refactor names * Prevent duplicate tags and categories information * Add style to the widget links * refactor: add `taxonomy` widget Replaces `categories` and `tag-cloud` widget. * style: remove unused `font_size_{{ .Count }}` in `taxonomy` widget --------- Co-authored-by: Jimmy Cai <hi@jimmycai.com>
2023-08-27 12:26:53 -04:00 · 2023-08-27 12:26:53 -04:00 · 4be110e540
commit 4be110e540
parent 5063e8f0b8
33 changed files with 50 additions and 141 deletions
--- a/assets/scss/partials/widgets.scss
+++ b/assets/scss/partials/widgets.scss
@ -65,3 +65,11 @@
        }
    }
 }
+
+/* Color for widget titles */
+.widget-title a.widget-link {
+    color: var(--accent-color);
+    &:hover {
+        color: var(--accent-color-darker);
+    }
+}
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@ -74,16 +74,20 @@ type = "archives"
 limit = 5

 [[widgets.homepage]]
-type = "categories"
+type = "taxonomy"

 [widgets.homepage.params]
 limit = 10
+type = "tags"
+icon = "tag"

 [[widgets.homepage]]
-type = "tag-cloud"
+type = "taxonomy"

 [widgets.homepage.params]
 limit = 10
+type = "categories"
+icon = "categories"

 [[widgets.page]]
 type = "toc"
--- a/i18n/ar.yaml
+++ b/i18n/ar.yaml
@ -29,12 +29,6 @@ widget:
        title: الارشيفات
        more: اكثر

-    tagCloud:
-        title: وسوم
-
-    categoriesCloud:
-        title: التصنيفات
-
 search:
    title: بحث
    placeholder: اكتب...
--- a/i18n/bn.yaml
+++ b/i18n/bn.yaml
@ -35,10 +35,6 @@ widget:
    archives:
        title: আর্কাইভ
        more: আরও
-    tagCloud:
-        title: ট্যাগ
-    categoriesCloud:
-        title: বিভাগ

 search:
    title: অনুসন্ধান
--- a/i18n/ca.yaml
+++ b/i18n/ca.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Arxiu
        more: Més
-    tagCloud:
-        title: Etiquetes
-    categoriesCloud:
-        title: Categories

 search:
    title: Cerca
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Archiv
        more: Weitere
-    tagCloud:
-        title: Schlagwörter
-    categoriesCloud:
-        title: Kategorien

 search:
    title: Suche
--- a/i18n/el.yaml
+++ b/i18n/el.yaml
@ -28,8 +28,6 @@ widget:
    archives:
        title: Αρχειο
        more: Περισσότερα
-    tagCloud:
-        title: Tags

 search:
    title: Αναζήτηση
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@ -31,10 +31,6 @@ widget:
    archives:
        title: Archives
        more: More
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categories

 search:
    title: Search
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Archivo
        more: Más
-    tagCloud:
-        title: Etiquetas
-    categoriesCloud:
-        title: Categorías

 search:
    title: Búsqueda
--- a/i18n/fa.yaml
+++ b/i18n/fa.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: آرشیو
        more: بیشتر
-    tagCloud:
-        title: تگ ها
-    categoriesCloud:
-        title: دسته بندی

 search:
    title: جستجو
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@ -28,8 +28,6 @@ widget:
    archives:
        title: Archives
        more: Autres
-    tagCloud:
-        title: Mots clés

 search:
    title: Rechercher
--- a/i18n/hu.yaml
+++ b/i18n/hu.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Archívum
        more: Több
-    tagCloud:
-        title: Cimkék
-    categoriesCloud:
-        title: Kategóriák

 search:
    title: Keresés
--- a/i18n/id.yaml
+++ b/i18n/id.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Arsip
        more: Lebih
-    tagCloud:
-        title: Tag
-    categoriesCloud:
-        title: Kategori

 search:
    title: Cari
--- a/i18n/it.yaml
+++ b/i18n/it.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Archivi
        more: Di più
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categorie

 search:
    title: Cerca
--- a/i18n/ja.yaml
+++ b/i18n/ja.yaml
@ -17,10 +17,6 @@ widget:
    archives:
        title: アーカイブ
        more: さらに見る
-    tagCloud:
-        title: タグ
-    categoriesCloud:
-        title: カテゴリ

 search:
    title: 検索
--- a/i18n/ko.yaml
+++ b/i18n/ko.yaml
@ -29,12 +29,6 @@ widget:
        title: 보관함
        more: 더보기

-    categoriesCloud:
-        title: 카테고리
-            
-    tagCloud:
-        title: 태그
-
 search:
    title: 검색
    placeholder: 검색어를 입력하세요...
--- a/i18n/nl.yaml
+++ b/i18n/nl.yaml
@ -23,10 +23,6 @@ widget:
    archives:
        title: Archief
        more: Meer
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categorie

 search:
    title: Zoeken
--- a/i18n/pl.yaml
+++ b/i18n/pl.yaml
@ -34,11 +34,6 @@ widget:
    archives:
        title: Archiwum
        more: Więcej
-    tagCloud:
-        title: Tagi
-
-    categoriesCloud:
-        title: Kategorie

 search:
    title: Szukaj
--- a/i18n/pt-br.yaml
+++ b/i18n/pt-br.yaml
@ -29,12 +29,6 @@ widget:
        title: Arquivos
        more: Mais

-    tagCloud:
-        title: Tags
-
-    categoriesCloud:
-        title: Categorias
-
 search:
    title: Busca
    placeholder: Digite algo...
--- a/i18n/pt-pt.yaml
+++ b/i18n/pt-pt.yaml
@ -45,12 +45,6 @@ widget:
            other: Arquivos
        more:
            other: Mais
-    tagCloud:
-        title:
-            other: Tags
-    categoriesCloud:
-        title:
-            other: Categorias

 search:
    title:
--- a/i18n/ru.yaml
+++ b/i18n/ru.yaml
@ -30,8 +30,6 @@ widget:
    archives:
        title: Архивы
        more: Ещё
-    tagCloud:
-        title: Теги

 search:
    title: Поиск
--- a/i18n/th.yaml
+++ b/i18n/th.yaml
@ -28,8 +28,6 @@ widget:
    archives:
        title: เนื้อหาที่เก็บถาวรแล้ว
        more: อื่นๆ นอกจากนี้
-    tagCloud:
-        title: แท็ก

 search:
    title: ค้นหา
--- a/i18n/tr.yaml
+++ b/i18n/tr.yaml
@ -23,8 +23,6 @@ widget:
    archives:
        title: Arşiv
        more: Daha fazla
-    tagCloud:
-        title: Etiketler

 search:
    title: Arama
--- a/i18n/uk.yaml
+++ b/i18n/uk.yaml
@ -29,8 +29,6 @@ widget:
    archives:
        title: Архіви
        more: Більше
-    tagCloud:
-        title: Теґи

 search:
    title: Пошук
--- a/i18n/vi.yaml
+++ b/i18n/vi.yaml
@ -48,14 +48,6 @@ widget:
    more:
      other: Còn nữa

-  tagCloud:
-    title:
-      other: Nhãn dán
-
-  categoriesCloud:
-    title:
-      other: Chuỗi bài
-
 search:
  title:
    other: Tìm kiếm
--- a/i18n/zh-cn.yaml
+++ b/i18n/zh-cn.yaml
@ -17,10 +17,6 @@ widget:
    archives:
        title: 归档
        more: 更多
-    tagCloud:
-        title: 标签云
-    categoriesCloud:
-        title: 分类

 search:
    title: 搜索
--- a/i18n/zh-hk.yaml
+++ b/i18n/zh-hk.yaml
@ -28,10 +28,6 @@ widget:
    archives:
        title: Archives
        more: 更多
-    tagCloud:
-        title: Tags
-    categoriesCloud:
-        title: Categories

 search:
    title: 搜尋
--- a/i18n/zh-tw.yaml
+++ b/i18n/zh-tw.yaml
@ -29,10 +29,6 @@ widget:
    archives:
        title: 紀錄
        more: 更多
-    tagCloud:
-        title: 標籤雲
-    categoriesCloud:
-        title: 分類

 search:
    title: 搜尋
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -11,7 +11,7 @@
        <div class="section-card">
            <div class="section-details">
                <h3 class="section-count">{{ T "list.page" (len .Pages) }}</h3>
-                <h1 class="section-term">{{ .Title }}</h1>
+                <h1 class="section-term">{{ default (strings.FirstUpper .Type) .Title }}</h1>
                {{ with .Params.description }}
                    <h2 class="section-description">{{ . }}</h2>
                {{ end }}
--- a/layouts/partials/widget/archives.html
+++ b/layouts/partials/widget/archives.html
@ -7,7 +7,9 @@
        <div class="widget-icon">
            {{ partial "helper/icon" "infinity" }}
        </div>
-        <h2 class="widget-title section-title">{{ T "widget.archives.title" }}</h2>
+        <h2 class="widget-title section-title">
+            <a class="widget-link" href="{{ $archivesPage.RelPermalink }}">{{ T "widget.archives.title" }}</a>
+        </h2>

        {{ $pages := where $context.Site.RegularPages "Type" "in" $context.Site.Params.mainSections }}
        {{ $archives := $pages.GroupByDate "2006" }}
--- a/layouts/partials/widget/categories.html
+++ b/layouts/partials/widget/categories.html
@ -1,16 +0,0 @@
-{{- $context := .Context -}}
-{{- $limit := default 10 .Params.limit -}}
-<section class="widget tagCloud">
-    <div class="widget-icon">
-        {{ partial "helper/icon" "categories" }}
-    </div>
-    <h2 class="widget-title section-title">{{ T "widget.categoriesCloud.title" }}</h2>
-
-    <div class="tagCloud-tags">
-        {{ range first $limit $context.Site.Taxonomies.categories.ByCount }}
-            <a href="{{ .Page.RelPermalink }}" class="font_size_{{ .Count }}">
-                {{ .Page.Title }}
-            </a>
-        {{ end }}
-    </div>
-</section>
--- a/layouts/partials/widget/tag-cloud.html
+++ b/layouts/partials/widget/tag-cloud.html
@ -1,16 +0,0 @@
-{{- $context := .Context -}}
-{{- $limit := default 10 .Params.limit -}}
-<section class="widget tagCloud">
-    <div class="widget-icon">
-        {{ partial "helper/icon" "tag" }}
-    </div>
-    <h2 class="widget-title section-title">{{ T "widget.tagCloud.title" }}</h2>
-
-    <div class="tagCloud-tags">
-        {{ range first $limit $context.Site.Taxonomies.tags.ByCount }}
-            <a href="{{ .Page.RelPermalink }}" class="font_size_{{ .Count }}">
-                {{ .Page.Title }}
-            </a>
-        {{ end }}
-    </div>
-</section>
--- a/layouts/partials/widget/taxonomy.html
+++ b/layouts/partials/widget/taxonomy.html
@ -0,0 +1,32 @@
+{{- $query := first 1 (where (where .Context.Site.Pages "Kind" "taxonomy") "Type" .Params.type) -}}
+{{- $context := .Context -}}
+{{- $limit := default 10 .Params.limit -}}
+{{- $hideInTaxonomyPage := default true .Params.hideInTaxonomyPage -}}
+{{- if $query -}}
+    {{- $taxonomyPage := index $query 0 -}}
+    {{- $isTaxonomyPage := eq .Context $taxonomyPage -}}
+    {{- if not (and $isTaxonomyPage $hideInTaxonomyPage) -}}
+        <section class="widget tagCloud">
+            <div class="widget-icon">
+                {{- partial "helper/icon" (default "tag" .Params.icon) -}}
+            </div>
+            <h2 class="widget-title section-title">
+                <a class="widget-link" href="{{ $taxonomyPage.RelPermalink }}">
+                    {{- default $taxonomyPage.Title .Params.title -}}
+                </a>
+            </h2>
+
+            <div class="tagCloud-tags">
+                {{- $pages := index $context.Site.Taxonomies .Params.type -}}
+                {{- $pagesSorted := $pages.ByCount -}}
+                {{- range first $limit $pagesSorted -}}
+                    <a href="{{ .Page.RelPermalink }}">
+                        {{- .Page.Title -}}
+                    </a>
+                {{- end -}}
+            </div>
+        </section>
+    {{- end -}}
+{{- else -}}
+    {{- warnf "Taxonomy [%s] not found." .Params.type -}}
+{{- end -}}