Projekt-Seite erstellt: Velocity-Template - Einlesen der Daten überarbeitet

[maven-thymeleaf-skin] / src / site / template.vm

diff --git a/src/site/template.vm b/src/site/template.vm
index a973c5c..c91a1b2 100644 (file)
--- a/src/site/template.vm
+++ b/src/site/template.vm
@@ -2,26 +2,68 @@
 <!-- Generated by Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end at $dateFormat.format( $currentDate ) -->
 
 
-## Automatisch generierte Seiten einlesen
 #set ( $pages = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
-#macro ( buildPages $items )
-  #foreach ( $item in $items )
-    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-    #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-    #set ( $sinkhole = $pages.put( $item.name, $currentItemHref ) )
-    #if ( !$item.items.empty )
-      #buildPages ( $item.items )
+#set ( $stack = $project.getClass().forName('java.util.LinkedList').newInstance() )
+#macro ( buildPages $menu )
+
+  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+  #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+
+  #if ($currentItemHref)
+    #set( $sinkhole = $stack.peek().childs.put($currentItemHref, $menu.name) )
+  #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
+
+  #set ( $page = $stack.pop() )
+  #if ( $page.uri != "" )
+
+    #if ( $pages.containsKey($page.uri) )
+      #set ( $childs = $pages.get($page.uri).childs )
+      #set ( $sinkhole = $page.put("childs", $childs) )
+
+      <!-- OVERWRITING PAGE - uri: $page.uri, name: "$page.name", childs: $page.childs -->
+    #else
+
+      <!-- NEW PAGE --------- uri: $page.uri, name: "$page.name", childs: $page.childs -->
     #end
+
+    #set ( $sinkhole = $pages.put($page.uri, $page) )
+    #set ( $sinkhole = $page.remove("uri") )
+
+  #else
+
+    <!-- DONE WITH MENUE ---- #if($page.name)$page.name#else(no name)#end -->
   #end
 #end
+
+
+## Seiten einlesen
 #foreach ( $menu in $decoration.body.menus )
   ## Nur benannte Menüs werden berücksichtigt
   #if ($menu.name)
-    #buildPages ( $menu.items )
+    #buildPages ( $menu )
+  #end
+#end
+#foreach ( $menu in $decoration.body.menus )
+  ## Nur unbenannte Menüs werden berücksichtigt
+  #if (!($menu.name))
+    #buildPages ( $menu )
   #end
 #end
+
 <!-- $pages -->
 
+
+
 #set ( $crumbs = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
 #macro ( searchBreadcrumbTrail $items )
   #set ( $sep = '' )
@@ -33,57 +75,38 @@
     #else
       #set ( $name = $item.name )
     #end
+    $sep"$currentItemHref": {
+      "name": "$name"
+      #if ( !$item.items.empty )
+        ,"childs": {
+        #set ( $sinkhole = $crumbs.put( $currentItemHref , $name) )
+        #searchBreadcrumbTrail ( $item.items )
+        #set ( $sinkhole = $crumbs.pop() )
+        }
+      #end
     #if ( !$breadcrumbs && $alignedFileName == $currentItemHref )
       #set ( $breadcrumbs = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
       ## Den Titel der Seite korrigieren!
       #set ( $title = "$project.name - $item.name" )
       #set ( $shortTitle = $name )
       #set ( $sinkhole = $breadcrumbs.put( 'index.html', $project.name) )
+      #set ( $sepc = '' )
       #foreach ( $crumb in $crumbs.entrySet() )
         #set ( $sinkhole = $breadcrumbs.put( $crumb.key , $crumb.value ) )
+        $sepc{ "uri": "$crumb.key", "name": "$crumb.value" }
+        #set( $sepc = ',' )
       #end
       #set ( $sinkhole = $breadcrumbs.put( $alignedFileName , $shortTitle) )
+      ]
     #end
-    $sep"$currentItemHref": {
-      "name": "$name"
-      #if ( !$item.items.empty )
-        ,"childs": {
-        #set ( $sinkhole = $crumbs.put( $currentItemHref , $name) )
-        #searchBreadcrumbTrail ( $item.items )
-        #set ( $sinkhole = $crumbs.pop() )
-        }
-      #end
     }
     #set ( $sep =',' )
   #end
 #end
 
-## Datenstrukturen für die Navigation vorbereiten
-#foreach ( $menu in $decoration.body.menus )
-  ## Nur unbenannte Menüs werden berücksichtigt
-  #if (!($menu.name))
-    ## Breadcrumb-Pfad suchen
-    "menu": {
-      #searchBreadcrumbTrail ( $menu.items )
-    }
-  #end
-#end
-
 <!-- title: $title -->
 <!-- short title: $shortTitle -->
 <!-- current page: $alignedFileName -->
-<!-- breadcrumbs: $breadcrumbs -->
-
-<!--
-#set ( $sep = '' )
-"$alignedFileName": [
-  #foreach( $crumb in $breadcrumbs.entrySet() )
-  $sep
-  { "uri": "$crumb.key", "name": "$crumb.value" }
-  #set ( $sep = ',' )
-  #end
-]
--->
 
 <html
     xmlns="http://www.w3.org/1999/xhtml"
@@ -97,7 +120,18 @@
     <link rel="canonical" href="$project.url/$alignedFileName"/>
   </head>
   <body>
-    <article class="main" layout:fragment="maincontent">
+    <article class="main" layout:fragment="maincontent" juplo:variables='merge:{
+## Datenstrukturen für die Navigation vorbereiten
+#foreach ( $menu in $decoration.body.menus )
+  ## Nur unbenannte Menüs werden berücksichtigt
+  #if (!($menu.name))
+    ## Breadcrumb-Pfad suchen
+    "pages": {
+      #searchBreadcrumbTrail ( $menu.items )
+    }
+  #end
+#end
+}'>
       <header><h1>$shortTitle</h1></header>
       $bodyContent
     </article>