X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fmaven%2Fsite.vm;h=b81690c4afe6928c635c18dd68c5c7960140361d;hb=73b5e8c984163e4fe64c437f9bd5736907e5b80c;hp=829534040e7d42e22f0ce945c17791e51bfd4702;hpb=9af3981a1881dca962ca14dcc911e19a930c1669;p=maven-thymeleaf-skin

diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 8295340..b81690c 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -7,72 +7,87 @@
 #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)
-    #set( $sinkhole = $stack.peek().childs.put($currentItemHref, $menu.name) )
+  #set ( $seen = false )
+  #foreach ( $entry in $stack )
+    #if ( $entry.uri == $currentItemHref )
+      #set ( $seen = true )
+    #end
   #end
 
-  #set ( $page = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
-  #set ( $sinkhole = $page.put("name", $menu.name) )
-  #set ( $sinkhole = $page.put("uri", $currentItemHref) )
-  #set ( $sinkhole = $page.put("childs", $project.getClass().forName('java.util.LinkedHashMap').newInstance()) )
-  #set ( $sinkhole = $stack.push( $page ) )
+  #if ( !$seen )
+    #if ($currentItemHref)
+      #set( $sinkhole = $stack.peek().childs.put($currentItemHref, $menu.name) )
+    #end
 
-  #if ($menu.title)
-    #set( $sinkhole = $page.put("title", $menu.title) )
-  #end
-  #if ($menu.alt)
-    #set( $sinkhole = $page.put("alt", $menu.alt) )
-  #end
-  #if ($menu.img)
-    #set( $sinkhole = $page.put("img", $menu.img) )
-  #end
+    #set ( $page = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
+    #set ( $sinkhole = $page.put("name", $menu.name) )
+    #set ( $sinkhole = $page.put("uri", $currentItemHref) )
+    #set ( $sinkhole = $page.put("childs", $project.getClass().forName('java.util.LinkedHashMap').newInstance()) )
+    #set ( $sinkhole = $stack.push( $page ) )
 
-  #foreach ( $item in $menu.items )
-    #buildPages ( $item )
-  #end
+    #if ($menu.title)
+      #set( $sinkhole = $page.put("title", $menu.title) )
+    #end
+    #if ($menu.alt)
+      #set( $sinkhole = $page.put("alt", $menu.alt) )
+    #end
+    #if ($menu.img)
+      #set( $sinkhole = $page.put("img", $menu.img) )
+    #end
 
-  #set ( $page = $stack.pop() )
-  #if ( $page.uri != "" )
-
-    #set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() )
-    #set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
-    #set ( $sinkhole = $crumb.put("uri", $page.uri) )
-    #set ( $sinkhole = $crumb.put("name", $page.name) )
-    #set ( $sinkhole = $crumbs.push($crumb) )
-    #foreach ( $entry in $stack )
-      #if ( $entry.uri != "" )
-        #set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
-        #set ( $sinkhole = $crumb.put("uri", $entry.uri) )
-        #set ( $sinkhole = $crumb.put("name", $entry.name) )
-        #set ( $sinkhole = $crumbs.push($crumb) )
-      #end
+    #foreach ( $item in $menu.items )
+      #buildPages ( $item )
     #end
-    #set ( $sinkhole = $page.put("crumbs", $crumbs) )
 
-    #if ( $pages.containsKey($page.uri) )
-      #set ( $childs = $pages.get($page.uri).childs )
-      #set ( $sinkhole = $page.put("childs", $childs) )
+    #set ( $page = $stack.pop() )
+    #if ( $page.uri != "" )
+
+      #set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() )
+      #set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
+      #set ( $sinkhole = $crumb.put("uri", $page.uri) )
+      #set ( $sinkhole = $crumb.put("name", $page.name) )
+      #set ( $sinkhole = $crumbs.push($crumb) )
+      #foreach ( $entry in $stack )
+        #if ( $entry.uri != "" )
+          #set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
+          #set ( $sinkhole = $crumb.put("uri", $entry.uri) )
+          #set ( $sinkhole = $crumb.put("name", $entry.name) )
+          #set ( $sinkhole = $crumbs.push($crumb) )
+        #end
+      #end
+      #set ( $sinkhole = $page.put("crumbs", $crumbs) )
 
-      <!-- OVERWRITING PAGE - uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
-    #else
+      #if ( $pages.containsKey($page.uri) )
+        #set ( $childs = $pages.get($page.uri).childs )
+        #set ( $sinkhole = $page.put("childs", $childs) )
 
-      <!-- NEW PAGE - - - - - uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
-    #end
+        <!-- OVERWRITING PAGE - uri: $page.uri / name: $page.name -->
+      #else
 
-    #set ( $sinkhole = $pages.put($page.uri, $page) )
+        <!-- NEW PAGE - - - - - uri: $page.uri / name: $page.name -->
+      #end
 
-  #else
+      #set ( $sinkhole = $pages.put($page.uri, $page) )
 
-    <!-- DONE WITH MENUE -  - #if($page.name)$page.name-->#else(no name)-->
-      #set( $siteTitle = $menu.title )
-      #set( $siteAlt = $menu.alt )
-      #set( $siteImg = $menu.img )
-      #set( $sinkhole = $pages.get("index.html").put("childs", $page.childs) )
-    #end
+    #else
 
