html2html: Include Doxygen 1.7.0 navigation header

Doxygen changed the format for HTML output in version 1.7.0, which
required some corresponding updates to the XSL transform and CSS in
order to include the navigation header. Fixes bug 651987.
This commit is contained in:
David King 2011-12-07 15:11:55 +01:00
parent 8b2461cc5c
commit 5afdeb629a
2 changed files with 16 additions and 7 deletions

View File

@ -20,7 +20,7 @@ table {
font-size: inherit;
}
div.navpath, .contents h1, .navigation div.tabs:first-child li:first-child {
div.navpath, .contents h1, .navigation div.tabs:first-child li:first-child, div[id='navrow1']:first-child li:first-child {
display: none;
}
@ -32,23 +32,23 @@ div.navpath, .contents h1, .navigation div.tabs:first-child li:first-child {
font-size: 100%;
}
.navigation div.tabs ul {
.navigation div.tabs ul, div[id='navrow1'] ul {
padding: 0;
}
.navigation div.tabs li {
.navigation div.tabs li, div[id='navrow1'] li {
display: inline;
padding: 2px 5px;
background: #d8dbd5 url(shade.png) top left repeat-x;
border: 1px solid #888a85;
}
.navigation div.tabs li.current {
.navigation div.tabs li.current, div[id='navrow1'] li.current {
border: 2px solid #686a65;
padding: 1px 4px;
}
.navigation div.tabs li.current a {
.navigation div.tabs li.current a, div[id='navrow1'] li.current a {
}
caption {

View File

@ -280,15 +280,24 @@ along with libgo; if not, write to the Free Software Foundation, Inc.,
<xsl:when test="$libgo.h2hmode = 'gtkmm'">
<h1 class="lgotitle"><xsl:value-of select="//html:title" /></h1>
<xsl:choose>
<!-- Doxygen versions older than 1.6.0? -->
<xsl:when test="//html:div[@id='content']">
<xsl:apply-templates select="//html:div[@id='content']" mode="gtkmm"/>
</xsl:when>
<xsl:otherwise>
<!-- Doxygen versions between 1.6.0 and 1.7.0 -->
<xsl:when test="//html:div[@id='navigation']">
<div id="content">
<xsl:apply-templates select="//html:div[@class='navigation']" mode="gtkmm"/>
<xsl:apply-templates select="//html:div[@class='contents']" mode="gtkmm"/>
</div>
</xsl:otherwise>
</xsl:when>
<!-- Doxygen 1.7.0 or greater -->
<xsl:when test="//html:div[@id='navrow1']">
<div id="content">
<xsl:apply-templates select="//html:div[@class='tabs']" mode="gtkmm"/>
<xsl:apply-templates select="//html:div[@class='contents']" mode="gtkmm"/>
</div>
</xsl:when>
</xsl:choose>
</xsl:when>
<xsl:when test="$libgo.h2hmode = 'content-id'">