use in-page titles to generate sidebar nav

2016-12-19 15:08:54 -05:00
parent b301f4ad3a
commit d8d99a171e
18 changed files with 409 additions and 650 deletions
@@ -1,4 +1,3 @@
-{% if page.title %}{% assign title=page.title %}{% endif %}
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -1 +1,15 @@
-{% for item in tree %}{% if item.section %}{% assign tree = item.section %}{% include tocsearch.html %}{% else %}{% if item.path == page.url %}{% assign foundTOC = thistoc %}{% assign title = item.title %}{% break %}{% endif %}{% endif %}{% endfor %}
+{% capture whitespace %}
+  {% for item in include.tree %}
+    {% if found_toc %}
+      {% break %}
+    {% endif %}
+    {% if item.section %}
+      {% include tocsearch.html tree=item.section toc=include.toc %}
+    {% else %}
+      {% if item == page.path %}
+        {% assign found_toc = include.toc %}
+        {% break %}
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endcapture %}
@@ -1,6 +1,26 @@
-{% for item in tree %}{% if item.section %}
-<div class="item" data-title="{{ item.title }}">
-  <div class="container">{% assign tree = item.section %}{% include tree.html %}
-  </div>
-</div>{% else %}{% assign prefix = item.path | slice: 0, 4 %}{% if prefix == "http" %}{% assign target=" target='_blank'" %}{% else %}{% assign target="" %}{% endif %}
-    <a class="item" data-title="{{ item.title }}" href="{{ item.path }}"{{ target }}></a>{% endif %}{% endfor %}
+{% for item in include.tree %}
+  {% if item.section %}
+    <div class="item" data-title="{{ item.title }}">
+      <div class="container">
+        {% include_cached tree.html tree=item.section %}
+      </div>
+    </div>
+  {% else %}
+
+    {% capture whitespace %}
+      {% if item.path %}
+        {% assign path   = item.path %}
+        {% assign title  = item.title %}
+        {% assign target = " target='_blank'" %}
+      {% else %}
+        {% assign page  = site.pages | where: "path", item | first %}
+        {% assign title = page.title %}
+        {% assign path  = page.url %}
+      {% endif %}
+    {% endcapture %}
+
+    {% if path %}
+      <a class="item" data-title="{{ title }}" href="{{ path }}"{{ target }}></a>
+    {% endif %}
+  {% endif %}
+{% endfor %}