Author: rgardler
Date: Thu Aug 9 10:22:16 2012
New Revision: 1371145
URL: http://svn.apache.org/viewvc?rev=1371145&view=rev
Log:
test the new 'multiple inheritence' capability in templates by making the
assetPlayer depend on both the twoColumn and Scanning template
Modified:
incubator/wookie/trunk/widgets/templates/assetPlayer/content_secondary.html
incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml
Modified:
incubator/wookie/trunk/widgets/templates/assetPlayer/content_secondary.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/assetPlayer/content_secondary.html?rev=1371145&r1=1371144&r2=1371145&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/assetPlayer/content_secondary.html
(original)
+++ incubator/wookie/trunk/widgets/templates/assetPlayer/content_secondary.html
Thu Aug 9 10:22:16 2012
@@ -1,17 +1,17 @@
<div>
- <div id="gotoAlbum" data-role="button">
+ <div class="scan" id="gotoAlbum" data-role="button">
Change Photos
</div>
- <div id="playPause" data-role="button">
+ <div class="scan" id="playPause" data-role="button">
Play
</div>
- <div id="prev" data-role="button">
+ <div class="scan" id="prev" data-role="button">
Previous Photo
</div>
- <div id="next" data-role="button">
+ <div class="scan" id="next" data-role="button">
Next Photo
</div>
</div>
Modified:
incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml?rev=1371145&r1=1371144&r2=1371145&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml
(original)
+++ incubator/wookie/trunk/widgets/templates/assetPlayer/template_build.xml Thu
Aug 9 10:22:16 2012
@@ -154,8 +154,15 @@
<ant antfile="${wookie.template.dir}/build.xml"
target="_generate_widget">
+ <property name="template.name" value="scanning"/>
+ <property name="copyWidgetFiles" value="false"/>
+ </ant>
+
+ <ant antfile="${wookie.template.dir}/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
