From 0aee53cb7dc0cd1b99aa39a913a14f73d9fee7fb Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 28 Oct 2022 21:40:05 +0800
Subject: [PATCH] fix: deprecated unwrapped fragment expression

---
 templates/category.html                   | 6 +++---
 templates/index.html                      | 6 +++---
 templates/links.html                      | 2 +-
 templates/modules/category-tree.html      | 2 +-
 templates/modules/header.html             | 6 +++---
 templates/modules/layout.html             | 8 ++++----
 templates/modules/sidebar.html            | 2 +-
 templates/modules/widgets/categories.html | 2 +-
 templates/page.html                       | 4 ++--
 templates/post.html                       | 6 +++---
 templates/tag.html                        | 4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/templates/category.html b/templates/category.html
index de5ba4e..eb1e7b4 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = null)"
+  th:replace="~{modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = null)}"
 >
   <th:block th:fragment="content">
-    <th:block th:replace="modules/category-filter" />
+    <th:block th:replace="~{modules/category-filter}" />
 
     <div
       id="post-list"
@@ -15,7 +15,7 @@
     >
       <th:block th:each="post : ${postItems}">
         <th:block
-          th:replace="modules/post-card :: post-card(${post},true,true,true,${list_layout == 'single' ? 'column' : 'row'})"
+          th:replace="~{modules/post-card :: post-card(${post},true,true,true,${list_layout == 'single' ? 'column' : 'row'})}"
         />
       </th:block>
     </div>
diff --git a/templates/index.html b/templates/index.html
index 5de2245..be6ef2f 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = null)"
+  th:replace="~{modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = null)}"
 >
   <th:block th:fragment="content">
-    <th:block th:replace="modules/category-filter" />
+    <th:block th:replace="~{modules/category-filter}" />
 
     <div
       id="post-list"
@@ -15,7 +15,7 @@
     >
       <th:block th:each="post : ${postItems}">
         <th:block
-          th:replace="modules/post-card :: post-card(${post},true,true,true,${list_layout == 'single' ? 'column' : 'row'})"
+          th:replace="~{modules/post-card :: post-card(${post},true,true,true,${list_layout == 'single' ? 'column' : 'row'})}"
         />
       </th:block>
     </div>
diff --git a/templates/links.html b/templates/links.html
index 123b286..89a0b5f 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = ~{::sidebar}, contentClass = '')"
+  th:replace="~{modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = ~{::sidebar}, contentClass = '')}"
 >
   <th:block th:fragment="content">
     <div class="rounded-xl bg-white p-4">
diff --git a/templates/modules/category-tree.html b/templates/modules/category-tree.html
index a9a3143..341c389 100644
--- a/templates/modules/category-tree.html
+++ b/templates/modules/category-tree.html
@@ -13,7 +13,7 @@
       </span>
     </a>
     <th:block th:if="${not #lists.isEmpty(category.children)}">
-      <th:block th:replace="modules/category-tree :: next (categories=${category.children})"></th:block>
+      <th:block th:replace="~{modules/category-tree :: next (categories=${category.children})}"></th:block>
     </th:block>
   </li>
 </ul>
diff --git a/templates/modules/header.html b/templates/modules/header.html
index 58f1578..d1e7acc 100644
--- a/templates/modules/header.html
+++ b/templates/modules/header.html
@@ -93,21 +93,21 @@
       <th:block th:switch="${theme.config.layout.header_widget}">
         <th:block th:case="latest_post" th:with="posts = ${postFinder.list(1,1)}">
           <div class="container mx-auto py-6" th:if="${posts.total gt 0}">
-            <th:block th:replace="modules/featured-post-card :: featured-post-card(post=${posts.items[0]})" />
+            <th:block th:replace="~{modules/featured-post-card :: featured-post-card(post=${posts.items[0]})}" />
           </div>
         </th:block>
         <th:block th:case="latest_post_grid" th:with="posts = ${postFinder.list(1,5)}">
           <div class="container mx-auto grid grid-cols-1 gap-3 py-6 sm:grid-cols-5" th:if="${posts.total gt 0}">
             <div class="col-span-1 sm:col-span-3">
               <th:block
-                th:replace="modules/post-card :: post-card(post=${posts.items[0]},cover=true,animation=false,border=false,direction='row')"
+                th:replace="~{modules/post-card :: post-card(post=${posts.items[0]},cover=true,animation=false,border=false,direction='row')}"
               />
             </div>
             <div class="col-span-1 grid grid-cols-1 gap-3 sm:col-span-2 sm:grid-cols-2">
               <th:block th:each="post,postStat : ${posts.items}">
                 <th:block th:if="${postStat.index != 0}">
                   <th:block
-                    th:replace="modules/post-card :: post-card(post=${post},cover=false,animation=false,border=false,direction='row')"
+                    th:replace="~{modules/post-card :: post-card(post=${post},cover=false,animation=false,border=false,direction='row')}"
                   />
                 </th:block>
               </th:block>
diff --git a/templates/modules/layout.html b/templates/modules/layout.html
index 67f8e77..95c2e92 100644
--- a/templates/modules/layout.html
+++ b/templates/modules/layout.html
@@ -17,7 +17,7 @@
       <th:block th:replace="${header}" />
     </th:block>
     <th:block th:if="${header == null}">
