Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r438379 - in
 /forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery:
 input.xmap resources/stylesheets/dir-to-galleryIndexPage.xsl status.xml
Date: Wed, 30 Aug 2006 05:29:26 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
Message-Id: <20060830052927.8C2C41A981A@eris.apache.org>

Author: crossley
Date: Tue Aug 29 22:29:26 2006
New Revision: 438379

URL: http://svn.apache.org/viewvc?rev=438379&view=rev
Log:
Enable "albuminfo" to contain links and other markup.

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/input.xmap
    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=438379&r1=438378&r2=438379&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 22:29:26 2006
@@ -72,9 +72,9 @@
       
       <map:match pattern="gallery/**/index_*.xml">
         <map:aggregate element="pics">
+          <map:part src="{lm:photoGallery.albuminfo.{1}}"/>
           <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/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=438379&r1=438378&r2=438379&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 22:29:26 2006
@@ -23,14 +23,17 @@
   <xsl:param name="cols"/>
   <xsl:param name="rows"/>
   
-  <xsl:template match="/pics/dir:directory">
+  <xsl:template match="pics">
     <document>
       <header>
-        <title><xsl:value-of select="/pics/albuminfo/title"/></title>
+        <title><xsl:value-of select="albuminfo/title"/></title>
       </header>
       <body>
-        <p><xsl:value-of select="/pics/albuminfo/description"/></p>
-
+        <xsl:apply-templates/>
+      </body>
+    </document>
+  </xsl:template>
+  <xsl:template match="dir:directory">
           <xsl:variable name="all_hits" select="dir:file" />
           <xsl:variable name="count" select="count(dir:file)"/>
           <table>
@@ -75,8 +78,6 @@
               <td width="100">&#160;</td>
             </tr>
           </table>
-      </body>
-    </document>
   </xsl:template>
   
   <xsl:template name="make_table_rows">
@@ -127,6 +128,17 @@
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
-  <xsl:template match="albuminfo"/>
+  <xsl:template match="albuminfo">
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="description">
+    <p><xsl:apply-templates/></p>
+  </xsl:template>
+  <xsl:template match="title"/>
+  <xsl:template match="@*|*|text()|processing-instruction()|comment()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
+    </xsl:copy>
+  </xsl:template>
 </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=438379&r1=438378&r2=438379&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 22:29:26 2006
@@ -20,6 +20,9 @@
   <changes>
     <release version="0.3" date="not-released">
       <action type="update" context="code" dev="DC">
+        Enable "albuminfo" to contain links and other markup.
+      </action>
+      <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">