Author: rgardler
Date: Fri Nov 16 23:22:54 2012
New Revision: 1410621

URL: http://svn.apache.org/viewvc?rev=1410621&view=rev
Log:
allow styles to be overridden easily in widgets

Added:
    incubator/wookie/trunk/widgets/templates/base/content_styles.html
Modified:
    incubator/wookie/trunk/widgets/templates/base/index.html
    incubator/wookie/trunk/widgets/templates/base/template_build.xml
    incubator/wookie/trunk/widgets/templates/browse/template_build.xml
    incubator/wookie/trunk/widgets/templates/scanning/template_build.xml
    incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml

Added: incubator/wookie/trunk/widgets/templates/base/content_styles.html
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/content_styles.html?rev=1410621&view=auto
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/content_styles.html (added)
+++ incubator/wookie/trunk/widgets/templates/base/content_styles.html Fri Nov 
16 23:22:54 2012
@@ -0,0 +1,2 @@
+<link rel="stylesheet" 
href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css"; />
+<link rel="stylesheet" href="style/all.css" />

Modified: incubator/wookie/trunk/widgets/templates/base/index.html
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/index.html?rev=1410621&r1=1410620&r2=1410621&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/base/index.html Fri Nov 16 
23:22:54 2012
@@ -20,11 +20,9 @@
     <meta http-equiv="pragma" content="no-cache"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
-
-    <link rel="stylesheet" 
href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css"; />
-    <link rel="stylesheet" href="style/all.css" />
     
     ${content.scripts}
+    ${content.styles}
                        
     <title>${widget.name}</title>              
   </head>

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=1410621&r1=1410620&r2=1410621&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/template_build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/base/template_build.xml Fri Nov 16 
23:22:54 2012
@@ -23,6 +23,22 @@
     <echo message="|  Initialising template properties for ${template.name}"/>
     <echo message="+------------------------------------------"/>
 
+    <loadfile property="content.styles"
+             srcFile="content_styles.html"
+             failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.styles"
+              srcFile="${template.dir}/${template.name}/content_styles.html"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+       
     <loadfile property="content.scripts"
              srcFile="content_scripts.html"
              failonerror="false">
@@ -140,4 +156,4 @@
     </ant>
     -->
   </target>
