From f925f2fd40990a52cba9fd7d69f9ac83571143dc Mon Sep 17 00:00:00 2001 From: Aditya Telange <21258296+adityatelange@users.noreply.github.com> Date: Thu, 27 Aug 2020 19:37:45 +0530 Subject: [PATCH] rm index : merge index and list --- layouts/_default/index.html | 61 ------------------------------------- layouts/_default/list.html | 28 +++++++++++++---- 2 files changed, 22 insertions(+), 67 deletions(-) delete mode 100644 layouts/_default/index.html diff --git a/layouts/_default/index.html b/layouts/_default/index.html deleted file mode 100644 index 453bf4ef..00000000 --- a/layouts/_default/index.html +++ /dev/null @@ -1,61 +0,0 @@ -{{ define "main" }} - -{{ if .Site.Params.profileMode }} -{{- partial "indexProfile.html" . }} -{{else}} {{/* if not profileMode */}} - -{{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }} -{{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }} - -{{ $PageContext := . }} -{{ if .IsHome }} -{{ $PageContext = .Site }} -{{ end }} -{{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} - -{{- range $index, $page := $paginator.Pages }} - -{{- $class := "post-entry" }} -{{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }} -{{- if (eq $.Site.Params.homeInfoParams.enabled true) }} -{{- partial "homeInfo.html" . }} -{{else}} -{{- $class = "first-entry" }} -{{ end }} -{{- else if .Data.Term }} -{{- $class = "post-entry tag-entry" }} -{{- end }} -
-
-

- {{ .Title }} - {{- if .Draft }}
  [draft]
{{- end }} -

-
-
-

{{ .Summary | plainify | htmlUnescape }}...

-
- - -
-{{- end }} - -{{- if gt $paginator.TotalPages 1 }} - -{{- end }} -{{end}}{{/* end profileMode */}} -{{ end }}{{/* end main */}} \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 4e7e14d0..4f69d81e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,17 +1,33 @@ {{ define "main" }} -{{- $scope := .Site }} -{{- if .Title }} -{{ $scope = . }} -{{ end }} +{{ if (and .Site.Params.profileMode .IsHome) }} +{{- partial "indexProfile.html" . }} +{{else}} {{/* if not profileMode */}} -{{- $paginator := .Paginate (where $scope.RegularPages ".Params.type" "!=" "page") }} +{{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }} +{{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }} + +{{ $PageContext := . }} +{{ if .IsHome }} +{{ $PageContext = .Site }} +{{else}} +{{- if .Title }} + +{{ end }} +{{ end }} +{{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} {{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }} +{{- if (eq $.Site.Params.homeInfoParams.enabled true) }} +{{- partial "homeInfo.html" . }} +{{else}} {{- $class = "first-entry" }} +{{ end }} {{- else if .Data.Term }} {{- $class = "post-entry tag-entry" }} {{- end }} @@ -47,5 +63,5 @@ {{- end }} - +{{end}}{{/* end profileMode */}} {{ end }}{{/* end main */}} \ No newline at end of file