Author: crossley
Date: Tue Aug 29 20:29:08 2006
New Revision: 438337
URL: http://svn.apache.org/viewvc?rev=438337&view=rev
Log:
Use the "albuminfo" to set the title and description of each gallery.
If an images/gallery/*/album.xml is not provided, then use the plugin default.
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml
(with props)
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/input.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryHome.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryIndexPage.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/status.xml
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/input.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/input.xmap?rev=438337&r1=438336&r2=438337&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/input.xmap
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/input.xmap
Tue Aug 29 20:29:08 2006
@@ -74,6 +74,7 @@
<map:aggregate element="pics">
<map:part src="cocoon:/gallery/{1}/dir.xml" />
<!-- <map:part src="cocoon:/gallery/{1}/comment.xml" /> -->
+ <map:part src="{lm:photoGallery.albuminfo.{1}}"/>
</map:aggregate>
<map:transform src="{lm:photoGallery.transform.dir.galleryIndexPage}">
<map:parameter name="page" value="{2}" />
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml?rev=438337&r1=438336&r2=438337&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
Tue Aug 29 20:29:08 2006
@@ -33,5 +33,11 @@
<match pattern="photoGallery.transform.*.*">
<location src="resources/stylesheets/{1}-to-{2}.xsl" />
</match>
+ <match pattern="photoGallery.albuminfo.*">
+ <select>
+ <location src="{lm:project.images/gallery/{1}/album.xml}"/>
+ <location src="resources/default-album-metadata.xml"/>
+ </select>
+ </match>
</locator>
</locationmap>
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml?rev=438337&view=auto
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml
Tue Aug 29 20:29:08 2006
@@ -0,0 +1,3 @@
+<albuminfo>
+ <title>Gallery</title>
+</albuminfo>
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryHome.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryHome.xsl?rev=438337&r1=438336&r2=438337&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryHome.xsl
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryHome.xsl
Tue Aug 29 20:29:08 2006
@@ -33,7 +33,7 @@
<title>
Photo Albums
</title>
- <p>List of all available albums in this gallery, showing the first
+ <p>List of all available albums in this gallery, showing one
photo from each. Select the photo to access that album.</p>
<xsl:apply-templates select="/dir:directory//dir:directory"/>
</section>
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryIndexPage.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryIndexPage.xsl?rev=438337&r1=438336&r2=438337&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryIndexPage.xsl
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources/stylesheets/dir-to-galleryIndexPage.xsl
Tue Aug 29 20:29:08 2006
@@ -26,11 +26,11 @@
<xsl:template match="/pics/dir:directory">
<document>
<header>
- <title>Gallery</title>
+ <title><xsl:value-of select="/pics/albuminfo/title"/></title>
</header>
<body>
- <section>
- <title>Gallery</title>
+ <p><xsl:value-of select="/pics/albuminfo/description"/></p>
+
<xsl:variable name="all_hits" select="dir:file" />
<xsl:variable name="count" select="count(dir:file)"/>
<table>
@@ -75,7 +75,6 @@
<td width="100"> </td>
</tr>
</table>
- </section>
</body>
</document>
</xsl:template>
@@ -128,5 +127,6 @@
</xsl:call-template>
</xsl:if>
</xsl:template>
+ <xsl:template match="albuminfo"/>
</xsl:stylesheet>
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/status.xml?rev=438337&r1=438336&r2=438337&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/status.xml
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/status.xml
Tue Aug 29 20:29:08 2006
@@ -19,6 +19,9 @@
<changes>
<release version="0.3" date="not-released">
+ <action type="update" context="code" dev="DC">
+ Use the "albuminfo" to set the title and description of each gallery.
+ </action>
<action type="add" context="code" dev="TWW">
Added a gallery/index page that lists the multiple galleries.
Enabled albums to contain metadata.
