diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 67c84842..9720468e 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -61,19 +61,27 @@
{{ $cardView := .Params.cardView | default (.Site.Params.list.cardView | default false) }}
{{ $cardViewScreenWidth := .Params.cardViewScreenWidth | default (.Site.Params.list.cardViewScreenWidth | default false) }}
{{ $groupByYear := .Params.groupByYear | default ($.Site.Params.list.groupByYear | default false) }}
+ {{ $orderByWeight := .Params.orderByWeight | default ($.Site.Params.list.orderByWeight | default false) }}
+ {{ $groupByYear := and (not $orderByWeight) $groupByYear }}
{{ if not $cardView }}
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
- {{ if $groupByYear }}
-
- {{ .Key }}
-
- {{ end }}
- {{ range .Pages }}
- {{ partial "article-link/simple.html" . }}
- {{ end }}
+ {{ if not $orderByWeight }}
+ {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
+ {{ if $groupByYear }}
+
+ {{ .Key }}
+
+ {{ end }}
+ {{ range .Pages }}
+ {{ partial "article-link/simple.html" . }}
+ {{ end }}
+ {{ end }}
+ {{ else }}
+ {{ range (.Paginate (.Pages.ByWeight)).Pages }}
+ {{ partial "article-link/simple.html" . }}
+ {{ end }}
{{ end }}
@@ -104,11 +112,17 @@
{{ else }}
{{ end }}
+ {{ if not $orderByWeight }}
{{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
{{ range .Pages }}
{{ partial "article-link/card.html" . }}
{{ end }}
{{ end }}
+ {{ else }}
+ {{ range (.Paginate (.Pages.ByWeight)).Pages }}
+ {{ partial "article-link/card.html" . }}
+ {{ end }}
+ {{ end }}
{{ if $cardViewScreenWidth }} {{ end }}