[yelp-xsl] Style work on post-content links, no more "Further Reading"
- From: Shaun McCance <shaunm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp-xsl] Style work on post-content links, no more "Further Reading"
- Date: Tue, 1 Nov 2011 15:56:28 +0000 (UTC)
commit 45a4f928694999d8377097d0ff0adc49cc65552e
Author: Shaun McCance <shaunm gnome org>
Date: Tue Nov 1 10:24:15 2011 -0400
Style work on post-content links, no more "Further Reading"
xslt/common/html.xsl | 10 ++++
xslt/gettext/domains/yelp-xsl.pot | 79 ++++++++++++++++------------------
xslt/gettext/domains/yelp-xsl.xml.in | 5 --
xslt/mallard/html/mal2html-page.xsl | 59 ++++++-------------------
4 files changed, 62 insertions(+), 91 deletions(-)
---
diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl
index a8767e8..c43f4cc 100644
--- a/xslt/common/html.xsl
+++ b/xslt/common/html.xsl
@@ -653,6 +653,16 @@ div.sect div.hgroup {
border-bottom: solid 1px </xsl:text>
<xsl:value-of select="$color.gray_border"/><xsl:text>;
}
+div.sect-links div.hgroup {
+ border-bottom: solid 2px </xsl:text>
+ <xsl:value-of select="$color.blue_border"/><xsl:text>;
+}
+div.sect div.sect-links {
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 0;
+}
+div.sect div.sect-links div.hgroup {
+ border: none;
+}
h1, h2, h3, h4, h5, h6, h7 {
margin: 0; padding: 0;
color: </xsl:text><xsl:value-of select="$color.text_light"/><xsl:text>;
diff --git a/xslt/gettext/domains/yelp-xsl.pot b/xslt/gettext/domains/yelp-xsl.pot
index 89f7d92..9ddb4f3 100644
--- a/xslt/gettext/domains/yelp-xsl.pot
+++ b/xslt/gettext/domains/yelp-xsl.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-07-01 10:19-0400\n"
+"POT-Creation-Date: 2011-11-01 10:23-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
"Language-Team: LANGUAGE <LL li org>\n"
@@ -130,91 +130,86 @@ msgstr ""
msgid "Final"
msgstr ""
-#. Automatic heading above a list of related links.
-#: yelp-xsl.xml.in:155(msg/msgstr)
-msgid "Further Reading"
-msgstr ""
-
#. Default title for a glossary.
-#: yelp-xsl.xml.in:160(msg/msgstr)
+#: yelp-xsl.xml.in:155(msg/msgstr)
msgid "Glossary"
msgstr ""
#. Accessible title for an important note.
-#: yelp-xsl.xml.in:165(msg/msgstr)
+#: yelp-xsl.xml.in:160(msg/msgstr)
msgid "Important"
msgstr ""
#. Revision status of a document or page. Work has begun, but
#. not all content has been written.
#.
-#: yelp-xsl.xml.in:173(msg/msgstr)
+#: yelp-xsl.xml.in:168(msg/msgstr)
msgid "Incomplete"
msgstr ""
#. Default title for an index of terms in a book.
-#: yelp-xsl.xml.in:178(msg/msgstr)
+#: yelp-xsl.xml.in:173(msg/msgstr)
msgid "Index"
msgstr ""
#. Automatic heading above a list of guide links.
-#: yelp-xsl.xml.in:183(msg/msgstr)
+#: yelp-xsl.xml.in:178(msg/msgstr)
msgid "More About"
msgstr ""
#. Default title for a refnamediv element. This is the common section
#. title found in most UNIX man pages.
#.
-#: yelp-xsl.xml.in:192(msg/msgstr)
+#: yelp-xsl.xml.in:187(msg/msgstr)
msgid "Name"
msgstr ""
#. Link text for a link to the next page in a series.
-#: yelp-xsl.xml.in:197(msg/msgstr)
+#: yelp-xsl.xml.in:192(msg/msgstr)
msgid "Next"
msgstr ""
#. Accessible title for a note.
-#: yelp-xsl.xml.in:202(msg/msgstr)
+#: yelp-xsl.xml.in:197(msg/msgstr)
msgid "Note"
msgstr ""
#. Revision status of a document or page. Content was once current,
#. but needs to be updated to reflect software updates.
#.
-#: yelp-xsl.xml.in:210(msg/msgstr)
+#: yelp-xsl.xml.in:205(msg/msgstr)
msgid "Outdated"
msgstr ""
#. Tooltip on play/pause buttons for audio and video objects.
-#: yelp-xsl.xml.in:215(msg/msgstr)
+#: yelp-xsl.xml.in:210(msg/msgstr)
msgid "Pause"
msgstr ""
#. Tooltip on play/pause buttons for audio and video objects.
-#: yelp-xsl.xml.in:220(msg/msgstr)
+#: yelp-xsl.xml.in:215(msg/msgstr)
msgid "Play"
msgstr ""
#. Default title for a preface to a book.
-#: yelp-xsl.xml.in:226(msg/msgstr)
+#: yelp-xsl.xml.in:221(msg/msgstr)
msgid "Preface"
msgstr ""
#. Link text for a link to the previous page in a series.
-#: yelp-xsl.xml.in:231(msg/msgstr)
+#: yelp-xsl.xml.in:226(msg/msgstr)
msgid "Previous"
msgstr ""
#. Revision status of a document or page. Content has been written
#. and should be reviewed by other team members.
#.
-#: yelp-xsl.xml.in:239(msg/msgstr)
+#: yelp-xsl.xml.in:234(msg/msgstr)
msgid "Ready for review"
msgstr ""
#. Automatic heading above a list of see-also links.
-#: yelp-xsl.xml.in:244(msg/msgstr)
+#: yelp-xsl.xml.in:239(msg/msgstr)
msgid "See Also"
msgstr ""
@@ -222,42 +217,42 @@ msgstr ""
#. This is used a tooltip on a link to shrink images back down after
#. they've been expanded to full size.
#.
-#: yelp-xsl.xml.in:253(msg/msgstr)
+#: yelp-xsl.xml.in:248(msg/msgstr)
msgid "Scale images down"
msgstr ""
#. Accessible title for a sidebar note.
-#: yelp-xsl.xml.in:258(msg/msgstr)
+#: yelp-xsl.xml.in:253(msg/msgstr)
msgid "Sidebar"
msgstr ""
#. Revision status of a document or page. No content has been written yet.
#.
-#: yelp-xsl.xml.in:265(msg/msgstr)
+#: yelp-xsl.xml.in:260(msg/msgstr)
msgid "Stub"
msgstr ""
#. Default title for a refsynopsisdiv element. This is the common section
#. title found in most UNIX man pages.
#.
-#: yelp-xsl.xml.in:273(msg/msgstr)
+#: yelp-xsl.xml.in:268(msg/msgstr)
msgid "Synopsis"
msgstr ""
#. Accessible title for a tip.
-#: yelp-xsl.xml.in:278(msg/msgstr)
+#: yelp-xsl.xml.in:273(msg/msgstr)
msgid "Tip"
msgstr ""
#. Figures can automatically scale images down to fit the page width.
#. This is used a tooltip on a link to expand images to full size.
#.
-#: yelp-xsl.xml.in:286(msg/msgstr)
+#: yelp-xsl.xml.in:281(msg/msgstr)
msgid "View images at normal size"
msgstr ""
#. Accessible title for a warning.
-#: yelp-xsl.xml.in:291(msg/msgstr)
+#: yelp-xsl.xml.in:286(msg/msgstr)
msgid "Warning"
msgstr ""
@@ -281,7 +276,7 @@ msgstr ""
#. with single quotation marks in your language, use the corresponding
#. double quotation mark for the watermark image.
#.
-#: yelp-xsl.xml.in:318(msg/msgstr)
+#: yelp-xsl.xml.in:313(msg/msgstr)
msgid "yelp-quote-201C.png"
msgstr ""
@@ -294,7 +289,7 @@ msgstr ""
#.
#. <label/> - The term being defined by the glossary entry
#.
-#: yelp-xsl.xml.in:334(msg/msgstr)
+#: yelp-xsl.xml.in:329(msg/msgstr)
msgid "View the bibliography entry <biblioentry.label/>."
msgstr ""
@@ -316,7 +311,7 @@ msgstr ""
#.
#. <biblioentry.label/> - The text content of the bibliography label
#.
-#: yelp-xsl.xml.in:357(msg/msgstr)
+#: yelp-xsl.xml.in:352(msg/msgstr)
msgid "[<biblioentry.label/>]"
msgstr ""
@@ -332,7 +327,7 @@ msgstr ""
#. <citation/> - The text content of the citation element, possibly
#. as a link to an entry in the bibliography
#.
-#: yelp-xsl.xml.in:374(msg/msgstr)
+#: yelp-xsl.xml.in:369(msg/msgstr)
msgid "[<citation.label/>]"
msgstr ""
@@ -360,7 +355,7 @@ msgstr ""
#. <comment.name/> - The name of the person making the comment
#. <comment.date/> - The date the comment was made
#.
-#: yelp-xsl.xml.in:403(msg/msgstr)
+#: yelp-xsl.xml.in:398(msg/msgstr)
msgid "from <comment.name/> on <comment.date/>"
msgstr ""
@@ -387,7 +382,7 @@ msgstr ""
#.
#. <comment.name/> - The name of the person making the comment
#.
-#: yelp-xsl.xml.in:431(msg/msgstr)
+#: yelp-xsl.xml.in:426(msg/msgstr)
msgid "from <comment.name/>"
msgstr ""
@@ -398,7 +393,7 @@ msgstr ""
#.
#. <string/> - The linked-to email address
#.
-#: yelp-xsl.xml.in:443(msg/msgstr)
+#: yelp-xsl.xml.in:438(msg/msgstr)
msgid "Send email to â<string/>â."
msgstr ""
@@ -409,7 +404,7 @@ msgstr ""
#.
#. <glossterm/> - The term being defined by the glossary entry
#.
-#: yelp-xsl.xml.in:455(msg/msgstr)
+#: yelp-xsl.xml.in:450(msg/msgstr)
msgid "Read the definition for â<glossterm/>â."
msgstr ""
@@ -429,7 +424,7 @@ msgstr ""
#.
#. <glosssee/> - The actual link or links of the cross reference
#.
-#: yelp-xsl.xml.in:476(msg/msgstr)
+#: yelp-xsl.xml.in:471(msg/msgstr)
msgid "See <glosssee/>."
msgstr ""
@@ -450,7 +445,7 @@ msgstr ""
#.
#. <glosssee/> - The actual link or links of the cross reference
#.
-#: yelp-xsl.xml.in:498(msg/msgstr)
+#: yelp-xsl.xml.in:493(msg/msgstr)
msgid "See also <glosssee/>."
msgstr ""
@@ -461,7 +456,7 @@ msgstr ""
#.
#. <node/> - The text content of the quote element
#.
-#: yelp-xsl.xml.in:510(msg/msgstr)
+#: yelp-xsl.xml.in:505(msg/msgstr)
msgid "â<node/>â"
msgstr ""
@@ -472,7 +467,7 @@ msgstr ""
#.
#. <node/> - The text content of the quote element
#.
-#: yelp-xsl.xml.in:522(msg/msgstr)
+#: yelp-xsl.xml.in:517(msg/msgstr)
msgid "â<node/>â"
msgstr ""
@@ -486,7 +481,7 @@ msgstr ""
#.
#. <seeie/> - The actual link or links of the cross reference
#.
-#: yelp-xsl.xml.in:537(msg/msgstr)
+#: yelp-xsl.xml.in:532(msg/msgstr)
msgid "See <seeie/>."
msgstr ""
@@ -500,7 +495,7 @@ msgstr ""
#.
#. <seeie/> - The actual link or links of the cross reference
#.
-#: yelp-xsl.xml.in:552(msg/msgstr)
+#: yelp-xsl.xml.in:547(msg/msgstr)
msgid "See also <seeie/>."
msgstr ""
diff --git a/xslt/gettext/domains/yelp-xsl.xml.in b/xslt/gettext/domains/yelp-xsl.xml.in
index 326f65e..2025d27 100644
--- a/xslt/gettext/domains/yelp-xsl.xml.in
+++ b/xslt/gettext/domains/yelp-xsl.xml.in
@@ -150,11 +150,6 @@ documentation team has reviewed and approved.
<msgstr>Final</msgstr>
</msg>
-<msg id="Further Reading">
-<its:locNote>Automatic heading above a list of related links.</its:locNote>
-<msgstr>Further Reading</msgstr>
-</msg>
-
<msg id="Glossary">
<its:locNote>Default title for a glossary.</its:locNote>
<msgstr>Glossary</msgstr>
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index d9d6484..ca89a53 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -366,7 +366,7 @@ REMARK: Describe this template
<!-- page | section -->
<xsl:template match="mal:page | mal:section">
<xsl:variable name="type" select="/mal:page/@type"/>
- <xsl:variable name="depth" select="count(ancestor::mal:section) + 1"/>
+ <xsl:variable name="depth" select="count(ancestor-or-self::mal:section) + 1"/>
<xsl:variable name="topiclinks">
<xsl:if test="$type = 'guide'">
<xsl:call-template name="mal.link.topiclinks"/>
@@ -457,21 +457,12 @@ REMARK: Describe this template
</div>
<xsl:apply-templates mode="mal2html.section.mode" select="mal:section"/>
<xsl:variable name="postlinks" select="mal:section/following-sibling::mal:links"/>
- <xsl:if test="not(mal:section)">
- <xsl:if test="$guidenodes and not(mal:links[ type = 'guide'])">
- <xsl:call-template name="mal2html.links.guide">
- <xsl:with-param name="depth" select="$depth + 2"/>
- <xsl:with-param name="links" select="$guidenodes"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:if test="$seealsonodes and not(mal:links[ type = 'seealso'])">
- <xsl:call-template name="mal2html.links.seealso">
- <xsl:with-param name="depth" select="$depth + 2"/>
- <xsl:with-param name="links" select="$seealsonodes"/>
- </xsl:call-template>
- </xsl:if>
- </xsl:if>
- <xsl:if test="($topicnodes and $postlinks[self::mal:links[ type = 'topic']]) or
+ <xsl:if test="(not(mal:section) and (
+ ($guidenodes and not(mal:links[ type = 'guide']))
+ or
+ ($seealsonodes and not(mal:links[ type = 'seealso']))
+ )) or
+ ($topicnodes and $postlinks[self::mal:links[ type = 'topic']]) or
($guidenodes and
($postlinks[self::mal:links[ type = 'guide']] or
(mal:section and not(mal:links[ type = 'guide'])))) or
@@ -480,32 +471,14 @@ REMARK: Describe this template
(mal:section and not(mal:links[ type = 'seealso']))))
">
<div class="sect sect-links">
- <div class="hgroup">
- <xsl:variable name="depth_">
- <xsl:choose>
- <xsl:when test="$depth + 1 < 6">
- <xsl:value-of select="$depth + 1"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="6"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:element name="{concat('h', $depth_)}" namespace="{$html.namespace}">
- <span class="title">
- <xsl:call-template name="l10n.gettext">
- <xsl:with-param name="msgid" select="'Further Reading'"/>
- </xsl:call-template>
- </span>
- </xsl:element>
- </div>
+ <div class="hgroup"/>
<div class="contents">
<xsl:for-each select="$postlinks">
<xsl:choose>
<xsl:when test="self::mal:links[ type = 'topic']">
<xsl:if test="$type = 'guide'">
<xsl:apply-templates select=".">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="allgroups" select="$allgroups"/>
<xsl:with-param name="links" select="$topicnodes"/>
</xsl:apply-templates>
@@ -513,39 +486,39 @@ REMARK: Describe this template
</xsl:when>
<xsl:when test="self::mal:links[ type = 'guide']">
<xsl:apply-templates select=".">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="links" select="$guidenodes"/>
</xsl:apply-templates>
</xsl:when>
<xsl:when test="self::mal:links[ type = 'seealso']">
<xsl:apply-templates select=".">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="links" select="$seealsonodes"/>
</xsl:apply-templates>
</xsl:when>
<xsl:when test="self::mal:links[ type = 'next']">
<xsl:if test="not(contains(concat(' ', @style, ' '), ' top '))">
<xsl:apply-templates select=".">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
</xsl:apply-templates>
</xsl:if>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select=".">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
</xsl:apply-templates>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
<xsl:if test="$guidenodes and not(mal:links[ type = 'guide'])">
<xsl:call-template name="mal2html.links.guide">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="links" select="$guidenodes"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="$seealsonodes and not(mal:links[ type = 'seealso'])">
<xsl:call-template name="mal2html.links.seealso">
- <xsl:with-param name="depth" select="$depth + 2"/>
+ <xsl:with-param name="depth" select="$depth + 1"/>
<xsl:with-param name="links" select="$seealsonodes"/>
</xsl:call-template>
</xsl:if>
@@ -737,8 +710,6 @@ a.linkdiv:hover {
text-decoration: none;
background-color: </xsl:text>
<xsl:value-of select="$color.blue_background"/><xsl:text>;
- outline: solid 1px </xsl:text>
- <xsl:value-of select="$color.blue_border"/><xsl:text>;
}
a.linkdiv > span.title {
display: block;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
