[yelp-xsl] [theme-html.css] Moving link trails to common CSS

[Shaun McCance <shaunm src gnome org>]

commit 0c003361d1cb6d82f99567c26c486dde5ea71d81
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Mar 15 10:04:04 2010 -0500

    [theme-html.css] Moving link trails to common CSS

 xslt/docbook/html/db2html-css.xsl      |   15 -----------
 xslt/docbook/html/db2html-division.xsl |   41 +++++++++++---------------------
 xslt/mallard/html/mal2html-css.xsl     |   11 --------
 xslt/mallard/html/mal2html-page.xsl    |   10 ++++----
 xslt/theme/theme-html.xsl              |    8 ++++++
 5 files changed, 27 insertions(+), 58 deletions(-)
---
diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl
index 420ea7b..23e07aa 100644
--- a/xslt/docbook/html/db2html-css.xsl
+++ b/xslt/docbook/html/db2html-css.xsl
@@ -116,21 +116,6 @@ tfoot { border-top: solid 2px; border-bottom: solid 2px; }
 
 div.title span.label { font-weight: normal; }
 
-<!-- == linktrail == -->
-ul.linktrail {
-  display: block;
-  margin: 0.2em 0 0 0;
-  text-align: </xsl:text><xsl:value-of select="$right"/><xsl:text>;
-}
-li.linktrail { display: inline; margin: 0; padding: 0; }
-<!-- FIXME: rtl? -->
-li.linktrail::before {
-  content: '&#x00A0; /&#x00A0;&#x00A0;';
-  color: </xsl:text><xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-<!-- FIXME: rtl? -->
-li.linktrail-first::before, li.linktrail-only::before { content: ''; }
-
 <!-- == navbar == -->
 div.navbar {
  margin: 1em 0 1em 0;
diff --git a/xslt/docbook/html/db2html-division.xsl b/xslt/docbook/html/db2html-division.xsl
index 3cefc2e..5809cc3 100644
--- a/xslt/docbook/html/db2html-division.xsl
+++ b/xslt/docbook/html/db2html-division.xsl
@@ -326,11 +326,6 @@ REMARK: Talk about some of the parameters
       <xsl:with-param name="title_content" select="$title_content"/>
       <xsl:with-param name="subtitle_content" select="$subtitle_content"/>
     </xsl:call-template>
-    <xsl:if test="$db2html.linktrail and $depth_in_chunk = 0">
-      <xsl:call-template name="db2html.linktrail">
-        <xsl:with-param name="node" select="$node"/>
-      </xsl:call-template>
-    </xsl:if>
     <xsl:choose>
       <xsl:when test="$callback">
         <xsl:apply-templates mode="db2html.division.div.content.mode" select="$node">
@@ -504,25 +499,11 @@ REMARK: Describe this
 <xsl:template name="db2html.linktrail">
   <xsl:param name="node"/>
   <xsl:if test="$node/ancestor::*">
-    <ul class="linktrail">
-      <!-- The parens put the nodes back in document order -->
-      <xsl:for-each select="($node/ancestor::*)">
-        <li>
-          <xsl:attribute name="class">
-            <xsl:text>linktrail</xsl:text>
-            <xsl:choose>
-              <xsl:when test="last() = 1">
-                <xsl:text> linktrail-only</xsl:text>
-              </xsl:when>
-              <xsl:when test="position() = 1">
-                <xsl:text> linktrail-first</xsl:text>
-              </xsl:when>
-              <xsl:when test="position() = last()">
-                <xsl:text> linktrail-last</xsl:text>
-              </xsl:when>
-            </xsl:choose>
-          </xsl:attribute>
-          <a class="linktrail">
+    <div class="trails">
+      <div class="trail">
+        <!-- The parens put the nodes back in document order -->
+        <xsl:for-each select="($node/ancestor::*)">
+          <a class="trail">
             <xsl:attribute name="href">
               <xsl:call-template name="db.xref.target">
                 <xsl:with-param name="linkend" select="@id"/>
@@ -540,9 +521,10 @@ REMARK: Describe this
               <xsl:with-param name="node" select="."/>
             </xsl:call-template>
           </a>
-        </li>
-      </xsl:for-each>
-    </ul>
+          <xsl:text>&#x00A0;» </xsl:text>
+        </xsl:for-each>
+      </div>
+    </div>
   </xsl:if>
 </xsl:template>
 
@@ -761,6 +743,11 @@ REMARK: Describe this template
         <xsl:with-param name="next_node" select="$next_node"/>
       </xsl:call-template>
     </xsl:if>
+    <xsl:if test="$db2html.linktrail">
+      <xsl:call-template name="db2html.linktrail">
+        <xsl:with-param name="node" select="$node"/>
+      </xsl:call-template>
+    </xsl:if>
   </div>
 </xsl:template>
 
diff --git a/xslt/mallard/html/mal2html-css.xsl b/xslt/mallard/html/mal2html-css.xsl
index 0aa41c9..11fd6e5 100644
--- a/xslt/mallard/html/mal2html-css.xsl
+++ b/xslt/mallard/html/mal2html-css.xsl
@@ -144,17 +144,6 @@ div.autolinks div.title span {
 }
 li.autolink { margin: 0.5em 0 0 0; padding: 0 0 0 1em; list-style-type: none; }
 
-div.linktrails {
-  margin: 0;
-}
-div.linktrail {
-  font-size: 0.83em;
-  margin: 0 1px 0.2em 1px;
-  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.2em;
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-
 table.twocolumn { width: 100%; }
 td.twocolumnleft { width: 48%; vertical-align: top; padding: 0; margin: 0; }
 td.twocolumnright {
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index 7c04f0f..182da82 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -398,7 +398,7 @@ REMARK: Describe this template
   </xsl:variable>
   <xsl:variable name="trailnodes" select="exsl:node-set($linktrails)/*"/>
   <xsl:if test="count($trailnodes) &gt; 0">
-    <div class="linktrails">
+    <div class="trails">
       <xsl:for-each select="$trailnodes">
         <xsl:sort select="(.//mal:title[ type='sort'])[1]"/>
         <xsl:sort select="(.//mal:title[ type='sort'])[2]"/>
@@ -419,7 +419,7 @@ REMARK: Describe this template
 -->
 <xsl:template name="mal2html.page.linktrails.trail">
   <xsl:param name="node" select="."/>
-  <div class="linktrail">
+  <div class="trail">
     <xsl:call-template name="mal2html.page.linktrails.link">
       <xsl:with-param name="node" select="$node"/>
     </xsl:call-template>
@@ -434,7 +434,7 @@ REMARK: Describe this template
 -->
 <xsl:template name="mal2html.page.linktrails.link">
   <xsl:param name="node" select="."/>
-  <a class="linktrail">
+  <a class="trail">
     <xsl:attribute name="href">
       <xsl:call-template name="mal.link.target">
         <xsl:with-param name="xref" select="$node/@xref"/>
@@ -448,10 +448,10 @@ REMARK: Describe this template
   </a>
   <xsl:choose>
     <xsl:when test="$node/@child = 'section'">
-      <xsl:text> â?º </xsl:text>
+      <xsl:text>&#x00A0;â?º </xsl:text>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:text> » </xsl:text>
+      <xsl:text>&#x00A0;» </xsl:text>
     </xsl:otherwise>
   </xsl:choose>
   <xsl:for-each select="$node/mal:link">
diff --git a/xslt/theme/theme-html.xsl b/xslt/theme/theme-html.xsl
index d4a71f4..4b26ca0 100644
--- a/xslt/theme/theme-html.xsl
+++ b/xslt/theme/theme-html.xsl
@@ -152,6 +152,14 @@ div.sect div.sect {
   margin-top: 1.44em;
   margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.72em;
 }
+div.trails { margin: 0; }
+div.trail {
+  font-size: 0.83em;
+  margin: 0 1px 0.2em 1px;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.2em;
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+}
 div.header {
   margin: 0;
   color: </xsl:text>