Author: rgardler
Date: Fri Dec 9 21:06:54 2011
New Revision: 1212635
URL: http://svn.apache.org/viewvc?rev=1212635&view=rev
Log:
make the defaults something relevant to Wookie itself (that is browse widgets
on the server)
Removed:
incubator/wookie/trunk/widgets/templates/browse/content_footer.html
incubator/wookie/trunk/widgets/templates/browse/content_header.html
Modified:
incubator/wookie/trunk/widgets/templates/browse/content_primary.html
incubator/wookie/trunk/widgets/templates/browse/default.widget.properties
incubator/wookie/trunk/widgets/templates/browse/index2html.xsl
incubator/wookie/trunk/widgets/templates/browse/readme.txt
incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add
Modified: incubator/wookie/trunk/widgets/templates/browse/content_primary.html
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/content_primary.html?rev=1212635&r1=1212634&r2=1212635&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/content_primary.html
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/content_primary.html Fri
Dec 9 21:06:54 2011
@@ -1,3 +1,8 @@
+<p> The content that creates this and the other items below comes from
+ content_primary.html. However, the user should never see this
+ since it should be replaced by the javascript code. If you are
+ seeing this then somthing has broken.</p>
+
<div id="results" data-role="collapsible-set">
<div class="result" data-role="collapsible" data-collapsed="true">
Modified:
incubator/wookie/trunk/widgets/templates/browse/default.widget.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/default.widget.properties?rev=1212635&r1=1212634&r2=1212635&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/default.widget.properties
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/default.widget.properties
Fri Dec 9 21:06:54 2011
@@ -1,10 +1,9 @@
# The URL from which to retrieve data for the browse index
#
# type: string
-# variables: query = query string entered into the search form
-# sort = the sort term for APIs that support it
-# order = the sort order for APId that support it
-browse.index.url="http://www.myexperiment.org/workflows.xml?sort="; + sort +
"&order=" + order
+# variables: sort = the sort term for APIs that support it
+# order = the sort order for APIs that support it
+browse.index.url="http://localhost:8080/wookie/widgets?all=true";
# URL of the stylesheet for transforming the index file returned from
browse.index.url into html
#
@@ -15,8 +14,9 @@ browse.index.xsl.url="index2html.xsl"
#
# type: string
# variables: query = query string entered into the search form
-# sprt = the sort term for APIs that support it
-browse.search.url="http://www.myexperiment.org/search.xml?sort="; + sort +
"&query=" + query + "&type=workflow"+ "&order=" + order
+# sort = the sort term for APIs that support it
+# order = the sort order for APIs that support it
+browse.search.url=
# Default sort parameter for APIs that support sorting of the results
browse.sort=updated
@@ -26,7 +26,7 @@ browse.sort=updated
#
# type: string
# variables: itemId is the ID of the item to display
-browse.get.detail.url=itemId +
"&elements=id,thumbnail,uploader,type,license-type,description,updated-at"
+browse.get.detail.url="http://localhost:8080/wookie/widgets/"; + itemId
# URL of the stylesheet for transforming a record detail
# into HTML for display in the expanded index section
Modified: incubator/wookie/trunk/widgets/templates/browse/index2html.xsl
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/index2html.xsl?rev=1212635&r1=1212634&r2=1212635&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/index2html.xsl (original)
+++ incubator/wookie/trunk/widgets/templates/browse/index2html.xsl Fri Dec 9
21:06:54 2011
@@ -25,15 +25,37 @@
</div>
</xsl:template>
- <xsl:template match="workflow">
- <div class='result' data-role='collapsible'>
- <xsl:attribute name="wid"><xsl:value-of select="@uri"/></xsl:attribute>
-
- <h3><xsl:value-of select="."/></h3>
+ <xsl:template match="widget">
+ <div class='result' data-role='collapsible'>
+ <xsl:attribute name="wid"><xsl:value-of
select="@id"/></xsl:attribute>
+
+ <xsl:apply-templates select="title"/>
<div class="detail">
- <p>Loading...</p>
- </div>
- </div>
+ <xsl:apply-templates select="icon"/>
+ <xsl:apply-templates select="description"/>
+ <xsl:apply-templates select="author"/>
+ </div>
+ </div>
+ </xsl:template>
+
+ <xsl:template match="title">
+ <h3><xsl:value-of select="."/></h3>
</xsl:template>
+
+ <xsl:template match="icon">
+ <img alt="icon">
+ <xsl:attribute name="src"><xsl:value-of select="."/></xsl:attribute>
+ </img>
+ </xsl:template>
+
+ <xsl:template match="description">
+ <p><xsl:value-of select="."/></p>
+ </xsl:template>
+
+ <xsl:template match="author">
+ <p>Author: <xsl:value-of select="."/></p>
+ </xsl:template>
+
+
</xsl:stylesheet>
Modified: incubator/wookie/trunk/widgets/templates/browse/readme.txt
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/readme.txt?rev=1212635&r1=1212634&r2=1212635&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/readme.txt (original)
+++ incubator/wookie/trunk/widgets/templates/browse/readme.txt Fri Dec 9
21:06:54 2011
@@ -11,7 +11,7 @@ This section describes how the template
** Results list
-The initial results list is generated by retrieving and XML document from the
URL defined by
+The initial results list is generated by retrieving and XML document or JSON
file from the URL defined by
"browse.index.url". This document is then transformed into HTML using a
stylesheet defined
in "browse.index.xsl.url" which degaults to "index2html.xsl". We recommend
copying this
stylesheet to your widget definition and editing it to process the data
returned by your
Modified: incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add?rev=1212635&r1=1212634&r2=1212635&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add
(original)
+++ incubator/wookie/trunk/widgets/templates/browse/style/screen.css.add Fri
Dec 9 21:06:54 2011
@@ -98,16 +98,3 @@
text-shadow: none;
border: none;
}
-
-
-/* theme buttons */
-.ui-btn-active {
- background: -moz-linear-gradient(center top , #85BA00, #539300) repeat
scroll 0 0 #459600;
- border: 1px solid #155600;
- text-shadow: 0 -1px 1px #145000;
-}
-
-.ui-field-contain {
- border-bottom-width: 0px;
- margin: 0.5em 0;
-}
