From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1148698-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id C75A7138350
	for <garchives@archives.gentoo.org>; Fri, 28 Feb 2020 07:15:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DBE37E0822;
	Fri, 28 Feb 2020 07:15:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AF32AE0822
	for <gentoo-commits@lists.gentoo.org>; Fri, 28 Feb 2020 07:15:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5BA4034F3B2
	for <gentoo-commits@lists.gentoo.org>; Fri, 28 Feb 2020 07:15:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E20B3155
	for <gentoo-commits@lists.gentoo.org>; Fri, 28 Feb 2020 07:15:19 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1582873146.55104cea1b44b11984723dd3f61c06e823cbd7f5.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: /
X-VCS-Repository: proj/devmanual
X-VCS-Files: devbook.xsl
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 55104cea1b44b11984723dd3f61c06e823cbd7f5
X-VCS-Branch: master
Date: Fri, 28 Feb 2020 07:15:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0de06899-2f1f-4331-9114-d2de079325eb
X-Archives-Hash: f5785a09dc358add59bde149f8d78ce0

commit:     55104cea1b44b11984723dd3f61c06e823cbd7f5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 20:36:27 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 06:59:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=55104cea

devbook.xsl: List sections in navigation dropdown.

This aims at improving navigation by also listing the sections of the
current chapter in the dropdown list.

As before, list any first-level sub-documents (below a divider line).

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 69a3b9a..ae25acb 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -358,7 +358,6 @@
   <!-- TOC Tree -->
   <xsl:template match="contentsTree" name="contentsTree">
     <xsl:param name="depth" select="0"/>
-    <xsl:param name="ulclass"/>
     <xsl:param name="maxdepth">
       <xsl:choose>
         <xsl:when test="@maxdepth"><xsl:value-of select="@maxdepth"/></xsl:when>
@@ -400,7 +399,7 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-        <ul class="{$ulclass}">
+        <ul>
           <xsl:for-each select="document($doc_self)/guide/include">
             <xsl:variable name="extraction_counter_node">
               <xsl:call-template name="contentsTree">
@@ -531,11 +530,35 @@
                     <ul class="nav navbar-nav">
                       <li><a href="{concat($relative_path_depth_recursion, substring-after(substring-before(@link, '##'), '::'), 'index.html', substring-after(@link, '##'))}"><span class="fa fa-home"/>&#160; Home</a></li>
                       <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><xsl:value-of select="/guide/chapter[1]/title"/> <span class="caret"></span></a>
-                        <xsl:call-template name="contentsTree">
-                          <xsl:with-param name="maxdepth" select="1"/>
-                          <xsl:with-param name="ulclass">dropdown-menu</xsl:with-param>
-                        </xsl:call-template>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                          <xsl:value-of select="/guide/chapter[1]/title"/>&#160;<span class="caret"></span>
+                        </a>
+                        <xsl:if test="/guide/chapter[1]/section or //contentsTree">
+                          <ul class="dropdown-menu">
+                            <!-- List sections of this chapter first. -->
+                            <xsl:for-each select="/guide/chapter[1]/section">
+                              <xsl:variable name="anchor">
+                                <xsl:call-template name="convert-to-anchor">
+                                  <xsl:with-param name="data" select="title"/>
+                                </xsl:call-template>
+                              </xsl:variable>
+                              <li><a class="reference" href="#{$anchor}"><xsl:value-of select="title"/></a></li>
+                            </xsl:for-each>
+                            <xsl:if test="//contentsTree">
+                              <li class="divider"></li>
+                              <!-- List any sub-documents included at first level.
+                                   We cannot call "contentsTree" directly, because it would
+                                   insert another "ul" element. So, assign it to a variable,
+                                   then copy only the "li" nodes. -->
+                              <xsl:variable name="contents">
+                                <xsl:call-template name="contentsTree">
+                                  <xsl:with-param name="maxdepth" select="1"/>
+                                </xsl:call-template>
+                              </xsl:variable>
+                              <xsl:copy-of select="exslt:node-set($contents)/ul/li"/>
+                            </xsl:if>
+                          </ul>
+                        </xsl:if>
                       </li>
                       <li><xsl:call-template name="findPrevious"/></li>
                       <li><xsl:call-template name="findNext"/></li>