Commit 647b496f authored by Marijan Milicevic's avatar Marijan Milicevic

ESSENTIALS-760 Templates for newspage are placed in the wrong folder

- done same change for events as well
parent bf4edd0a
......@@ -25,14 +25,14 @@
</instructionSet>
<instructionSet group="jsp">
<file action="copy" source="jsp/eventslist-main-eventslist.jsp" target="{{jspRoot}}/hstdefault/eventslist-main-eventslist.jsp"/>
<file action="copy" source="jsp/eventslist-main-eventslist.jsp" target="{{jspRoot}}/{{namespace}}/eventslist-main-eventslist.jsp"/>
<file action="copy" source="jsp/eventspage-main.jsp" target="{{jspRoot}}/{{namespace}}/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/eventslist-main-eventslist.ftl" target="{{freemarkerRoot}}/{{namespace}}/eventslist-main-eventslist.ftl"/>
<freemarker action="copy" source="freemarker/eventspage-main.ftl" target="{{freemarkerRoot}}/{{namespace}}/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"/>
......@@ -41,13 +41,13 @@
<instructionSet group="extraTemplates">
<freemarker action="copy"
source="freemarker/eventslist-main-eventslist-variant.ftl"
target="{{freemarkerRoot}}/hstdefault/eventslist-main-eventslist/variant.ftl"/>
target="{{freemarkerRoot}}/{{namespace}}/eventslist-main-eventslist/variant.ftl"/>
<file action="copy"
source="freemarker/eventslist-main-eventslist.properties"
target="{{freemarkerRoot}}/hstdefault/eventslist-main-eventslist.properties"/>
target="{{freemarkerRoot}}/{{namespace}}/eventslist-main-eventslist.properties"/>
<file action="copy"
source="freemarker/eventslist-main-eventslist_nl.properties"
target="{{freemarkerRoot}}/hstdefault/eventslist-main-eventslist_nl.properties"/>
target="{{freemarkerRoot}}/{{namespace}}/eventslist-main-eventslist_nl.properties"/>
<freemarker action="copy"
source="freemarker/eventspage-main-variant.ftl"
target="{{freemarkerRoot}}/{{namespace}}/eventspage-main/variant.ftl"/>
......
......@@ -21,6 +21,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>{{webfilesPrefix}}/freemarker/hstdefault/eventslist-main-eventslist.ftl</sv:value>
<sv:value>{{webfilesPrefix}}/freemarker/{{namespace}}/eventslist-main-eventslist.ftl</sv:value>
</sv:property>
</sv:node>
......@@ -20,6 +20,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>jsp/hstdefault/eventslist-main-eventslist.jsp</sv:value>
<sv:value>jsp/{{namespace}}/eventslist-main-eventslist.jsp</sv:value>
</sv:property>
</sv:node>
......@@ -24,14 +24,14 @@
</instructionSet>
<instructionSet group="jsp">
<file action="copy" source="jsp/newslist-main-newslist.jsp" target="{{jspRoot}}/hstdefault/newslist-main-newslist.jsp"/>
<file action="copy" source="jsp/newslist-main-newslist.jsp" target="{{jspRoot}}/{{namespace}}/newslist-main-newslist.jsp"/>
<file action="copy" source="jsp/newspage-main.jsp" target="{{jspRoot}}/{{namespace}}/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/newslist-main-newslist.ftl" target="{{freemarkerRoot}}/{{namespace}}/newslist-main-newslist.ftl"/>
<freemarker action="copy" source="freemarker/newspage-main.ftl" target="{{freemarkerRoot}}/{{namespace}}/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"/>
......@@ -40,13 +40,13 @@
<instructionSet group="extraTemplates">
<freemarker action="copy"
source="freemarker/newslist-main-newslist-variant.ftl"
target="{{freemarkerRoot}}/hstdefault/newslist-main-newslist/variant.ftl"/>
target="{{freemarkerRoot}}/{{namespace}}/newslist-main-newslist/variant.ftl"/>
<file action="copy"
source="freemarker/newslist-main-newslist.properties"
target="{{freemarkerRoot}}/hstdefault/newslist-main-newslist.properties"/>
target="{{freemarkerRoot}}/{{namespace}}/newslist-main-newslist.properties"/>
<file action="copy"
source="freemarker/newslist-main-newslist_nl.properties"
target="{{freemarkerRoot}}/hstdefault/newslist-main-newslist_nl.properties"/>
target="{{freemarkerRoot}}/{{namespace}}/newslist-main-newslist_nl.properties"/>
<freemarker action="copy"
source="freemarker/newspage-main-variant.ftl"
target="{{freemarkerRoot}}/{{namespace}}/newspage-main/variant.ftl"/>
......
......@@ -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/hstdefault/newslist-main-newslist.ftl</sv:value>
<sv:value>{{webfilesPrefix}}/freemarker/{{namespace}}/newslist-main-newslist.ftl</sv:value>
</sv:property>
</sv:node>
......@@ -20,6 +20,6 @@
<sv:value>hst:template</sv:value>
</sv:property>
<sv:property sv:name="hst:renderpath" sv:type="String">
<sv:value>jsp/hstdefault/newslist-main-newslist.jsp</sv:value>
<sv:value>jsp/{{namespace}}/newslist-main-newslist.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