Merge pull request #252 from gethinode/develop

Develop

README.md

@@ -116,7 +116,7 @@ Hinode is inspired by the following themes:
 
 ## Donate
 
-<a href="https://www.buymeacoffee.com/markdumay" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;"></a>
+<a href="https://www.buymeacoffee.com/markdumay" target="_blank" rel="noopener noreferrer"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;"></a>
 
 ## License
 

config/_default/languages.toml

@@ -8,10 +8,10 @@
     [en.params.head]
         tagline = "A Hugo Theme"
     [en.params.feature]
-        link = "/en/about"
+        link = "about"
         caption = "About"
     [en.params.footer]
-        license = "Licensed under Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank'>CC BY-NC-SA 4.0</a>)."
+        license = "Licensed under Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer'>CC BY-NC-SA 4.0</a>)."
         socialTitle = "Follow me"
         socialCaption = "I work on everything coding and tweet developer memes"
 # toml-docs-end lang-param
@@ -23,9 +23,9 @@
     [nl.params.head]
         tagline = "Een Hugo Thema"
     [nl.params.feature]
-        link = "/nl/over-mij"
+        link = "over-mij"
         caption = "Over mij"
     [nl.params.footer]
-        license = "Gelicenseerd onder Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank'>CC BY-NC-SA 4.0</a>)."
+        license = "Gelicenseerd onder Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer'>CC BY-NC-SA 4.0</a>)."
         socialTitle = "Volg mij"
         socialCaption = "Ik doe aan programmeren en tweet memes"

config/_default/menus/menus.en.toml

@@ -15,13 +15,13 @@
 
 [[main]]
   name = "Sample project"
-  url = "/en/projects/sample-project/"
+  url = "/projects/sample-project/"
   parent = "Projects"
   weight = 1
 
 [[main]]
   name = "Another project"
-  url = "/en/projects/another-project/"
+  url = "/projects/another-project/"
   parent = "Projects"
   weight = 2
 
@@ -61,13 +61,13 @@
 
 [[sample]]
   name = "Sample project"
-  url = "/en/projects/sample-project/"
+  url = "/projects/sample-project/"
   parent = "Projects"
   weight = 1
 
 [[sample]]
   name = "Another project"
-  url = "/en/projects/another-project/"
+  url = "/projects/another-project/"
   parent = "Projects"
   weight = 2
 # toml-docs-end sample-navigation

config/_default/menus/menus.nl.toml

@@ -15,13 +15,13 @@
 
 [[main]]
   name = "Voorbeeldproject"
-  url = "/nl/projecten/voorbeeldproject/"
+  url = "/projecten/voorbeeldproject/"
   parent = "Projecten"
   weight = 1
 
 [[main]]
   name = "Ander project"
-  url = "/nl/projecten/ander-project/"
+  url = "/projecten/ander-project/"
   parent = "Projecten"
   weight = 2
 
@@ -61,13 +61,13 @@
 
 [[sample]]
   name = "Voorbeeldproject"
-  url = "/nl/projecten/voorbeeldproject/"
+  url = "/projecten/voorbeeldproject/"
   parent = "Projecten"
   weight = 1
 
 [[sample]]
   name = "Ander project"
-  url = "/nl/projecten/ander-project/"
+  url = "/projecten/ander-project/"
   parent = "Projecten"
   weight = 2
 # toml-docs-end sample-navigation

config/_default/params.toml

@@ -40,6 +40,7 @@
         title = "Blog"
         sort = "date"
         reverse = true
+        nested = true
         cols = 3
         color = ""
         padding = "0"
@@ -53,6 +54,7 @@
         title = "Projects"
         sort = "title"
         reverse = false
+        nested = true
         cols = 1
         color = "body-tertiary"
         padding = "3"

content/en/blog/_index.md

@@ -1,4 +1,5 @@
 ---
 author: Mark Dumay
 title: Blog
+nested: true
 ---

