Author: rgardler
Date: Tue Nov 29 15:32:02 2011
New Revision: 1207916
URL: http://svn.apache.org/viewvc?rev=1207916&view=rev
Log:
make the default base content more generic and point the user to appropriate
files for customisations
Removed:
incubator/wookie/trunk/widgets/templates/testWidgets/baseTestWidget/content_primary.html
Modified:
incubator/wookie/trunk/widgets/templates/base/content_footer.html
incubator/wookie/trunk/widgets/templates/base/content_header.html
incubator/wookie/trunk/widgets/templates/base/content_primary.html
incubator/wookie/trunk/widgets/templates/base/images/icon.png
incubator/wookie/trunk/widgets/templates/base/images/icon_16x16.png
incubator/wookie/trunk/widgets/templates/base/images/icon_32x32.png
incubator/wookie/trunk/widgets/templates/base/index.html
incubator/wookie/trunk/widgets/templates/base/style/screen.css.add
incubator/wookie/trunk/widgets/templates/build.xml
incubator/wookie/trunk/widgets/templates/testWidgets/baseTestWidget/widget.properties
Modified: incubator/wookie/trunk/widgets/templates/base/content_footer.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/content_footer.html?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/content_footer.html (original)
+++ incubator/wookie/trunk/widgets/templates/base/content_footer.html Tue Nov
29 15:32:02 2011
@@ -14,5 +14,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div class="content">© <Copyright holder></div>
-<a class="button" href="#help" data-role="button" data-rel="dialog"
data-transition="pop" data-icon="info" data-iconpos="left">Help</a>
+<div class="content">See content_footer.html</div>
+<a class="button" href="#help" data-role="button" data-rel="dialog"
data-transition="pop" data-icon="info" data-iconpos="notext">Help</a>
Modified: incubator/wookie/trunk/widgets/templates/base/content_header.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/content_header.html?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/content_header.html (original)
+++ incubator/wookie/trunk/widgets/templates/base/content_header.html Tue Nov
29 15:32:02 2011
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div class="header_title" id="view_title">${widget.name}</div>
\ No newline at end of file
+<div class="header_title" id="view_title">see content_header.html</div>
Modified: incubator/wookie/trunk/widgets/templates/base/content_primary.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/content_primary.html?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/content_primary.html
(original)
+++ incubator/wookie/trunk/widgets/templates/base/content_primary.html Tue Nov
29 15:32:02 2011
@@ -17,8 +17,9 @@
<h2>Primary Content</h2>
-<p>This is the primary content panel for ${widget.name}.
-This content has been loaded from a configuration file in the template
-definition.</p>
+<p>This is the primary content panel for ${widget.name}.</p>
+
+<p>This content is loaded from content_primary.html</p>
+
+
-<p>The description of this widget is "${widget.description}"</p>
Modified: incubator/wookie/trunk/widgets/templates/base/images/icon.png
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/images/icon.png?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/wookie/trunk/widgets/templates/base/images/icon_16x16.png
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/images/icon_16x16.png?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/wookie/trunk/widgets/templates/base/images/icon_32x32.png
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/images/icon_32x32.png?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/wookie/trunk/widgets/templates/base/index.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/index.html?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/index.html (original)
+++ incubator/wookie/trunk/widgets/templates/base/index.html Tue Nov 29
15:32:02 2011
@@ -51,7 +51,7 @@
<h4>Help: ${widget.name}</h4>
</div> <!-- /header -->
- <div data-role="content" class="ui-content" id="content-help">
+ <div data-role="content" class="ui-content" id="content-help">
${widget.help}
</div><!-- /content -->
</div><!-- /page -->
Modified: incubator/wookie/trunk/widgets/templates/base/style/screen.css.add
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/base/style/screen.css.add?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/base/style/screen.css.add
(original)
+++ incubator/wookie/trunk/widgets/templates/base/style/screen.css.add Tue Nov
29 15:32:02 2011
@@ -40,6 +40,11 @@
float:left;
}
+.footer .content {
+ font: 70%
+ float:left;
+}
+
.footer .button {
float:right;
}
Modified: incubator/wookie/trunk/widgets/templates/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/build.xml?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/build.xml (original)
+++ incubator/wookie/trunk/widgets/templates/build.xml Tue Nov 29 15:32:02 2011
@@ -58,6 +58,9 @@
<target name="generate-test-widgets"
description="Generate a single test widget from the template">
+
+ <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 -->
<echo message="+------------------------------------------+"/>
@@ -70,7 +73,7 @@
genericantfile="${basedir}/build.xml"
inheritall="true">
<dirset dir="testWidgets">
- <include name="*TestWidget"/>
+ <include name="${widget.include}"/>
</dirset>
</subant>
</target>
Modified:
incubator/wookie/trunk/widgets/templates/testWidgets/baseTestWidget/widget.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/testWidgets/baseTestWidget/widget.properties?rev=1207916&r1=1207915&r2=1207916&view=diff
==============================================================================
---
incubator/wookie/trunk/widgets/templates/testWidgets/baseTestWidget/widget.properties
(original)
+++
incubator/wookie/trunk/widgets/templates/testWidgets/baseTestWidget/widget.properties
Tue Nov 29 15:32:02 2011
@@ -1,5 +1,5 @@
template.name=base
-widget.shortname=BasicRiCTestWidget
-widget.name=Basic RiC Test Widget
+widget.shortname=BaseTestWidget
+widget.name=Test Widget from Base Template
widget.description=This is a very simple test widget from the base template.
widget.help=<p>There is nothing much to do here, so little need of help.</p>
\ No newline at end of file
