Merge pull request #4 from amzrk2/dev

Merge branch "dev" into "master"

4 files changed, 172 insertions, 17 deletions

diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index 62114b2..dab458f 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 <div id="page-tag">
-    <span>文章总数：{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span>
+    <span>{{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span>
 </div>
 <!-- archives range in posts -->
 {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }}
@@ -14,9 +14,61 @@
     </div>
 </div>
 {{ end }}
+<!-- custom smart pagination -->
+{{ $offsetLinks := 2 }}
+{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
+{{ $lowerLimit := (add $offsetLinks 1) }}
+{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
 {{ if gt $paginator.TotalPages 1 }}
-<div id="pagination">
-    {{ template "_internal/pagination.html" . }}
-</div>
+<ul id="pagination">
+    {{ if ne $paginator.PageNumber 1 }}
+    <li class="pag-first">
+        <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a>
+    </li>
+    {{ end }}
+    {{ if $paginator.HasPrev }}
+    <li class="pag-previous">
+        <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a>
+    </li>
+    {{ end }}
+
+    {{ range $paginator.Pagers }}
+    {{ $.Scratch.Set "pageNumFlag" false }}
+    {{ if gt $paginator.TotalPages $maxLinks }}
+    {{ if le $paginator.PageNumber $lowerLimit }}
+    {{ if le .PageNumber $maxLinks }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ else if ge $paginator.PageNumber $upperLimit }}
+    {{ if gt .PageNumber (sub $paginator.TotalPages $maxLinks) }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ else }}
+    {{ if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ end }}
+    {{ else }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ if eq ($.Scratch.Get "pageNumFlag") true }}
+    <li class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+        <a href="{{ .URL }}">{{ .PageNumber }}</a>
+    </li>
+    {{ end }}
+    {{ end }}
+
+    {{ if $paginator.HasNext }}
+    <li class="pag-next">
+        <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a>
+    </li>
+    {{ end }}
+    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+    <li class="pag-last">
+        <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a>
+    </li>
+    {{ end }}
+</ul>
 {{ end }}
+
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 9f72153..a1eb732 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -16,9 +16,7 @@
                 {{ partial "sidebar.html" . }}
             </div>
             <div id="container-progress">
-                <a href="javascript:void(0)">
-                    <div id="progress"></div>
-                </a>
+                <div id="progress"></div>
             </div>
         </div>
     </main>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e459763..567e577 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -17,9 +17,61 @@
     </div>
 </div>
 {{ end }}
+<!-- custom smart pagination -->
+{{ $offsetLinks := 2 }}
+{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
+{{ $lowerLimit := (add $offsetLinks 1) }}
+{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
 {{ if gt $paginator.TotalPages 1 }}
-<div id="pagination">
-    {{ template "_internal/pagination.html" . }}
-</div>
+<ul id="pagination">
+    {{ if ne $paginator.PageNumber 1 }}
+    <li class="pag-first">
+        <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a>
+    </li>
+    {{ end }}
+    {{ if $paginator.HasPrev }}
+    <li class="pag-previous">
+        <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a>
+    </li>
+    {{ end }}
+
+    {{ range $paginator.Pagers }}
+    {{ $.Scratch.Set "pageNumFlag" false }}
+    {{ if gt $paginator.TotalPages $maxLinks }}
+    {{ if le $paginator.PageNumber $lowerLimit }}
+    {{ if le .PageNumber $maxLinks }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ else if ge $paginator.PageNumber $upperLimit }}
+    {{ if gt .PageNumber (sub $paginator.TotalPages $maxLinks) }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ else }}
+    {{ if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ end }}
+    {{ else }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ if eq ($.Scratch.Get "pageNumFlag") true }}
+    <li class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+        <a href="{{ .URL }}">{{ .PageNumber }}</a>
+    </li>
+    {{ end }}
+    {{ end }}
+
+    {{ if $paginator.HasNext }}
+    <li class="pag-next">
+        <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a>
+    </li>
+    {{ end }}
+    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+    <li class="pag-last">
+        <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a>
+    </li>
+    {{ end }}
+</ul>
 {{ end }}
+
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index 5aef22f..dd15f58 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -1,9 +1,10 @@
 {{ define "main" }}
 <div id="page-tag">
-    <span>拥有标签 {{ .Title }} 的文章：</span>
+    <span>{{ i18n "tagsCurrentTag" . }}</span>
 </div>
 <!-- tags page range in posts -->
-{{ range .Paginator.Pages }}
+{{ $paginator := .Paginator }}
+{{ range $paginator.Pages }}
 <div id="post">
     <h2 id="post-title">
         <a href="{{ .Permalink }}">{{ .Title }}</a>
@@ -11,7 +12,7 @@
     <div id="post-meta">
         {{ partial "post-meta.html" . }}
     </div>
-    <div id="post-summary">
+    <div class="markdown-body" id="post-summary">
         {{ .Summary }}
     </div>
     <div id="post-exlink">
@@ -19,9 +20,61 @@
     </div>
 </div>
 {{ end }}
-{{ if gt .Paginator.TotalPages 1 }}
-<div id="pagination">
-    {{ template "_internal/pagination.html" . }}
-</div>
+<!-- custom smart pagination -->
+{{ $offsetLinks := 2 }}
+{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
+{{ $lowerLimit := (add $offsetLinks 1) }}
+{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
+{{ if gt $paginator.TotalPages 1 }}
+<ul id="pagination">
+    {{ if ne $paginator.PageNumber 1 }}
+    <li class="pag-first">
+        <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a>
+    </li>
+    {{ end }}
+    {{ if $paginator.HasPrev }}
+    <li class="pag-previous">
+        <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a>
+    </li>
+    {{ end }}
+
+    {{ range $paginator.Pagers }}
+    {{ $.Scratch.Set "pageNumFlag" false }}
+    {{ if gt $paginator.TotalPages $maxLinks }}
+    {{ if le $paginator.PageNumber $lowerLimit }}
+    {{ if le .PageNumber $maxLinks }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ else if ge $paginator.PageNumber $upperLimit }}
+    {{ if gt .PageNumber (sub $paginator.TotalPages $maxLinks) }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ else }}
+    {{ if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ end }}
+    {{ else }}
+    {{ $.Scratch.Set "pageNumFlag" true }}
+    {{ end }}
+    {{ if eq ($.Scratch.Get "pageNumFlag") true }}
+    <li class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+        <a href="{{ .URL }}">{{ .PageNumber }}</a>
+    </li>
+    {{ end }}
+    {{ end }}
+
+    {{ if $paginator.HasNext }}
+    <li class="pag-next">
+        <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a>
+    </li>
+    {{ end }}
+    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+    <li class="pag-last">
+        <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a>
+    </li>
+    {{ end }}
+</ul>
 {{ end }}
+
 {{ end }}
\ No newline at end of file