content/nl/blog/bootstrap-elements.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Bootstrap elementen
+slug: bootstrap-elementen
 date: 2023-02-17
 description: Gebruik shortcodes om eenvoudig Bootstrap elementen toe te voegen.
 tags: ["bootstrap", "shortcode"]

content/nl/blog/first-post.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Eerste artikel
+slug: eerste-artikel
 date: 2022-10-01
 description: Dit is mijn eerste artikel.
 tags: ["blog"]

content/nl/blog/fourth-post.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Vierde artikel
+slug: vierde-artikel
 date: 2023-01-01
 description: Dit is mijn vierde artikel.
 tags: ["blog"]

content/nl/blog/second-post.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Tweede artikel
+slug: tweede-artikel
 date: 2022-11-01
 description: Dit is mijn tweede artikel.
 tags: ["blog"]

content/nl/blog/third-post.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Derde artikel
+slug: derde-artikel
 date: 2022-12-01
 description: Dit is mijn derde artikel.
 tags: ["blog"]

layouts/404.html

@@ -6,7 +6,7 @@
                 <p class="display-1 mt-3 fw-bold">404</p>
                 <p class="fs-3">{{ T "pageNotFoundTitle" }}</p>
             </span>
-            <p>{{ T "pageNotFound" }} <a href="{{ "/" | relURL }}">{{ T "pageNotFoundHome" }}</a>.</p>
+            <p>{{ T "pageNotFound" }} <a href="{{ "/" | relLangURL }}">{{ T "pageNotFoundHome" }}</a>.</p>
         </div>
     </div>
 {{ end }}

layouts/_default/list.html

@@ -1,8 +1,9 @@
 {{- define "main" -}}
     {{- partial "assets/section-list.html" (dict 
         "page" .
-        "section" .Section
+        "section" .Type
         "home" false
+        "nested" .Params.Nested
         "title" .Title
         "paginate" true)
     -}}

layouts/_default/single.html

@@ -17,14 +17,14 @@
         <div class="mt-3">
             <div class="d-none-dark">
                 {{ range (.GetTerms "tags") -}}
-                    <a class="btn btn-light btn-sm" href="{{ (path.Join .Page.RelPermalink) | relURL }}" role="button">{{ .LinkTitle }}</a>
+                    <a class="btn btn-light btn-sm" href="{{ (path.Join .Page.RelPermalink) | relLangURL }}" role="button">{{ .LinkTitle }}</a>
                     &nbsp;
                 {{ end -}}
             </div>
             
             <div class="d-none-light">
                 {{ range (.GetTerms "tags") -}}
-                    <a class="btn btn-outline-secondary btn-sm" href="{{ (path.Join .Page.RelPermalink) | relURL }}" role="button">{{ .LinkTitle }}</a>
+                    <a class="btn btn-outline-secondary btn-sm" href="{{ (path.Join .Page.RelPermalink) | relLangURL }}" role="button">{{ .LinkTitle }}</a>
                     &nbsp;
                 {{ end -}}
             </div>

layouts/docs/list.html

@@ -1,10 +0,0 @@
-<!-- Hugo considers all first-level directories to be a root section. As such, as "/en/docs/" is considered to be a
-     branch bundle, despite it not having an "_index.md" page. Being a branch bundle, Hugo uses a list template to
-    render the "/en/docs/" page. This overwrites the alias defined in "/en/docs/<ver>/getting-started/introduction/". 
-    
-    This empty list template is deliberately added to the "/layouts/docs/" directory to prevent Hugo from generating 
-    a list page for "/en/docs/" (all other nested sections). This enables the alias defined in 
-    "/en/docs/<version>/getting-started/introduction/".
-
-    See https://gohugo.io/content-management/sections/ for more details.
-    -->

layouts/index.html

@@ -18,6 +18,7 @@
             "page" $page 
             "section" $section 
             "home" true 
