Author: rgardler
Date: Fri Aug 10 12:26:07 2012
New Revision: 1371685
URL: http://svn.apache.org/viewvc?rev=1371685&view=rev
Log:
deprecate use of *.add.css files for extending stylesheets - this filename
structure prevents some editors from providing contextual help etc. - we now
use .add.css instead by default (the old format will still work for backward
compatibility)
Added:
incubator/wookie/trunk/widgets/templates/assetPlayer/style/screen.add.css
- copied unchanged from r1370743,
incubator/wookie/trunk/widgets/templates/assetPlayer/style/screen.css.add
incubator/wookie/trunk/widgets/templates/base/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/base/style/screen.css.add
incubator/wookie/trunk/widgets/templates/browse/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add
incubator/wookie/trunk/widgets/templates/composite/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/composite/style/screen.css.add
incubator/wookie/trunk/widgets/templates/enyo/base/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/enyo/base/style/screen.css.add
incubator/wookie/trunk/widgets/templates/itemDetail/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/itemDetail/style/screen.css.add
incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add
incubator/wookie/trunk/widgets/templates/walkthrough/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/walkthrough/style/screen.css.add
incubator/wookie/trunk/widgets/templates/widgets/twitter/style/screen.add.css
- copied unchanged from r1369749,
incubator/wookie/trunk/widgets/templates/widgets/twitter/style/screen.css.add
Removed:
incubator/wookie/trunk/widgets/templates/assetPlayer/style/screen.css.add
incubator/wookie/trunk/widgets/templates/base/style/screen.css.add
incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add
incubator/wookie/trunk/widgets/templates/composite/style/screen.css.add
incubator/wookie/trunk/widgets/templates/enyo/base/style/screen.css.add
incubator/wookie/trunk/widgets/templates/itemDetail/style/screen.css.add
incubator/wookie/trunk/widgets/templates/testWidgets/assetPlayerTestWidget/index.html
incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add
incubator/wookie/trunk/widgets/templates/walkthrough/style/screen.css.add
incubator/wookie/trunk/widgets/templates/widgets/twitter/style/screen.css.add
Modified:
incubator/wookie/trunk/widgets/templates/build.xml
incubator/wookie/trunk/widgets/templates/readme.txt
Modified: incubator/wookie/trunk/widgets/templates/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/build.xml?rev=1371685&r1=1371684&r2=1371685&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/build.xml Fri Aug 10 12:26:07 2012
@@ -45,8 +45,6 @@
<echo message="| in: ${basedir} |"/>
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
-
-
<subant target="_generate_and_deploy_widget"
genericantfile="${basedir}/build.xml"
@@ -60,19 +58,19 @@
<delete dir="${widget.build.dir}/${widget.shortname}.tmp"/>
</target>
- <target name="_remove_comments">
- <echo message="+------------------------------------------"/>
- <echo message="| Removing comments from files: |"/>
- <echo message="| in: ${widget.build.dir}/${widget.shortname}" />
- <echo message="+------------------------------------------"/>
- <replaceregexp match="<\%[^>]*>" flags="g" replace="" >
- <fileset dir="${widget.build.dir}/${widget.shortname}" >
- <exclude name="images/*"/>
- <exclude name="assets/*"/>
- <exclude name="lib/*"/>
- </fileset>
- </replaceregexp>
- </target>
+ <target name="_remove_comments">
+ <echo message="+------------------------------------------"/>
+ <echo message="| Removing comments from files: |"/>
+ <echo message="| in: ${widget.build.dir}/${widget.shortname}" />
+ <echo message="+------------------------------------------"/>
+ <replaceregexp match="<\%[^>]*>" flags="g" replace="" >
+ <fileset dir="${widget.build.dir}/${widget.shortname}" >
+ <exclude name="images/*"/>
+ <exclude name="assets/*"/>
+ <exclude name="lib/*"/>
+ </fileset>
+ </replaceregexp>
+ </target>
<target name="generate-test-widgets"
description="Generate a single test widget from the template">
@@ -80,7 +78,9 @@
<property name="widget.include" value="*TestWidget"/>
<!-- This target is intended to be used to test any changes to the
- template before all widgets are regenerated -->
+ template before all widgets are regenerated. At this point we need
+ to manually veriify that the widgets are built and behave as expected.
+ FIXME: it would be really nice to have some autoated tests here. -->
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
<echo message="| Generating test widgets |"/>
@@ -299,6 +299,8 @@
failonerror="false">
<fileset dir="../common/style">
<include name="**/*.css"/>
+ <include name="**/*.add.css"/>
+ <!-- deprecated: don't use .css.add extensions -->
<include name="**/*.css.add"/>
</fileset>
</copy>
@@ -307,7 +309,10 @@
failonerror="false">
<fileset dir="./style">
<include name="**/*.css"/>
+ <include name="**/*.add.css"/>
+ <!-- deprecated: don't use .css.add extensions -->
<include name="**/*.css.add"/>
+
</fileset>
</copy>
@@ -319,7 +324,9 @@
</fileset>
<fileset dir="${widget.build.dir}/${widget.shortname}.tmp/style"
erroronmissingdir="false">
- <include name="*.css.add"/>
+ <include name="*.add.css"/>
+ <!-- deprecated: don't use .css.add extensions -->
+ <include name="**/*.css.add"/>
</fileset>
</concat>
<move tofile="${widget.build.dir}/${widget.shortname}.tmp/style/all.css"
@@ -444,9 +451,7 @@
<copy todir="${widget.build.dir}/${widget.shortname}.tmp/style"
overwrite="true"
failonerror="false">
- <fileset dir="${template.dir}/${template.name}/style">
- <include name="**/*.css"/>
- </fileset>
+ <fileset dir="${template.dir}/${template.name}/style"/>
</copy>
<!-- Copy/Create the libraries -->
Modified: incubator/wookie/trunk/widgets/templates/readme.txt
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/readme.txt?rev=1371685&r1=1371684&r2=1371685&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/readme.txt (original)
+++ incubator/wookie/trunk/widgets/templates/readme.txt Fri Aug 10 12:26:07 2012
@@ -150,7 +150,7 @@ styling to the Hello World widget.
Starting in your widget definition directory:
* mkdir style
- * create file "style/helloworld.css.add"
+ * create file "style/helloworld.add.css"
* add the following to your css file
* .content-primary { background: yellow; }
* cd ..
@@ -453,7 +453,7 @@ widgets just like any other resources. I
to or modify CSS rules defined in parent templates.
To create additive CSS simply add files with names in the form of
-"foo.css.add". The contents of these files will be added to the start
+"foo.add.css". The contents of these files will be added to the start
of a final CSS file called "all.css".
The base template provides a link to the "all.css" in its "index.html" file.
Therefore, if your template
