summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2003-10-17 02:58:19 +0000
committerShaun McCance <shaunm@src.gnome.org>2003-10-17 02:58:19 +0000
commit1a072cbf66cf0d94b5ce36193eeff9d6f2b697ba (patch)
treec4c6394c894bf6a2c4cb08f208571b23477a6511
parentb0e20c759ee664bda1b1b7e9151701c238e16e6d (diff)
downloadyelp-1a072cbf66cf0d94b5ce36193eeff9d6f2b697ba.tar.gz
- Actually use html.navbar.*, passing in links as params
* db2html-html.xsl: * yelp-customization.xsl: - Actually use html.navbar.*, passing in links as params * db2html-inline.xsl: - Handle interface, because Gnumeric hates me
-rw-r--r--stylesheets/ChangeLog9
-rw-r--r--stylesheets/db2html-html.xsl46
-rw-r--r--stylesheets/db2html-inline.xsl6
-rw-r--r--stylesheets/yelp-customization.xsl32
4 files changed, 68 insertions, 25 deletions
diff --git a/stylesheets/ChangeLog b/stylesheets/ChangeLog
index 1446b768..1d64459c 100644
--- a/stylesheets/ChangeLog
+++ b/stylesheets/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-16 Shaun McCance <shaunm@gnome.org>
+
+ * db2html-html.xsl:
+ * yelp-customization.xsl:
+ - Actually use html.navbar.*, passing in links as params
+
+ * db2html-inline.xsl:
+ - Handle interface, because Gnumeric hates me
+
2003-10-12 Shaun McCance <shaunm@gnome.org>
* db2html*.xsl:
diff --git a/stylesheets/db2html-html.xsl b/stylesheets/db2html-html.xsl
index dae6f365..ae9b6ed3 100644
--- a/stylesheets/db2html-html.xsl
+++ b/stylesheets/db2html-html.xsl
@@ -5,6 +5,12 @@
<xsl:template name="html">
<xsl:param name="node" select="."/>
<xsl:param name="leaf" select="true()"/>
+ <xsl:variable name="prevlink">
+ <xsl:apply-templates select="$node" mode="navbar.prev.link.mode"/>
+ </xsl:variable>
+ <xsl:variable name="nextlink">
+ <xsl:apply-templates select="$node" mode="navbar.next.link.mode"/>
+ </xsl:variable>
<html>
<head>
@@ -29,6 +35,8 @@
</xsl:call-template>
<xsl:call-template name="html.navbar.top">
<xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="prevlink" select="$prevlink"/>
+ <xsl:with-param name="nextlink" select="$nextlink"/>
</xsl:call-template>
<xsl:apply-templates select="$node">
@@ -38,6 +46,8 @@
<xsl:call-template name="html.navbar.bottom">
<xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="prevlink" select="$prevlink"/>
+ <xsl:with-param name="nextlink" select="$nextlink"/>
</xsl:call-template>
<xsl:call-template name="html.body.bottom">
<xsl:with-param name="node" select="$node"/>
@@ -192,12 +202,44 @@ div[class="attribution"] {
<xsl:template name="html.navbar.top">
<xsl:param name="node" select="."/>
-<p><i><xsl:apply-templates select="$node" mode="navbar.prev.link.mode"/></i></p>
-<p><i><xsl:apply-templates select="$node" mode="navbar.next.link.mode"/></i></p>
+ <xsl:param name="prevlink">
+ <xsl:apply-templates select="$node" mode="navbar.prev.link.mode"/>
+ </xsl:param>
+ <xsl:param name="nextlink">
+ <xsl:apply-templates select="$node" mode="navbar.next.link.mode"/>
+ </xsl:param>
+ <table width="100%" cellpadding="0" cellspacing="0">
+ <tr width="100%">
+ <td width="50%" style="text-align: left;">
+ <xsl:copy-of select="$prevlink"/>
+ </td>
+ <td width="50%" style="text-align: right;">
+ <xsl:copy-of select="$nextlink"/>
+ </td>
+ </tr>
+ </table>
+ <hr/>
</xsl:template>
<xsl:template name="html.navbar.bottom">
<xsl:param name="node" select="."/>
+ <xsl:param name="prevlink">
+ <xsl:apply-templates select="$node" mode="navbar.prev.link.mode"/>
+ </xsl:param>
+ <xsl:param name="nextlink">
+ <xsl:apply-templates select="$node" mode="navbar.next.link.mode"/>
+ </xsl:param>
+ <hr/>
+ <table width="100%" cellpadding="0" cellspacing="0">
+ <tr width="100%">
+ <td width="50%" style="text-align: left;">
+ <xsl:copy-of select="$prevlink"/>
+ </td>
+ <td width="50%" style="text-align: right;">
+ <xsl:copy-of select="$nextlink"/>
+ </td>
+ </tr>
+ </table>
</xsl:template>
</xsl:stylesheet>
diff --git a/stylesheets/db2html-inline.xsl b/stylesheets/db2html-inline.xsl
index 8408eafa..67414c4e 100644
--- a/stylesheets/db2html-inline.xsl
+++ b/stylesheets/db2html-inline.xsl
@@ -289,6 +289,10 @@
<xsl:call-template name="inline"/>
</xsl:template>
+<xsl:template match="interface">
+ <xsl:call-template name="inline"/>
+</xsl:template>
+
<xsl:template match="interfacename">
<xsl:call-template name="inline.mono"/>
</xsl:template>
@@ -347,7 +351,7 @@
<span class="{name(.)}">
<xsl:for-each select="*[name(.) != 'shortcut']">
<xsl:if test="position() &gt; 1">
- <xsl:text>&#10132;</xsl:text>
+ <xsl:text>&#8201;&#8594;&#8201;</xsl:text>
</xsl:if>
<xsl:apply-templates select="."/>
</xsl:for-each>
diff --git a/stylesheets/yelp-customization.xsl b/stylesheets/yelp-customization.xsl
index edcedfca..969728ea 100644
--- a/stylesheets/yelp-customization.xsl
+++ b/stylesheets/yelp-customization.xsl
@@ -99,34 +99,22 @@
</xsl:variable>
<div>
- <table width="100%" cellpadding="0" cellspacing="0">
- <tr width="100%">
- <td width="50%" style="text-align: left;">
- <xsl:copy-of select="$prevlink"/>
- </td>
- <td width="50%" style="text-align: right;">
- <xsl:copy-of select="$nextlink"/>
- </td>
- </tr>
- </table>
- <hr/>
+ <xsl:call-template name="html.navbar.top">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="prevlink" select="$prevlink"/>
+ <xsl:with-param name="nextlink" select="$nextlink"/>
+ </xsl:call-template>
<xsl:apply-templates select="$node">
<xsl:with-param name="depth" select="0"/>
<xsl:with-param name="leaf" select="$leaf"/>
</xsl:apply-templates>
- <hr/>
- <table width="100%" cellpadding="0" cellspacing="0">
- <tr width="100%">
- <td width="50%" style="text-align: left;">
- <xsl:copy-of select="$prevlink"/>
- </td>
- <td width="50%" style="text-align: right;">
- <xsl:copy-of select="$nextlink"/>
- </td>
- </tr>
- </table>
+ <xsl:call-template name="html.navbar.bottom">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="prevlink" select="$prevlink"/>
+ <xsl:with-param name="nextlink" select="$nextlink"/>
+ </xsl:call-template>
</div>
</xsl:template>