+            "nested" true 
             "moreTitle" $moreTitle
             "sectionURL" $sectionURL)
         -}}

layouts/partials/assets/card.html

@@ -60,7 +60,7 @@
 
         {{- range $index, $tag := first $maxTags ($page.GetTerms "tags") -}}
             {{- if gt $index 0 }} • {{ end -}}
-            <a href="{{ (path.Join $tag.Page.RelPermalink) | relURL }}" class="{{ $link }} tag-link" aria-label="tag: {{ $tag.LinkTitle }}">{{ $tag.LinkTitle }}</a>
+            <a href="{{ (path.Join $tag.Page.RelPermalink) | relLangURL }}" class="{{ $link }} tag-link" aria-label="tag: {{ $tag.LinkTitle }}">{{ $tag.LinkTitle }}</a>
         {{- end -}}
     </small></p>
 {{- end -}}

layouts/partials/assets/navbar.html

@@ -169,18 +169,18 @@
                     {{- $menu_item_url := $menu.URL | relLangURL -}}
                     {{- $page_url:= $page.RelPermalink | relLangURL -}}
                     {{- $active := hasPrefix $page_url $menu_item_url -}}
-                    
+
                     {{- $url := urls.Parse .URL -}}
                     {{- $baseurl := urls.Parse $.Site.Params.Baseurl -}}
                     {{- if .HasChildren -}}
                         <li class="nav-item dropdown">
-                            <a class="nav-link {{ if $active }}active{{ end }} dropdown-toggle" href="{{ .URL }}" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <a class="nav-link {{ if $active }}active{{ end }} dropdown-toggle" href="{{ .URL | relLangURL  }}" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                                 {{ if $active }}<span class="active">{{ .Name }}</span>{{ else }}{{ .Name }}{{ end }}
                             </a>
                             <ul class="dropdown-menu dropdown-menu-end">
                                 {{- range .Children -}}
-                                    {{- $child_active := eq $page_url .URL -}}
-                                    <li><a class="dropdown-item {{ if $child_active }}active{{ end }}" href="{{ .URL }}">{{ .Name }}</a></li>
+                                    {{- $child_active := eq $page_url (.URL | relLangURL) -}}
+                                    <li><a class="dropdown-item {{ if $child_active }}active{{ end }}" href="{{ .URL | relLangURL  }}">{{ .Name }}</a></li>
                                 {{- end -}}
                             </ul>
                         </li>
@@ -188,7 +188,7 @@
                         <li class="nav-item">
                             {{- $external := ne $url.Host $baseurl.Host -}}
                             <a class="nav-link {{ if $active }}active{{ end }}"
-                                href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if $external }}target="_blank" {{ end }}>
+                                href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if $external }}target="_blank" rel="noopener noreferrer" {{ end }}>
                                 {{- with $pre}}{{ . }}{{ end -}}
                                 <span {{if $active }} class="active"{{end}}>{{ .Name }}</span>
                                 {{- with $post}}{{ . }}{{ end -}}

layouts/partials/assets/section-list.html

@@ -8,7 +8,7 @@
 {{- $title := .title -}}
 {{- $moreTitle := .moreTitle -}}
 {{- $sectionURL := .sectionURL -}}
-
+{{- $nested := .nested | default true -}}
 {{- $paginate := true -}}
 {{- $sort := "date" -}}
 {{- $order := "desc" -}}
@@ -32,6 +32,7 @@
     {{- with index . "title" }}{{ $title = or $.title . }}{{ end -}}
     {{- with index . "sort" }}{{ $sort = . }}{{ end -}}
     {{- if (index . "reverse") }}{{ $order = "desc" }}{{ else }}{{ $order = "asc" }}{{ end -}}
+    {{- if $home }}{{- if (isset . "nested") }}{{ $nested = (index . "nested") }}{{ end -}}{{ end -}}
     {{- if (index . "separator") }}{{ $separator = true }}{{ else }}{{ $separator = false }}{{ end -}}
     {{- with index . "orientation" }}{{ $orientation = . }}{{ end -}}
     {{- with index . "cols" }}{{ $cols = . }}{{ end -}}
