From 1b4d111f5ec20056f91257a751fa522aa7a7c8fa Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Fri, 26 Jun 2020 14:48:14 +0200 Subject: [PATCH] Fixed: Layout Structure --- layouts/_default/list.html | 35 +++++++++++++++------- layouts/_default/single.html | 14 +++++---- layouts/_default/terms.html | 23 -------------- layouts/partials/header-post.html | 22 -------------- layouts/partials/header-project.html | 30 ------------------- layouts/partials/list-item-post.html | 21 ------------- layouts/partials/list-item-project.html | 23 -------------- layouts/partials/list-item.html | 37 ----------------------- layouts/partials/post.html | 1 - layouts/partials/project.html | 4 --- layouts/projects/list.html | 32 ++++++++++++++++++++ layouts/projects/single.html | 40 +++++++++++++++++++++++++ 12 files changed, 104 insertions(+), 178 deletions(-) delete mode 100644 layouts/_default/terms.html delete mode 100644 layouts/partials/header-post.html delete mode 100644 layouts/partials/header-project.html delete mode 100644 layouts/partials/list-item-post.html delete mode 100644 layouts/partials/list-item-project.html delete mode 100644 layouts/partials/list-item.html delete mode 100644 layouts/partials/project.html create mode 100644 layouts/projects/list.html create mode 100644 layouts/projects/single.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index afb1736..3861c8d 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -2,18 +2,31 @@

{{ .Title }}

- {{ range (.Paginator 10).Pages }} - {{ if eq "Posts" $.Title }} - {{partial "list-item-post.html" .}} - {{else}} - {{ partial "list-item-project.html" . }} - {{end}} - {{end}} - +
+ +
+ +

{{ .Title }}

+ +
{{ .Description }}
+ {{ range.Params.categories }} + + {{ . }} + + {{ end }} + {{ range .Params.tags }} + + {{ . }} + + {{ end }} +
+
+ {{ end }}
-{{ partial "paginator" . }} - -{{ partial "footer" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index f35e4e5..6002f62 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,11 +1,13 @@ {{ partial "header" . }}
- {{ if eq "Posts" $.Title }} - {{partial "post.html" .}} - {{else}} - {{ partial "project" . }} - {{end}} +
+

{{ .Title }}

+
+ +
+
{{ .Content }}
+
-{{ partial "footer.html" . }} +{{ partial "footer" . }} \ No newline at end of file diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html deleted file mode 100644 index f579a16..0000000 --- a/layouts/_default/terms.html +++ /dev/null @@ -1,23 +0,0 @@ -{{ partial "header" . }} - -
- -
-

{{ .Title }}

- -
    - {{ range $key, $value := .Data.Terms }} -
  • - - {{ $key }} - - ({{ len $value }}) -
    • - {{ end }} -
-
- -
- - -{{ partial "footer" . }} diff --git a/layouts/partials/header-post.html b/layouts/partials/header-post.html deleted file mode 100644 index 43bd02a..0000000 --- a/layouts/partials/header-post.html +++ /dev/null @@ -1,22 +0,0 @@ -
- {{ .Date.Format (.Site.Params.dateFormat | default "") | $.Scratch.Set "pub_date" }} - {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }} - {{ with .ReadingTime }} {{ $.Scratch.Set "read_time" . }} {{ end }} - - -

{{ .Title }}

-
{{ $.Scratch.Get "pub_date" }} - {{ $.Scratch.Get "read_time" }} minutes
-
{{ $.Scratch.Get "subtitle" }}
- - {{ range.Params.categories }} - - - {{ . }} - - {{ end }} - {{ range .Params.tags }} - - {{ . }} - - {{ end }} -
diff --git a/layouts/partials/header-project.html b/layouts/partials/header-project.html deleted file mode 100644 index 57a785b..0000000 --- a/layouts/partials/header-project.html +++ /dev/null @@ -1,30 +0,0 @@ -
- {{ $.Scratch.Set "link" .RelPermalink }} - {{ with .Params.repo }} - {{ $repoHost := default "gitlab" $.Params.repoHost }} - {{ if eq "github" $repoHost }} - {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }} - {{ else if eq "gitlab" $repoHost }} - {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }} - {{ end }} - {{ end }} - {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }} - - - -

{{ .Title }}

- -

{{ $.Scratch.Get "subtitle" }}

- - {{ range.Params.categories }} - - - {{ . }} - - {{ end }} - {{ range .Params.tags }} - - {{ . }} - - {{ end }} -
diff --git a/layouts/partials/list-item-post.html b/layouts/partials/list-item-post.html deleted file mode 100644 index 53f344a..0000000 --- a/layouts/partials/list-item-post.html +++ /dev/null @@ -1,21 +0,0 @@ -
- {{ .Date.Format (.Site.Params.dateFormat | default "January 2, 2006") | $.Scratch.Set "pub_date" }} - {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }} - {{ with .ReadingTime }} {{ $.Scratch.Set "read_time" . }} {{ end }} - - -

