From 313bf70c1c2b06c93803494d2fdb3c5a2c78a150 Mon Sep 17 00:00:00 2001
From: nineya <361654768@qq.com>
Date: Wed, 22 Mar 2023 14:57:52 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/common/widget.html                  | 24 ++++++-------------
 .../widget/{ad_piece.ftl => ad_piece.html}    |  0
 .../{categories.ftl => categories.html}       |  0
 templates/widget/{links.ftl => links.html}    |  0
 templates/widget/{love.ftl => love.html}      |  0
 templates/widget/{music.ftl => music.html}    |  0
 templates/widget/{notice.ftl => notice.html}  |  0
 .../widget/{profile.ftl => profile.html}      |  0
 ...cent_comments.ftl => recent_comments.html} |  0
 .../{recent_posts.ftl => recent_posts.html}   |  0
 .../widget/{tagcloud.ftl => tagcloud.html}    |  0
 templates/widget/{tags.ftl => tags.html}      |  0
 templates/widget/{toc.ftl => toc.html}        |  0
 13 files changed, 7 insertions(+), 17 deletions(-)
 rename templates/widget/{ad_piece.ftl => ad_piece.html} (100%)
 rename templates/widget/{categories.ftl => categories.html} (100%)
 rename templates/widget/{links.ftl => links.html} (100%)
 rename templates/widget/{love.ftl => love.html} (100%)
 rename templates/widget/{music.ftl => music.html} (100%)
 rename templates/widget/{notice.ftl => notice.html} (100%)
 rename templates/widget/{profile.ftl => profile.html} (100%)
 rename templates/widget/{recent_comments.ftl => recent_comments.html} (100%)
 rename templates/widget/{recent_posts.ftl => recent_posts.html} (100%)
 rename templates/widget/{tagcloud.ftl => tagcloud.html} (100%)
 rename templates/widget/{tags.ftl => tags.html} (100%)
 rename templates/widget/{toc.ftl => toc.html} (100%)

diff --git a/templates/common/widget.html b/templates/common/widget.html
index defe1d4..c482dd9 100644
--- a/templates/common/widget.html
+++ b/templates/common/widget.html
@@ -1,21 +1,11 @@
 <aside xmlns:th="https://www.thymeleaf.org"
        th:fragment="widget (position)"
        class="column column-side column-${position} ${settings[position+'_sidebar_sticky']!'none'}-sticky">
-<!--    <#assign sidebar_list=[]>-->
-<!--    <#list settings?keys as key>-->
-<!--        <#if key?index_of('sidebar_priority_') != -1>-->
-<!--            <#assign property = "sidebar_" + key?substring(17)>-->
-<!--            <#if settings[property]?? && settings[property] == position>-->
-<!--                <#assign priority = settings[key]!'0'?number>-->
-<!--                <#assign sidebar_list=sidebar_list + [{"property": "${key?substring(17)}", "priority": "${priority}"}]>-->
-<!--            </#if>-->
-<!--        </#if>-->
-<!--    </#list>-->
-<!--    <#list sidebar_list?sort_by('priority')?reverse as sidebar>-->
-<!--        <#include "../widget/${sidebar.property}.ftl">-->
-<!--    </#list>-->
-<!--    <#if position == 'left'>-->
-<!--        <div class="column-right-shadow is-hidden-desktop">-->
-<!--        </div>-->
-<!--    </#if>-->
+  <th:block th:each="sidebar :${theme.config.sidebar.sidebar_show}">
+    <th:block th:if="${sidebar.position == position}">
+      <th:block th:replace="${'/widget/' + sidebar.type}" />
+    </th:block>
+  </th:block>
+  <div th:if="${position == 'left'}" class="column-right-shadow is-hidden-desktop">
+  </div>
 </aside>
\ No newline at end of file
diff --git a/templates/widget/ad_piece.ftl b/templates/widget/ad_piece.html
similarity index 100%
rename from templates/widget/ad_piece.ftl
rename to templates/widget/ad_piece.html
diff --git a/templates/widget/categories.ftl b/templates/widget/categories.html
similarity index 100%
rename from templates/widget/categories.ftl
rename to templates/widget/categories.html
diff --git a/templates/widget/links.ftl b/templates/widget/links.html
similarity index 100%
rename from templates/widget/links.ftl
rename to templates/widget/links.html
diff --git a/templates/widget/love.ftl b/templates/widget/love.html
similarity index 100%
rename from templates/widget/love.ftl
rename to templates/widget/love.html
diff --git a/templates/widget/music.ftl b/templates/widget/music.html
similarity index 100%
rename from templates/widget/music.ftl
rename to templates/widget/music.html
diff --git a/templates/widget/notice.ftl b/templates/widget/notice.html
similarity index 100%
rename from templates/widget/notice.ftl
rename to templates/widget/notice.html
diff --git a/templates/widget/profile.ftl b/templates/widget/profile.html
similarity index 100%
rename from templates/widget/profile.ftl
rename to templates/widget/profile.html
diff --git a/templates/widget/recent_comments.ftl b/templates/widget/recent_comments.html
similarity index 100%
rename from templates/widget/recent_comments.ftl
rename to templates/widget/recent_comments.html
diff --git a/templates/widget/recent_posts.ftl b/templates/widget/recent_posts.html
similarity index 100%
rename from templates/widget/recent_posts.ftl
rename to templates/widget/recent_posts.html
diff --git a/templates/widget/tagcloud.ftl b/templates/widget/tagcloud.html
similarity index 100%
rename from templates/widget/tagcloud.ftl
rename to templates/widget/tagcloud.html
diff --git a/templates/widget/tags.ftl b/templates/widget/tags.html
similarity index 100%
rename from templates/widget/tags.ftl
rename to templates/widget/tags.html
diff --git a/templates/widget/toc.ftl b/templates/widget/toc.html
similarity index 100%
rename from templates/widget/toc.ftl
rename to templates/widget/toc.html