X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fmaven%2Fsite.vm;h=7f1a87a1d85d1a53eed89034451852f4f01bb94a;hb=18264996e6b581927eba843ec128ad93b18c0d4f;hp=50bd7ca954b68011ab633996b36bbcc38e4af3c4;hpb=4fa3df5cd8a89e13863a5a21766da28aa70f5c77;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 50bd7ca..7f1a87a 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -14,69 +14,80 @@
   #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 -->
-    #else
+      #if ( $pages.containsKey($page.uri) )
+        #set ( $childs = $pages.get($page.uri).childs )
+        #set ( $sinkhole = $page.put("childs", $childs) )
 
-      <!-- NEW PAGE - - - - - uri: $page.uri -->
-    #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
 
@@ -85,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
@@ -121,65 +139,16 @@
     xmlns="http://www.w3.org/1999/xhtml"
     th:replace="~{/templates/layout.html :: layout(
       uri='$sitePath$alignedFileName',
-      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
-              #set($last = "")
-              #foreach($crumb in $page.crumbs)
-                #if($sitePath+$crumb.uri != $last)
-                  $csep
-                  &quot;$sitePath$crumb.uri&quot;
-                  #set($csep = ",")
-                  #set($last = $sitePath+$crumb.uri)
-                #end
-              #end
-            ]
-            #set($sep = ",")
-          #end
-        }
-      }
-      ')}"
-    >
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      json='MERGE:' + ~{:: pre[class='json']/text()})}" >
   <head>
-    <title id="title">#if($shortTitle and $shortTitle != '')$title#else$project.name &mdash; $pages.get($alignedFileName).name#end</title>
+    <title class="title">$title</title>
     <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
     <link id="canonical" rel="canonical" href="$canonicalPath$alignedFileName"/>
   </head>
   <body>
+    <h1 class="short_title">$shortTitle</h1>
     <h2>Path</h2>
     <p>
       <ol>
@@ -191,7 +160,33 @@
       $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