X-Git-Url: https://juplo.de/gitweb/?p=maven-thymeleaf-skin;a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fmaven%2Fsite.vm;h=cabe6102420a146acb84a3a4ad5fa8444d347a46;hp=f7e6c8bbdb51102ddcbf97fc9f5663a83dcbdf41;hb=5c8553e67fbb60ee2911ca6024a680bac286570d;hpb=23d828ee5b1f217f984cf27e750b5a4d26472b9a

diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index f7e6c8b..cabe610 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -7,7 +7,11 @@
 #set ( $stack = $project.getClass().forName('java.util.LinkedList').newInstance() )
 #macro ( buildPages $menu )
 
-  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+  #if ( $menu.href )
+    #set ( $currentItemHref = $PathTool.calculateLink( $menu.href, $relativePath ) )
+  #else
+    #set ( $currentItemHref = '' )
+  #end
   #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
 
   #if ($currentItemHref)
@@ -56,10 +60,10 @@
       #set ( $childs = $pages.get($page.uri).childs )
       #set ( $sinkhole = $page.put("childs", $childs) )
 
-      <!-- OVERWRITING PAGE - uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
+      <!-- OVERWRITING PAGE - uri: $page.uri -->
     #else
 
-      <!-- NEW PAGE - - - - - uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
+      <!-- NEW PAGE - - - - - uri: $page.uri -->
     #end
 
     #set ( $sinkhole = $pages.put($page.uri, $page) )
@@ -102,6 +106,7 @@
 #end
 #set ( $siteCrumbs = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'crumbs' ).getValue() )
 
+<!-- name: $pages.get($alignedFileName).name -->
 <!-- title: $title -->
 <!-- short title: $shortTitle -->
 <!-- current page: $alignedFileName -->
@@ -113,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>juplo - $title</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>
@@ -133,8 +182,7 @@
       </ol>
     </p>
     <hr />
-    <article class="main" layout:fragment="maincontent">
-      <header><h1>$shortTitle</h1></header>
+    <article class="maincontent">
       $bodyContent
     </article>
     <hr />
