[library-web/new-website-style: 24/24] Merge branch 'master' into new-website-style
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [library-web/new-website-style: 24/24] Merge branch 'master' into new-website-style
- Date: Sun, 20 Mar 2011 11:42:00 +0000 (UTC)
commit 903413182faef0129400a7f25199f416036c40a8
Merge: 32176d3 90b29ca
Author: Frédéric Péters <fpeters 0d be>
Date: Sun Mar 20 12:40:25 2011 +0100
Merge branch 'master' into new-website-style
Conflicts:
data/xslt/html2html.xsl
src/app.py
data/xslt/html2html.xsl | 3 ++-
src/app.py | 4 ++--
src/lgo.py | 10 ++++------
3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --cc data/xslt/html2html.xsl
index 1c2efe7,beac329..10948b2
--- a/data/xslt/html2html.xsl
+++ b/data/xslt/html2html.xsl
@@@ -233,16 -219,8 +234,16 @@@ along with libgo; if not, write to the
</head>
<body>
<xsl:call-template name="libgo.header" />
- <div class="body {$libgo.h2hmode}">
+ <div id="container">
+ <xsl:attribute name="class">
+ <xsl:value-of select="$libgo.h2hmode"/>
+ <xsl:if test="//html:div[ class='toc']">
+ <xsl:text> two_columns</xsl:text>
+ </xsl:if>
+ </xsl:attribute>
+ <div class="content">
- <xsl:if test="$libgo.originalhref">
+ <xsl:if test="$libgo.originalhref and $libgo.hidehref != 'true'">
+ <div class="action_box">
<p class="canonical-ref">
Canonical document reference:
<a href="{$libgo.originalhref}"><xsl:value-of select="$libgo.originalhref"/></a>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
