Tobias Jeger pushed to branch master at cms-community / hippo-essentials
Commits:
8453a21c by Tobias Jeger at 2018-02-04T21:15:14+01:00
ESSENTIALS-1143 Put blog detail templates into "shared" hstdefault
folder
- - - - -
796a8c8f by Tobias Jeger at 2018-02-07T21:54:40+01:00
ESSENTIALS-1143 Merge branch 'master' into bugfix/ESSENTIALS-1143
- - - - -
60f24d08 by Tobias Jeger at 2018-02-07T22:17:36+01:00
ESSENTIALS-1143 Reintegrate 'bugfix/ESSENTIALS-1143'
- - - - -
3 changed files:
- plugins/blog/src/main/resources/META-INF/blog_instructions.xml
- plugins/blog/src/main/resources/hst/template-blog-detail-freemarker.xml
- plugins/blog/src/main/resources/hst/template-blog-detail-jsp.xml
Changes:
=====================================
plugins/blog/src/main/resources/META-INF/blog_instructions.xml
=====================================
--- a/plugins/blog/src/main/resources/META-INF/blog_instructions.xml
+++ b/plugins/blog/src/main/resources/META-INF/blog_instructions.xml
@@ -86,7 +86,7 @@
<file action="copy" source="jsp/blog-main.jsp"
target="{{jspRoot}}/{{namespace}}/blog/blog-main.jsp"/>
<file action="copy" source="jsp/blog-author-posts.jsp"
target="{{jspRoot}}/hstdefault/blog/blog-author-posts.jsp"/>
<file action="copy" source="jsp/blog-facet.jsp"
target="{{jspRoot}}/hstdefault/facet/blog-facet.jsp"/>
- <file action="copy" source="jsp/blog-detail.jsp"
target="{{jspRoot}}/{{namespace}}/blog/blog-detail.jsp"/>
+ <file action="copy" source="jsp/blog-detail.jsp"
target="{{jspRoot}}/hstdefault/blog/blog-detail.jsp"/>
<file action="copy" source="jsp/blog-list.jsp"
target="{{jspRoot}}/hstdefault/blog/blog-list.jsp"/>
</instructionSet>
@@ -96,7 +96,7 @@
<instructionSet group="freemarker">
<freemarker action="copy" source="freemarker/blog-facet.ftl"
target="{{freemarkerRoot}}/hstdefault/facet/blog-facet.ftl"/>
<freemarker action="copy" source="freemarker/blog-author-posts.ftl"
target="{{freemarkerRoot}}/hstdefault/blog/blog-author-posts.ftl"/>
- <freemarker action="copy" source="freemarker/blog-detail.ftl"
target="{{freemarkerRoot}}/{{namespace}}/blog/blog-detail.ftl"/>
+ <freemarker action="copy" source="freemarker/blog-detail.ftl"
target="{{freemarkerRoot}}/hstdefault/blog/blog-detail.ftl"/>
<freemarker action="copy" source="freemarker/blog-main.ftl"
target="{{freemarkerRoot}}/{{namespace}}/blog/blog-main.ftl"/>
<freemarker action="copy" source="freemarker/blog-list.ftl"
target="{{freemarkerRoot}}/hstdefault/blog/blog-list.ftl"/>
</instructionSet>
@@ -113,13 +113,13 @@
target="{{freemarkerRoot}}/hstdefault/blog/blog-list_nl.properties"/>
<freemarker action="copy"
source="freemarker/blog-detail-variant.ftl"
-
target="{{freemarkerRoot}}/{{namespace}}/blog/blog-detail/variant.ftl"/>
+
target="{{freemarkerRoot}}/hstdefault/blog/blog-detail/variant.ftl"/>
<file action="copy"
source="freemarker/blog-detail.properties"
-
target="{{freemarkerRoot}}/{{namespace}}/blog/blog-detail.properties"/>
+ target="{{freemarkerRoot}}/hstdefault/blog/blog-detail.properties"/>
<file action="copy"
source="freemarker/blog-detail_nl.properties"
-
target="{{freemarkerRoot}}/{{namespace}}/blog/blog-detail_nl.properties"/>
+
target="{{freemarkerRoot}}/hstdefault/blog/blog-detail_nl.properties"/>
</instructionSet>
<!--
=====================================
plugins/blog/src/main/resources/hst/template-blog-detail-freemarker.xml
=====================================
--- a/plugins/blog/src/main/resources/hst/template-blog-detail-freemarker.xml
+++ b/plugins/blog/src/main/resources/hst/template-blog-detail-freemarker.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2014-2015 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");
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}}/blog/blog-detail.ftl</sv:value>
+
<sv:value>{{webfilesPrefix}}/freemarker/hstdefault/blog/blog-detail.ftl</sv:value>
</sv:property>
</sv:node>
=====================================
plugins/blog/src/main/resources/hst/template-blog-detail-jsp.xml
=====================================
--- a/plugins/blog/src/main/resources/hst/template-blog-detail-jsp.xml
+++ b/plugins/blog/src/main/resources/hst/template-blog-detail-jsp.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2014 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");
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}}/blog/blog-detail.jsp</sv:value>
+ <sv:value>jsp/hstdefault/blog/blog-detail.jsp</sv:value>
</sv:property>
</sv:node>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/32b06c87e537dfe894e7985140366547343bba3e...60f24d08908f048e0bd46b3f447888c17fde0e52
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/32b06c87e537dfe894e7985140366547343bba3e...60f24d08908f048e0bd46b3f447888c17fde0e52
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
