From: Kai Moritz <kai@juplo.de>
Date: Tue, 28 Feb 2017 16:44:20 +0000 (+0100)
Subject: Replaced layout-decorator the according build-in feature of thymeleaf 3.x
X-Git-Tag: maven-thymeleaf-skin-1.0.0~1
X-Git-Url: https://juplo.de/gitweb/?p=maven-thymeleaf-skin;a=commitdiff_plain;h=b62d434740f3e6989a2d6e5eb444de81d9ae57c8

Replaced layout-decorator the according build-in feature of thymeleaf 3.x

Also:

* Refactored the generated JSON
* Made the JSON-generation more readable with the help of indentation
---

diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index ca508d4..cabe610 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -118,15 +118,59 @@
 <!--*/-->
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:layout="http://www.thymeleaf.org"
-    layout:decorator="templates/layout"
-    th:with="
+    th:replace="~{/templates/layout.html :: layout(
       uri='$sitePath$alignedFileName',
-      json='merge:{&quot;pages&quot;:{#set($sep = "")#foreach($page in $pages)$sep&quot;$sitePath$page.uri&quot;:{&quot;name&quot;:&quot;$page.name&quot;,#if(!$page.childs.isEmpty())&quot;childs&quot;:{#set($csep = "")#foreach($child in $page.childs.entrySet())$csep&quot;$sitePath$child.key&quot;:&quot;$child.value&quot;#set($csep = ",")#end},#end&quot;crumbs&quot;:[#set($csep = "")#if($siteCrumbs)$siteCrumbs#set($csep = ",")#end#foreach($crumb in $page.crumbs)$csep{&quot;uri&quot;:&quot;$sitePath$crumb.uri&quot;,&quot;name&quot;:&quot;$crumb.name&quot;}#set($csep = ",")#end]#if($page.title),&quot;title&quot;:&quot;$page.title&quot;#end#if($page.alt),&quot;alt&quot;:&quot;$page.alt&quot;#end#if($page.img),&quot;img&quot;:&quot;$page.img&quot;#end}#set($sep = ",")#end}#if($siteTitle),&quot;site_title&quot;:&quot;$siteTitle&quot;#end#if($siteAlt),&quot;site_alt&quot;:&quot;$siteAlt&quot;#end#if($siteImg),&quot;site_img&quot;:&quot;$siteImg&quot;#end}'
-      "
+      json='MERGE:
+      {
+        &quot;_names&quot;: {
+          #set($sep = "")
+          #foreach($page in $pages)
+            $sep
+            &quot;$sitePath$page.uri&quot;: &quot;$page.name&quot;
+            #set($sep = ",")
+          #end
+        },
+        &quot;_childs&quot;: {
+          #set($sep = "")
+          #foreach($page in $pages)
+            #if(!$page.childs.isEmpty())
+              $sep
+              &quot;$sitePath$page.uri&quot;: [
+                #set($csep = "")
+                #foreach($child in $page.childs.entrySet())
+                  $csep
+                  &quot;$sitePath$child.key&quot;
+                  #set($csep = ",")
+                #end
+              ]
+              #set($sep = ",")
+            #end
+          #end
+        },
+        &quot;_crumbs&quot;: {
+          #set($sep = "")
+          #foreach($page in $pages)
+            $sep
+            &quot;$sitePath$page.uri&quot;: [
+              #set($csep = "")
+              #if($siteCrumbs)
+                $siteCrumbs
+                #set($csep = ",")
+              #end
+              #foreach($crumb in $page.crumbs)
+                $csep
+                &quot;$sitePath$crumb.uri&quot;
+                #set($csep = ",")
+              #end
+            ]
+            #set($sep = ",")
+          #end
+        }
+      }
+      ')}"
     >
   <head>
-    <title>#if($shortTitle and $shortTitle != '')$title#else$project.name &mdash; $pages.get($alignedFileName).name#end</title>
+    <title id="title">#if($shortTitle and $shortTitle != '')$title#else$project.name &mdash; $pages.get($alignedFileName).name#end</title>
     <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
     <link rel="canonical" href="$sitePath$alignedFileName"/>
   </head>
@@ -138,7 +182,7 @@
       </ol>
     </p>
     <hr />
-    <article class="main" layout:fragment="maincontent">
+    <article class="maincontent">
       $bodyContent
     </article>
     <hr />
diff --git a/src/site/site.xml b/src/site/site.xml
index 799111f..f14724a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -24,7 +24,7 @@
   <custom>
     <thymeproxy>
       <path>/maven-thymeleaf-skin/</path>
-      <crumbs><![CDATA[{&quot;uri&quot;:&quot;/projects.html&quot;,&quot;name&quot;:&quot;Projects&quot;}]]></crumbs>
+      <crumbs><![CDATA[&quot;/projects.html&quot;]]></crumbs>
     </thymeproxy>
   </custom>
 </project>
