Merge pull request #3292 from flyinprogrammer/eliminate_section_metadata

site/_docs/assets.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Assets
-prev_section: datafiles
-next_section: migrations
 permalink: /docs/assets/
 ---
 

site/_docs/collections.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Collections
-prev_section: variables
-next_section: datafiles
 permalink: /docs/collections/
 ---
 

site/_docs/configuration.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Configuration
-prev_section: structure
-next_section: frontmatter
 permalink: /docs/configuration/
 ---
 

site/_docs/continuous-integration.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Continuous Integration
-prev_section: deployment-methods
-next_section: troubleshooting
 permalink: /docs/continuous-integration/
 ---
 

site/_docs/contributing.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Contributing
-prev_section: upgrading
-next_section: history
 permalink: /docs/contributing/
 ---
 

site/_docs/datafiles.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Data Files
-prev_section: collections
-next_section: assets
 permalink: /docs/datafiles/
 ---
 

site/_docs/deployment-methods.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Deployment methods
-prev_section: github-pages
-next_section: continuous-integration
 permalink: /docs/deployment-methods/
 ---
 

site/_docs/drafts.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Working with drafts
-prev_section: posts
-next_section: pages
 permalink: /docs/drafts/
 ---
 

site/_docs/extras.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Extras
-prev_section: plugins
-next_section: github-pages
 permalink: /docs/extras/
 ---
 

site/_docs/frontmatter.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Front Matter
-prev_section: configuration
-next_section: posts
 permalink: /docs/frontmatter/
 ---
 

site/_docs/github-pages.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: GitHub Pages
-prev_section: extras
-next_section: deployment-methods
 permalink: /docs/github-pages/
 ---
 

site/_docs/history.md

@@ -2,7 +2,6 @@
 layout: docs
 title: History
 permalink: "/docs/history/"
-prev_section: contributing
 ---
 
 ## 2.5.3 / 2014-12-22

site/_docs/index.md

@@ -1,7 +1,6 @@
 ---
 layout: docs
 title: Welcome
-next_section: quickstart
 permalink: /docs/home/
 ---
 

site/_docs/installation.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Installation
-prev_section: quickstart
-next_section: usage
 permalink: /docs/installation/
 ---
 

site/_docs/migrations.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Blog migrations
-prev_section: assets
-next_section: templates
 permalink: /docs/migrations/
 ---
 

site/_docs/pages.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Creating pages
-prev_section: drafts
-next_section: variables
 permalink: /docs/pages/
 ---
 

site/_docs/pagination.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Pagination
-prev_section: permalinks
-next_section: plugins
 permalink: /docs/pagination/
 ---
 

site/_docs/permalinks.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Permalinks
-prev_section: templates
-next_section: pagination
 permalink: /docs/permalinks/
 ---
 

site/_docs/plugins.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Plugins
-prev_section: pagination
-next_section: extras
 permalink: /docs/plugins/
 ---
 

site/_docs/posts.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Writing posts
-prev_section: frontmatter
-next_section: drafts
 permalink: /docs/posts/
 ---
 

site/_docs/quickstart.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Quick-start guide
-prev_section: home
-next_section: installation
 permalink: /docs/quickstart/
 ---
 

site/_docs/resources.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Resources
-prev_section: sites
-next_section: upgrading
 permalink: /docs/resources/
 ---
 

site/_docs/sites.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Sites using Jekyll
-prev_section: troubleshooting
-next_section: resources
 permalink: /docs/sites/
 ---
 

site/_docs/structure.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Directory structure
-prev_section: usage
-next_section: configuration
 permalink: /docs/structure/
 ---
 

site/_docs/templates.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Templates
-prev_section: migrations
-next_section: permalinks
 permalink: /docs/templates/
 ---
 

site/_docs/troubleshooting.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Troubleshooting
-prev_section: deployment-methods
-next_section: sites
 permalink: /docs/troubleshooting/
 ---
 

site/_docs/upgrading.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Upgrading
-prev_section: resources
-next_section: contributing
 permalink: /docs/upgrading/
 ---
 

site/_docs/usage.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Basic Usage
-prev_section: installation
-next_section: structure
 permalink: /docs/usage/
 ---
 

site/_docs/variables.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Variables
-prev_section: pages
-next_section: collections
 permalink: /docs/variables/
 ---
 

site/_docs/windows.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Jekyll on Windows
-prev_section: configuration
-next_section: posts
 permalink: /docs/windows/
 ---
 

site/_includes/section_nav.html

@@ -1,22 +1,39 @@
-<div class="section-nav">
+{% comment %}
-  <div class="left align-right">
+Map grabs the doc sections, giving us an array of arrays. Join, flattens all
-    {% if page.prev_section != null %}
+the items to a comma delimited string. Split turns it into an array again.
-      <a href="/docs/{{ page.prev_section }}/" class="prev">
+{% endcomment %}
-        Back
+{% assign docs = site.data.docs | map: 'docs' | join: ',' | split: ',' %}
-      </a>
-    {% else %}
-      <span class="prev disabled">Back</span>
-    {% endif %}
-  </div>
-  <div class="right align-left">
-    {% if page.next_section != null %}
-      <a href="/docs/{{ page.next_section }}/" class="next">
-        Next
-      </a>
-    {% else %}
-      <span class="next disabled">Next</span>
-    {% endif %}
-  </div>
-  <div class="clear"></div>
-</div>
 
+{% comment %}
+Because this is built for every page, lets find where we are in the ordered
+document list by comparing url strings. Then if there's something previous or
+next, lets build a link to it.
+{% endcomment %}
+
+{% for document in docs %}
+  {% assign document_url = document | prepend:"/docs/" | append:"/" %}
+  {% if document_url == page.url %}
+    <div class="section-nav">
+      <div class="left align-right">
+          {% if forloop.first %}
+            <span class="prev disabled">Back</span>
+          {% else %}
+            {% assign previous = forloop.index0 | minus: 1 %}
+            {% assign previous_page = docs[previous] | prepend:"/docs/" | append:"/" %}
+            <a href="{{ previous_page }}" class="prev">Back</a>
+          {% endif %}
+      </div>
+      <div class="right align-left">
+          {% if forloop.last %}
+            <span class="next disabled">Next</span>
+          {% else %}
+            {% assign next = forloop.index0 | plus: 1 %}
+            {% assign next_page = docs[next] | prepend:"/docs/" | append:"/" %}
+            <a href="{{ next_page }}" class="next">Next</a>
+          {% endif %}
+      </div>
+    </div>
+    <div class="clear"></div>
+    {% break %}
+  {% endif %}
+{% endfor %}