diff options
Diffstat (limited to 'layouts/_default')
| -rw-r--r-- | layouts/_default/baseof.html | 1 | ||||
| -rw-r--r-- | layouts/_default/list.html | 33 | ||||
| -rw-r--r-- | layouts/_default/single.html | 19 | ||||
| -rw-r--r-- | layouts/_default/terms.html | 8 |
4 files changed, 18 insertions, 43 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 25befda..a67d0c4 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,6 +8,7 @@ {{ block "header" . }}{{ partial "header.html" . }}{{ end }} {{ block "main" . }}{{ end }} {{ partial "footer.html" . }} + {{ block "footer" . }}{{ end }} </body> </html> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5e52b60..e08da36 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -9,38 +9,7 @@ {{ end }} <div class="posts-list"> {{ range .Paginator.Pages }} - <article class="post-preview"> - <a href="{{ .Permalink }}"> - <h2 class="post-title">{{ .Title }}</h2> - - {{ if .Params.subtitle }} - <h3 class="post-subtitle"> - {{ .Params.subtitle }} - </h3> - {{ end }} - </a> - - <p class="post-meta"> - {{ partial "post_meta.html" . }} - </p> - <div class="post-entry"> - {{ if .Truncated }} - {{ .Summary }} - <a href="{{ .Permalink }}" class="post-read-more">[{{ i18n "readMore" }}]</a> - {{ else }} - {{ .Content }} - {{ end }} - </div> - - {{ if .Params.tags }} - <div class="blog-tags"> - {{ range .Params.tags }} - <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a> - {{ end }} - </div> - {{ end }} - - </article> + {{ partial "post_preview.html" .}} {{ end }} </div> {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 7af7637..0ab1bf5 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -23,14 +23,19 @@ {{ end }} {{ if .Site.Params.showRelatedPosts }} - {{ $related := .Site.RegularPages.Related . | first 3 }} - {{ with $related }} - <h4 class="see-also">{{ i18n "seeAlso" }}</h4> - <ul> - {{ range . }} - <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li> + {{ range first 1 (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }} + {{ $.Scratch.Set "has_related" true }} {{ end }} - </ul> + + {{ if $.Scratch.Get "has_related" }} + <h4 class="see-also">{{ i18n "seeAlso" }}</h4> + <ul> + {{ $num_to_show := .Site.Params.related_content_limit | default 5 }} + {{ range first $num_to_show (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }} + <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li> + {{ end }} + </ul> + {{ end }} {{ end }} </article> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index d16cf6f..88e6d31 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -5,18 +5,18 @@ <div class="container" role="main"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <article class="post-preview"> - <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> + <div class="panel-group" id="accordion"> {{ range $key, $value := .Data.Terms.ByCount }} <div class="panel panel-default"> - <a class="collapsed" role="button" data-toggle="collapse" data-target="#collapse{{ $value.Name }}" data-parent="#accordion" aria-expanded="false" aria-controls="collapse{{ $value.Name }}"> - <div class="panel-heading" role="tab" id="header{{ $value.Name }}"> + <a class="collapsed" role="button" data-toggle="collapse" data-target="#collapse{{ $value.Name }}" data-parent="#accordion"> + <div class="panel-heading" id="header{{ $value.Name }}"> <h4 class="panel-title"> {{ $value.Name }} <span class="badge">{{ $value.Count }}</span> </h4> </div> </a> - <div id="collapse{{ $value.Name }}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading{{ $value.Name }}"> + <div id="collapse{{ $value.Name }}" class="panel-collapse collapse"> <div class="panel-body"> <a href="{{ $.Site.LanguagePrefix | absURL }}/{{ $data.Plural }}/{{ $value.Name | urlize }}/" class="list-group-item view-all"> View all</a> |