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 2010/01/08 23:08:07 UTC
svn commit: r897333 - in /incubator/wookie/trunk/widgets: bubbles/config.xml
weather/config.xml widget-template/config.xml
widget-template/images/icon.png widget-template/index.html
widget-template/scripts/common.js youdecide/config.xml
Author: scottbw
Date: Fri Jan 8 22:08:07 2010
New Revision: 897333
URL: http://svn.apache.org/viewvc?rev=897333&view=rev
Log:
Applied patch for WOOKIE-87 which improves the widget template (Thanks to Ross Gardler for the patch). While checking this over I noticed a few widgets using the deprecated uid attribute rather than id so I've updated these. Wookie's parser is quite lax and does check for uid if no id attribute is found, but its better to use the correct attribute for spec conformance and interoperability with other W3C implementations.
Added:
incubator/wookie/trunk/widgets/widget-template/images/icon.png (with props)
Removed:
incubator/wookie/trunk/widgets/widget-template/scripts/common.js
Modified:
incubator/wookie/trunk/widgets/bubbles/config.xml
incubator/wookie/trunk/widgets/weather/config.xml
incubator/wookie/trunk/widgets/widget-template/config.xml
incubator/wookie/trunk/widgets/widget-template/index.html
incubator/wookie/trunk/widgets/youdecide/config.xml
Modified: incubator/wookie/trunk/widgets/bubbles/config.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/bubbles/config.xml?rev=897333&r1=897332&r2=897333&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/bubbles/config.xml (original)
+++ incubator/wookie/trunk/widgets/bubbles/config.xml Fri Jan 8 22:08:07 2010
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
- uid="http://www.opera.com/widgets/bubbles"
+ id="http://www.opera.com/widgets/bubbles"
version="2006-07-26"
height="320"
width="240">
Modified: incubator/wookie/trunk/widgets/weather/config.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/weather/config.xml?rev=897333&r1=897332&r2=897333&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/weather/config.xml (original)
+++ incubator/wookie/trunk/widgets/weather/config.xml Fri Jan 8 22:08:07 2010
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
uid="http://www.getwookie.org/widgets/weather"
version="1.0"
height="125"
width="125">
<name>Weather</name>
<description>A silly Weather widget</description>
<icon src="icon.png"/>
<content src="index.htm"/>
<access network="true"/>
<author>Scott Wilson</author>
<licence>Example license (based on MIT License)
Copyright (c) 2008 The Foo Bar Corp.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</licence>
</widget>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
id="http://www.getwookie.org/widgets/weather"
version="1.0"
height="125"
width="125">
<name>Weather</name>
<description>A silly Weather widget</description>
<icon src="icon.png"/>
<content src="index.htm"/>
<access network="true"/>
<author>Scott Wilson</author>
<licence>Example license (based on MIT License)
Copyright (c) 2008 The Foo Bar Corp.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</licence>
</widget>
\ No newline at end of file
Modified: incubator/wookie/trunk/widgets/widget-template/config.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/config.xml?rev=897333&r1=897332&r2=897333&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/widget-template/config.xml (original)
+++ incubator/wookie/trunk/widgets/widget-template/config.xml Fri Jan 8 22:08:07 2010
@@ -16,12 +16,32 @@
-->
<widget xmlns="http://www.w3.org/ns/widgets"
id="http://www.getwookie.org/widgets/@widget.shortname@"
- width="@widget.width"
- height="@widget.height"
+ version="0.1"
+ width="@widget.width@"
+ height="@widget.height@"
>
<name>@widget.shortname@</name>
- <description>@widget.description</description>
+ <description>@widget.description@</description>
<content src="index.html"/>
+ <icon src="images/icon.png"/>
+ <access network="false"/>
+ <author>Apache Wookie (Incubating) Team</author>
+ <licence>Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.</licence>
+
</widget>
+
Added: incubator/wookie/trunk/widgets/widget-template/images/icon.png
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/images/icon.png?rev=897333&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wookie/trunk/widgets/widget-template/images/icon.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/wookie/trunk/widgets/widget-template/index.html
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/widget-template/index.html?rev=897333&r1=897332&r2=897333&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/widget-template/index.html (original)
+++ incubator/wookie/trunk/widgets/widget-template/index.html Fri Jan 8 22:08:07 2010
@@ -17,32 +17,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-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='scripts/common.js' charset='utf-8'></script>
<link rel="stylesheet" href="style/common.css" type="text/css"/>
</head>
- <body onload="init()">
- <div id="front">
- <div id="weather"></div>
- <div id="city"></div>
- <div id="temperature"></div>
- <div id="settings">
- <input type="submit" class="groovybutton" id ="settings" value="settings" onClick="showBack()">
- </div>
- </div>
-
- <div id="back">
- <div id="controls">
- <select id="city_selector" name="city_selector" onchange="setCity()">
- <option>Belfast</option>
- <option>Birmingham</option>
- <option>London</option>
- <option selected>Manchester</option>
- </select>
- <input type="submit" class="groovybutton" id ="done" value="Done" onClick="showFront()">
- </div>
- </div>
+ <body>
+ <h1>Hello World...</h1>
</body>
</html>
\ No newline at end of file
Modified: incubator/wookie/trunk/widgets/youdecide/config.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/youdecide/config.xml?rev=897333&r1=897332&r2=897333&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/youdecide/config.xml (original)
+++ incubator/wookie/trunk/widgets/youdecide/config.xml Fri Jan 8 22:08:07 2010
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
uid="http://www.getwookie.org/widgets/youdecide"
version="1.0"
height="320"
width="255">
<name>You decide</name>
<description>A quick and simple voting widget</description>
<icon src="icon.png"/>
<content src="index.html"/>
<access network="true"/>
<author>Scott Wilson</author>
+<?xml version="1.0" encoding="utf-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
id="http://www.getwookie.org/widgets/youdecide"
version="1.0"
height="320"
width="255">
<name>You decide</name>
<description>A quick and simple voting widget</description>
<icon src="icon.png"/>
<content src="index.html"/>
<access network="true"/>
<author>Scott Wilson</author>
<feature name="http://wave.google.com" required="true"/>
<preference name="moderator" value="false"/>
</widget>
\ No newline at end of file