Updated signature of fragement-replacment

[maven-thymeleaf-skin] / src / main / resources / META-INF / maven / site.vm
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm

index bb81305..b9d030b 100644 (file)
--- 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() )
  
  <!-- name: $pages.get($alignedFileName).name -->
@@ -120,9 +121,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
@@ -176,7 +179,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>