diff options
| -rw-r--r-- | themes/archie/layouts/_default/list.html | 14 | ||||
| -rw-r--r-- | themes/archie/layouts/_default/term.html | 17 | ||||
| -rw-r--r-- | themes/archie/layouts/_default/terms.html | 20 |
3 files changed, 9 insertions, 42 deletions
diff --git a/themes/archie/layouts/_default/list.html b/themes/archie/layouts/_default/list.html index eb377de..aeeebb9 100644 --- a/themes/archie/layouts/_default/list.html +++ b/themes/archie/layouts/_default/list.html @@ -1,4 +1,7 @@ {{ define "main" }} +{{- if .Content -}} +{{ .Content }} +{{ else }} {{ if isset .Data "Term" }} <h1>Entries tagged - "{{ .Data.Term }}"</h1> {{ else }} @@ -7,11 +10,12 @@ <ul class="posts"> {{- range .Data.Pages -}} - {{- if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) -}} - <li class="post"> - <span class="meta">{{ dateFormat "02 Jan 2006" .Date }}</span> - <a href="{{ .RelPermalink }}">{{.Title}}</a> - </li> - {{- end -}} + {{- if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) -}} + <li class="post"> + <span class="meta">{{ dateFormat "02 Jan 2006" .Date }}</span> - <a href="{{ .RelPermalink }}">{{.Title}}</a> + </li> + {{- end -}} {{- end -}} </ul> {{ end }} +{{ end }} diff --git a/themes/archie/layouts/_default/term.html b/themes/archie/layouts/_default/term.html deleted file mode 100644 index eb377de..0000000 --- a/themes/archie/layouts/_default/term.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ define "main" }} -{{ if isset .Data "Term" }} -<h1>Entries tagged - "{{ .Data.Term }}"</h1> -{{ else }} -<h1 class="page-title">All articles</h1> -{{ end }} - -<ul class="posts"> - {{- range .Data.Pages -}} - {{- if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) -}} - <li class="post"> - <span class="meta">{{ dateFormat "02 Jan 2006" .Date }}</span> - <a href="{{ .RelPermalink }}">{{.Title}}</a> - </li> - {{- end -}} - {{- end -}} -</ul> -{{ end }} diff --git a/themes/archie/layouts/_default/terms.html b/themes/archie/layouts/_default/terms.html deleted file mode 100644 index fea9c2f..0000000 --- a/themes/archie/layouts/_default/terms.html +++ /dev/null @@ -1,20 +0,0 @@ -{{ define "main" }} -<h1 class="page-title">All tags</h1> - -{{ $biggest := 1 }} -{{ $smallest := 1 }} -{{ $max := 3 }} -{{ $min := 1 }} -{{ $size := $min }} - -{{ $data := .Data }} -<div class="tag-cloud"> - <ul class="tags"> - {{ range $key, $value := .Data.Terms.ByCount }} - {{ $size := (add (mul (div $value.Count $biggest) (sub $max $min)) $min) }} - {{ $size := (cond (eq $biggest $smallest) $min $size) }} - <li><a style="font-size: {{ $size }}rem;" href="{{ $.Site.LanguagePrefix | absURL }}{{ $data.Plural }}/{{ $value.Name | urlize }}/">{{ $value.Name }}</a></li> - {{ end }} - </ul> -</div> -{{ end }} |