From 332c38a97ac4eb5082948c4f189ce27734d46974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Mon, 17 May 2021 15:15:45 +0800
Subject: [PATCH] =?UTF-8?q?layout:=E6=9B=B4=E6=96=B0=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E5=B8=A6=E6=9C=89=E7=BF=BB=E9=A1=B5=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/grid/layout/category.ejs | 13 +++----------
 themes/grid/layout/index.ejs    | 13 +++----------
 themes/grid/layout/post.ejs     | 23 ++++++++++++-----------
 themes/grid/layout/recently.ejs | 13 +++----------
 themes/grid/layout/tag.ejs      | 13 +++----------
 5 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/themes/grid/layout/category.ejs b/themes/grid/layout/category.ejs
index 14d9101..1bfdbb3 100644
--- a/themes/grid/layout/category.ejs
+++ b/themes/grid/layout/category.ejs
@@ -1,17 +1,10 @@
 <div class="flex mx-2 my-2 main-content">
     <section class="w-3-4-a w-2-2-n w-2-2-m px-1">
         <%- partial('partial/post/list', {start: 1}) %>
-        <% if (page.total > 1) { %>
-        <div class="flex rm-between-a p-1">
-            <a class="<% if (page.prev == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.prev_link %>"
-                uk-slidenav-previous></a>
-            <a class="<% if (page.next == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.next_link %>"
-                uk-slidenav-next
-                ></a>
+        <div class="uk-card uk-card-default uk-card-small uk-width-1-1 px-2 py-1 flex rm-between-a cm-center-a">
+            <%- uk_paginator({total: page.total, current: page.current, sideSize: 3, midSize: 6, base: url_for(page.path), mainClasses: ["mb-0"]}) %>
+            <a href="#" uk-totop uk-scroll class="mt-1" title="回到页首" tooltip="回到页首"></a>
         </div>
-        <% } %>
     </section>
     <section class="w-1-4-a flex col-a hin him">
         <%- partial('partial/side', {'noCategories': true, 'noTags': false}) %>
diff --git a/themes/grid/layout/index.ejs b/themes/grid/layout/index.ejs
index ac02bb8..b3389da 100644
--- a/themes/grid/layout/index.ejs
+++ b/themes/grid/layout/index.ejs
@@ -1,17 +1,10 @@
 <div class="flex mx-2 my-2 main-content">
     <section class="w-3-4-a w-2-2-m px-1 extend-1-a">
         <%- partial('partial/post/list', {start: 1}) %>
-        <% if (page.total > 1) { %>
-        <div class="flex rm-between-a p-1">
-            <a class="<% if (page.prev == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.prev_link %>"
-                uk-slidenav-previous></a>
-            <a class="<% if (page.next == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.next_link %>"
-                uk-slidenav-next
-                ></a>
+        <div class="uk-card uk-card-default uk-card-small uk-width-1-1 px-2 py-1 flex rm-between-a cm-center-a">
+            <%- uk_paginator({total: page.total, current: page.current, sideSize: 3, midSize: 6, base: "/", mainClasses: ["mb-0"]}) %>
+            <a href="#" uk-totop uk-scroll class="mt-1" title="回到页首" tooltip="回到页首"></a>
         </div>
-        <% } %>
     </section>
     <section class="w-1-4-a flex col-a hin him">
         <%- partial('partial/side', {'noCategories': false, 'noTags': false}) %>
diff --git a/themes/grid/layout/post.ejs b/themes/grid/layout/post.ejs
index 67f1cdb..0c96133 100644
--- a/themes/grid/layout/post.ejs
+++ b/themes/grid/layout/post.ejs
@@ -21,24 +21,25 @@
                                 separator: ' / '
                                 }) %>
                         </div>
-                        <% } %>
+                    <% } %>
                 </div>
             </div>
             <article class="uk-card-body">
                 <%- page.content %>
             </article>
