Author: rgardler
Date: Wed Dec 5 15:58:26 2012
New Revision: 1417496
URL: http://svn.apache.org/viewvc?rev=1417496&view=rev
Log:
parameterise icon location and create a more sensible default for the tile
content
Modified:
wookie/trunk/widgets/templates/base/config.xml
wookie/trunk/widgets/templates/base/content_tile.html
wookie/trunk/widgets/templates/default.widget.properties
Modified: wookie/trunk/widgets/templates/base/config.xml
URL:
http://svn.apache.org/viewvc/wookie/trunk/widgets/templates/base/config.xml?rev=1417496&r1=1417495&r2=1417496&view=diff
==============================================================================
--- wookie/trunk/widgets/templates/base/config.xml (original)
+++ wookie/trunk/widgets/templates/base/config.xml Wed Dec 5 15:58:26 2012
@@ -1,49 +1,49 @@
-<%
- 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.
-%>
-<widget xmlns="http://www.w3.org/ns/widgets";
- id="http://wookie.apache.org/widgets/${widget.shortname}";
- version="0.1"
- width="320"
- height="480"
- >
- <name>${widget.name}</name>
- <description>${widget.description}</description>
- <content src="index.html"/>
- <icon src="images/icon.png"/>
- <author>Apache Wookie (Incubating) Community</author>
- <access origin="${widget.access.origin}"/>
-
- <license>
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
- </license>
-
-</widget>
-
-
-
+<%
+ 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.
+%>
+<widget xmlns="http://www.w3.org/ns/widgets";
+ id="http://wookie.apache.org/widgets/${widget.shortname}";
+ version="0.1"
+ width="320"
+ height="480"
+ >
+ <name>${widget.name}</name>
+ <description>${widget.description}</description>
+ <content src="index.html"/>
+ <icon src="${widget.icon.src}"/>
+ <author>Apache Wookie (Incubating) Community</author>
+ <access origin="${widget.access.origin}"/>
+
+ <license>
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+ </license>
+
+</widget>
+
+
+
Modified: wookie/trunk/widgets/templates/base/content_tile.html
URL:
http://svn.apache.org/viewvc/wookie/trunk/widgets/templates/base/content_tile.html?rev=1417496&r1=1417495&r2=1417496&view=diff
==============================================================================
--- wookie/trunk/widgets/templates/base/content_tile.html (original)
+++ wookie/trunk/widgets/templates/base/content_tile.html Wed Dec 5 15:58:26
2012
@@ -15,6 +15,5 @@
limitations under the License.
%>
-<h4>This is the tiled view of the Base Template</h4>
-
-<p>It comes from content_tile.html</p>
+<img src="${widget.icon.src}" alt="${widget.tile.tip}"/>
+<h2>${widget.name}</h2>
Modified: wookie/trunk/widgets/templates/default.widget.properties
URL:
http://svn.apache.org/viewvc/wookie/trunk/widgets/templates/default.widget.properties?rev=1417496&r1=1417495&r2=1417496&view=diff
==============================================================================
--- wookie/trunk/widgets/templates/default.widget.properties (original)
+++ wookie/trunk/widgets/templates/default.widget.properties Wed Dec 5
15:58:26 2012
@@ -1,22 +1,23 @@
-template.name=base
-widget.shortname=BaseTemplateWidget
-widget.name=Base Widget
-widget.description=A simple widget that is derived from the base template and
nothing more.
-widget.help=<p>There is nothing much to do here, so little need of help.</p>
-
-// The default origins this widget will be allowed to access
-widget.access.origin=foo.bar
-
-wookie.url=http://localhost:8080/wookie
-
-# CSS3 media queries used to identify screen size
-widget.media.screen.veryNarrow = only screen and (max-width : 320px)
-widget.media.screen.narrow = only screen and (min-width : 321px) and
(max-width : 640px)
-widget.media.screen.moderateWidth = only screen and (min-width : 641px) and
(max-width : 1024px)
-widget.media.screen.wide = only screen and (min-width : 1025px) and (max-width
: 1800px)
-widget.media.screen.veryWide = only screen and (min-width : 1801px)
-
-widget.media.screen.short = only screen and (max-height : 480px)
-widget.media.screen.moderateHeight = only screen and (min-height : 481px) and
(max-width : 800px)
-widget.media.screen.tall = only screen and (min-width : 801px)
-
+template.name=base
+widget.shortname=BaseTemplateWidget
+widget.name=Base Widget
+widget.description=A simple widget that is derived from the base template and
nothing more.
+widget.help=<p>There is nothing much to do here, so little need of help.</p>
+widget.icon.src=images/icon.png
+
+// The default origins this widget will be allowed to access
+widget.access.origin=foo.bar
+
+wookie.url=http://localhost:8080/wookie
+
+# CSS3 media queries used to identify screen size
+widget.media.screen.veryNarrow = only screen and (max-width : 320px)
+widget.media.screen.narrow = only screen and (min-width : 321px) and
(max-width : 640px)
+widget.media.screen.moderateWidth = only screen and (min-width : 641px) and
(max-width : 1024px)
+widget.media.screen.wide = only screen and (min-width : 1025px) and (max-width
: 1800px)
+widget.media.screen.veryWide = only screen and (min-width : 1801px)
+
+widget.media.screen.short = only screen and (max-height : 480px)
+widget.media.screen.moderateHeight = only screen and (min-height : 481px) and
(max-width : 800px)
+widget.media.screen.tall = only screen and (min-width : 801px)
+
