From 26effade34ebf65d15d58410979276c6f5ffb8b0 Mon Sep 17 00:00:00 2001
From: Huy Tran <hoang.huy.tran@gmail.com>
Date: Fri, 30 Mar 2018 18:09:06 +1100
Subject: [PATCH] Fixes #1

---
 layouts/index.html                 |  6 +-----
 layouts/partials/list_content.html |  6 +-----
 layouts/partials/post_content.html | 19 +++++++------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/layouts/index.html b/layouts/index.html
index 76485e9..df10349 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -8,11 +8,7 @@
         <div class="post">
         <h1 class="post-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
         <span class="post-date">
-          {{- if isset .Site.Params "dateformat" -}}
-            {{ .Date.Format .Site.Params.dateformat }}
-          {{- else -}}
-            {{ .Date.Format "Jan 02 2006" }}
-          {{- end -}}
+          {{- .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") -}}
         </span>
         {{ .Summary }}
         {{ if .Truncated }}
diff --git a/layouts/partials/list_content.html b/layouts/partials/list_content.html
index d9f216d..ab3460b 100644
--- a/layouts/partials/list_content.html
+++ b/layouts/partials/list_content.html
@@ -6,11 +6,7 @@
             <a href="{{ .Permalink }}">{{ .Title }}</a>
             {{ if not .Date.IsZero }}
             <time class="pull-right post-list">
-                {{- if isset .Site.Params "dateformat" -}}
-                    {{ .Date.Format .Site.Params.dateformat }}
-                {{- else -}}
-                    {{ .Date.Format "Jan 02 2006" }}
-                {{- end -}}
+                {{- .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") -}}
             </time>    
             {{end}}
         </span>
diff --git a/layouts/partials/post_content.html b/layouts/partials/post_content.html
index c93b6c1..329d103 100644
--- a/layouts/partials/post_content.html
+++ b/layouts/partials/post_content.html
@@ -5,32 +5,27 @@
     <span class="text-left post-date meta">
       <!-- published date -->      
       {{ if not .Date.IsZero }} 
-        <i class="fas fa-calendar-alt"></i>
-        {{ if isset .Site.Params "dateformat" -}}
-          {{ .Date.Format .Site.Params.dateformat }}
-        {{- else -}}
-          {{ .Date.Format "Jan 02 2006" }}
-        {{- end -}}        
+        <i class="fas fa-calendar-alt"></i> {{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") -}}
       {{ end }}
       <!-- categories -->
-      {{ if isset .Params "categories" }}
-        {{ $total := len .Params.categories }}
+      {{ with .Params.categories }}
+        {{ $total := len . }}
         {{ if gt $total 0 }}
             in
             {{ $total := sub $total 1 }}
-            {{ range $i, $cat := sort $.Params.categories }}
+            {{ range $i, $cat := sort . }}
                 <a class="meta" href="{{ "/categories/" | relURL }}{{ $cat | urlize }}">{{ $cat | upper }}</a>
                 {{ if lt $i $total }},{{ end }}
             {{ end }}
         {{ end }}
       {{ end }}
       <!-- tags -->
-      {{ if isset .Params "tags" }}
-        {{ $total := len .Params.tags }}
+      {{ with .Params.tags }}
+        {{ $total := len . }}
         {{ if gt $total 0 }}
             <br/>
             {{ $subtotal := sub $total 1 }} <i class="fas fa-tags"></i>
-            {{ range $i, $tag := sort $.Params.tags }}
+            {{ range $i, $tag := sort . }}
             <a class="meta" href="{{ "/tags/" | relURL }}{{ $tag | urlize }}">{{ $tag | lower }}</a>{{ if lt $i $subtotal }} {{ end }}
         {{ end }}
       {{ end }}