Merge branch 'dev' for version v0.6.0v0.6.0

8 files changed, 11 insertions, 8 deletions

diff --git a/README.md b/README.md
index 10c3941..6cd7434 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,9 @@ theme = "hamburg"
     customCSS = ['hamburg.css']
     # Show this very user-friendly and absolutely not annoying GDPR notice at the bottom of the page
     ShowGDPRNotice = true
+	subtitle = "The great example site of the hugo-hamburg-theme"
+	# Since 0.57.0 there's the concept of "main sections". The files for the section "posts" are in "./content/posts/".
+	mainSections = ["posts"]
 
 [languages]
     [languages.en]
@@ -71,7 +74,7 @@ theme = "hamburg"
 ```
 
 ### Additional `vienna`-theme params
-There're some other params from the [original vienna theme](https://github.com/keichi/vienna) I've not used so far. They probably work, but there's no guarantee:
+There're some other params from the [original vienna theme](https://github.com/keichi/vienna) I've not used so far. Most of them might **not work** anymore, so there's no guarantee:
 ```toml
 [params]
     # Social accounts. Link to these accounts are displayed in the header and
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 11802d8..5c8ab46 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -14,3 +14,4 @@ theme = "hamburg"
 
 [params]
 	subtitle = "The great example site of the hugo-hamburg-theme"
+	mainSections = ["posts"]
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9ae4d8d..05fbe39 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,7 @@
 {{ partial "header.html" . }}
 <section class="article-list">
   <h1>{{ .Title }}</h1>
-  {{ range .Data.Pages }}
+  {{ range .Pages }}
     <div class="delimiter"></div>
     {{ .Render "li" }}
   {{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 3fdea4d..e7b1998 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -6,7 +6,7 @@
       {{ i18n "allTags" }}
     </a>
   </div>
-  {{ range .Data.Pages }}
+  {{ range .Pages }}
     <div class="delimiter"></div>
     {{ .Render "li" }}
   {{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index a4d5a24..801323a 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -3,7 +3,7 @@
   <h1>{{ .Title }}</h1>
   {{ $data := .Data }}
   <div class="list-group">
-    {{ range $key, $value := .Data.Pages }}
+	{{ range $key, $value := .Pages }}
       <a class="list-group-item" href="{{ $value.URL }}">
         {{ $value.Name }}
       </a>
diff --git a/layouts/index.html b/layouts/index.html
index cf1dd7c..f24966c 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,6 +1,6 @@
 {{ partial "header.html" . }}
 <div class="article-list">
-  {{ range $index, $page := where .Data.Pages "Type" "posts" }}
+  {{ range $index, $page := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
     {{ if ne $index 0 }}
       <div class="delimiter"></div>
     {{ end }}
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html
index 22fcaf4..6ab3a25 100644
--- a/layouts/shortcodes/note.html
+++ b/layouts/shortcodes/note.html
@@ -1,5 +1,3 @@
-{{ $note := (index .Params 0) }}
-
 <div class="note note-border">
-	{{ $note | markdownify }}
+	{{ .Inner | markdownify }}
 </div>
diff --git a/theme.toml b/theme.toml
index 5992857..10502cd 100644
--- a/theme.toml
+++ b/theme.toml
@@ -5,6 +5,7 @@ description = "Simple and clean blog theme for hugo"
 homepage = "https://github.com/hauke96/hugo-theme-hamburg"
 tags = ["blog", "tags", "bootstrap", "multilingual", "clean", "minimal", "disqus", "font awesome", "mobile"]
 repo = "https://github.com/hauke96/hugo-theme-hamburg"
+min_version = "0.57"
 
 [author]
 	name = "Hauke Stieler"