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/27 20:49:50 UTC
svn commit: rev 20513 - in avalon/trunk/central/system/themes/avalon2/html: . resources
Author: niclas
Date: Thu May 27 11:49:50 2004
New Revision: 20513
Modified:
avalon/trunk/central/system/themes/avalon2/html/nav-aggregate.xsl
avalon/trunk/central/system/themes/avalon2/html/resources/style.css
avalon/trunk/central/system/themes/avalon2/html/transform.xsl
Log:
More fixes in the theme.
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 Thu May 27 11:49:50 2004
@@ -79,5 +79,8 @@
</xsl:choose>
</item>
</xsl:template>
-
+
+ <xsl:template match="links" >
+ </xsl:template >
+
</xsl:stylesheet>
Modified: avalon/trunk/central/system/themes/avalon2/html/resources/style.css
==============================================================================
--- avalon/trunk/central/system/themes/avalon2/html/resources/style.css (original)
+++ avalon/trunk/central/system/themes/avalon2/html/resources/style.css Thu May 27 11:49:50 2004
@@ -127,6 +127,11 @@
border-bottom: 1px black solid;
}
+div[border=none]
+{
+ border: none;
+}
+
.menuitem
{
display: block;
@@ -197,16 +202,34 @@
.footer
{
- border-top: 3px solid #9999FF;
- margin: 1em;
- padding-top: 0.25em;
- padding-left: 1.25em;
- padding-right: 1.75em;
+ border-top: 3px solid #B0B0B0;
+ margin-top: 30px;
+ margin-bottom: 20px;
+ margin-left: 2em;
+ margin-right: 2em;
+ padding-top: 2px;
+ font-size: 8pt;
+ font-family: Verdana, Tahoma, Helvetica, Sans-Serif;
+ font-style: italic;
}
-.icons
+.copyright
{
- display: none;
+ margin-left: 1em;
+ margin-right: 1em;
+}
+
+.views
+{
+ margin-top: 10px;
+ margin-left: 1em;
+}
+
+#xmllink
+{
+ border: none;
+ color: white;
+ background-color: white;
}
.dummy
@@ -408,3 +431,4 @@
color: black;
outline: none;
}
+
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 Thu May 27 11:49:50 2004
@@ -8,6 +8,8 @@
<xsl:param name="directory" />
<xsl:param name="file" />
<xsl:param name="fullpath" />
+ <xsl:param name="svn-location" />
+ <xsl:param name="copyright" />
<xsl:template match="document">
<html>
@@ -31,11 +33,11 @@
</xsl:template>
<xsl:template match="body">
+ <xsl:variable name="x" select="document('navigation.xml', / )/project/body//menu/level" />
<body>
<table class="logobar" >
<tr>
<td class="feather" >
- <xsl:variable name="x" select="document('navigation.xml', / )/project/body//menu/level" />
<img>
<xsl:attribute name="src"><xsl:value-of select="$x[position() = last()]" />resources/feather.jpg</xsl:attribute>
</img>
@@ -47,16 +49,6 @@
</tr>
</table>
- <div class="icons">
- <xsl:variable name="x" select="document('navigation.xml', / )/project/body//menu/level" />
- <img class="pdf" >
- <xsl:attribute name="src"><xsl:value-of select="$x[last()]" />resource/pdf.png</xsl:attribute>
- </img>
- <img class="printer" >
- <xsl:attribute name="src"><xsl:value-of select="$x[last()]" />resource/printer.png</xsl:attribute>
- </img>
- </div>
-
<xsl:choose>
<xsl:when test="$directory = ''" >
<xsl:call-template name="create-bar">
@@ -77,6 +69,18 @@
<div class="content" >
<xsl:apply-templates />
+
+ <div class="footer" >
+ <span class="copyright"><xsl:value-of select="$copyright" /></span>
+ <div class="views" >
+ <a id="xmllink" class="viewlink" >
+ <xsl:attribute name="href"><xsl:value-of select="$svn-location" /></xsl:attribute>
+ <img>
+ <xsl:attribute name="src"><xsl:value-of select="$x[position() = last()]" />resources/xml.gif</xsl:attribute>
+ </img>
+ </a>
+ </div>
+ </div>
</div>
</body>
</xsl:template>
@@ -139,16 +143,22 @@
<xsl:template match="menu">
<xsl:param name="dir" />
<xsl:choose>
- <xsl:when test="count( menu ) = 0" >
- <xsl:apply-templates select="menu" >
- <xsl:with-param name="dir" select="concat( $dir, '../')" />
- </xsl:apply-templates>
+
+ <!-- Don't include the Root level menu choices in the menu bar
+ unless it is the root directory
+ -->
+ <xsl:when test="count( menu ) = 0 and not( $directory = '' )" >
</xsl:when>
+
<xsl:otherwise>
<div class="menu">
<xsl:apply-templates select="menu" >
<xsl:with-param name="dir" select="concat( $dir, '../')" />
</xsl:apply-templates>
+ <xsl:if test="count( item ) = 0" >
+ <xsl:attribute name="border">none</xsl:attribute>
+ <span class="dummy" />
+ </xsl:if>
<xsl:apply-templates select="item" >
<xsl:with-param name="dir" select="$dir" />
</xsl:apply-templates>
@@ -184,9 +194,6 @@
</xsl:template>
<xsl:template match="footer" >
- <div class="footer" >
- <xsl:apply-templates />
- </div>
</xsl:template>
<xsl:template match="legal" >
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org