merge upstream

layouts/_default/list.html

@@ -3,9 +3,26 @@
 {{ $Pages := .Pages }}
 
 {{ if .IsHome }}
-  {{ $Pages = where site.RegularPages "Type" "in" site.Params.mainSections }}
+  {{ $Pages = where site.RegularPages "Type" "in" .Site.Params.mainSections }}
 {{ end }}
 
+{{ if .Site.Params.show_excerpts }}
+
+{{- range $Pages }}
+<article>
+  <header>
+    <h1>{{ .Title }}</h1>
+    {{ if .Date }}<time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "January 02, 2006" }}</time>{{ end }}
+  </header>
+  {{ .Summary }}
+  {{- if .Truncated }}
+    <div class="more"><a href="{{ .RelPermalink }}">read more</a></div>
+  {{- end }}
+</article>
+{{- end }}
+
+{{ else }}
+
 <article>
   <header><h1>{{ .Title | default "Posts" | humanize }}</h1></header>
   <ul class="archive">
@@ -20,3 +37,5 @@
 </article>
 
 {{ end }}
+
+{{ end }}