diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html new file mode 100644 index 0000000..b8a365e --- /dev/null +++ b/layouts/_default/_markup/render-link.html @@ -0,0 +1 @@ +{{ .Text | safeHTML }} diff --git a/layouts/_default/index.html b/layouts/_default/index.html index 62bbf0e..82e036b 100644 --- a/layouts/_default/index.html +++ b/layouts/_default/index.html @@ -12,7 +12,8 @@ {{ if .IsHome }} {{ $PageContext = .Site }} {{ end }} - {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} + {{ $pages := where $PageContext.RegularPages "Type" $contentTypeName }} + {{ $paginator := .Paginate ( ( $pages | symdiff (where $pages "Params.hiddenPage" "==" "true")) | symdiff (where $pages "Params.hiddenPage" "==" true) ) }} {{ range $paginator.Pages }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 6a469bd..ae26cd1 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -5,7 +5,8 @@ {{ end }}
- {{ range .Paginator.Pages }} + {{ $paginator := .Paginate ( (.Pages | symdiff (where .Pages "Params.hiddenPage" "==" "true")) | symdiff (where .Pages "Params.hiddenPage" true) ) }} + {{ range $paginator.Pages }}

{{ .Title | markdownify }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 65aa855..abd1591 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -10,6 +10,7 @@ {{- if ge $limit 1 -}} {{- $pages = $pages | first $limit -}} {{- end -}} +{{- $pages = ($pages | symdiff (where $pages "Params.hiddenPage" "==" "true")) | symdiff (where $pages "Params.hiddenPage" true) -}} {{- printf "" | safeHTML }} diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml index f5abe25..3954614 100644 --- a/layouts/_default/sitemap.xml +++ b/layouts/_default/sitemap.xml @@ -1,7 +1,7 @@ {{ printf "" | safeHTML }} - {{ range .Data.Pages }} + {{ range (.Pages | symdiff (where .Pages "Params.hiddenPage" "==" "true")) | symdiff (where .Pages "Params.hiddenPage" true) }} {{- if .Permalink -}} {{ .Permalink }}{{ if not .Lastmod.IsZero }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 399d665..156202b 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -3,15 +3,18 @@

{{ .Title }}

    {{ $type := .Type }} - {{ range $key, $value := .Data.Terms.Alphabetical }} - {{ $name := .Name }} - {{ $count := .Count }} + {{ range $term := .Data.Terms.Alphabetical }} + {{ $termPages := (.Pages | symdiff (where .Pages "Params.hiddenPage" "==" "true")) | symdiff (where .Pages "Params.hiddenPage" true) }} + {{ if (len $termPages | ne 0) }} + {{ $name := $term.Name }} + {{ $count := len $termPages }} {{ with $.Site.GetPage (printf "/%s/%s" $type $name) }}
  • {{ .Name }} ({{ $count }})
  • {{ end }} {{ end }} + {{ end }}

{{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9352d88..196586e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -2,10 +2,8 @@ -{{ if .Params.noindex }} - {{ if or (eq (.Param "noindex") true) (eq (.Param "noindex") "true") }} - - {{ end }} +{{ if .Params.hiddenPage | or .Params.noindex | in (slice "true" true) }} + {{ else }} {{ end }}