X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fmaven%2Fsite.vm;h=1e336edbe0fc377f3519cd0d97af34333bc08197;hb=0c6b512af3d695df17a7b80e5c55a2873f6c09f3;hp=cabe6102420a146acb84a3a4ad5fa8444d347a46;hpb=b62d434740f3e6989a2d6e5eb444de81d9ae57c8;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 cabe610..1e336ed 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
@@ -100,10 +118,11 @@
 #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 -->
@@ -120,9 +139,11 @@
     xmlns="http://www.w3.org/1999/xhtml"
     th:replace="~{/templates/layout.html :: layout(
       uri='$sitePath$alignedFileName',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
       json='MERGE:
       {
-        &quot;_names&quot;: {
+        &quot;_titles&quot;: {
           #set($sep = "")
           #foreach($page in $pages)
             $sep
@@ -157,10 +178,14 @@
                 $siteCrumbs
                 #set($csep = ",")
               #end
+              #set($last = "")
               #foreach($crumb in $page.crumbs)
-                $csep
-                &quot;$sitePath$crumb.uri&quot;
-                #set($csep = ",")
+                #if($sitePath+$crumb.uri != $last)
+                  $csep
+                  &quot;$sitePath$crumb.uri&quot;
+                  #set($csep = ",")
+                  #set($last = $sitePath+$crumb.uri)
+                #end
               #end
             ]
             #set($sep = ",")
@@ -172,7 +197,7 @@
   <head>
     <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>