@@ -48,8 +49,20 @@
     {{- with index . "vertical" }}{{ $vertical = . }}{{ end -}}
     {{- with index . "width" }}{{ $width = . }}{{ end -}}
 {{- end -}}
+{{ if ne (printf "%T" $nested) "bool" }}
+    {{ errorf "partial [assets/section-list.html] - Invalid value for param 'nested'"}}
+{{ end }}
+
+{{ $list := "" }}
+{{ if $nested }}
+    {{ $list = where site.RegularPages "Type" "in" $section }}
+{{ else if $home }}
+    {{ $sectionPage := site.GetPage "section" $section }}
+    {{ $list = $sectionPage.RegularPages }}
+{{ else }}
+    {{ $list = $page.RegularPages }}
+{{ end }}
 
-{{ $list := where site.RegularPages "Type" "in" $section }}
 {{ $max := (len $list) -}}
 {{ if eq $max 0 }}
     {{- $bundle := site.GetPage $section -}}

layouts/partials/footer/social.html

@@ -7,7 +7,7 @@
         </div>
         <div class="col text-sm-start text-center col-sm-6 col-md-4">
             {{ range .Site.Menus.social -}}
-                <a href="{{ .URL | relURL }}" target="_blank" rel="noopener" aria-label="{{ .Name | safeHTML }}" class="text-decoration-none link-secondary d-inline p-2">
+                <a href="{{ .URL | relLangURL }}" target="_blank" rel="noopener noreferrer" aria-label="{{ .Name | safeHTML }}" class="text-decoration-none link-secondary d-inline p-2">
                     {{ .Pre | safeHTML }}
                 </a>
             {{ end -}}

layouts/partials/head/stylesheet.html

@@ -30,7 +30,7 @@
 {{- end -}}
 
 {{- if not hugo.IsProduction -}}
-    <link rel="stylesheet" href="{{ $css.Permalink | relURL }}">
+    <link rel="stylesheet" href="{{ $css.Permalink | relLangURL }}">
 {{- else -}}
     {{- $css = $css | fingerprint | resources.PostProcess -}}
     <link rel="stylesheet" href="{{ $css.Permalink }}" integrity="{{ $css.Data.Integrity }}" crossorigin="anonymous">

layouts/tags/list.html

@@ -13,7 +13,7 @@
                                 {{ .Count }} {{ if gt .Count 1 }} {{ T "articles" }} {{ else }} {{ T "article" }} {{ end }}
                             </div>
                             <div class="col">
-                                <a href="{{ (path.Join .Page.RelPermalink) | relURL }}">{{ .Name | markdownify }}</a>
+                                <a href="{{ (path.Join .Page.RelPermalink) | relLangURL }}">{{ .Name | markdownify }}</a>
                             </div>
                         </div>
                     {{ end }}
@@ -32,7 +32,7 @@
                                     <p class="text-body-secondary mt-5">{{ $year }}</p>
                                     {{ $.Scratch.Set "lastYear" $year }}
                                 {{ end }}
-                                <a href="{{ .Permalink | relURL }}">{{ if .Draft }}{{ T "draft" | upper }}: {{end}}{{ .Title | markdownify }}</a>
+                                <a href="{{ (path.Join .Page.RelPermalink) | relLangURL }}">{{ if .Draft }}{{ T "draft" | upper }}: {{end}}{{ .Title | markdownify }}</a>
                             </div>
                         </div>
                     {{ end }}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.12.9",
+  "version": "0.12.12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.12.9",
+      "version": "0.12.12",
       "license": "MIT",
       "devDependencies": {
         "@fortawesome/fontawesome-free": "^6.4.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.12.9",
+  "version": "0.12.12",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",