You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/05/31 17:10:51 UTC
svn commit: rev 20691 - avalon/trunk/central/system/themes/avalon2/html
Author: niclas
Date: Mon May 31 08:10:50 2004
New Revision: 20691
Modified:
avalon/trunk/central/system/themes/avalon2/html/nav-aggregate.xsl
avalon/trunk/central/system/themes/avalon2/html/transform.xsl
Log:
download.cgi wasn't handled properly.
Modified: avalon/trunk/central/system/themes/avalon2/html/nav-aggregate.xsl
==============================================================================
--- avalon/trunk/central/system/themes/avalon2/html/nav-aggregate.xsl (original)
+++ avalon/trunk/central/system/themes/avalon2/html/nav-aggregate.xsl Mon May 31 08:10:50 2004
@@ -56,13 +56,13 @@
<xsl:attribute name="selected">true</xsl:attribute>
</xsl:if>
</xsl:when>
- <!-- Contains an html file without a directory -->
- <xsl:when test="contains( @href, '.html') and not( contains( @href, '/') )" >
+ <!-- Contains a file without a directory -->
+ <xsl:when test="contains( @href, '.') and not( contains( @href, '/') )" >
<xsl:attribute name="href"><xsl:value-of select="@href" /></xsl:attribute>
<xsl:attribute name="name"><xsl:value-of select="@name" /></xsl:attribute>
</xsl:when>
<!-- Contains a directory without file -->
- <xsl:when test="contains( @href, 'index.html') and contains( @href, '/')" >
+ <xsl:when test="not( contains( @href, '.') ) and contains( @href, '/')" >
<xsl:attribute name="href"><xsl:value-of select="substring-before( @href, 'index.html' ) " /></xsl:attribute>
<xsl:attribute name="name"><xsl:value-of select="@name" /></xsl:attribute>
<xsl:if test="contains( $fullpath, substring-before( @href, '/' ) )" >
Modified: avalon/trunk/central/system/themes/avalon2/html/transform.xsl
==============================================================================
--- avalon/trunk/central/system/themes/avalon2/html/transform.xsl (original)
+++ avalon/trunk/central/system/themes/avalon2/html/transform.xsl Mon May 31 08:10:50 2004
@@ -8,8 +8,9 @@
<xsl:param name="directory" />
<xsl:param name="file" />
<xsl:param name="fullpath" />
- <xsl:param name="svn-location" />
+ <xsl:param name="public-location" />
<xsl:param name="copyright" />
+ <xsl:param name="copyright_url" />
<xsl:param name="logoright_file" />
<xsl:param name="logoright_url" />
<xsl:param name="logoleft_file" />
@@ -95,10 +96,21 @@
</div>
<div class="footer" >
- <span class="copyright"><xsl:value-of select="$copyright" /></span>
+ <xsl:choose>
+ <xsl:when test="$copyright_url = ''" >
+ <span class="copyright"><xsl:value-of select="$copyright" /></span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span class="copyright">
+ <a><xsl:attribute name="href" ><xsl:value-of select="$copyright_url" /></xsl:attribute>
+ <xsl:value-of select="$copyright" />
+ </a>
+ </span>
+ </xsl:otherwise>
+ </xsl:choose>
<div class="views" >
<a id="xmllink" class="viewlink" >
- <xsl:attribute name="href"><xsl:value-of select="$svn-location" /></xsl:attribute>
+ <xsl:attribute name="href"><xsl:value-of select="$public-location" /></xsl:attribute>
<img>
<xsl:attribute name="src"><xsl:value-of select="$relativepath[position() = last()]" />images/xml.gif</xsl:attribute>
</img>
@@ -248,7 +260,7 @@
</xsl:choose>
<xsl:attribute name="href">
<xsl:choose>
- <xsl:when test="contains( @href, '.html' )" >
+ <xsl:when test="contains( @href, '.' )" >
<xsl:value-of select="concat( $dir, @href )" />
</xsl:when>
<xsl:otherwise>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org