1 files changed, 21 insertions, 14 deletions
diff --git a/themes/hugo-book/layouts/_default/baseof.html b/themes/hugo-book/layouts/baseof.html
index a6c4c07..2e6b0a9 100644
--- a/themes/hugo-book/layouts/_default/baseof.html
+++ b/themes/hugo-book/layouts/baseof.html
@@ -4,15 +4,11 @@
   {{ partial "docs/html-head" . }}
   {{ partial "docs/inject/head" . }}
 </head>
-<body dir="{{ default "ltr" .Site.Language.LanguageDirection }}">
+<body dir="{{ default "ltr" .Site.Language.LanguageDirection }}" class="book-kind-{{ .Kind }} book-type-{{ .Type }} book-layout-{{ .Layout }}">
   <input type="checkbox" class="hidden toggle" id="menu-control" />
   <input type="checkbox" class="hidden toggle" id="toc-control" />
   <main class="container flex">
-    <aside class="book-menu">
-      <div class="book-menu-content">
-        {{ template "menu" . }} <!-- Left menu Content -->
-      </div>
-    </aside>
+    {{ template "menu-container" . }} <!-- Left menu -->
 
     <div class="book-page">
       <header class="book-header">
@@ -29,23 +25,24 @@
       </footer>
 
       {{ template "comments" . }} <!-- Comments block -->
-
       <label for="menu-control" class="hidden book-menu-overlay"></label>
     </div>
 
-    {{ if default true (default .Site.Params.BookToC .Params.BookToC) }}
-    <aside class="book-toc">
-      <div class="book-toc-content">
-        {{ template "toc" . }} <!-- Table of Contents -->
-      </div>
-    </aside>
-    {{ end }}
+    {{ template "toc-container" . }} <!-- Table of Contents -->
   </main>
 
   {{ partial "docs/inject/body" . }}
 </body>
 </html>
 
+{{ define "menu-container" }}
+<aside class="book-menu">
+  <div class="book-menu-content">
+    {{ template "menu" . }}
+  </div>
+</aside>
+{{ end }}
+
 {{ define "menu" }}
   {{ partial "docs/menu" . }}
 {{ end }}
@@ -78,6 +75,16 @@
   </article>
 {{ end }}
 
+{{ define "toc-container" }}
+{{ if partial "docs/toc-show" . }}
+<aside class="book-toc">
+  <div class="book-toc-content">
+    {{ template "toc" . }}
+  </div>
+</aside>
+{{ end }}
+{{ end }}
+
 {{ define "toc" }}
   {{ partial "docs/toc" . }}
 {{ end }}