+      <!-- DONE WITH MENUE -  - #if($page.name)$page.name-->#else(no name)-->
+        #set( $siteTitle = $menu.title )
+        #set( $siteAlt = $menu.alt )
+        #set( $siteImg = $menu.img )
+        #set( $sinkhole = $pages.get("index.html").put("childs", $page.childs) )
+      #end
+
+    #end
+  #else
+    <!-- Skipping already seen entry: uri=$currentItemHref, name=$menu.name -->
   #end
 #end
 
@@ -81,6 +96,13 @@
 #set ( $page = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
 #set ( $sinkhole = $page.put("uri", "index.html") )
 #set ( $sinkhole = $page.put("name", "$project.name") )
+#set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() )
+#set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
+#set ( $sinkhole = $crumb.put("uri", $page.uri) )
+#set ( $sinkhole = $crumb.put("name", $page.name) )
+#set ( $sinkhole = $crumbs.push( $crumb ) )
+#set ( $sinkhole = $page.put("crumbs", $crumbs ) )
+#set ( $sinkhole = $pages.put($page.uri, $page) )
 #set ( $sinkhole = $stack.push($page) )
 #foreach ( $menu in $decoration.body.menus )
   ## Nur benannte Menüs werden berücksichtigt
@@ -96,12 +118,14 @@
 #end
 
 ## Custom Variablen einlesen
-#set ( $sitePath = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'path' ).getValue() )
-#if ( !$sitePath )
-  #set ( $sitePath = "" )
+#set ( $canonicalPath = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'path' ).getValue() )
+#if ( !$canonicalPath )
+  #set ( $canonicalPath = "" )
 #end
+#set ( $sitePath = $canonicalPath + $project.version + "/" )
 #set ( $siteCrumbs = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'crumbs' ).getValue() )
 
+<!-- name: $pages.get($alignedFileName).name -->
 <!-- title: $title -->
 <!-- short title: $shortTitle -->
 <!-- current page: $alignedFileName -->
@@ -113,14 +137,15 @@
 <!--*/-->
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:layout="http://www.thymeleaf.org"
-    layout:decorator="templates/layout"
-    th:with="uri='$sitePath$alignedFileName'"
-    >
+    th:replace="~{/templates/layout.html :: layout(
+      uri='$sitePath$alignedFileName',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      json='MERGE:' + ~{:: pre[class='json']/text()})}" >
   <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"/>
+    <link id="canonical" rel="canonical" href="$canonicalPath$alignedFileName"/>
   </head>
   <body>
     <h2>Path</h2>
@@ -130,12 +155,37 @@
       </ol>
     </p>
     <hr />
-    <article class="main" layout:fragment="maincontent" juplo:variables='merge:{"pages":{#set($sep = "")#foreach($page in $pages)$sep"$sitePath$page.uri":{"name":"$page.name",#if(!$page.childs.isEmpty())"childs":{#set($csep = "")#foreach($child in $page.childs.entrySet())$csep"$sitePath$child.key":"$child.value"#set($csep = ",")#end},#end"crumbs":[#set($csep = "")#if($siteCrumbs)$siteCrumbs#set($csep = ",")#end#foreach($crumb in $page.crumbs)$csep{"uri":"$sitePath$crumb.uri","name":"$crumb.name"}#set($csep = ",")#end]#if($page.title),"title":"$page.title"#end#if($page.alt),"alt":"$page.alt"#end#if($page.img),"img":"$page.img"#end}#set($sep = ",")#end}#if($siteTitle),"site_title":"$siteTitle"#end#if($siteAlt),"site_alt":"$siteAlt"#end#if($siteImg),"site_img":"$siteImg"#end}'>
-      <header><h1>$shortTitle</h1></header>
+    <article class="maincontent">
       $bodyContent
     </article>
     <hr />
-    <h2>Pages</h2>
+    <h2>Page Structure as JSON</h2>
+    <pre class="json">
+{
+  "_titles": {#set($sep = "")#foreach($page in $pages)$sep
+    "$sitePath$page.uri": "$page.name"#set($sep = ",")
+#end
+
+  },
+  "_childs": {#set($sep = "")#foreach($page in $pages)#if(!$page.childs.isEmpty())$sep
+    "$sitePath$page.uri": [#set($csep = "")#foreach($child in $page.childs.entrySet())$csep
+      "$sitePath$child.key"#set($csep = ",")#end
+
+    ]#set($sep = ",")#end#end
+
+  },
+  "_crumbs": {#set($sep = "")#foreach($page in $pages)$sep
+    "$sitePath$page.uri": [
+#set($csep = "")#if($siteCrumbs)
+      $siteCrumbs#set($csep = ",")#end#set($last = "")#foreach($crumb in $page.crumbs)#if($sitePath+$crumb.uri != $last)$csep
+      "$sitePath$crumb.uri"#set($csep = ",")#set($last = $sitePath+$crumb.uri)#end#end
+
+    ]#set($sep = ",")#end
+
+  }
+}
+    </pre>
+    <h2>All Pages</h2>
     <p>
       <ul>
         #foreach($page in $pages)<li><a href="$page.uri">$page.name</a></li>#end