Fill theme.toml, refactor injection partials

2018-09-12 14:21:46 +02:00
parent 2e5e2a2f5c
commit ca37d7488c
18 changed files with 35 additions and 42 deletions
@@ -1,25 +1,26 @@
 <!DOCTYPE html>
 <html>
 <head>
-  {{ partial "book/html-head" . }}
-  <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+  {{ partial "docs/html-head" . }}
+  {{ partial "docs/inject/head" . }}
+  <title>{{ block "title" . }} {{- .Site.Title -}} {{ end }}</title>
 </head>

 <body>
  <div class="pure-g">

    <div class="pure-u book-nav">
-      {{ partial "book/nav" . }}
+      {{ partial "docs/nav" . }}
    </div>
    <div class="pure-u book-content">
      <div class="pure-g">

        <div class="pure-u book-page markdown">
-          {{ block "main" . }}{{ end }}
+          {{ block "main" . }} {{- .Content -}} {{ end }}
        </div>
        {{ if and (default true .Site.Params.BookShowTOC) (.Page.TableOfContents) }}
        <div class="pure-u book-toc">
-          {{ partial "book/toc" . }}
+          {{ partial "docs/toc" . }}
        </div>
        {{ end }}

@@ -27,5 +28,6 @@
    </div>

  </div>
+  {{ partial "docs/inject/body" . }}
 </body>
 </html>
@@ -1,7 +1 @@
-{{- define "title" -}}
-  {{ .Site.Title }}
-{{ end }}
-
-{{- define "main" -}}
-  <div>{{ .Content }}</div>
-{{ end }}
+{{ define "." }} {{ end }}
@@ -1,7 +1 @@
-{{- define "title" -}}
-  {{ .Site.Title }}
-{{ end }}
-
-{{- define "main" -}}
-  <div>{{ .Content }}</div>
-{{ end }}
+{{ define "." }} {{ end }}
@@ -1,5 +0,0 @@
-<nav role="navigation">
-  {{ partial "book/nav-brand" . }}
-  {{ with .Site.GetPage .Site.Params.BookMenuBundle }}{{ .Content }}{{ end }}
-  {{ partial "book/nav-after" . }}
-</nav>
@@ -1,5 +0,0 @@
-{{ if .Site.Params.BookMenuBundle }}
-  {{ partial "book/nav-bundle" . }}
-{{ else }}
-  {{ partial "book/nav-tree" . }}
-{{ end }}
@@ -6,6 +6,4 @@
 <!-- <link href="/css/grids-responsive-min.css" rel="stylesheet"> -->

 {{ $styles := resources.Get "styles.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
-<link rel="stylesheet" href="{{ $styles.Permalink }}">
-
-{{ partial "book/html-head-after" . }}
+<link rel="stylesheet" href="{{ $styles.Permalink }}">
@@ -0,0 +1,8 @@
+<nav role="navigation">
+  {{ partial "docs/nav-brand" . }}
+  {{ partial "docs/inject/nav-before" . }}
+  {{ with .Site.GetPage .Site.Params.BookMenuBundle }}
+    {{- .Content -}}
+  {{ end }}
+  {{ partial "docs/inject/nav-after" . }}
+</nav>
@@ -13,8 +13,8 @@
 {{ end }}

 <nav role="navigation">
-  {{ partial "book/nav-brand" . }}
-  {{ partial "book/nav-before" . }}
+  {{ partial "docs/nav-brand" . }}
+  {{ partial "docs/inject/nav-before" . }}

  <ul>
  {{ range .Scratch.Get "BookSections" }}
@@ -22,7 +22,7 @@
  {{ end }}
  </ul>

-  {{ partial "book/nav-after" . }}
+  {{ partial "docs/inject/nav-after" . }}
 </nav>

 <!-- Single section of menu (recursive) -->
@@ -0,0 +1,5 @@
+{{ if .Site.Params.BookMenuBundle }}
+  {{ partial "docs/nav-bundle" . }}
+{{ else }}
+  {{ partial "docs/nav-tree" . }}
+{{ end }}