You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/05/14 17:05:40 UTC
svn commit: r537870 - in /lenya/trunk/src/modules/news/xslt:
collection2include.xsl collection2xhtml.xsl
Author: andreas
Date: Mon May 14 08:05:39 2007
New Revision: 537870
URL: http://svn.apache.org/viewvc?view=rev&rev=537870
Log:
Wrap news items in divs, enable aggregation of nested news documents
Modified:
lenya/trunk/src/modules/news/xslt/collection2include.xsl
lenya/trunk/src/modules/news/xslt/collection2xhtml.xsl
Modified: lenya/trunk/src/modules/news/xslt/collection2include.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/news/xslt/collection2include.xsl?view=diff&rev=537870&r1=537869&r2=537870
==============================================================================
--- lenya/trunk/src/modules/news/xslt/collection2include.xsl (original)
+++ lenya/trunk/src/modules/news/xslt/collection2include.xsl Mon May 14 08:05:39 2007
@@ -46,12 +46,24 @@
<a type="application/rss+xml" href="lenya-document:{$uuid}?uuid2url.extension=rss">RSS 2.0</a>
</div>
<h1><xsl:value-of select="$title"/></h1>
- <xsl:for-each select="col:document">
- <xsl:sort order="descending" select="meta:metadata/dc:elements/dc:date"/>
- <xsl:if test="position() <= number($includeItems)">
- <xsl:apply-templates select="."/>
- </xsl:if>
- </xsl:for-each>
+ <xsl:choose>
+ <xsl:when test="col:document//xhtml:div[@class = 'newsItem']">
+ <xsl:for-each select="col:document//xhtml:div[@class = 'newsItem']">
+ <xsl:sort select="xhtml:h2/xhtml:span[@class = 'newsDate']/i18n:date-time/@value" order="descending"/>
+ <xsl:if test="position() <= number($includeItems)">
+ <xsl:apply-templates select="."/>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="col:document">
+ <xsl:sort order="descending" select="meta:metadata/dc:elements/dc:date"/>
+ <xsl:if test="position() <= number($includeItems)">
+ <xsl:apply-templates select="."/>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
</xsl:template>
Modified: lenya/trunk/src/modules/news/xslt/collection2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/news/xslt/collection2xhtml.xsl?view=diff&rev=537870&r1=537869&r2=537870
==============================================================================
--- lenya/trunk/src/modules/news/xslt/collection2xhtml.xsl (original)
+++ lenya/trunk/src/modules/news/xslt/collection2xhtml.xsl Mon May 14 08:05:39 2007
@@ -54,9 +54,18 @@
</p>
</xsl:if>
- <xsl:apply-templates select="col:document">
- <xsl:sort order="descending" select="meta:metadata/dc:elements/dc:date"/>
- </xsl:apply-templates>
+ <xsl:choose>
+ <xsl:when test="col:document//xhtml:div[@class = 'newsItem']">
+ <xsl:apply-templates select="col:document//xhtml:div[@class = 'newsItem']">
+ <xsl:sort select="xhtml:h2/xhtml:span[@class = 'newsDate']/i18n:date-time/@value" order="descending"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="col:document">
+ <xsl:sort order="descending" select="meta:metadata/dc:elements/dc:date"/>
+ </xsl:apply-templates>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
</body>
</html>
@@ -66,16 +75,18 @@
<xsl:template match="col:document">
<xsl:variable name="date" select="meta:metadata/dc:elements/dc:date"/>
<xsl:variable name="title" select="meta:metadata/dc:elements/dc:title"/>
- <h2>
- <span class="newsDate">
- <i18n:date-time src-pattern="yyyy-MM-dd HH:mm:ss" locale="{$language}" value="{$date}" />
- </span><br />
- <xsl:variable name="href">
- <xsl:call-template name="getHref"/>
- </xsl:variable>
- <a href="{$href}" style="text-decoration: none"><xsl:value-of select="$title"/></a>
- </h2>
- <xsl:apply-templates select="xhtml:html/xhtml:body/xhtml:p[1]" mode="excerpt"/>
+ <div class="newsItem">
+ <h2>
+ <span class="newsDate">
+ <i18n:date-time src-pattern="yyyy-MM-dd HH:mm:ss" locale="{$language}" value="{$date}" />
+ </span><br />
+ <xsl:variable name="href">
+ <xsl:call-template name="getHref"/>
+ </xsl:variable>
+ <a href="{$href}" style="text-decoration: none"><xsl:value-of select="$title"/></a>
+ </h2>
+ <xsl:apply-templates select="xhtml:html/xhtml:body/xhtml:p[1]" mode="excerpt"/>
+ </div>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org