Change the default menu and how previous/next work

gmkurtzer · gmkurtzer · commit 3c9a66f5beeb · 2016-10-02T18:56:36.000-07:00
diff --git a/404.md b/404.md
@@ -1,6 +1,7 @@
 ---
 title: "Page Not Found"
 search: exclude
+sidebar: main_sidebar
 ---  
 
 Sorry, but the page you were trying to view does not exist. Try searching for it or looking at the URL to see if it looks correct.
diff --git a/_config.yml b/_config.yml
@@ -66,7 +66,7 @@ defaults:
       layout: "page"
       comments: true
       search: true
-      sidebar: docs_sidebar
+      sidebar: main_sidebar
   -
     scope:
       path: ""
@@ -85,7 +85,7 @@ defaults:
       layout: "post"
       comments: true
       search: true
-      sidebar: docs_sidebar
+      sidebar: main_sidebar
 
 
 # these are defaults used for the frontmatter for these file types
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -43,30 +43,23 @@ <h1 class="post-title-main">{{ page.title }}</h1>
     <script>
     $(document).ready(function(){
 
-        var next = $("li.active").next().last().find('a').attr('href');
-        var previous = $("li.active").prev().last().find('a').attr('href');
+        var next = "{{ page.next }}";
+        var previous = "{{ page.previous }}";
 
         // NEXT BUTTON
-        if (typeof next == 'undefined'){
+        if (next == ''){
             console.log("disabling next button")
             $(".next-button").addClass("hidden")
-        } else if (next == "#") {
-            next = $("li.active").next().find("li").first().find('a').attr('href');
-            $(".next-button").closest('a').attr('href', next)
-            $(".next-button").removeClass('hidden')
         } else {
             $(".next-button").closest('a').attr('href', next)
+            //$(".next-button").attr('href', next);
             $(".next-button").removeClass('hidden')
         }
 
         // PREVIOUS BUTTON
-        if (typeof previous == 'undefined'){
+        if (previous == ''){
             console.log("disabling previous button")
             $(".previous-button").addClass("hidden")
-        } else if (previous == "#") {
-            previous = $("li.active").prev().find("li").last().find('a').attr('href')
-            $(".previous-button").closest('a').attr('href', previous)
-            $(".previous-button").removeClass('hidden')
         } else {
             $(".previous-button").closest('a').attr('href', previous)
             $(".previous-button").removeClass('hidden')
diff --git a/pages/docs/contributing/contributing-docs.md b/pages/docs/contributing/contributing-docs.md
@@ -1,6 +1,6 @@
 ---
 title: Contributing to Documentation
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: contributing-docs
 folder: releases
 ---
diff --git a/pages/docs/contributing/contributing-singularity.md b/pages/docs/contributing/contributing-singularity.md
@@ -1,6 +1,6 @@
 ---
 title: Contributing to Singularity
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: contributing-singularity
 folder: docs
 ---
diff --git a/pages/docs/getting-started/bootstrap-image.md b/pages/docs/getting-started/bootstrap-image.md
@@ -1,6 +1,6 @@
 ---
 title: Getting Started with Bootstrap
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: bootstrap-image
 folder: docs
 ---
diff --git a/pages/docs/getting-started/create-an-image.md b/pages/docs/getting-started/create-an-image.md
@@ -1,6 +1,6 @@
 ---
 title: Create an Image
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: create-image
 folder: docs
 ---
diff --git a/pages/docs/getting-started/docker.md b/pages/docs/getting-started/docker.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity and Docker
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docker
 folder: docs
 ---
diff --git a/pages/docs/getting-started/image-environment.md b/pages/docs/getting-started/image-environment.md
@@ -1,6 +1,6 @@
 ---
 title: Image Environment
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: image-environment
 folder: docs
 ---
diff --git a/pages/docs/install/install-linux.md b/pages/docs/install/install-linux.md
@@ -1,6 +1,6 @@
 ---
 title: Install on Linux
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: install-linux
 folder: docs
 ---
diff --git a/pages/docs/install/install-mac.md b/pages/docs/install/install-mac.md
@@ -1,6 +1,6 @@
 ---
 title: Running Singularity with Vagrant (Mac)
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: install-mac
 folder: docs
 ---
diff --git a/pages/docs/install/install-vagrant.md b/pages/docs/install/install-vagrant.md
@@ -1,6 +1,6 @@
 ---
 title: Running Singularity with Vagrant
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: install-vagrant
 folder: docs
 ---
diff --git a/pages/docs/install/install-windows.md b/pages/docs/install/install-windows.md
@@ -1,6 +1,6 @@
 ---
 title: Running Singularity with Vagrant (Windows)
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: install-windows
 folder: docs
 ---
diff --git a/pages/docs/overview/about.md b/pages/docs/overview/about.md
@@ -1,6 +1,6 @@
 ---
 title: Introduction
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: about
 folder: docs
 ---
diff --git a/pages/docs/overview/faq.md b/pages/docs/overview/faq.md
@@ -1,6 +1,6 @@
 ---
 title: Frequently Asked Questions
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: faq
 folder: docs
 ---
diff --git a/pages/docs/overview/start.md b/pages/docs/overview/start.md
@@ -1,7 +1,8 @@
 ---
 title: Quick Start
 sidebar: home_sidebar
-permalink: start
+permalink: quickstart
+next: hello
 folder: docs
 ---
 
diff --git a/pages/docs/overview/support.md b/pages/docs/overview/support.md
@@ -1,6 +1,6 @@
 ---
 title: Support
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: support
 folder: docs
 ---
diff --git a/pages/docs/singularity/advanced-config.md b/pages/docs/singularity/advanced-config.md
@@ -1,6 +1,6 @@
 ---
 title: The Singularity Configuration File
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-config
 folder: docs
 ---
diff --git a/pages/docs/singularity/docs-bootstrap.md b/pages/docs/singularity/docs-bootstrap.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity Bootstrap
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-bootstrap
 toc: false
 folder: docs
diff --git a/pages/docs/singularity/docs-exec.md b/pages/docs/singularity/docs-exec.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity Exec
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-exec
 folder: docs
 toc: false
diff --git a/pages/docs/singularity/docs-export.md b/pages/docs/singularity/docs-export.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity Export
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-export
 toc: false
 folder: docs
diff --git a/pages/docs/singularity/docs-hpc.md b/pages/docs/singularity/docs-hpc.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity on HPC
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-hpc
 folder: docs
 toc: false
diff --git a/pages/docs/singularity/docs-import.md b/pages/docs/singularity/docs-import.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity Import
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-import
 toc: false
 folder: docs
diff --git a/pages/docs/singularity/docs-license.md b/pages/docs/singularity/docs-license.md
@@ -1,6 +1,6 @@
 ---
 title: License
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-license
 folder: docs
 toc: false
diff --git a/pages/docs/singularity/docs-overview.md b/pages/docs/singularity/docs-overview.md
@@ -1,6 +1,6 @@
 ---
 title: Docs Overview
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-overview
 folder: docs
 ---
diff --git a/pages/docs/singularity/docs-run.md b/pages/docs/singularity/docs-run.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity Run
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-run
 folder: docs
 toc: false
diff --git a/pages/docs/singularity/docs-security.md b/pages/docs/singularity/docs-security.md
@@ -1,6 +1,6 @@
 ---
 title: Security
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-security
 folder: docs
 ---
diff --git a/pages/docs/singularity/docs-shell.md b/pages/docs/singularity/docs-shell.md
@@ -1,6 +1,6 @@
 ---
 title: Singularity Shell
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-shell
 folder: docs
 ---
diff --git a/pages/docs/singularity/docs-usage.md b/pages/docs/singularity/docs-usage.md
@@ -1,6 +1,6 @@
 ---
 title: Basic Command Usage
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: docs-usage
 folder: docs
 ---
diff --git a/pages/news/news.html b/pages/news/news.html
@@ -1,6 +1,6 @@
 ---
 title: News
-sidebar: docs_sidebar
+sidebar: main_sidebar
 keywords: news, blog, updates, release notes, announcements
 permalink: blog
 toc: false
diff --git a/pages/news/news_archive.html b/pages/news/news_archive.html
@@ -1,6 +1,6 @@
 ---
 title: News
-sidebar: docs_sidebar
+sidebar: main_sidebar
 keywords: news, blog, updates, release notes, announcements
 permalink: news_archive
 toc: false
diff --git a/pages/recipes/recipes.md b/pages/recipes/recipes.md
@@ -1,6 +1,6 @@
 ---
 title: Recipes
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: tutorials
 folder: recipes
 toc: false
diff --git a/pages/releases/releases.md b/pages/releases/releases.md
@@ -1,6 +1,6 @@
 ---
 title: Releases
-sidebar: docs_sidebar
+sidebar: main_sidebar
 permalink: all-releases
 keywords: news, blog, updates, release notes, announcements
 folder: releases
