You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2009/12/10 12:12:04 UTC
svn commit: r889188 - in /incubator/wookie/trunk/widgets: build.xml
widget-template/config.xml widget-template/index.html
widget-template/scripts/common.js widget-template/style/common.css
Author: scottbw
Date: Thu Dec 10 11:11:29 2009
New Revision: 889188
URL: http://svn.apache.org/viewvc?rev=889188&view=rev
Log:
Applied patch for WOOKIE-74 and WOOKIE-83, updating the widget template and build script to better conform to W3C. Thanks to Ross Gardler for the patch, and to Markus Essl for reporting the issue.
Added:
incubator/wookie/trunk/widgets/widget-template/style/common.css
Modified:
incubator/wookie/trunk/widgets/build.xml
incubator/wookie/trunk/widgets/widget-template/config.xml
incubator/wookie/trunk/widgets/widget-template/index.html
incubator/wookie/trunk/widgets/widget-template/scripts/common.js
Modified: incubator/wookie/trunk/widgets/build.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/build.xml?rev=889188&r1=889187&r2=889188&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/build.xml (original)
+++ incubator/wookie/trunk/widgets/build.xml Thu Dec 10 11:11:29 2009
@@ -40,6 +40,7 @@
<target name="seed-widget" description="Seed a new widget">
<input message="What is the short name of the widget you wish to create?" addproperty="widget.shortname"/>
+ <input message="Provide a brief description of the purpose of the ${widget.shortname} widget" addproperty="widget.description"/>
<input message="What is the default height of the ${widget.shortname} widget?" addproperty="widget.height" defaultvalue="320"/>
<input message="What is the default width of the widget you wish to create?" addproperty="widget.width" defaultvalue="200"/>
@@ -48,6 +49,7 @@
<fileset dir="${widget.template.dir}"/>
<filterset>
<filter token="widget.shortname" value="${widget.shortname}"/>
+ <filter token="widget.description" value="${widget.description}"/>
<filter token="widget.height" value="${widget.height}"/>
<filter token="widget.width" value="${widget.width}"/>
</filterset>
Modified: incubator/wookie/trunk/widgets/widget-template/config.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/config.xml?rev=889188&r1=889187&r2=889188&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/widget-template/config.xml (original)
+++ incubator/wookie/trunk/widgets/widget-template/config.xml Thu Dec 10 11:11:29 2009
@@ -15,12 +15,13 @@
limitations under the License.
-->
<widget xmlns="http://www.w3.org/ns/widgets"
- id="http://www.getwookie.org/widgets@widget.shortname@"
- network="public">
- <widgetname>@widget.shortname@</widgetname>
+ id="http://www.getwookie.org/widgets/@widget.shortname@"
+ width="@widget.width"
+ height="@widget.height"
+ >
+ <name>@widget.shortname@</name>
+ <description>@widget.description</description>
<content src="index.html"/>
- <width>@widget.width@</width>
- <height>@widget.height@</height>
</widget>
Modified: incubator/wookie/trunk/widgets/widget-template/index.html
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/index.html?rev=889188&r1=889187&r2=889188&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/widget-template/index.html (original)
+++ incubator/wookie/trunk/widgets/widget-template/index.html Thu Dec 10 11:11:29 2009
@@ -20,8 +20,8 @@
<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>@widget.shortname@</title>
- <script type='text/javascript' src='common.js' charset='utf-8'></script>
- <link rel="stylesheet" href="common.css" type="text/css"/>
+ <script type='text/javascript' src='scripts/common.js' charset='utf-8'></script>
+ <link rel="stylesheet" href="style/common.css" type="text/css"/>
</head>
<body onload="init()">
<div id="front">
Modified: incubator/wookie/trunk/widgets/widget-template/scripts/common.js
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/scripts/common.js?rev=889188&r1=889187&r2=889188&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/widget-template/scripts/common.js (original)
+++ incubator/wookie/trunk/widgets/widget-template/scripts/common.js Thu Dec 10 11:11:29 2009
@@ -1,4 +1,4 @@
-var city = ÒManchesterÓ;
+var city = "Manchester";
function init(){
Widget.preferenceForKey(instanceid_key, "city", setLocation);
Added: incubator/wookie/trunk/widgets/widget-template/style/common.css
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/style/common.css?rev=889188&view=auto
==============================================================================
--- incubator/wookie/trunk/widgets/widget-template/style/common.css (added)
+++ incubator/wookie/trunk/widgets/widget-template/style/common.css Thu Dec 10 11:11:29 2009
@@ -0,0 +1,12 @@
+html {
+height:100%;
+max-height:100%;
+padding:0;
+margin:0;
+border:0;
+font-family: "trebuchet ms", tahoma, verdana, arial, sans-serif;
+/* hide overflow:hidden from IE5/Mac */
+/* \*/
+overflow: hidden;
+/* */
+}
\ No newline at end of file