xupyprmv · January 20, 2016 11:51 · Mar 9, 2014 · Mar 9, 2014 · Mar 9, 2014 · Mar 8, 2014
diff --git a/navigation.html b/navigation.html
@@ -1,3 +1,4 @@
+{% capture html %}
 <ul>
     {% if include.context == "/" %}
         <li class="{% if page.url == "/" %}active{% endif %}">
@@ -20,3 +21,4 @@
 
     {% endfor %}
 </ul>
+{% endcapture %}{{ html | strip_newlines | replace:'    ','' | replace:'    ','' | replace:'  ',' ' }}
diff --git a/navigation.html b/navigation.html
@@ -14,9 +14,7 @@
         {% if current == include.context %}
             <li class="{% if page.url contains entry.url %}active{% endif %}">
                 <a href="{{ site.baseurl }}{{ entry.url }}">{{ entry.title }}</a>
-                {% if entry.children != false %}
-                    {% include navigation.html context=entry.url %}
-                {% endif %}
+                {% include navigation.html context=entry.url %}
             </li>
         {% endif %}
 

diff --git a/navigation.html b/navigation.html
@@ -1,4 +1,10 @@
 <ul>
+    {% if include.context == "/" %}
+        <li class="{% if page.url == "/" %}active{% endif %}">
+            <a href="{{ site.baseurl }}/">{{ site.title }}</a>
+        </li>
+    {% endif %}
+
     {% assign entries = site.pages | sort: "path" %}
     {% for entry in entries %}
 
@@ -16,4 +22,3 @@
 
     {% endfor %}
 </ul>
-
diff --git a/README.md b/README.md
@@ -1,21 +0,0 @@
-A simple nested page navigation list for Jekyll that highlights the currently active tree.
-
-#### Usage
-
-```
-{% include navigation.html context="[top-level-path]" %}
-```
-
-If you wanted to list all pages starting with the root, you'd do:
-
-```
-{% include navigation.html context="/" %}
-```
-
-If you instead wanted to list everything beneath `/foo/bar`, you'd do:
-
-```
-{% include navigation.html context="/foo/bar/" %}
-```
-
-To stop looking for children, and therefore avoid creating an empty `<ul>` if none exists, add `children: false` to your page's Front Matter.

diff --git a/navigation.html b/navigation.html
@@ -1,5 +1,6 @@
 <ul>
-    {% for entry in site.pages %}
+    {% assign entries = site.pages | sort: "path" %}
+    {% for entry in entries %}
 
         {% capture slug    %}{{ entry.url | split: "/"   | last                       }}{% endcapture %}
         {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}

diff --git a/README.md b/README.md
@@ -1,5 +1,21 @@
-### Usage
+A simple nested page navigation list for Jekyll that highlights the currently active tree.
+
+#### Usage
 
 ```
 {% include navigation.html context="[top-level-path]" %}
 ```
+
+If you wanted to list all pages starting with the root, you'd do:
+
+```
+{% include navigation.html context="/" %}
+```
+
+If you instead wanted to list everything beneath `/foo/bar`, you'd do:
+
+```
+{% include navigation.html context="/foo/bar/" %}
+```
+
+To stop looking for children, and therefore avoid creating an empty `<ul>` if none exists, add `children: false` to your page's Front Matter.
diff --git a/navigation.html b/navigation.html
@@ -5,11 +5,14 @@
         {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
 
         {% if current == include.context %}
-            <li>
-                <a href="{{ entry.url }}" class="{% if page.url == entry.url %}active{% endif %}">{{ entry.title }}</a>
-                {% include navigation.html context=entry.url %}
+            <li class="{% if page.url contains entry.url %}active{% endif %}">
+                <a href="{{ site.baseurl }}{{ entry.url }}">{{ entry.title }}</a>
+                {% if entry.children != false %}
+                    {% include navigation.html context=entry.url %}
+                {% endif %}
             </li>
         {% endif %}
 
     {% endfor %}
 </ul>
+
diff --git a/navigation.html b/navigation.html
@@ -7,7 +7,7 @@
         {% if current == include.context %}
             <li>
                 <a href="{{ entry.url }}" class="{% if page.url == entry.url %}active{% endif %}">{{ entry.title }}</a>
-                {% include categories.html context=entry.url %}
+                {% include navigation.html context=entry.url %}
             </li>
         {% endif %}
 

diff --git a/README.md b/README.md
@@ -3,7 +3,3 @@
 ```
 {% include navigation.html context="[top-level-path]" %}
 ```
-
-### Todo
-
-- Fix list nesting
diff --git a/navigation.html b/navigation.html
@@ -1,15 +1,15 @@
-{% for entry in site.pages %}
-
-    {% capture slug    %}{{ entry.url | split: "/"   | last                       }}{% endcapture %}
-    {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
-
-    {% if current == include.context %}
-        <ul>
+<ul>
+    {% for entry in site.pages %}
+
+        {% capture slug    %}{{ entry.url | split: "/"   | last                       }}{% endcapture %}
+        {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
+
+        {% if current == include.context %}
             <li>
                 <a href="{{ entry.url }}" class="{% if page.url == entry.url %}active{% endif %}">{{ entry.title }}</a>
                 {% include categories.html context=entry.url %}
             </li>
-        </ul>
-    {% endif %}
-
-{% endfor %}
+        {% endif %}
+
+    {% endfor %}
+</ul>
diff --git a/README.md b/README.md
@@ -1 +1,9 @@
-Usage: `{% include navigation.html context="[top-level-path]" %}`
+### Usage
+
+```
+{% include navigation.html context="[top-level-path]" %}
+```
+
+### Todo
+
+- Fix list nesting
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+Usage: `{% include navigation.html context="[top-level-path]" %}`
diff --git a/navigation.html b/navigation.html
@@ -0,0 +1,15 @@
+{% for entry in site.pages %}
+
+    {% capture slug    %}{{ entry.url | split: "/"   | last                       }}{% endcapture %}
+    {% capture current %}{{ entry.url | remove: slug | remove: "//" | append: "/" }}{% endcapture %}
+
+    {% if current == include.context %}
+        <ul>
+            <li>
+                <a href="{{ entry.url }}" class="{% if page.url == entry.url %}active{% endif %}">{{ entry.title }}</a>
+                {% include categories.html context=entry.url %}
+            </li>
+        </ul>
+    {% endif %}
+
+{% endfor %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Usage: `{% include navigation.html context="[top-level-path]" %}`
No results found