saul365/LoveIt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(paginate): add param home_paginate for home post pages and fix relURL bug

Browse Source
This commit is contained in:
Dillon
2019-11-20 21:39:04 +08:00
parent 789bd994ff
commit 473900da79
10 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layouts/index.html
View File

@@ -3,8 +3,14 @@
<div class="post-warp">
{{- partial "home/profile.html" . -}}
{{ $paginator := .Paginate (where .Site.RegularPages "Type" "posts") -}}
{{ range where $paginator.Pages "Params.show_in_homepage" "!=" false -}}
{{ $paginator := where .Site.RegularPages "Type" "posts" -}}
{{ $paginator = where $paginator "Params.show_in_homepage" "!=" false -}}
{{ with .Site.Params.home_paginate -}}
{{ $paginator = $.Paginate $paginator . -}}
{{ else -}}
{{ $paginator = $.Paginate $paginator -}}
{{ end -}}
{{ range $paginator.Pages -}}
{{ .Render "summary" -}}
{{ end -}}

2
layouts/partials/head.html
View File

@@ -23,7 +23,7 @@
<link rel="next" href="{{ .NextInSection.Permalink }}" />
{{ end -}}
<link rel="canonical" href="{{ .Permalink }}" />
<link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">

4
layouts/partials/home/profile.html
View File

@@ -7,8 +7,8 @@
{{ end }}
{{ if $avatar }}
<div class="home-avatar">
<a href="/posts/">
<img src={{ $avatar }} alt="avatar">
<a href="/posts">
<img src={{ $avatar | relURL }} alt="avatar">
</a>
</div>
{{ end }}

2
layouts/partials/paginator.html
View File

@@ -9,7 +9,7 @@
{{ range $pag.Pagers }}
{{ $right := sub .TotalPages .PageNumber }}
{{ $showNumber := or (le .PageNumber 1) (eq $right 0) }}
{{ $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 3)) (lt .PageNumber (add $pag.PageNumber 3))) }}
{{ $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 3)) (lt .PageNumber (add $pag.PageNumber 3))) }}
{{ if $showNumber }}
{{ $.Scratch.Set "__paginator.ellipsed" false }}
{{ $.Scratch.Set "__paginator.shouldEllipse" false }}