-</project>
\ No newline at end of file
+</project>

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=1410621&r1=1410620&r2=1410621&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/template_build.xml 
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/template_build.xml Fri Nov 
16 23:22:54 2012
@@ -1,206 +1,223 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project basedir="." name="browse_template">
-  <target name="_init_template"
-          description="Define any template specifc properties">
-    <echo message="+------------------------------------------"/>
-    <echo message="|  Initialising template properties for ${template.name} 
template"/>
-    <echo message="+------------------------------------------"/>
-
-       
-    <loadfile property="browse.item.detail.template"
-             srcFile="item_template.html"
-             failonerror="false">
-      <filterchain>
-       <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="browse.item.detail.template"
-             srcFile="../common/item_template.html"
-             failonerror="false">
-      <filterchain>
-       <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-    
-    <loadfile property="browse.item.detail.template"
-              srcFile="${template.dir}/${template.name}/item_template.html"
-              failonerror="false">
-      <filterchain>
-       <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-       
-    <loadfile property="browse.item.summary.template"
-             srcFile="item_summary_template.html"
-             failonerror="false">
-      <filterchain>
-       <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="browse.item.summary.template"
-             srcFile="../common/item_summary_template.html"
-             failonerror="false">
-      <filterchain>
-       <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-    
-    <loadfile property="browse.item.summary.template"
-              
srcFile="${template.dir}/${template.name}/item_summary_template.html"
-              failonerror="false">
-      <filterchain>
-       <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-       
-    <loadfile property="content.scripts"
-             srcFile="content_scripts.html"
-             failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-       
-    <loadfile property="content.scripts"
-              srcFile="${template.dir}/${template.name}/content_scripts.html"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="content.primary"
-             srcFile="content_primary.html"
-             failonerror="false">
-      <filterchain>
-       <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="content.secondary"
-             srcFile="content_secondary.html"
-             failonerror="false">
-      <filterchain>
-       <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="content.footer"
-              srcFile="content_footer.html"
-              failonerror="false">
-      <filterchain>
-       <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <!-- load properties we've set in other templates -->
-    <property file="${widget.build.dir}/${widget.shortname}.properties"/>
-    <!-- write the full property set for this template -->
-    <echoproperties 
destfile="${widget.build.dir}/${widget.shortname}.properties" prefix=""/>
-  </target>
-
-
-  <target name="_generate_from_parent_templates">
-    <echo message="+------------------------------------------"/>
-    <echo message="|  Generating from parent templates for ${template.name}"/>
-    <echo message="+------------------------------------------"/>
-
-    <!-- Build from base template -->
-    <ant antfile="../../build.xml"
-         target="_generate_widget">
-      <property name="template.name" value="twoColumn"/>
-      <property name="copyWidgetFiles" value="false"/>
-    </ant>
-  </target>
-</project>
\ No newline at end of file
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." name="browse_template">
+  <target name="_init_template"
+          description="Define any template specifc properties">
+    <echo message="+------------------------------------------"/>
+    <echo message="|  Initialising template properties for ${template.name} 
template"/>
+    <echo message="+------------------------------------------"/>
+
+       
+    <loadfile property="browse.item.detail.template"
+             srcFile="item_template.html"
+             failonerror="false">
+      <filterchain>
+       <striplinebreaks/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="browse.item.detail.template"
+             srcFile="../common/item_template.html"
+             failonerror="false">
+      <filterchain>
+       <striplinebreaks/>
+      </filterchain>
+    </loadfile>
+    
+    <loadfile property="browse.item.detail.template"
+              srcFile="${template.dir}/${template.name}/item_template.html"
+              failonerror="false">
+      <filterchain>
+       <striplinebreaks/>
+      </filterchain>
+    </loadfile>
+       
+    <loadfile property="browse.item.summary.template"
+             srcFile="item_summary_template.html"
+             failonerror="false">
+      <filterchain>
+       <striplinebreaks/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="browse.item.summary.template"
+             srcFile="../common/item_summary_template.html"
+             failonerror="false">
+      <filterchain>
+       <striplinebreaks/>
+      </filterchain>
+    </loadfile>
+    
+    <loadfile property="browse.item.summary.template"
+              
srcFile="${template.dir}/${template.name}/item_summary_template.html"
+              failonerror="false">
+      <filterchain>
+       <striplinebreaks/>
+      </filterchain>
+    </loadfile>
+
+
+    <loadfile property="content.styles"
+             srcFile="content_styles.html"
+             failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.styles"
+              srcFile="${template.dir}/${template.name}/content_styles.html"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+       
+    <loadfile property="content.scripts"
+             srcFile="content_scripts.html"
+             failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+       
+    <loadfile property="content.scripts"
+              srcFile="${template.dir}/${template.name}/content_scripts.html"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.primary"
+             srcFile="content_primary.html"
+             failonerror="false">
+      <filterchain>
+       <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.secondary"
+             srcFile="content_secondary.html"
+             failonerror="false">
+      <filterchain>
+       <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.footer"
+              srcFile="content_footer.html"
+              failonerror="false">
+      <filterchain>
+       <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <!-- load properties we've set in other templates -->
+    <property file="${widget.build.dir}/${widget.shortname}.properties"/>
+    <!-- write the full property set for this template -->
+    <echoproperties 
destfile="${widget.build.dir}/${widget.shortname}.properties" prefix=""/>
+  </target>
+
+
+  <target name="_generate_from_parent_templates">
+    <echo message="+------------------------------------------"/>
+    <echo message="|  Generating from parent templates for ${template.name}"/>
+    <echo message="+------------------------------------------"/>
+
+    <!-- Build from base template -->
+    <ant antfile="../../build.xml"
+         target="_generate_widget">
+      <property name="template.name" value="twoColumn"/>
+      <property name="copyWidgetFiles" value="false"/>
+    </ant>
+  </target>
+</project>

Modified: incubator/wookie/trunk/widgets/templates/scanning/template_build.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/scanning/template_build.xml?rev=1410621&r1=1410620&r2=1410621&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/scanning/template_build.xml 
(original)
+++ incubator/wookie/trunk/widgets/templates/scanning/template_build.xml Fri 
Nov 16 23:22:54 2012
@@ -23,6 +23,22 @@
     <echo message="|  Initialising template properties for ${template.name}"/>
     <echo message="+------------------------------------------"/>
 