{{ .Title }}

-
{{ $.Scratch.Get "pub_date" }} - {{ $.Scratch.Get "read_time" }} minutes
-
{{ $.Scratch.Get "subtitle" }}
- {{ range.Params.categories }} - - {{ . }} - - {{ end }} - {{ range .Params.tags }} - - {{ . }} - - {{ end }} - -
diff --git a/layouts/partials/list-item-project.html b/layouts/partials/list-item-project.html deleted file mode 100644 index 2c44215..0000000 --- a/layouts/partials/list-item-project.html +++ /dev/null @@ -1,23 +0,0 @@ -
- -
- -

{{ .Title }}

- -
{{ .Description }}
- {{ range.Params.categories }} - - {{ . }} - - {{ end }} - {{ range .Params.tags }} - - {{ . }} - - {{ end }} -
-
diff --git a/layouts/partials/list-item.html b/layouts/partials/list-item.html deleted file mode 100644 index 078b638..0000000 --- a/layouts/partials/list-item.html +++ /dev/null @@ -1,37 +0,0 @@ -
- - {{ $.Scratch.Set "link" .RelPermalink }} - {{ with .Params.repo }} - {{ $repoHost := default "github" $.Params.repoHost }} - {{ if eq "github" $repoHost }} - {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }} - {{ else if eq "gitlab" $repoHost }} - {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }} - {{ else if eq "bitbucket" $repoHost }} - {{ printf "https://bitbucket.org/%s/%s/" $.Site.Params.bitbucketUsername . | $.Scratch.Set "link" }} - {{ end }} - {{ end }} - {{ with .Params.link }} {{ $.Scratch.Set "link" . }} {{ end }} - - {{ .Date.Format (.Site.Params.dateFormat | default "January 2, 2006") | $.Scratch.Set "pub_date" }} - {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }} - {{ with .ReadingTime }} {{ $.Scratch.Set "read_time" . }} {{ end }} - - -

{{ .Title }}

-
{{ $.Scratch.Get "pub_date" }} - {{ $.Scratch.Get "read_time" }} minutes
-
{{ $.Scratch.Get "subtitle" }}
- - {{ range.Params.categories }} - - - {{ . }} - - {{ end }} - {{ range .Params.tags }} - - {{ . }} - - {{ end }} - -
diff --git a/layouts/partials/post.html b/layouts/partials/post.html index db08407..e3b5f56 100644 --- a/layouts/partials/post.html +++ b/layouts/partials/post.html @@ -1,7 +1,6 @@ {{ partial "header-post" .}}

{{ .Content }}
- {{ $related := first 3 (where (where (where .Site.Pages.ByDate.Reverse ".Type" "==" "post") ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }} diff --git a/layouts/partials/project.html b/layouts/partials/project.html deleted file mode 100644 index 3825680..0000000 --- a/layouts/partials/project.html +++ /dev/null @@ -1,4 +0,0 @@ -{{ partial "header-project" .}} -
-
{{ .Content }}
-
\ No newline at end of file diff --git a/layouts/projects/list.html b/layouts/projects/list.html new file mode 100644 index 0000000..2237018 --- /dev/null +++ b/layouts/projects/list.html @@ -0,0 +1,32 @@ +{{ partial "header" . }} + +
+

{{ .Title }}

+ {{ range .Pages }} +
+ +
+ +

{{ .Title }}

+ +
{{ .Description }}
+ {{ range.Params.categories }} + + {{ . }} + + {{ end }} + {{ range .Params.tags }} + + {{ . }} + + {{ end }} +
+
+ {{end}} +
+ +{{ partial "footer" . }} \ No newline at end of file diff --git a/layouts/projects/single.html b/layouts/projects/single.html new file mode 100644 index 0000000..d0a3d94 --- /dev/null +++ b/layouts/projects/single.html @@ -0,0 +1,40 @@ +{{ partial "header" . }} + +
+
+ {{ $.Scratch.Set "link" .RelPermalink }} + {{ with .Params.repo }} + {{ $repoHost := default "gitlab" $.Params.repoHost }} + {{ if eq "github" $repoHost }} + {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }} + {{ else if eq "gitlab" $repoHost }} + {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }} + {{ end }} + {{ end }} + {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }} + + + +

{{ .Title }}

+ +

{{ $.Scratch.Get "subtitle" }}

+ + {{ range.Params.categories }} + + + {{ . }} + + {{ end }} + {{ range .Params.tags }} + + {{ . }} + + {{ end }} +
+ +
+
{{ .Content }}
+
+
+ +{{ partial "footer" . }} \ No newline at end of file