Commit 1c81e454 authored by Tobias Jeger's avatar Tobias Jeger

ESSENTIALS-760 Reintegrate 'bugfix/ESSENTIALS-760'

parents e08a794f 5187977e
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -26,14 +26,14 @@
<instructionSet group="jsp">
<file action="copy" source="jsp/eventslist-main-eventslist.jsp" target="{{jspRoot}}/hstdefault/eventslist-main-eventslist.jsp"/>
<file action="copy" source="jsp/eventspage-main.jsp" target="{{jspRoot}}/{{namespace}}/eventspage-main.jsp"/>
<file action="copy" source="jsp/eventspage-main.jsp" target="{{jspRoot}}/hstdefault/eventspage-main.jsp"/>
<xml action="copy" source="xml/hst/templates/events-main-content-jsp.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:templates"/>
<xml action="copy" source="xml/hst/templates/eventslist-main-eventslist-jsp.xml" target="/hst:hst/hst:configurations/hst:default/hst:templates"/>
</instructionSet>
<instructionSet group="freemarker">
<freemarker action="copy" source="freemarker/eventslist-main-eventslist.ftl" target="{{freemarkerRoot}}/hstdefault/eventslist-main-eventslist.ftl"/>
<freemarker action="copy" source="freemarker/eventspage-main.ftl" target="{{freemarkerRoot}}/{{namespace}}/eventspage-main.ftl"/>
<freemarker action="copy" source="freemarker/eventspage-main.ftl" target="{{freemarkerRoot}}/hstdefault/eventspage-main.ftl"/>
<xml action="copy" source="xml/hst/templates/events-main-content-freemarker.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:templates"/>
<xml action="copy" source="xml/hst/templates/eventslist-main-eventslist-freemarker.xml" target="/hst:hst/hst:configurations/hst:default/hst:templates"/>
</instructionSet>
......@@ -50,13 +50,13 @@
target="{{freemarkerRoot}}/hstdefault/eventslist-main-eventslist_nl.properties"/>
<freemarker action="copy"
source="freemarker/eventspage-main-variant.ftl"
target="{{freemarkerRoot}}/{{namespace}}/eventspage-main/variant.ftl"/>
target="{{freemarkerRoot}}/hstdefault/eventspage-main/variant.ftl"/>
<file action="copy"
source="freemarker/eventspage-main.properties"
target="{{freemarkerRoot}}/{{namespace}}/eventspage-main.properties"/>
target="{{freemarkerRoot}}/hstdefault/eventspage-main.properties"/>
<file action="copy"
source="freemarker/eventspage-main_nl.properties"
target="{{freemarkerRoot}}/{{namespace}}/eventspage-main_nl.properties"/>
target="{{freemarkerRoot}}/hstdefault/eventspage-main_nl.properties"/>
</instructionSet>
<instructionSet>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -20,6 +20,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>{{webfilesPrefix}}/freemarker/{{namespace}}/eventspage-main.ftl</sv:value>
<sv:value>{{webfilesPrefix}}/freemarker/hstdefault/eventspage-main.ftl</sv:value>
</sv:property>
</sv:node>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -20,6 +20,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>jsp/{{namespace}}/eventspage-main.jsp</sv:value>
<sv:value>jsp/hstdefault/eventspage-main.jsp</sv:value>
</sv:property>
</sv:node>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -26,14 +26,14 @@
<instructionSet group="jsp">
<file action="copy" source="jsp/newslist-main-newslist.jsp" target="{{jspRoot}}/hstdefault/newslist-main-newslist.jsp"/>
<file action="copy" source="jsp/newspage-main.jsp" target="{{jspRoot}}/{{namespace}}/newspage-main.jsp"/>
<file action="copy" source="jsp/newspage-main.jsp" target="{{jspRoot}}/hstdefault/newspage-main.jsp"/>
<xml action="copy" source="xml/hst/templates/news-main-content-jsp.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:templates"/>
<xml action="copy" source="xml/hst/templates/newslist-main-newslist-jsp.xml" target="/hst:hst/hst:configurations/hst:default/hst:templates"/>
</instructionSet>
<instructionSet group="freemarker">
<freemarker action="copy" source="freemarker/newslist-main-newslist.ftl" target="{{freemarkerRoot}}/hstdefault/newslist-main-newslist.ftl"/>
<freemarker action="copy" source="freemarker/newspage-main.ftl" target="{{freemarkerRoot}}/{{namespace}}/newspage-main.ftl"/>
<freemarker action="copy" source="freemarker/newspage-main.ftl" target="{{freemarkerRoot}}/hstdefault/newspage-main.ftl"/>
<xml action="copy" source="xml/hst/templates/news-main-content-freemarker.xml" target="/hst:hst/hst:configurations/{{namespace}}/hst:templates"/>
<xml action="copy" source="xml/hst/templates/newslist-main-newslist-freemarker.xml" target="/hst:hst/hst:configurations/hst:default/hst:templates"/>
</instructionSet>
......@@ -50,13 +50,13 @@
target="{{freemarkerRoot}}/hstdefault/newslist-main-newslist_nl.properties"/>
<freemarker action="copy"
source="freemarker/newspage-main-variant.ftl"
target="{{freemarkerRoot}}/{{namespace}}/newspage-main/variant.ftl"/>
target="{{freemarkerRoot}}/hstdefault/newspage-main/variant.ftl"/>
<file action="copy"
source="freemarker/newspage-main.properties"
target="{{freemarkerRoot}}/{{namespace}}/newspage-main.properties"/>
target="{{freemarkerRoot}}/hstdefault/newspage-main.properties"/>
<file action="copy"
source="freemarker/newspage-main_nl.properties"
target="{{freemarkerRoot}}/{{namespace}}/newspage-main_nl.properties"/>
target="{{freemarkerRoot}}/hstdefault/newspage-main_nl.properties"/>
</instructionSet>
<instructionSet>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -20,6 +20,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>{{webfilesPrefix}}/freemarker/{{namespace}}/newspage-main.ftl</sv:value>
<sv:value>{{webfilesPrefix}}/freemarker/hstdefault/newspage-main.ftl</sv:value>
</sv:property>
</sv:node>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014 Hippo B.V. (http://www.onehippo.com)
Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......@@ -20,6 +20,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>jsp/{{namespace}}/newspage-main.jsp</sv:value>
<sv:value>jsp/hstdefault/newspage-main.jsp</sv:value>
</sv:property>
</sv:node>
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