-      <th:block th:replace="modules/header :: header(isHome = true)" />
+      <th:block th:replace="~{modules/header :: header(isHome = true)}" />
     </th:block>
     <section class="container mx-auto"></section>
     <section class="container mx-auto mt-6 grid grid-cols-4 gap-6" th:classappend="${contentClass}">
@@ -28,13 +28,13 @@
         <th:block th:replace="${sidebar}" />
       </th:block>
       <th:block th:if="${sidebar == null}">
-        <th:block th:replace="modules/sidebar :: sidebar(prepend = null)" />
+        <th:block th:replace="~{modules/sidebar :: sidebar(prepend = null)}" />
       </th:block>
     </section>
-    <th:block th:replace="modules/footer" />
+    <th:block th:replace="~{modules/footer}" />
     <th:block th:if="${footer != null}">
       <th:block th:replace="${footer}" />
     </th:block>
-    <th:block th:replace="modules/overlay-menu" />
+    <th:block th:replace="~{modules/overlay-menu}" />
   </body>
 </html>
diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html
index 849418f..0c3a407 100644
--- a/templates/modules/sidebar.html
+++ b/templates/modules/sidebar.html
@@ -4,7 +4,7 @@
       <th:block th:replace="${prepend}" />
     </th:block>
     <th:block th:each="widget : ${widgets}">
-      <th:block th:replace="'modules/widgets/'+${widget}" />
+      <th:block th:replace="~{'modules/widgets/'+${widget}}" />
     </th:block>
   </th:block>
 </aside>
diff --git a/templates/modules/widgets/categories.html b/templates/modules/widgets/categories.html
index f498ae9..7cf4523 100644
--- a/templates/modules/widgets/categories.html
+++ b/templates/modules/widgets/categories.html
@@ -7,7 +7,7 @@
   </h2>
   <div class="mt-2" th:with="categories = ${categoryFinder.listAsTree()}">
     <ul class="space-y-1">
-      <li th:replace="modules/category-tree :: single(categories=${categories})" />
+      <li th:replace="~{modules/category-tree :: single(categories=${categories})}" />
     </ul>
   </div>
 </div>
diff --git a/templates/page.html b/templates/page.html
index f6923b3..455f394 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="modules/layout :: html(header = ~{::header}, content = ~{::content}, head = null, footer = ~{::footer}, sidebar = null, contentClass = ${theme.config.layout.content_header} and ${not #strings.isEmpty(singlePage.spec.cover)} ? '!-mt-20' : '')"
+  th:replace="~{modules/layout :: html(header = ~{::header}, content = ~{::content}, head = null, footer = ~{::footer}, sidebar = null, contentClass = ${theme.config.layout.content_header} and ${not #strings.isEmpty(singlePage.spec.cover)} ? '!-mt-20' : '')}"
 >
   <th:block th:fragment="header">
     <th:block
-      th:replace="modules/header :: header(isHome = false, cover = ${singlePage.spec.cover}, title = ${singlePage.spec.title})"
+      th:replace="~{modules/header :: header(isHome = false, cover = ${singlePage.spec.cover}, title = ${singlePage.spec.title})}"
     />
   </th:block>
   <th:block th:fragment="content">
diff --git a/templates/post.html b/templates/post.html
index 0211cc7..d921a5b 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="modules/layout :: html(header = ~{::header}, content = ~{::content}, head = null, footer = ~{::footer}, sidebar = ~{::sidebar}, contentClass = ${theme.config.layout.content_header} and ${not #strings.isEmpty(post.spec.cover)} ? '!-mt-20' : '')"
+  th:replace="~{modules/layout :: html(header = ~{::header}, content = ~{::content}, head = null, footer = ~{::footer}, sidebar = ~{::sidebar}, contentClass = ${theme.config.layout.content_header} and ${not #strings.isEmpty(post.spec.cover)} ? '!-mt-20' : '')}"
 >
   <th:block th:fragment="header">
     <th:block
-      th:replace="modules/header :: header(isHome = false, cover = ${post.spec.cover}, title = ${post.spec.title})"
+      th:replace="~{modules/header :: header(isHome = false, cover = ${post.spec.cover}, title = ${post.spec.title})}"
     />
   </th:block>
   <th:block th:fragment="footer">
@@ -26,7 +26,7 @@
     </div>
   </th:block>
   <th:block th:fragment="sidebar">
-    <th:block th:replace="modules/sidebar :: sidebar(prepend = ~{::sidebar_prepend})"></th:block>
+    <th:block th:replace="~{modules/sidebar :: sidebar(prepend = ~{::sidebar_prepend})}"></th:block>
   </th:block>
   <th:block th:fragment="content">
     <div class="rounded-xl bg-white p-4">
diff --git a/templates/tag.html b/templates/tag.html
index 820437e..7f7b585 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html
   xmlns:th="https://www.thymeleaf.org"
-  th:replace="modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = null)"
+  th:replace="~{modules/layout :: html(header = null, content = ~{::content}, head = null, footer = null, sidebar = null, contentClass = null)}"
 >
   <th:block th:fragment="content">
     <div class="flex text-gray-900">
@@ -17,7 +17,7 @@
     >
       <th:block th:each="post : ${postItems}">
         <th:block
-          th:replace="modules/post-card :: post-card(${post},true,true,true,${list_layout == 'single' ? 'column' : 'row'})"
+          th:replace="~{modules/post-card :: post-card(${post},true,true,true,${list_layout == 'single' ? 'column' : 'row'})}"
         />
       </th:block>
     </div>
