X-Git-Url: https://juplo.de/gitweb/?p=maven-thymeleaf-skin;a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fmaven%2Fsite.vm;h=50bd7ca954b68011ab633996b36bbcc38e4af3c4;hp=b5a3ca10e742e3dc6bf34e0ab38fa47253ce338e;hb=028805129ca80fab45237caae76d34c048a65c71;hpb=8ce3ec37ca2bc459d7c80d768973c7e5645b3d85
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index b5a3ca1..50bd7ca 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -100,10 +100,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() )
@@ -121,28 +122,62 @@
th:replace="~{/templates/layout.html :: layout(
uri='$sitePath$alignedFileName',
json='MERGE:
-{
- "_names":{#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
- #foreach($crumb in $page.crumbs)
- $csep"$sitePath$crumb.uri"#set($csep = ",")
- #end]#set($sep = ",")
- #end}
-}
+ {
+ "_names": {
+ #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
+ }
+ }
')}"
>
#if($shortTitle and $shortTitle != '')$title#else$project.name — $pages.get($alignedFileName).name#end
-
+
Path