fix list template

3 files changed, 30 insertions, 11 deletions

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 2fa3b5a..c447b84 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,3 +1,15 @@
 {{ define "main" }}
-  {{ partial "blog-post-list.html" . }}
+<h1>{{ .Title }}</h1>
+<ul>
+{{ $pages := .Pages }}
+{{ range $pages.ByPublishDate.Reverse }}
+  <li>
+    {{ $dateFormat := $.Site.Params.dateFormat | default "Jan 2, 2006" }}
+    {{ .PublishDate.Format $dateFormat }}
+    <a href="{{ .Permalink }}">
+      {{ .Title }}
+    </a>
+  </li>        
+{{ end }}
+</ul>
 {{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 1b805d6..9442bcd 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,18 +1,13 @@
 {{ define "main" }}
   <h1>{{ .Title }}</h1>
   <ul>
-    {{ $type := .Type }}
-    {{ range $key, $value := .Data.Terms.ByCount }}
-      {{ $name := .Name }}
-      {{ $count := .Count }}
-      {{ with $.Site.GetPage (printf "/%s/%s" $type $name) }}
+    {{ range .Data.Terms.Alphabetical }}
       <li>
-        {{ printf "(%d)" $count }}
-        <a href="{{ .Permalink }}">
-          {{ $name }}
+        {{ printf "(%d)" .Count }}
+        <a href="{{ .Page.RelPermalink }}">
+          {{ .Page.Title }}
         </a>
       </li>
-      {{ end }}
     {{ end }}
   </ul>
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 353f3c4..fdf3d2f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,3 +1,15 @@
 {{ define "main" }}

-  {{ partial "blog-post-list.html" . }}

+<h1>{{ .Title }}</h1>

+<ul>

+{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}

+{{ range $pages.ByPublishDate.Reverse }}

+  <li>

+    {{ $dateFormat := $.Site.Params.dateFormat | default "Jan 2, 2006" }}

+    {{ .PublishDate.Format $dateFormat }}

+    <a href="{{ .Permalink }}">

+      {{ .Title }}

+    </a>

+  </li>        

+{{ end }}

+</ul>

 {{ end }}