From 536550d4241f50c5143a2608896c62054392fb41 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Fri, 7 Nov 2014 01:51:30 -0500
Subject: [PATCH] Rework PDF/HTML selection to the top bar instead.

---
 tex4ht.usr   | 23 +++++++++--------------
 webhacks.cfg |  9 +++++----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/tex4ht.usr b/tex4ht.usr
index 482e09a..8ce20d7 100644
--- a/tex4ht.usr
+++ b/tex4ht.usr
@@ -1,21 +1,16 @@
-\newcommand{\startmymenu}{\HCode{
+\newcommand{\footermenu}{\HCode{
      <footer class="navbar navbar-default navbar-fixed-bottom copyleft-navbar">\Hnewline
        <div class="container">\Hnewline
      <nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">\Hnewline
-     <ul class="nav navbar-nav navbar-left">\Hnewline
-      <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">License: CC By SA 4.0 International</a></li>\Hnewline}}
-
-\newcommand{\selectmulti}{\HCode{<li class="active"><a href="/guide">HTML</a></li>\Hnewline
-       <li><a href="/guide/monolithic">HTML (1 page)</a></li>\Hnewline}}
-\newcommand{\selectmonolith}{\HCode{<li><a href="/guide/">HTML</a></li>\Hnewline
-       <li><a class="active"><a href="/guide/monolithic">HTML (1 page)</a></li>\Hnewline}}
-
-\newcommand{\finishmymenu}{\HCode{<li><a href="/guide/comprehensive-gpl-guide.pdf">PDF</a></li>\Hnewline
-       <li><a href="/guide/comprehensive-gpl-guide.ps">Postscript</a></li>\Hnewline
-       </ul>\Hnewline}}
+     <p class="navbar-text navbar-left">License:
+        <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">CC By SA 4.0 International</a></p>\Hnewline}}
 
 \:CheckOption{monolith} \if:Option
-   \newcommand{\monolith}{\Configure{@BODY}{\startmymenu\selectmonolith\finishmymenu\HCode{</nav></div></footer>}}}
+   \newcommand{\monolith}{\Configure{@BODY}{\footermenu\HCode{</nav></div></footer>}}}
+   \newcommand{\selectpropermenuitem}{\HCode{<li><a href="/guide/">HTML</a></li>\Hnewline
+          <li class="active"> <a href="/guide/monolithic">HTML (1 page)</a></li>\Hnewline}}
  \else
-    \newcommand{\monolith}{\Configure{next+}{\startmymenu\selectmulti\finishmymenu\HCode{\Hnewline<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation"><ul class="nav navbar-nav navbar-right">}}{\HCode{</ul></nav></div></footer>}}}
+   \newcommand{\selectpropermenuitem}{\HCode{<li class="active"><a href="/guide">HTML</a></li>\Hnewline
+               <li><a href="/guide/monolithic">HTML (1 page)</a></li>\Hnewline}}
+   \newcommand{\monolith}{\Configure{next+}{\footermenu\HCode{\Hnewline<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation"><ul class="nav navbar-nav navbar-right">}}{\HCode{</ul></nav></div></footer>}}}
  \fi
diff --git a/webhacks.cfg b/webhacks.cfg
index dfb35fe..268946d 100644
--- a/webhacks.cfg
+++ b/webhacks.cfg
@@ -40,12 +40,13 @@
           </button>\Hnewline
           <svg width="245" height="50" style="margin: 5px"><image xlink:href="/copyleftorg-green-stylized.svg" src="/copyleftorg-green-stylized.png" width="245" height="50"></image></svg>\Hnewline
         </div>\Hnewline
-        <nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">\Hnewline
+        <nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation"><ul class="nav navbar-nav">\Hnewline}}
+\Configure{@BODY}{\selectpropermenuitem\HCode{<li><a href="/guide/comprehensive-gpl-guide.pdf">PDF</a></li>\Hnewline
+       <li><a href="/guide/comprehensive-gpl-guide.ps">Postscript</a></li></ul>\Hnewline
           <ul class="nav navbar-nav navbar-right">\Hnewline
         <li><a href="/">Wiki</a></li>\Hnewline
         <li class="active"><a href="/guide/">Tutorial and Guide</a></li>\Hnewline
-    </ul></nav></div></header>\Hnewline
-}}
+        </ul></nav></div></header>\Hnewline}}
 
 \monolith
 
@@ -54,7 +55,7 @@
    {\HCode{<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">\Hnewline
 <ul class="nav navbar-nav">}}
    {\HCode{</ul></nav>}}
-   {\startmymenu\selectmulti\finishmymenu\HCode{<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">\Hnewline
+   {\footermenu\HCode{<nav class="collapse navbar-collapse copyleft-navbar-collapse" role="navigation">\Hnewline
 <ul class="nav navbar-nav navbar-right">\Hnewline}}
    {\HCode{</ul></nav></div></footer>}}