From e157088d21d4f898340e0a2d6f0479a813920419 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 24 Jun 2020 07:17:23 +0200
Subject: [PATCH] improve pagination and taxonomy terms listing

---
 assets/sass/_litera-soft.scss    |  2 ++
 layouts/partials/pagination.html |  2 +-
 layouts/partials/sidebar.html    |  7 ++-----
 layouts/taxonomy/list.html       |  9 ++-------
 layouts/taxonomy/terms.html      | 33 +++++++++++++++++++-------------
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/assets/sass/_litera-soft.scss b/assets/sass/_litera-soft.scss
index 791f42a..e121e8f 100755
--- a/assets/sass/_litera-soft.scss
+++ b/assets/sass/_litera-soft.scss
@@ -41,6 +41,8 @@ $dark:          $gray-800 !default;
 
 $yiq-contrasted-threshold:  190 !default;
 
+$card-cap-bg:   $gray-100;
+
 // Body
 
 $body-color:                $gray-800 !default;
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index e717987..1def6b6 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -19,4 +19,4 @@
       </ul>
     </div>
     <div class="col-md-4"> </div>
-{{end}}
+{{ end }}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 2b2e913..425a330 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -5,11 +5,8 @@
          src="{{ .Site.BaseURL}}img/{{ .Params.img }}" alt="{{ .Params.title }}">
     {{ else if .Params.teaser }}
     <div class="card mt-3">
-      <div class="card-header">
-        <h4 class="card-title">{{ i18n "Teaser" }}</h4>
-      </div>
-      <div class="card-body">
-        <p class="card-text">{{ .Params.teaser }}</p>
+      <div class="card-body bg-light">
+        <h4 class="card-text">{{ .Params.teaser }}</h4>
       </div>
     </div>
     {{ else if .Site.Params.defaultImage }}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 30f0456..266f1a0 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -5,14 +5,9 @@
   <div class="row">
     <div class="col-md-12">
       <div class="card mt-3 mb-3">
-        <div class="card-header">
-          <h2 class="card-title">{{i18n "topic"}}: {{ .Title }}</h2>
+        <div class="card-body bg-light">
+          <h2 class="card-text">{{i18n "topic"}}: {{ .Title }}</h2>
         </div>
-        {{ with .Content }}
-        <div class="card-body">
-          <p class="card-text">{{ . }}</p>
-        </div>
-        {{ end }}
       </div>
     </div>
   </div>
diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html
index 66d52de..7dbbb7d 100644
--- a/layouts/taxonomy/terms.html
+++ b/layouts/taxonomy/terms.html
@@ -4,21 +4,28 @@
 
   <div class="row">
     <div class="col-md-12">
-    <div class="card mt-3 mb-3">
-      <div class="card-header">
-        <h2 class="card-title">{{.Title}}</h2>
-      </div>
-      <div  class="card-body">
-        <ul class="card-text list-inline">
-          {{ range .Data.Terms.Alphabetical }}
-          <li>
-            <a href="{{ .Page.Permalink }}"> 
-              {{ .Page.Title }} </a> ({{ .Count }})</li>
-          {{ end }}
-        </ul>
+      <div class="card mt-3">
+        <div class="card-body bg-light">
+          <h2 class="card-text"> {{ .Title }}</h2>
+        </div>
       </div>
     </div>
-
   </div>
 
+  <div class="row">
+    {{ range .Data.Terms.ByCount }}
+    <div class="col-md-4 mt-3">
+      <div class="card">
+        <a href="{{ .Page.Permalink }}" 
+           class="list-group-item d-flex justify-content-between align-items-center text-decoration-none">
+          {{ .Page.Title }}
+          <span class="badge badge-light badge-pill">{{ .Count }}</span>
+        </a>
+      </div>
+    </div>
+    {{ end }}
+  </div>
+
+</div>
+
 {{ end }}