+    <loadfile property="content.styles"
+             srcFile="content_styles.html"
+             failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.styles"
+              srcFile="${template.dir}/${template.name}/content_styles.html"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
     <loadfile property="content.scripts"
              srcFile="content_scripts.html"
              failonerror="false">
@@ -137,4 +153,4 @@
       <property name="copyWidgetFiles" value="false"/>
     </ant>
   </target>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml?rev=1410621&r1=1410620&r2=1410621&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml 
(original)
+++ incubator/wookie/trunk/widgets/templates/twoColumn/template_build.xml Fri 
Nov 16 23:22:54 2012
@@ -1,157 +1,173 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project basedir="." name="twoColumn_template">
-  <target name="_init_template"
-          description="Define any template specifc properties">
-    <echo message="+------------------------------------------"/>
-    <echo message="|  Initialising template properties for ${template.name}"/>
-    <echo message="+------------------------------------------"/>
-
-    <loadfile property="content.scripts"
-             srcFile="content_scripts.html"
-             failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-       
-    <loadfile property="content.scripts"
-              srcFile="${template.dir}/${template.name}/content_scripts.html"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="content.primary"
-             srcFile="content_primary.html"
-             failonerror="false">
-      <filterchain>
-       <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="content.secondary"
-             srcFile="content_secondary.html"
-             failonerror="false">
-      <filterchain>
-       <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <loadfile property="content.footer"
-              srcFile="content_footer.html"
-              failonerror="false">
-      <filterchain>
-       <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"
-              failonerror="false">
-      <filterchain>
-       <expandproperties/>
-      </filterchain>
-    </loadfile>
-
-    <!-- load properties we've set in other templates -->
-    <property file="${widget.build.dir}/${widget.shortname}.properties"/>
-    <!-- write the full property set for this template -->
-    <echoproperties 
destfile="${widget.build.dir}/${widget.shortname}.properties" prefix=""/>
-  </target>
-
-
-  <target name="_generate_from_parent_templates">
-    <echo message="+------------------------------------------"/>
-    <echo message="|  Generating from parent templates for ${template.name}"/>
-    <echo message="+------------------------------------------"/>
-
-    <!-- Build from base template -->
-    <ant antfile="${wookie.template.dir}/build.xml"
-         target="_generate_widget">
-      <property name="template.name" value="base"/>
-      <property name="copyWidgetFiles" value="false"/>
-    </ant>
-  </target>
-</project>
\ No newline at end of file
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." name="twoColumn_template">
+  <target name="_init_template"
+          description="Define any template specifc properties">
+    <echo message="+------------------------------------------"/>
+    <echo message="|  Initialising template properties for ${template.name}"/>
+    <echo message="+------------------------------------------"/>
+
+    <loadfile property="content.styles"
+             srcFile="content_styles.html"
+             failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.styles"
+              srcFile="${template.dir}/${template.name}/content_styles.html"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.scripts"
+             srcFile="content_scripts.html"
+             failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+       
+    <loadfile property="content.scripts"
+              srcFile="${template.dir}/${template.name}/content_scripts.html"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.primary"
+             srcFile="content_primary.html"
+             failonerror="false">
+      <filterchain>
+       <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.secondary"
+             srcFile="content_secondary.html"
+             failonerror="false">
+      <filterchain>
+       <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <loadfile property="content.footer"
+              srcFile="content_footer.html"
+              failonerror="false">
+      <filterchain>
+       <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"
+              failonerror="false">
+      <filterchain>
+       <expandproperties/>
+      </filterchain>
+    </loadfile>
+
+    <!-- load properties we've set in other templates -->
+    <property file="${widget.build.dir}/${widget.shortname}.properties"/>
+    <!-- write the full property set for this template -->
+    <echoproperties 
destfile="${widget.build.dir}/${widget.shortname}.properties" prefix=""/>
+  </target>
+
+
+  <target name="_generate_from_parent_templates">
+    <echo message="+------------------------------------------"/>
+    <echo message="|  Generating from parent templates for ${template.name}"/>
+    <echo message="+------------------------------------------"/>
+
+    <!-- Build from base template -->
+    <ant antfile="${wookie.template.dir}/build.xml"
+         target="_generate_widget">
+      <property name="template.name" value="base"/>
+      <property name="copyWidgetFiles" value="false"/>
+    </ant>
+  </target>
+</project>


Reply via email to