From 5701197651efd9d179d5c1b152c698459533a00a Mon Sep 17 00:00:00 2001 From: Huy Tran Date: Sat, 21 Jul 2018 06:32:00 +1000 Subject: [PATCH] refactors/revises theme layouts --- layouts/_default/single.html | 2 +- layouts/index.html | 10 +++---- layouts/partials/commenting.html | 6 +---- layouts/partials/header.html | 1 - layouts/partials/header/meta.html | 10 +++++++ layouts/partials/header/meta.old.html | 2 +- layouts/partials/page_list.html | 2 +- layouts/partials/page_single.html | 2 +- layouts/partials/portfolio/content.html | 2 +- layouts/partials/post-meta-after.html | 35 ++++++++++++++++--------- layouts/partials/post-meta-before.html | 30 ++++++++++----------- layouts/partials/post-related.html | 1 - layouts/partials/posts-list.html | 2 +- layouts/partials/sidebar.html | 19 ++++++++------ layouts/portfolio/list.html | 11 ++++++++ 15 files changed, 80 insertions(+), 55 deletions(-) create mode 100644 layouts/portfolio/list.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 68a8bcf..b6a6af6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -7,7 +7,7 @@ {{- end -}} {{ define "footer" -}} -
+
{{- partial "highlight-js.html" . -}} {{- partial "commenting.html" . -}}
diff --git a/layouts/index.html b/layouts/index.html index 55ff567..434b4f3 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -3,15 +3,15 @@ {{- end }} {{ define "content" -}} -
+
{{ range (where .Data.Pages "Type" "not in" (slice "about" "portfolio")).GroupBy "Section" -}} {{ range .Pages }} -
- +
+ {{ .Title }}{{ if .Draft }} {{ end }} - - {{ .Date.Format (.Site.Params.dateformat | default "Jan 02, 2006") }} + + {{ .Date.Format (.Site.Params.dateformat | default "Jan 02, 2006") }} {{ .Summary }} {{ if .Truncated -}} diff --git a/layouts/partials/commenting.html b/layouts/partials/commenting.html index 99d72a4..e829626 100644 --- a/layouts/partials/commenting.html +++ b/layouts/partials/commenting.html @@ -1,11 +1,7 @@ -{{- if and (not .Site.BuildDrafts) (ne .Params.showcomments false) -}} +{{- if ne .Params.showcomments false -}} {{ if .Site.DisqusShortname -}} -
-

Comments

{{- partial "commenting/disqus.html" . -}} {{- else if .Site.Params.GraphCommentId -}} -
-

Comments

