use mainSections, update Permalinks and asset URLS

10 files changed, 36 insertions, 43 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2553864..05d8666 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -25,12 +25,20 @@
   {{ partial "main-menu-mobile.html" . }}
   <div class="wrapper">
     {{ partial "header.html" . }}
-    {{ if eq .Section "docs" }}
+
+    {{ $displaySidebar := false }}
+    {{ range site.Params.mainSections }}
+    {{ if eq $.Section . }}
+    {{ $displaySidebar = true }}
+    {{ end }}
+    {{ end }}
+
+    {{ if $displaySidebar }}
     <div class="container pt-2 pt-md-6 pb-3 pb-md-6">
       <div class="row">
         <div class="col-12 col-md-3 mb-3">
           <div class="sidebar">
-            {{ partial "docs-menu.html" . }}
+            {{ partial "sidebar.html" . }}
           </div>
         </div>
         <div class="col-12 col-md-9">
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ecc12be..180e5ad 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,5 @@
-{{ define "header_css" }}{{ end }} {{ define "body_classes" }}{{ end }}
+{{ define "header_css" }}{{ end }}
+{{ define "body_classes" }}page-default-list{{ end }}
 {{ define "header_classes" }}{{ end }}
 
 {{ define "main" }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 86dc697..3c930e1 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 {{ define "header_css" }}{{ end }}
-{{ define "body_classes" }}{{ end }}
+{{ define "body_classes" }}page-default-single{{ end }}
 {{ define "header_classes" }}{{ end }}
 
 {{ define "main" }}
diff --git a/layouts/index.html b/layouts/index.html
index 5e8b454..806a899 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -20,11 +20,11 @@
   <div class="container pt-4 pb-16">
     <div class="row">
       <div class="col-12">
-        <h1 class="title">{{.Title}}</h1>
+        <h1 class="title">{{ .Title }}</h1>
         <div class="content">
-          {{.Content}}
+          {{ .Content }}
         </div>
-        <a class="button button-primary mb-2" href="{{ .Site.BaseURL }}docs">Read The Docs</a>
+        <a class="button button-primary mb-2" href="{{ "docs" | absURL }}">Read The Docs</a>
       </div>
     </div>
   </div>
@@ -32,16 +32,16 @@
 
 <div class="strip">
   <div class="container pt-4 pb-4">
-      <div class="row justify-content-center">
-        <div class="col-12 col-md-10">
-          <div class="terminal">
-            <img src="{{ .Site.BaseURL }}images/terminal.gif" />
-          </div>
+    <div class="row justify-content-center">
+      <div class="col-12 col-md-10">
+        <div class="terminal">
+          <img src="{{ "images/terminal.gif" | absURL}}" />
         </div>
       </div>
     </div>
   </div>
 </div>
+</div>
 {{ end }}
 
 {{ define "footer_js" }}
diff --git a/layouts/partials/docs-menu.html b/layouts/partials/docs-menu.html
deleted file mode 100644
index adbbac4..0000000
--- a/layouts/partials/docs-menu.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{$currentNode := .}}
-<div class="docs-menu">
-  <h4>Docs</h4>
-  <ul>
-    {{ range (where .Site.Pages "Section" "docs") sort .Site.Pages ".Weight" }}
-    <li class="{{ if eq .UniqueID $currentNode.UniqueID }}active {{ end }}">
-      <a href="{{ .URL }}">{{ .Title }}</a>
-    </li>
-    {{ end }}
-  </ul>
-</div>
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
deleted file mode 100644
index 13054e6..0000000
--- a/layouts/partials/footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="footer">
-  <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <div class="footer-inner">
-          <ul class="footer-menu">
-            <li><a href="{{ .Site.BaseURL }}">Home</a></li>
-            <li><a href="{{ .Site.BaseURL }}contact">Contact</a></li>
-            <li class="copyright">© {{ now.Format "2006" }} {{.Site.Title}}</li>
-          </ul>
-        </div>
-      </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 9038b21..160c766 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,10 +1,10 @@
 <div class='header'>
   <div class="container">
     <div class="logo">
-      <a href="{{ .Site.BaseURL }}"><img alt="Figurit Homepage" src="{{ .Site.BaseURL }}images/logo.svg" /></a>
+      <a href="{{ .Site.BaseURL }}"><img alt="Logo" src="{{ "images/logo.svg" | absURL }}" /></a>
     </div>
     <div class="logo-mobile">
-      <a href="{{ .Site.BaseURL }}"><img alt="Figurit Homepage" src="{{ .Site.BaseURL }}images/logo-mobile.svg" /></a>
+      <a href="{{ .Site.BaseURL }}"><img alt="Logo" src="{{ "images/logo-mobile.svg" | absURL }}" /></a>
     </div>
     {{ partial "main-menu.html" . }}
     {{ partial "hamburger.html" . }}
diff --git a/layouts/partials/main-menu-mobile.html b/layouts/partials/main-menu-mobile.html
index 2aae467..5211ea7 100644
--- a/layouts/partials/main-menu-mobile.html
+++ b/layouts/partials/main-menu-mobile.html
@@ -3,8 +3,7 @@
     {{ $currentPage := . }}
     {{ range .Site.Menus.main }}
     <li class="menu-item-{{ .Name | lower }}{{ if $currentPage.IsMenuCurrent "main" . }} active{{ end }}">
-      <a href="{{.URL}}">
-        {{ .Pre }}
+      <a href="{{ .URL }}">
         <span>{{ .Name }}</span>
       </a>
     </li>
diff --git a/layouts/partials/main-menu.html b/layouts/partials/main-menu.html
index 924c91b..7ea303c 100644
--- a/layouts/partials/main-menu.html
+++ b/layouts/partials/main-menu.html
@@ -3,8 +3,7 @@
     {{ $currentPage := . }}
     {{ range .Site.Menus.main }}
     <li class="menu-item-{{ .Name | lower }}{{ if $currentPage.IsMenuCurrent "main" . }} active{{ end }}">
-      <a href="{{.URL}}">
-        {{ .Pre }}
+      <a href="{{ .URL }}">
         <span>{{ .Name }}</span>
       </a>
     </li>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
new file mode 100644
index 0000000..73861a8
--- /dev/null
+++ b/layouts/partials/sidebar.html
@@ -0,0 +1,11 @@
+{{$currentNode := .}}
+<div class="docs-menu">
+  <h4>{{ .Section | humanize }}</h4>
+  <ul>
+    {{ range (where .Site.RegularPages "Section" .Section) sort .Site.RegularPages ".Weight" }}
+    <li class="{{ if eq .UniqueID $currentNode.UniqueID }}active {{ end }}">
+      <a href="{{ .Permalink }}">{{ .Title }}</a>
+    </li>
+    {{ end }}
+  </ul>
+</div>
\ No newline at end of file