WIP: Normal links are rendered...

[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 d01dfec..50bd7ca 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 -->
@@ -118,33 +119,65 @@
  <!--*/-->
  <html
      xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:layout="http://www.thymeleaf.org"
-    layout:decorator="templates/layout"
-    th:with="
+    th:replace="~{/templates/layout.html :: layout(
        uri='$sitePath$alignedFileName',
        json='MERGE:
-{
-  &quot;_names&quot;:{#set($sep = "")#foreach($page in $pages)$sep&quot;$sitePath$page.uri&quot;:&quot;$page.name&quot;#set($sep = ",")#end},
-  &quot;_childs&quot;:{#set($sep = "")#foreach($page in $pages)
-    #if(!$page.childs.isEmpty())$sep&quot;$sitePath$page.uri&quot;:[#set($csep = "")#foreach($child in $page.childs.entrySet())
-      $csep&quot;$sitePath$child.key&quot;#set($csep = ",")
-      #end]
-    #end
-  #end},
-  &quot;_crumbs&quot;:{#set($sep = "")#foreach($page in $pages)
-    $sep&quot;$sitePath$page.uri&quot;:[#set($csep = "")
-      #if($siteCrumbs)$siteCrumbs#set($csep = ",")#end
-      #foreach($crumb in $page.crumbs)
-      $csep&quot;$sitePath$crumb.uri&quot;#set($csep = ",")
-      #end]
-    #end}
-}
-      '"
+      {
+        &quot;_names&quot;: {
+          #set($sep = "")
+          #foreach($page in $pages)
+            $sep
+            &quot;$sitePath$page.uri&quot;: &quot;$page.name&quot;
+            #set($sep = ",")
+          #end
+        },
+        &quot;_childs&quot;: {
+          #set($sep = "")
+          #foreach($page in $pages)
+            #if(!$page.childs.isEmpty())
+              $sep
+              &quot;$sitePath$page.uri&quot;: [
+                #set($csep = "")
+                #foreach($child in $page.childs.entrySet())
+                  $csep
+                  &quot;$sitePath$child.key&quot;
+                  #set($csep = ",")
+                #end
+              ]
+              #set($sep = ",")
+            #end
+          #end
+        },
+        &quot;_crumbs&quot;: {
+          #set($sep = "")
+          #foreach($page in $pages)
+            $sep
+            &quot;$sitePath$page.uri&quot;: [
+              #set($csep = "")
+              #if($siteCrumbs)
+                $siteCrumbs
+                #set($csep = ",")
+              #end
+              #set($last = "")
+              #foreach($crumb in $page.crumbs)
+                #if($sitePath+$crumb.uri != $last)
+                  $csep
+                  &quot;$sitePath$crumb.uri&quot;
+                  #set($csep = ",")
+                  #set($last = $sitePath+$crumb.uri)
+                #end
+              #end
+            ]
+            #set($sep = ",")
+          #end
+        }
+      }
+      ')}"
      >
    <head>
-    <title>#if($shortTitle and $shortTitle != '')$title#else$project.name &mdash; $pages.get($alignedFileName).name#end</title>
+    <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>
@@ -154,7 +187,7 @@
        </ol>
      </p>
      <hr />
-    <article class="main" layout:fragment="maincontent">
+    <article class="maincontent">
        $bodyContent
      </article>
      <hr />