Author: rgardler
Date: Wed Dec 14 23:37:11 2011
New Revision: 1214550
URL: http://svn.apache.org/viewvc?rev=1214550&view=rev
Log:
allow the sctipts tags to be redefined by widgets
Added:
incubator/wookie/trunk/widgets/templates/browse/content_scripts.html
- copied, changed from r1212133,
incubator/wookie/trunk/widgets/templates/base/content_scripts.html
Modified:
incubator/wookie/trunk/widgets/templates/browse/index.html
incubator/wookie/trunk/widgets/templates/browse/template_build.xml
Copied: incubator/wookie/trunk/widgets/templates/browse/content_scripts.html
(from r1212133,
incubator/wookie/trunk/widgets/templates/base/content_scripts.html)
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/content_scripts.html?p2=incubator/wookie/trunk/widgets/templates/browse/content_scripts.html&p1=incubator/wookie/trunk/widgets/templates/base/content_scripts.html&r1=1212133&r2=1214550&rev=1214550&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/content_scripts.html
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/content_scripts.html Wed
Dec 14 23:37:11 2011
@@ -1,3 +1,3 @@
<script type="text/javascript"
src="http://code.jquery.com/jquery-1.6.4.min.js";></script>
-<script type="text/javascript"
src="http://code.jquery.com/mobile/1.0rc2/jquery.mobile-1.0rc2.min.js";></script>
+<script type="text/javascript"
src="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js";></script>
<script type="text/javascript" src="scripts/controller.js"></script>
Modified: incubator/wookie/trunk/widgets/templates/browse/index.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/index.html?rev=1214550&r1=1214549&r2=1214550&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/browse/index.html Wed Dec 14
23:37:11 2011
@@ -26,10 +26,7 @@
<link rel="stylesheet" href="style/media.css" />
<link rel="stylesheet" href="style/all.css" />
-<script type="text/javascript"
- src="http://code.jquery.com/jquery-1.6.4.min.js";></script>
-<script type="text/javascript"
-
src="http://code.jquery.com/mobile/1.0rc2/jquery.mobile-1.0rc2.min.js";></script>
+${content.scripts}
<script type="text/javascript" src="lib/XSLTransform.js"></script>
<script type="text/javascript" src="scripts/controller.js"></script>
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=1214550&r1=1214549&r2=1214550&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/template_build.xml
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/template_build.xml Wed Dec
14 23:37:11 2011
@@ -22,6 +22,22 @@
<echo message="| Initialising template properties"/>
<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">
