From 3cd5911befc5e9913383c7d26b9683c7e9eff2f6 Mon Sep 17 00:00:00 2001 From: Airbo ZH Date: Tue, 31 Jan 2023 11:42:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BE=A7=E6=A0=8F?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=84=E4=BB=B6=E4=B8=8D=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/modules/widgets/aside/categories.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/modules/widgets/aside/categories.html b/templates/modules/widgets/aside/categories.html index 8f00d33e..5acfe2fe 100644 --- a/templates/modules/widgets/aside/categories.html +++ b/templates/modules/widgets/aside/categories.html @@ -2,13 +2,12 @@
+ th:with="categories = ${categoryFinder.list(1, theme.config.sidebar.categoryQuantity)}">
分类
- + \ No newline at end of file From 68df9c2d8e68cdd667b9df839250d0cfd2c6ae29 Mon Sep 17 00:00:00 2001 From: Airbo ZH Date: Wed, 1 Feb 2023 16:33:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84div=20=E4=BC=9A=E5=AF=BC=E8=87=B4div=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/modules/widgets/aside/tags-stat.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/modules/widgets/aside/tags-stat.html b/templates/modules/widgets/aside/tags-stat.html index c2c6f3a5..af5e8110 100644 --- a/templates/modules/widgets/aside/tags-stat.html +++ b/templates/modules/widgets/aside/tags-stat.html @@ -4,16 +4,14 @@ -
-
+
- + -
+
- + -
From 2a25bd47e6c7ab423792215cbdac72c30e64db03 Mon Sep 17 00:00:00 2001 From: Airbo ZH Date: Wed, 1 Feb 2023 16:33:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20tags=E5=92=8Cstat=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=B2=A1=E6=9C=89card=E6=A0=B7=E5=BC=8F=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widgets/aside/contain/stat-contain.html | 48 +++++++++++++++++++ .../widgets/aside/contain/tags-contain.html | 23 +++++++++ templates/modules/widgets/aside/stat.html | 47 ++---------------- .../modules/widgets/aside/tags-stat.html | 4 +- templates/modules/widgets/aside/tags.html | 22 ++------- 5 files changed, 79 insertions(+), 65 deletions(-) create mode 100644 templates/modules/widgets/aside/contain/stat-contain.html create mode 100644 templates/modules/widgets/aside/contain/tags-contain.html diff --git a/templates/modules/widgets/aside/contain/stat-contain.html b/templates/modules/widgets/aside/contain/stat-contain.html new file mode 100644 index 00000000..8cd27f94 --- /dev/null +++ b/templates/modules/widgets/aside/contain/stat-contain.html @@ -0,0 +1,48 @@ + + + + + + +
统计
+
+
+
+
文章数 :
+
+
+
+ + + + + + + + + + + + +
+
+
分类数 :
+
+
+
+
+
+
评论数 :
+
+
+
+
+
+
访问量 :
+
+
+
+
+ + + \ No newline at end of file diff --git a/templates/modules/widgets/aside/contain/tags-contain.html b/templates/modules/widgets/aside/contain/tags-contain.html new file mode 100644 index 00000000..a7da31c5 --- /dev/null +++ b/templates/modules/widgets/aside/contain/tags-contain.html @@ -0,0 +1,23 @@ + + + + + + +
标签
+
+ + + [[${tag.spec.displayName}]] + + +
+ + + + + \ No newline at end of file diff --git a/templates/modules/widgets/aside/stat.html b/templates/modules/widgets/aside/stat.html index 62dfd64a..450060b0 100644 --- a/templates/modules/widgets/aside/stat.html +++ b/templates/modules/widgets/aside/stat.html @@ -1,48 +1,7 @@ - - -
统计
-
-
-
-
文章数 :
-
-
-
- - - - - - - - - - - - -
-
-
分类数 :
-
-
-
-
-
-
评论数 :
-
-
-
-
-
-
访问量 :
-
-
-
-
- - - \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/templates/modules/widgets/aside/tags-stat.html b/templates/modules/widgets/aside/tags-stat.html index af5e8110..5d73bbf7 100644 --- a/templates/modules/widgets/aside/tags-stat.html +++ b/templates/modules/widgets/aside/tags-stat.html @@ -6,11 +6,11 @@
- +
- +
diff --git a/templates/modules/widgets/aside/tags.html b/templates/modules/widgets/aside/tags.html index c6c46990..baea78a5 100644 --- a/templates/modules/widgets/aside/tags.html +++ b/templates/modules/widgets/aside/tags.html @@ -2,22 +2,6 @@ - - -
标签
-
- - - [[${tag.spec.displayName}]] - - -
- - - - - +
+ +
\ No newline at end of file From c2790cfab014f20a63f9c1852ea52967ed7ded5a Mon Sep 17 00:00:00 2001 From: sunheyi <1061867552@qq.com> Date: Sat, 4 Feb 2023 16:33:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat=EF=BC=9A=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E5=BB=BA=E7=AB=99=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/js/main.js | 14 ++++++++--- .../widgets/aside/contain/stat-contain.html | 24 +++++++++---------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/templates/assets/js/main.js b/templates/assets/js/main.js index a20286de..05588777 100644 --- a/templates/assets/js/main.js +++ b/templates/assets/js/main.js @@ -682,10 +682,17 @@ document.addEventListener('DOMContentLoaded', function () { * 網頁運行時間 */ const addRuntime = () => { - const $runtimeCount = document.getElementById('runtimeshow') + const $runtimeCount = document.getElementById('runtimeshow'); if ($runtimeCount) { - const publishDate = $runtimeCount.getAttribute('data-publishDate') - $runtimeCount.innerText = btf.diffDate(publishDate) + ' ' + GLOBAL_CONFIG.runtime + var s1 = $runtimeCount.innerText;;//建站时间 + if(s1) + { + s1 = new Date(s1.replace(/-/g, "/")); + s2 = new Date(); + var days = s2.getTime() - s1.getTime(); + var number_of_days = parseInt(days / (1000 * 60 * 60 * 24)); + $runtimeCount.innerText =number_of_days; + } } } @@ -863,6 +870,7 @@ document.addEventListener('DOMContentLoaded', function () { // GLOBAL_CONFIG.runtime && addRuntime() addLastPushDate() toggleCardCategory() + addRuntime() } sidebarFn() diff --git a/templates/modules/widgets/aside/contain/stat-contain.html b/templates/modules/widgets/aside/contain/stat-contain.html index 8cd27f94..ae285c48 100644 --- a/templates/modules/widgets/aside/contain/stat-contain.html +++ b/templates/modules/widgets/aside/contain/stat-contain.html @@ -12,18 +12,6 @@
- - - - - - - - - - - -
分类数 :
@@ -42,6 +30,18 @@
+
+
+
建站天数 :
+
+
+
+ From 7c07986f998152dfa1dd2a182e690ae1da608c19 Mon Sep 17 00:00:00 2001 From: sunheyi <1061867552@qq.com> Date: Sat, 4 Feb 2023 16:41:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=20=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/assets/js/main.js b/templates/assets/js/main.js index 05588777..66887db1 100644 --- a/templates/assets/js/main.js +++ b/templates/assets/js/main.js @@ -691,7 +691,7 @@ document.addEventListener('DOMContentLoaded', function () { s2 = new Date(); var days = s2.getTime() - s1.getTime(); var number_of_days = parseInt(days / (1000 * 60 * 60 * 24)); - $runtimeCount.innerText =number_of_days; + $runtimeCount.innerText =number_of_days+"天"; } } } From a1d7a80526d31d42794cfb29d4a61abd2f6acbcc Mon Sep 17 00:00:00 2001 From: sunheyi <1061867552@qq.com> Date: Sat, 4 Feb 2023 17:27:14 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=20=E6=96=87=E5=BA=93=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/modules/sidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html index 25e2bbf9..136650e1 100644 --- a/templates/modules/sidebar.html +++ b/templates/modules/sidebar.html @@ -40,9 +40,9 @@
- +
-
+