projects
/
maven-thymeleaf-skin
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
cabe610
..
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
#end
## Custom Variablen einlesen
-#set ( $
site
Path = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'path' ).getValue() )
-#if ( !$
site
Path )
- #set ( $
site
Path = "" )
+#set ( $
canonical
Path = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'path' ).getValue() )
+#if ( !$
canonical
Path )
+ #set ( $
canonical
Path = "" )
#end
#end
+#set ( $sitePath = $canonicalPath + $project.version + "/" )
#set ( $siteCrumbs = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'crumbs' ).getValue() )
<!-- name: $pages.get($alignedFileName).name -->
#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',
xmlns="http://www.w3.org/1999/xhtml"
th:replace="~{/templates/layout.html :: layout(
uri='$sitePath$alignedFileName',
+ title=~{:: title},
+ maincontent=~{:: .maincontent},
json='MERGE:
{
json='MERGE:
{
- "_
nam
es": {
+ "_
titl
es": {
#set($sep = "")
#foreach($page in $pages)
$sep
#set($sep = "")
#foreach($page in $pages)
$sep
@@
-157,10
+160,14
@@
$siteCrumbs
#set($csep = ",")
#end
$siteCrumbs
#set($csep = ",")
#end
+ #set($last = "")
#foreach($crumb in $page.crumbs)
#foreach($crumb in $page.crumbs)
- $csep
- "$sitePath$crumb.uri"
- #set($csep = ",")
+ #if($sitePath+$crumb.uri != $last)
+ $csep
+ "$sitePath$crumb.uri"
+ #set($csep = ",")
+ #set($last = $sitePath+$crumb.uri)
+ #end
#end
]
#set($sep = ",")
#end
]
#set($sep = ",")
@@
-172,7
+179,7
@@
<head>
<title id="title">#if($shortTitle and $shortTitle != '')$title#else$project.name — $pages.get($alignedFileName).name#end</title>
<meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
<head>
<title id="title">#if($shortTitle and $shortTitle != '')$title#else$project.name — $pages.get($alignedFileName).name#end</title>
<meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
- <link
rel="canonical" href="$site
Path$alignedFileName"/>
+ <link
id="canonical" rel="canonical" href="$canonical
Path$alignedFileName"/>
</head>
<body>
<h2>Path</h2>
</head>
<body>
<h2>Path</h2>