fix: deprecated unwrapped fragment expression

Signed-off-by: Ryan Wang <i@ryanc.cc>
xzhuz · Nov 20, 2023 · 83eff9c · 83eff9c
1 parent 04ef334
commit 83eff9c
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 27 deletions.
diff --git a/templates/archives.html b/templates/archives.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = '归档 - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = '归档 - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">

diff --git a/templates/assets/dist/style.css b/templates/assets/dist/style.css
diff --git a/templates/categories.html b/templates/categories.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = '分类 - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = '分类 - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">

diff --git a/templates/category.html b/templates/category.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = '分类：' + ${category.spec.displayName} + ' - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = '分类：' + ${category.spec.displayName} + ' - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">
@@ -39,10 +39,10 @@
         th:classappend="${theme.config.home_setting.posts_style}?'px-5 md:px-0 max-w-xl sm:max-w-2xl md:max-w-3xl lg:max-w-5xl':'px-5 max-w-4xl'"
       >
         <th:block th:if="${theme.config.home_setting.posts_style}">
-          <th:block th:replace="module/widget/post_cards :: post_cards" />
+          <th:block th:replace="~{module/widget/post_cards :: post_cards}" />
         </th:block>
         <th:block th:unless="${theme.config.home_setting.posts_style}">
-          <th:block th:replace="module/widget/post_list :: post_list" />
+          <th:block th:replace="~{module/widget/post_list :: post_list}" />
         </th:block>
         <!-- 分页 -->
         <nav

diff --git a/templates/index.html b/templates/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = ${site.title},content = ~{::content})"
+  th:replace="~{module/macro :: html(title = ${site.title},content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">
@@ -66,7 +66,7 @@ <h3 class="mb-4 mt-8 hidden dark:text-gray-300 md:block">
             <span class="iconfont icon-new mr-2 text-base text-red-600"></span>
             最新文章
           </h3>
-          <th:block th:replace="module/widget/post_cards :: post_cards" />
+          <th:block th:replace="~{module/widget/post_cards :: post_cards}" />
         </th:block>
         <th:block th:unless="${theme.config.home_setting.posts_style}">
           <div
@@ -87,7 +87,7 @@ <h3 class="mb-4 mt-8 dark:text-gray-300">
             <span class="iconfont icon-new mr-2 text-base text-red-600"></span>
             最新文章
           </h3>
-          <th:block th:replace="module/widget/post_list :: post_list" />
+          <th:block th:replace="~{module/widget/post_list :: post_list}" />
         </th:block>
 
         <!-- 分页 -->

diff --git a/templates/links.html b/templates/links.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = '友情链接 - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = '友情链接 - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">

diff --git a/templates/module/footer.html b/templates/module/footer.html
@@ -159,5 +159,5 @@
     </div>
   </footer>
 
-  <th:block th:replace="module/back2Top :: back2Top" />
+  <th:block th:replace="~{module/back2Top :: back2Top}" />
 </th:block>
diff --git a/templates/module/header.html b/templates/module/header.html
@@ -80,7 +80,7 @@
             class="link fill-current text-gray-800 dark:text-gray-100"
             style="padding-top: 0.8rem"
           >
-            <th:block th:replace="module/dark_mode :: dark_mode" />
+            <th:block th:replace="~{module/dark_mode :: dark_mode}" />
           </span>
           <span
             th:if="${pluginFinder.available('PluginSearchWidget')}"

diff --git a/templates/module/macro.html b/templates/module/macro.html
@@ -12,7 +12,7 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <title th:text="${title}"></title>
-    <th:block th:replace="module/styles :: styles" />
+    <th:block th:replace="~{module/styles :: styles}" />
     <script th:src="@{/assets/js/plugins/jquery.min.js}"></script>
     <script
       th:if="${theme.config.general.pjax_enabled} and ${pluginFinder.available('PluginCommentWidget')}"
@@ -21,15 +21,15 @@
   </head>
   <body class="m-0 h-full p-0 font-sans">
     <div class="flex h-full flex-col">
-      <th:block th:replace="module/header :: header" />
+      <th:block th:replace="~{module/header :: header}" />
       <div class="bg-gray-50 dark:bg-gray-900" style="flex: 1 0 auto">
         <th:block th:replace="${content}" />
       </div>
-      <th:block th:replace="module/footer :: footer" />
+      <th:block th:replace="~{module/footer :: footer}" />
     </div>
   </body>
-  <th:block th:replace="module/plugins :: plugins" />
+  <th:block th:replace="~{module/plugins :: plugins}" />
   <script th:src="@{/assets/js/utils.js}"></script>
   <script th:src="@{/assets/js/main.js}"></script>
-  <th:block th:replace="module/script :: script" />
+  <th:block th:replace="~{module/script :: script}" />
 </html>
diff --git a/templates/module/script.html b/templates/module/script.html
@@ -73,5 +73,5 @@
   </th:block>
 
   <!-- Pjax 相关代码  -->
-  <th:block th:replace="module/pjax :: pjax" />
+  <th:block th:replace="~{module/pjax :: pjax}" />
 </th:block>
diff --git a/templates/moments.html b/templates/moments.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = |${title} - ${site.title}|, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = |${title} - ${site.title}|, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">

diff --git a/templates/page.html b/templates/page.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = ${singlePage.spec.title} + ' - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = ${singlePage.spec.title} + ' - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">

diff --git a/templates/photos.html b/templates/photos.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = |${title} - ${site.title}|, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = |${title} - ${site.title}|, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">

diff --git a/templates/post.html b/templates/post.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = ${post.spec.title} + ' - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = ${post.spec.title} + ' - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">
@@ -146,7 +146,7 @@
       <div
         class="md-content mx-auto mt-8 max-w-4xl text-center tracking-wider sm:leading-normal md:leading-relaxed"
       >
-        <th:block th:replace="module/widget/sponsor :: sponsor" />
+        <th:block th:replace="~{module/widget/sponsor :: sponsor}" />
         <div class="my-4 inline-block text-center">
           <span
             role="button"

diff --git a/templates/tag.html b/templates/tag.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = '标签：' + ${tag.spec.displayName} + ' - ' + ${site.title}, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = '标签：' + ${tag.spec.displayName} + ' - ' + ${site.title}, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">
@@ -39,10 +39,10 @@
         th:classappend="${theme.config.home_setting.posts_style}?'px-5 md:px-0 max-w-xl sm:max-w-2xl md:max-w-3xl lg:max-w-5xl':'px-5 max-w-4xl'"
       >
         <th:block th:if="${theme.config.home_setting.posts_style}">
-          <th:block th:replace="module/widget/post_cards :: post_cards" />
+          <th:block th:replace="~{module/widget/post_cards :: post_cards}" />
         </th:block>
         <th:block th:unless="${theme.config.home_setting.posts_style}">
-          <th:block th:replace="module/widget/post_list :: post_list" />
+          <th:block th:replace="~{module/widget/post_list :: post_list}" />
         </th:block>
         <!-- 分页 -->
         <nav

diff --git a/templates/tags.html b/templates/tags.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="module/macro :: html(title = '标签 - ' + ${site.title}, header = null, content = ~{::content})"
+  th:replace="~{module/macro :: html(title = '标签 - ' + ${site.title}, header = null, content = ~{::content})}"
 >
   <th:block th:fragment="content">
     <main class="mx-auto" id="container">