Commit 17a41213 authored by Bert Leunis's avatar Bert Leunis

TRIVIAL Reintegrate bugfix/CMS-11494 intrelease/4.2

parents 5621c512 83ea158a
<#ftl output_format="HTML"> <#ftl output_format="HTML">
<!DOCTYPE html> <!DOCTYPE html>
<#-- <#--
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com) Copyright 2014-2018 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
...@@ -167,10 +167,10 @@ ${response.setContentType("text/html;charset=UTF-8")} ...@@ -167,10 +167,10 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#list 1..distance as d> <#list 1..distance as d>
<#assign ancestorLink = "../${ancestorLink}"> <#assign ancestorLink = "../${ancestorLink}">
</#list> </#list>
<a href="${ancestorLink}">${ancestor.name!html}</a>/<#t> <a href="${ancestorLink}">${ancestor.name}</a>/<#t>
<#assign distance = distance - 1> <#assign distance = distance - 1>
</#list> </#list>
<a href="./">${currentNode.name!html}</a>/<#t> <a href="./">${currentNode.name}</a>/<#t>
</#if> </#if>
</code> </code>
...@@ -182,7 +182,7 @@ ${response.setContentType("text/html;charset=UTF-8")} ...@@ -182,7 +182,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#if child.index gt 1> <#if child.index gt 1>
<#assign childLink = "${childLink}[${child.index}]"> <#assign childLink = "${childLink}[${child.index}]">
</#if> </#if>
<a href="./${childLink}/"> <a href="./${childLink?url_path}/">
${child.name} ${child.name}
<#if child.hasProperty("hippo:count")> <#if child.hasProperty("hippo:count")>
[${child.getProperty("hippo:count").long}] [${child.getProperty("hippo:count").long}]
...@@ -240,7 +240,7 @@ ${response.setContentType("text/html;charset=UTF-8")} ...@@ -240,7 +240,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#list queryResultNodes as node> <#list queryResultNodes as node>
<#if node??> <#if node??>
<li> <li>
<a href="${baseRelPath}${node.path?substring(1)!url}">${node.path}</a> <a href="${baseRelPath}${node.path?substring(1)?url_path}">${node.path}</a>
<#-- TODO <#-- TODO
writer.println("<a class=\"node-link\" title=\"Open node in new cms console window\" target=\"_blank\" href=\"" + req.getContextPath() + "/console/?path=" + resultNode.getPath() + "\">c</a>"); writer.println("<a class=\"node-link\" title=\"Open node in new cms console window\" target=\"_blank\" href=\"" + req.getContextPath() + "/console/?path=" + resultNode.getPath() + "\">c</a>");
writer.println("<a class=\"node-link\" title=\"Open node in new cms window\" target=\"_blank\" href=\"" + req.getContextPath() + "/?path=" + resultNode.getPath() + "\">cms</a>"); writer.println("<a class=\"node-link\" title=\"Open node in new cms window\" target=\"_blank\" href=\"" + req.getContextPath() + "/?path=" + resultNode.getPath() + "\">cms</a>");
...@@ -305,7 +305,7 @@ ${response.setContentType("text/html;charset=UTF-8")} ...@@ -305,7 +305,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
</blockquote> </blockquote>
<ol> <ol>
<li> <li>
Found node: <a href="${baseRelPath}${nodeById.path?substring(1)!url}">${nodeById.path}</a> Found node: <a href="${baseRelPath}${nodeById.path?substring(1)?url_path}">${nodeById.path}</a>
<#-- TODO <#-- TODO
writer.println("<a class=\"node-link\" title=\"Open node in new cms console window\" target=\"_blank\" href=\"" + req.getContextPath() + "/console/?path=" + n.getPath() + "\">c</a>"); writer.println("<a class=\"node-link\" title=\"Open node in new cms console window\" target=\"_blank\" href=\"" + req.getContextPath() + "/console/?path=" + n.getPath() + "\">c</a>");
writer.println("<a class=\"node-link\" title=\"Open node in new cms window\" target=\"_blank\" href=\"" + req.getContextPath() + "/?path=" + n.getPath() + "\">cms</a>"); writer.println("<a class=\"node-link\" title=\"Open node in new cms window\" target=\"_blank\" href=\"" + req.getContextPath() + "/?path=" + n.getPath() + "\">cms</a>");
...@@ -318,7 +318,7 @@ ${response.setContentType("text/html;charset=UTF-8")} ...@@ -318,7 +318,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
<h3>Getting nodes having a reference to </h3> <h3>Getting nodes having a reference to </h3>
<blockquote> <blockquote>
UUID = ${request.getParameter("uuid")!} UUID = ${request.getParameter("uuid")!}
( <a href="${baseRelPath}${nodeById.path?substring(1)!url}">${nodeById.path}</a> ) ( <a href="${baseRelPath}${nodeById.path?substring(1)?url_path}">${nodeById.path}</a> )
</blockquote> </blockquote>
<hr> <hr>
<table> <table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment