X-Git-Url: https://juplo.de/gitweb/?p=maven-thymeleaf-skin;a=blobdiff_plain;f=src%2Fsite%2Ftemplate.vm;h=af51847af98e837e603d53c893b0753af9502d7a;hp=2577a89ff1c23cd957a6cfc61079829941a0b333;hb=8191ffb48ddff970ebafaa064fd6fc87b3a93ab3;hpb=5cc870a4b3d426af53044610ffd306591a54c23e

diff --git a/src/site/template.vm b/src/site/template.vm
index 2577a89..af51847 100644
--- a/src/site/template.vm
+++ b/src/site/template.vm
@@ -19,6 +19,16 @@
   #set ( $sinkhole = $page.put("childs", $project.getClass().forName('java.util.LinkedHashMap').newInstance()) )
   #set ( $sinkhole = $stack.push( $page ) )
 
+  #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
+
   #foreach ( $item in $menu.items )
     #buildPages ( $item )
   #end
@@ -44,20 +54,28 @@
       <!-- 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 -->
+      <!-- NEW PAGE - - - - - uri: $page.uri, path: $crumbs, 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 -->
+    <!-- DONE WITH MENUE -  - #if($page.name)$page.name-->#else(no name)-->
+      #set( $siteTitle = $menu.title )
+      #set( $siteAlt = $menu.alt )
+      #set( $siteImg = $menu.img )
+    #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)
@@ -71,78 +89,34 @@
   #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
-    $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
-    }
-    #set ( $sep =',' )
-  #end
+## Custom Variablen einlesen
+#set ( $sitePath = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'path' ).getValue() )
+#if ( !$sitePath )
+  #set ( $sitePath = "" )
 #end
+#set ( $siteCrumbs = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'crumbs' ).getValue() )
 
 <!-- title: $title -->
 <!-- short title: $shortTitle -->
 <!-- current page: $alignedFileName -->
+<!-- path: $sitePath -->
+<!-- crumbs: $siteCrumbs -->
+<!-- pages: $pages -->
+
 
 <html
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:layout="http://www.thymeleaf.org"
     layout:decorator="templates/layout"
-    th:with="uri='$alignedFileName'"
+    th:with="uri='$sitePath$alignedFileName'"
     >
   <head>
     <title>juplo - $title</title>
     <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
-    <link rel="canonical" href="$project.url/$alignedFileName"/>
+    <link rel="canonical" href="$sitePath$alignedFileName"/>
   </head>
   <body>
-    <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
-}'>
+    <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>
       $bodyContent
     </article>