-            <% if (page.tags.length> 0) { %>
-                <div class="uk-card-footer flex rm-start-a">
-                    <div class="tag-title">分类标签：</div>
-                    <div class="flex rm-flex-a extend-1-a w-wrap-a tag-host">
-                        <% page.tags.each(function(tag) { %>
-                            <span class="uk-label ml-1 mb-1">
-                                <%= tag.name %>
-                            </span>
-                            <% }) %>
-                    </div>
+            <div class="uk-card-footer flex rm-between-a">
+                <div class="tag-title">分类标签：</div>
+                <% if (page.tags.length> 0) { %>
+                <div class="flex rm-flex-a extend-1-a w-wrap-a tag-host">
+                    <% page.tags.each(function(tag) { %>
+                        <span class="uk-label ml-1 mb-1">
+                            <%= tag.name %>
+                        </span>
+                        <% }) %>
                 </div>
                 <% } %>
+                <a href="#" uk-totop uk-scroll class="mt-1 js-end-a" title="回到页首" tooltip="回到页首"></a>
+            </div>
         </div>
     </section>
     <section class="w-1-4-a hin him">
diff --git a/themes/grid/layout/recently.ejs b/themes/grid/layout/recently.ejs
index 927d822..665c6fe 100644
--- a/themes/grid/layout/recently.ejs
+++ b/themes/grid/layout/recently.ejs
@@ -1,17 +1,10 @@
 <div class="flex mx-2 my-2 main-content">
     <section class="w-3-4-a w-2-2-m px-1 extend-1-a">
         <%- partial('partial/post/update-list', {start: 1}) %>
-        <% if (page.total > 1) { %>
-        <div class="flex rm-between-a p-1">
-            <a class="<% if (page.prev == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.prev_link %>"
-                uk-slidenav-previous></a>
-            <a class="<% if (page.next == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.next_link %>"
-                uk-slidenav-next
-                ></a>
+        <div class="uk-card uk-card-default uk-card-small uk-width-1-1 px-2 py-1 flex rm-between-a cm-center-a">
+            <%- uk_paginator({total: page.total, current: page.current, sideSize: 3, midSize: 6, base: url_for(page.path), mainClasses: ["mb-0"]}) %>
+            <a href="#" uk-totop uk-scroll class="mt-1" title="回到页首" tooltip="回到页首"></a>
         </div>
-        <% } %>
     </section>
     <section class="w-1-4-a flex col-a hin him">
         <%- partial('partial/side', {'noCategories': false, 'noTags': false}) %>
diff --git a/themes/grid/layout/tag.ejs b/themes/grid/layout/tag.ejs
index 4cadc3b..9cf654f 100644
--- a/themes/grid/layout/tag.ejs
+++ b/themes/grid/layout/tag.ejs
@@ -1,17 +1,10 @@
 <div class="flex mx-2 my-2 main-content">
     <section class="w-3-4-a w-2-2-n w-2-2-m px-1">
         <%- partial('partial/post/list', {start: 1}) %>
-        <% if (page.total > 1) { %>
-        <div class="flex row-a rm-between-a p-1">
-            <a class="<% if (page.prev == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.prev_link %>"
-                uk-slidenav-previous></a>
-            <a class="<% if (page.next == 0) { %>uk-disabled<% } %>"
-                href="/<%- page.next_link %>"
-                uk-slidenav-next
-                ></a>
+        <div class="uk-card uk-card-default uk-card-small uk-width-1-1 px-2 py-1 flex rm-between-a cm-center-a">
+            <%- uk_paginator({total: page.total, current: page.current, sideSize: 3, midSize: 6, base: url_for(page.path), mainClasses: ["mb-0"]}) %>
+            <a href="#" uk-totop uk-scroll class="mt-1" title="回到页首" tooltip="回到页首"></a>
         </div>
-        <% } %>
     </section>
     <section class="w-1-4-a flex col-a hin him">
         <%- partial('partial/side', {'noCategories': false, 'noTags': true}) %>