{{- partial "commenting/graphcomment.html" . -}} {{- end -}} {{- end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 3dd1efb..f7cb9a3 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -7,7 +7,6 @@ {{ partial "header/font-awesome.html" . }} {{ "" | safeHTML }} {{ partial "header/highlight-css.html" . }} - {{ ` diff --git a/layouts/partials/header/meta.html b/layouts/partials/header/meta.html index 0eb31fa..8cd0eea 100644 --- a/layouts/partials/header/meta.html +++ b/layouts/partials/header/meta.html @@ -4,5 +4,15 @@ {{ "" | safeHTML }} {{ .Hugo.Generator }} +{{- if .IsHome }} + {{ $.Scratch.Set "theTitle" .Site.Title -}} +{{else}} + {{ $.Scratch.Add "theTitle" .Title}} + {{ $.Scratch.Add "theTitle" " • "}} + {{ $.Scratch.Add "theTitle" .Site.Title}} +{{- end -}} +{{ $.Scratch.Get "theTitle" }} +{{ with .Site.Params.meta.description -}}{{- end }} +{{ with .Site.Params.meta.keywords -}}{{- end }} {{ partial "header/twitter_cards.html" . }} {{ partial "header/opengraph.html" . }} \ No newline at end of file diff --git a/layouts/partials/header/meta.old.html b/layouts/partials/header/meta.old.html index 18020a0..781a0cb 100644 --- a/layouts/partials/header/meta.old.html +++ b/layouts/partials/header/meta.old.html @@ -8,7 +8,7 @@ {{ $.Scratch.Set "theTitle" .Site.Title -}} {{else}} {{ $.Scratch.Add "theTitle" .Title}} - {{ $.Scratch.Add "theTitle" "·"}} + {{ $.Scratch.Add "theTitle" " • "}} {{ $.Scratch.Add "theTitle" .Site.Title}} {{- end -}} {{ $.Scratch.Get "theTitle" }} diff --git a/layouts/partials/page_list.html b/layouts/partials/page_list.html index 4d7d105..6a4b027 100644 --- a/layouts/partials/page_list.html +++ b/layouts/partials/page_list.html @@ -1,4 +1,4 @@ -

{{ .Title }}

+{{ .Title }}
    {{- with .Data.Pages -}} {{ partial "posts-list.html" . }} diff --git a/layouts/partials/page_single.html b/layouts/partials/page_single.html index ba99f9f..00f3cc5 100644 --- a/layouts/partials/page_single.html +++ b/layouts/partials/page_single.html @@ -13,4 +13,4 @@
{{ partial "post-meta-after.html" . }} {{ partial "post-related.html" . }} - + \ No newline at end of file diff --git a/layouts/partials/portfolio/content.html b/layouts/partials/portfolio/content.html index 76d1102..15cc0d9 100644 --- a/layouts/partials/portfolio/content.html +++ b/layouts/partials/portfolio/content.html @@ -1,5 +1,5 @@
-

{{ .Title }}

+ {{ .Title }} {{ range where .Data.Pages "Params.featured" "==" "true" }}
diff --git a/layouts/partials/post-meta-after.html b/layouts/partials/post-meta-after.html index 882b75a..b751ff6 100644 --- a/layouts/partials/post-meta-after.html +++ b/layouts/partials/post-meta-after.html @@ -1,13 +1,22 @@ -
-
- - {{ with .Prev -}} - Next: {{ .Title }} - {{- end }} - - - {{ with .Next -}} - Previous: {{ .Title }} - {{- end }} - -
\ No newline at end of file +
+ +
diff --git a/layouts/partials/post-meta-before.html b/layouts/partials/post-meta-before.html index c3edd80..7b211b2 100644 --- a/layouts/partials/post-meta-before.html +++ b/layouts/partials/post-meta-before.html @@ -1,36 +1,34 @@ {{ if ne .Params.showpagemeta false }} -
- +
- {{ if not .Date.IsZero }} + {{ if not .Date.IsZero -}} {{ .Date.Format (.Site.Params.dateformat | default "Jan 02, 2006") -}} - {{ end }} + {{- end }} - {{ with .Params.categories }} - {{ $total := len . }} - {{ if gt $total 0 }} + {{- with .Params.categories -}} + {{- $total := len . -}} + {{ if gt $total 0 -}} in - {{ $total := sub $total 1 }} - {{ range $i, $cat := sort . }} - {{ $cat | upper }} + {{- $total := sub $total 1 -}} + {{- range $i, $cat := sort . }} + {{ $cat | upper }} {{ if lt $i $total }},{{ end }} - {{ end }} - {{ end }} - {{ end }} + {{- end -}} + {{- end -}} + {{- end -}} {{ with .Params.tags }} {{ $total := len . }} {{ if gt $total 0 }}
{{ $subtotal := sub $total 1 }} - {{ range $i, $tag := sort . }} - #{{ $tag | lower }} + {{ range $i, $tag := . }} + #{{ $tag | lower }} {{ if lt $i $subtotal }} {{ end }} {{ end }} {{ end }} {{ end }}
{{ .ReadingTime }} min read -
{{ end }} \ No newline at end of file diff --git a/layouts/partials/post-related.html b/layouts/partials/post-related.html index 2657757..8e27368 100644 --- a/layouts/partials/post-related.html +++ b/layouts/partials/post-related.html @@ -2,7 +2,6 @@ {{ $related := .Site.RegularPages.Related . | first 5 }} {{ with $related }} -

Related Articles

    {{ partial "posts-list.html" . }} diff --git a/layouts/partials/posts-list.html b/layouts/partials/posts-list.html index f6b9004..174ea5e 100644 --- a/layouts/partials/posts-list.html +++ b/layouts/partials/posts-list.html @@ -3,7 +3,7 @@ {{ .Title }} {{if not .Date.IsZero}} - + {{end}} diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 1106e96..ef062e4 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,13 +1,16 @@ -
    -
    -
    - -

    {{ .Site.Title }}

    -     +
    +
    +
    +
    + {{ .Site.Title }} +
    {{ with .Site.Params.authorimage }} - Author Image {{ end }} -

    +

    + Author Image +

    + {{ end }} +

    {{ with .Site.Params.description }} {{.}} {{ else }} Your site's description {{end}}

    diff --git a/layouts/portfolio/list.html b/layouts/portfolio/list.html new file mode 100644 index 0000000..4214f54 --- /dev/null +++ b/layouts/portfolio/list.html @@ -0,0 +1,11 @@ +{{ define "header" -}} + {{ partial "header.html" . }} +{{- end -}} + +{{ define "content" -}} + {{ partial "portfolio/content.html" . }} +{{- end -}} + +{{ define "footer" -}} + {{ partial "footer.html" . }} +{{- end }}