Fill theme.toml, refactor injection partials

2018-09-12 14:21:46 +02:00 · 2018-09-12 14:21:46 +02:00 · ca37d7488c
parent 2e5e2a2f5c
commit ca37d7488c
18 changed files with 35 additions and 42 deletions
--- a/archetypes/default.md
+++ b/archetypes/default.md
@ -1,2 +0,0 @@
-+++
-+++
--- a/archetypes/docs.md
+++ b/archetypes/docs.md
@ -0,0 +1,4 @@
+---
+title: "{{ .Name | humanize | title }}"
+weight: 1
+---
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@ -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>
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@ -1,7 +1 @@
-{{- define "title" -}}
-  {{ .Site.Title }}
-{{ end }}
-
-{{- define "main" -}}
-  <div>{{ .Content }}</div>
-{{ end }}
+{{ define "." }} {{ end }}
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@ -1,7 +1 @@
-{{- define "title" -}}
-  {{ .Site.Title }}
-{{ end }}
-
-{{- define "main" -}}
-  <div>{{ .Content }}</div>
-{{ end }}
+{{ define "." }} {{ end }}
--- a/layouts/partials/book/nav-bundle.html
+++ b/layouts/partials/book/nav-bundle.html
@ -1,5 +0,0 @@
-<nav role="navigation">
-  {{ partial "book/nav-brand" . }}
-  {{ with .Site.GetPage .Site.Params.BookMenuBundle }}{{ .Content }}{{ end }}
-  {{ partial "book/nav-after" . }}
-</nav>
--- a/layouts/partials/book/nav.html
+++ b/layouts/partials/book/nav.html
@ -1,5 +0,0 @@
-{{ if .Site.Params.BookMenuBundle }}
-  {{ partial "book/nav-bundle" . }}
-{{ else }}
-  {{ partial "book/nav-tree" . }}
-{{ end }}
--- a/layouts/partials/docs/html-head.html
+++ b/layouts/partials/docs/html-head.html
@ -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 }}">
--- a/layouts/partials/book/html-head-after.html
+++ b/layouts/partials/book/html-head-after.html
--- a/layouts/partials/docs/inject/head.html
+++ b/layouts/partials/docs/inject/head.html
--- a/layouts/partials/docs/inject/nav-after.html
+++ b/layouts/partials/docs/inject/nav-after.html
--- a/layouts/partials/docs/inject/nav-before.html
+++ b/layouts/partials/docs/inject/nav-before.html
--- a/layouts/partials/docs/nav-brand.html
+++ b/layouts/partials/docs/nav-brand.html
--- a/layouts/partials/docs/nav-bundle.html
+++ b/layouts/partials/docs/nav-bundle.html
@ -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>
--- a/layouts/partials/docs/nav-tree.html
+++ b/layouts/partials/docs/nav-tree.html
@ -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) -->
--- a/layouts/partials/docs/nav.html
+++ b/layouts/partials/docs/nav.html
@ -0,0 +1,5 @@
+{{ if .Site.Params.BookMenuBundle }}
+  {{ partial "docs/nav-bundle" . }}
+{{ else }}
+  {{ partial "docs/nav-tree" . }}
+{{ end }}
--- a/layouts/partials/docs/toc.html
+++ b/layouts/partials/docs/toc.html
--- a/theme.toml
+++ b/theme.toml
@ -3,13 +3,13 @@

 name = "Book"
 license = "MIT"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE"
-description = ""
-homepage = "http://example.com/"
-tags = []
+licenselink = "https://github.com/alex-shpak/hugo-book/blob/master/LICENSE"
+description = "Hugo documentation theme as simple as plain book"
+homepage = "https://github.com/alex-shpak/hugo-book"
+tags = ["responsive", "clean", "documentation", "docs", "flexbox"]
 features = []
 min_version = "0.41"

 [author]
  name = "Alex Shpak"
-  homepage = ""
+  homepage = "https://github.com/alex-shpak/"