From 41ef0bdcde0534402d430185052f4c553144487c Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Wed, 6 May 2020 20:30:07 +0800
Subject: General template fix

---
 layouts/_default/archives.html | 11 ++++++-----
 layouts/_default/baseof.html   |  1 +
 layouts/_default/list.html     | 12 ++++++------
 layouts/_default/single.html   |  3 +++
 layouts/_default/tag.html      | 13 +++++++------
 5 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index e3ee3e5..348e6ac 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -1,8 +1,9 @@
 {{ define "main" }}
-<div id="page-tag">
+<!-- page info section e.g. current tag & total archive pages -->
+<div id="page-info">
     <span>{{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span>
 </div>
-<!-- archives range in posts -->
+<!-- archives range in all posts -->
 {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }}
 {{ range $paginator.Pages }}
 <div id="post-archive">
@@ -14,7 +15,8 @@
     </div>
 </div>
 {{ end }}
-<!-- custom smart pagination -->
+
+<!-- START custom smart pagination -->
 {{ $offsetLinks := 2 }}
 {{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
 {{ $lowerLimit := (add $offsetLinks 1) }}
@@ -31,7 +33,6 @@
         <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
     </li>
     {{ end }}
-
     {{ range $paginator.Pagers }}
     {{ $.Scratch.Set "pageNumFlag" false }}
     {{ if gt $paginator.TotalPages $maxLinks }}
@@ -57,7 +58,6 @@
     </li>
     {{ end }}
     {{ end }}
-
     {{ if $paginator.HasNext }}
     <li class="pag-next">
         <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
@@ -70,5 +70,6 @@
     {{ end }}
 </ul>
 {{ end }}
+<!-- END custom smart pagination -->
 
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6df6ad6..71ba5a5 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -15,6 +15,7 @@
             <div class="col-md-3 col-12 float-left" id="sidebar">
                 {{ partial "sidebar.html" . }}
             </div>
+            <!-- global APlayer -->
             {{ if .Site.Params.playerURL }}
             <div id="aplayer"></div>
             {{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e2a0eb7..7f387f6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- homepage range in posts -->
+<!-- homepage range in all posts -->
 {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
 {{ range $paginator.Pages }}
 <div id="post">
@@ -17,7 +17,8 @@
     </div>
 </div>
 {{ end }}
-<!-- custom smart pagination -->
+
+<!-- START custom smart pagination -->
 {{ $offsetLinks := 2 }}
 {{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
 {{ $lowerLimit := (add $offsetLinks 1) }}
@@ -26,15 +27,14 @@
 <ul id="pagination">
     {{ if ne $paginator.PageNumber 1 }}
     <li class="pag-first">
-        <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a>
+        <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></a>
     </li>
     {{ end }}
     {{ if $paginator.HasPrev }}
     <li class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a>
+        <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
     </li>
     {{ end }}
-
     {{ range $paginator.Pagers }}
     {{ $.Scratch.Set "pageNumFlag" false }}
     {{ if gt $paginator.TotalPages $maxLinks }}
@@ -60,7 +60,6 @@
     </li>
     {{ end }}
     {{ end }}
-
     {{ if $paginator.HasNext }}
     <li class="pag-next">
         <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
@@ -73,5 +72,6 @@
     {{ end }}
 </ul>
 {{ end }}
+<!-- END custom smart pagination -->
 
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6056021..7ee7d25 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,6 @@
 {{ define "main" }}
 <article>
+    <!-- post meta -->
     <h4 id="post-title">
         <a href="{{ .Permalink }}">{{ .Title }}</a>
     </h4>
@@ -9,10 +10,12 @@
     {{ with .Params.playerURL }}
     <div id="post-aplayer"></div>
     {{ end }}
+    <!-- post main content -->
     <div class="markdown-body" id="post-content">
         {{ .Content }}
     </div>
 </article>
+<!-- post license -->
 {{ if ne .Params.noLicense true }}
 <div class="markdown-body" id="license">
     <blockquote>
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index 6a0d4d2..b2860b2 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -1,8 +1,9 @@
 {{ define "main" }}
-<div id="page-tag">
+<!-- page info section e.g. current tag & total archive pages -->
+<div id="page-info">
     <span>{{ i18n "tagsCurrentTag" . }}</span>
 </div>
-<!-- tags page range in posts -->
+<!-- tags page range in posts with current tag -->
 {{ $paginator := .Paginator }}
 {{ range $paginator.Pages }}
 <div id="post">
@@ -16,11 +17,12 @@
         {{ .Summary }}
     </div>
     <div id="post-exlink">
-        <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
+        {{ partial "post-exlink.html" . }}
     </div>
 </div>
 {{ end }}
-<!-- custom smart pagination -->
+
+<!-- START custom smart pagination -->
 {{ $offsetLinks := 2 }}
 {{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
 {{ $lowerLimit := (add $offsetLinks 1) }}
@@ -37,7 +39,6 @@
         <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a>
     </li>
     {{ end }}
-
     {{ range $paginator.Pagers }}
     {{ $.Scratch.Set "pageNumFlag" false }}
     {{ if gt $paginator.TotalPages $maxLinks }}
@@ -63,7 +64,6 @@
     </li>
     {{ end }}
     {{ end }}
-
     {{ if $paginator.HasNext }}
     <li class="pag-next">
         <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a>
@@ -76,5 +76,6 @@
     {{ end }}
 </ul>
 {{ end }}
+<!-- END custom smart pagination -->
 
 {{ end }}
\ No newline at end of file
-- 
cgit v1.2.3