From 5979be2db6b7aacd335e4c893cb2d56f04e9b7a8 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Mon, 8 Jun 2020 14:54:08 +0200
Subject: [PATCH] minor rearrangements and fixes

---
 .gitignore                    |  2 +-
 archetypes/default.md         | 13 ++++++++++---
 i18n/de.yaml                  | 30 ++++++++++++++++++++----------
 i18n/en.yaml                  | 30 ++++++++++++++++++++----------
 layouts/partials/card.html    |  4 ++--
 layouts/partials/footer.html  |  2 +-
 layouts/partials/header.html  |  4 ++--
 layouts/partials/sidebar.html |  8 ++++----
 layouts/taxonomy/list.html    |  2 +-
 9 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8fc9767..20fc099 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 public
 resources
 themes
-static/images
+static/img
diff --git a/archetypes/default.md b/archetypes/default.md
index 00e77bd..8241bb1 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,6 +1,13 @@
 ---
-title: "{{ replace .Name "-" " " | title }}"
-date: {{ .Date }}
-draft: true
+title:  "{{ replace .Name "-" " " | title }}"
+summary: ""
+img:
+domains: []
+topics: []
+date:   {{ .Date }}
+author: 
+draft:  true
+weight: 10
 ---
 
+### First Headline
diff --git a/i18n/de.yaml b/i18n/de.yaml
index df72105..956f97b 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -1,5 +1,5 @@
 #
-# en.yaml 2020-03-08
+# en.yaml 2020-05-10
 #
 
 about:
@@ -8,21 +8,21 @@ about:
 author:
   other: Autor
 
-categories:
-  other: Kategorien
-
-Categories:
-  other: Kategorien
-
-category:
-  other: Kategorie
-
 contact:
   other: Kontakt
 
 dateFormat:
   other: 02.01.2006
 
+domains:
+  other: Bereiche
+
+Domains:
+  other: Bereiche
+
+domains:
+  other: Bereich
+
 next:
   other: Weiter
 
@@ -31,3 +31,13 @@ prev:
 
 recentArticles:
   other: Aktuelle Artikel
+
+topics:
+  other: Themen
+
+Topics:
+  other: Themen
+
+topic:
+  other: Thema
+
diff --git a/i18n/en.yaml b/i18n/en.yaml
index c341fea..69e709b 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -1,5 +1,5 @@
 #
-# en.yaml 2020-03-08
+# en.yaml 2020-05-10
 #
 
 about:
@@ -8,15 +8,6 @@ about:
 author:
   other: Author
 
-categories:
-  other: Categories
-
-Categories:
-  other: Categories
-
-category:
-  other: Category
-
 contact:
   other: Contact
 
@@ -24,6 +15,15 @@ dateFormat:
   other: Jan 02, 2006
 #  other: 2006-01-02
 
+domains:
+  other: Domains
+
+Domains:
+  other: Domains
+
+domain:
+  other: Domain
+
 next:
   other: Next
 
@@ -32,3 +32,13 @@ prev:
 
 recentArticles:
   other: Recent Posts
+
+topics:
+  other: Topics
+
+Topics:
+  other: Topics
+
+topic:
+  other: Topic
+
diff --git a/layouts/partials/card.html b/layouts/partials/card.html
index 823f1f8..3e1c7b4 100644
--- a/layouts/partials/card.html
+++ b/layouts/partials/card.html
@@ -4,9 +4,9 @@
     <div class="panel panel-default">
       
       {{ if .Params.img }}
-        <img width="100%" src="{{ .Site.BaseURL }}images/{{ .Params.img }}" alt="{{ .Title }}">
+        <img width="100%" src="{{ .Site.BaseURL }}img/{{ .Params.img }}" alt="{{ .Title }}">
       {{ else if .Site.Params.defaultImage }}
-        <img width="100%" src="{{ .Site.BaseURL }}images/{{ .Site.Params.defaultImage }}" alt="{{ .Site.Title }}">
+        <img width="100%" src="{{ .Site.BaseURL }}img/{{ .Site.Params.defaultImage }}" alt="{{ .Site.Title }}">
       {{ end }}
 
       <div class="panel-body">
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 4aa3070..194aa96 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -11,7 +11,7 @@
 
       <div class="col-md-4 text-center mt25" >
         {{ with .Site.Params.builtBy }}
-          <a target="_blank" href="{{.link}}"><img src="/{{.Site.BaseURL}}images/{{.image}}" alt="{{.name}}"></a>
+          <a target="_blank" href="{{.link}}"><img src="/{{.Site.BaseURL}}img/{{.image}}" alt="{{.name}}"></a>
         {{ end }}
       </div>
 
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index fcf6fad..f6c60fb 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -9,14 +9,14 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a href="{{ .Site.BaseURL }}"><img src="{{.Site.BaseURL}}images/{{.Site.Params.logo}}" alt="{{.Site.Title}}"></a>
+      <a href="{{ .Site.BaseURL }}"><img src="{{.Site.BaseURL}}img/{{.Site.Params.logo}}" alt="{{.Site.Title}}"></a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse " id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav navbar-right">
         <li><a href="{{ .Site.BaseURL }}pages/about/">{{i18n "about"}}</a></li>
-        <li><a href="{{ .Site.BaseURL }}categories/">{{i18n "categories"}}</a></li>
+        <li><a href="{{ .Site.BaseURL }}topics/">{{i18n "topics"}}</a></li>
         <li><a href="{{ .Site.BaseURL }}pages/contact/">{{i18n "contact"}}</a></li>
       </ul>
     </div><!-- /.navbar-collapse -->
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index a806fed..02f4b6d 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -2,17 +2,17 @@
 
     <div class="post-img">
        {{ if .Params.img }}
-        <img width="600" src="{{ .Site.BaseURL}}images/{{ .Params.img }}" alt="{{ .Params.title }}">
+        <img width="600" src="{{ .Site.BaseURL}}img/{{ .Params.img }}" alt="{{ .Params.title }}">
         {{ else }}
-        <img width="600" src="{{ .Site.BaseURL }}images/{{ .Site.Params.defaultImage }}" alt="matrix">
+        <img width="600" src="{{ .Site.BaseURL }}img/{{ .Site.Params.defaultImage }}" alt="matrix">
         {{ end }}
     </div>
         
 
-    {{ $taxo := "categories" }}
+    {{ $taxo := "topics" }}
     {{ if .Param $taxo }}
     <div class="mt10 sb-box">
-      <h3>{{i18n "categories"}}</h3>  
+      <h3>{{i18n "topics"}}</h3>  
       <ul id="{{ $taxo }}">
         {{ range .Param $taxo }}
           {{ $name := . }}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 64646e2..e571b33 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -3,7 +3,7 @@
 <div class="home">
 
   <div class="row">
-        <h1 class="site-title">{{i18n "category"}}: {{.Title | title}}</h1>
+        <h1 class="site-title">{{i18n "topic"}}: {{.Title | title}}</h1>
         <br />
   </div>