From 3bc0270bee4531b9dc2bfd1949f1084ee7eb180e Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 20 Jun 2020 08:15:08 +0200
Subject: [PATCH] improvements and simplifications

---
 archetypes/default.md         |  1 +
 assets/sass/main.scss         |  2 --
 i18n/de.yaml                  |  2 +-
 layouts/_default/baseof.html  |  2 +-
 layouts/partials/header.html  | 14 ++++++--------
 layouts/partials/sidebar.html | 15 ++++++---------
 layouts/taxonomy/terms.html   | 31 ++++++++++++++++++-------------
 7 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/archetypes/default.md b/archetypes/default.md
index a0c4b6f..edf3f0c 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -2,6 +2,7 @@
 title:  "{{ replace .Name "-" " " | title }}"
 summary: ""
 img:
+teaser: ""
 domains: []
 topics: []
 date:   {{ .Date }}
diff --git a/assets/sass/main.scss b/assets/sass/main.scss
index b8bfdfa..4692bc5 100644
--- a/assets/sass/main.scss
+++ b/assets/sass/main.scss
@@ -1,5 +1,3 @@
-@import url("https://fonts.googleapis.com/css?family=Raleway:400,700");
-
 // Import partials from `sass_dir` (defaults to `_sass`)
 @import
         "litera-soft",
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 52ec393..6a508f9 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -1,5 +1,5 @@
 #
-# en.yaml 2020-05-10
+# de.yaml 2020-06-19
 #
 
 about:
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a5c0ff5..abb4be8 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -9,7 +9,7 @@
   <link rel="icon" href="{{ .Site.BaseURL }}img/{{ .Site.Params.favicon }}">
   {{ end }}
 
-  <title>{{ .Title}}{{if .IsPage}} - {{.Site.Title}}{{ end }}</title>
+  <title>{{ .Title}}{{if .IsPage}} - {{ .Site.Title }}{{ end }}</title>
 
   {{ $main := resources.Get "sass/main.scss" | toCSS | minify }}
   <link rel="stylesheet" href="{{ $main.RelPermalink }}">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 097ad43..4779cb8 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -10,15 +10,13 @@
 
   <div class="collapse navbar-collapse" id="navbarColor03">
     <ul class="navbar-nav mr-auto pull-right">
+      {{ $currentPage := . }}
+      {{ range .Site.Menus.main }}
       <li class="nav-item">
-        <a class="nav-link"
-           href="{{ .Site.BaseURL }}pages/about/">{{i18n "about"}}</a></li>
-      <li class="nav-item">
-        <a class="nav-link"
-           href="{{ .Site.BaseURL }}topics/">{{i18n "topics"}}</a></li>
-      <li class="nav-item">
-        <a class="nav-link"
-           href="{{ .Site.BaseURL }}pages/contact/">{{i18n "contact"}}</a></li>
+        <a href="{{ .URL }}"
+           class="nav-link{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}"
+           title="{{ .Title  }}">{{ .Name }}</a></li>
+      {{ end }}
     </ul>
   </div>
 
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 7bdc7f8..609d054 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -17,20 +17,17 @@
          src="{{ .Site.BaseURL }}img/{{ .Site.Params.defaultImage }}" alt="dummy">
     {{ end }}
 
-    {{ $taxo := "topics" }}
-    {{ if .Param $taxo }}
+    {{ $site := .Site }}
+    {{ with .Params.Topics }}
     <div class="card mt-3">
       <div class="card-header">
         <h4>{{i18n "topics"}}</h4>
       </div>
       <div class="card-body">
-        <ul id="{{ $taxo }}" class="list-inline">
-          {{ range .Param $taxo }}
-            {{ $name := . }}
-            {{ with $.Site.GetPage (printf "/%s/%s" $taxo ($name | urlize)) }}
-              <li><a href="{{ .Permalink }}"
-                     class="text-decoration-none">{{ $name }}</a></li>
-            {{ end }}
+        <ul id="topics" class="list-inline">
+          {{ range . }}
+          {{ $page := $site.GetPage (printf "/topics/%s" .) }}
+          <li><a href="{{ $page.Permalink }}">{{ $page.Title }}</a> </li>
           {{ end }}
         </ul>
       </div>
diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html
index c97fb06..66d52de 100644
--- a/layouts/taxonomy/terms.html
+++ b/layouts/taxonomy/terms.html
@@ -1,19 +1,24 @@
 {{ define "main" }}
 
-<div id="content">
+<div id="home">
+
+  <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>
+    </div>
 
-  <div class="site-header-content">
-    <h1 class="site-title">{{i18n .Title}}</h1>
-    <ul class="site-description">
-      {{ $data := .Data }}
-      {{ range $key, $value := .Data.Terms.Alphabetical }}
-      <li>
-        <a href="{{ $.Site.BaseURL }}{{ $data.Plural }}/{{ $value.Name | urlize }}"> 
-          {{ $value.Name }} </a> ({{ $value.Count }})</li>
-      {{ end }}
-    </ul>
   </div>
 
-</div>
-
 {{ end }}