Author: rgardler
Date: Thu Dec 1 00:47:56 2011
New Revision: 1208922
URL: http://svn.apache.org/viewvc?rev=1208922&view=rev
Log:
ensure content is loaded from common folders where possible
Modified:
incubator/wookie/trunk/widgets/templates/base/template_build.xml
incubator/wookie/trunk/widgets/templates/browse/template_build.xml
incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml
incubator/wookie/trunk/widgets/templates/message/template_build.xml
Modified: incubator/wookie/trunk/widgets/templates/base/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/template_build.xml?rev=1208922&r1=1208921&r2=1208922&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/template_build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/base/template_build.xml Thu Dec 1
00:47:56 2011
@@ -39,13 +39,23 @@
</filterchain>
</loadfile>
- <loadfile property="content.header"
- srcFile="content_header.html"
- failonerror="false">
- <filterchain>
- <expandproperties/>
- </filterchain>
- </loadfile>
+
+ <!-- Load the content header -->
+ <loadfile property="content.header"
+ srcFile="content_header.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
+ <loadfile property="content.header"
+ srcFile="../common/content_header.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.header"
srcFile="${template.dir}/${template.name}/content_header.html"
@@ -64,6 +74,14 @@
</filterchain>
</loadfile>
+ <loadfile property="content.primary"
+ srcFile="../common/content_primary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
<!-- load content from template definition -->
<loadfile property="content.primary"
srcFile="${template.dir}/${template.name}/content_primary.html"
@@ -80,6 +98,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.footer"
+ srcFile="../common/content_footer.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.footer"
srcFile="${template.dir}/${template.name}/content_footer.html"
Modified: incubator/wookie/trunk/widgets/templates/browse/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/template_build.xml?rev=1208922&r1=1208921&r2=1208922&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/template_build.xml
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/template_build.xml Thu Dec
1 00:47:56 2011
@@ -29,6 +29,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.header"
+ srcFile="../common/content_header.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.header"
srcFile="${template.dir}/${template.name}/content_header.html"
@@ -45,6 +53,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.primary"
+ srcFile="../common/content_primary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.primary"
srcFile="${template.dir}/${template.name}/content_primary.html"
@@ -61,6 +77,15 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+
+ <loadfile property="content.secondary"
+ srcFile="../common/content_secondary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.secondary"
srcFile="${template.dir}/${template.name}/content_secondary.html"
@@ -77,6 +102,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.footer"
+ srcFile="../common/content_footer.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.footer"
srcFile="${template.dir}/${template.name}/content_footer.html"
Modified: incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml?rev=1208922&r1=1208921&r2=1208922&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml
(original)
+++ incubator/wookie/trunk/widgets/templates/itemDetail/template_build.xml Thu
Dec 1 00:47:56 2011
@@ -30,6 +30,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.header"
+ srcFile="../common/content_header.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.header"
srcFile="${template.dir}/${template.name}/content_header.html"
@@ -48,6 +56,14 @@
</filterchain>
</loadfile>
+ <loadfile property="content.primary"
+ srcFile="../common/content_primary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
<!-- load content from template definition -->
<loadfile property="content.primary"
srcFile="${template.dir}/${template.name}/content_primary.html"
@@ -66,6 +82,14 @@
</filterchain>
</loadfile>
+ <loadfile property="content.secondary"
+ srcFile="../common/content_secondary.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
+
<!-- load content from template definition -->
<loadfile property="content.secondary"
srcFile="${template.dir}/${template.name}/content_secondary.html"
@@ -82,6 +106,14 @@
<expandproperties/>
</filterchain>
</loadfile>
+
+ <loadfile property="content.footer"
+ srcFile="../common/content_footer.html"
+ failonerror="false">
+ <filterchain>
+ <expandproperties/>
+ </filterchain>
+ </loadfile>
<loadfile property="content.footer"
srcFile="${template.dir}/${template.name}/content_footer.html"
Modified: incubator/wookie/trunk/widgets/templates/message/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/message/template_build.xml?rev=1208922&r1=1208921&r2=1208922&view=diff
==============================================================================
Binary files - no diff available.
