X-Git-Url: https://juplo.de/gitweb/?p=maven-thymeleaf-skin;a=blobdiff_plain;f=src%2Fsite%2Ftemplate.vm;h=27ecbdf307ee9b45b3855355dead7537464108be;hp=a973c5cf889da32a77cbb38eb1a62d8cd53621e0;hb=a262df930a08a2829ebe652c27c34352ab01e156;hpb=f994fcfdc04b570c697a9520e24f5ec1406ed20e

diff --git a/src/site/template.vm b/src/site/template.vm
index a973c5c..27ecbdf 100644
--- a/src/site/template.vm
+++ b/src/site/template.vm
@@ -2,88 +2,84 @@
 <!-- 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 != "" )
+
+    #set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() )
+    #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) )
+
+    #if ( $pages.containsKey($page.uri) )
+      #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 -->
+    #else
+
+      <!-- NEW PAGE --------- uri: $page.uri, path: $crumbs, name: "$page.name", childs: $page.childs -->
+    #end
+
+    #set ( $sinkhole = $pages.put($page.uri, $page) )
+
+  #else
+
+    <!-- DONE WITH MENUE ---- #if($page.name)$page.name#else(no name)#end -->
   #end
 #end
+
+
+## Seiten einlesen
+#set ( $page = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
+#set ( $sinkhole = $page.put("uri", $alignedFileName) )
+#set ( $sinkhole = $page.put("name", "About") )
+#set ( $sinkhole = $stack.push($page) )
 #foreach ( $menu in $decoration.body.menus )
   ## Nur benannte Menüs werden berücksichtigt
   #if ($menu.name)
-    #buildPages ( $menu.items )
+    #buildPages ( $menu )
   #end
 #end
-<!-- $pages -->
-
-#set ( $crumbs = $project.getClass().forName('java.util.LinkedHashMap').newInstance() )
-#macro ( searchBreadcrumbTrail $items )
-  #set ( $sep = '' )
-  #foreach ( $item in $items )
-    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
-    #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
-    #if ( $currentItemHref == 'index.html' )
-      #set ( $name = $project.name )
-    #else
-      #set ( $name = $item.name )
-    #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) )
-      #foreach ( $crumb in $crumbs.entrySet() )
-        #set ( $sinkhole = $breadcrumbs.put( $crumb.key , $crumb.value ) )
-      #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 )
-    }
+    #buildPages ( $menu )
   #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
-]
--->
+<!-- pages: $pages -->
+
 
 <html
     xmlns="http://www.w3.org/1999/xhtml"
@@ -97,7 +93,7 @@
     <link rel="canonical" href="$project.url/$alignedFileName"/>
   </head>
   <body>
-    <article class="main" layout:fragment="maincontent">
+    <article class="main" layout:fragment="maincontent" juplo:variables='merge:{"pages":{#set($sep = "")#foreach($page in $pages)$sep"$page.uri":{"name":"$page.name",#if(!$page.childs.isEmpty())"childs":{#set($csep = "")#foreach($child in $page.childs.entrySet())$csep"$child.key":"$child.value"#set($csep = ",")#end},#end"crumbs":[#set($csep = "")#foreach($crumb in $page.crumbs)$csep{"uri":"$crumb.uri","name":"$crumb.name"}#set($csep = ",")#end]}#set($sep = ",")#end}}'>
       <header><h1>$shortTitle</h1></header>
       $bodyContent
     </article>