fix menu

_data/navigation.yml

@@ -1,12 +1,5 @@
 # Site navigation links
-- title: Home
+- title: 
-  url: /
+  url: 
+  menuorder: 
 
-- title: Presentations
-  url: /presentations/
-
-- title: Resume
-  url: /resume/
-
-- title: Blog
-  url: /blog/

_includes/_navigation.html

@@ -9,13 +9,16 @@
 	<div class="top-navigation">
 		<nav role="navigation" id="site-nav" class="nav">
 		    <ul>
-		        {% for link in site.data.navigation %}
+		    	{% assign links = site.pages | where_exp: "item", "item.menuorder != nil" %}
-				    {% if link.url contains 'http' %}
+		    	{% assign alllinks = links | concat: site.data.navigation | sort: 'menuorder' %}
-				        {% assign domain = '' %}
+		        {% for link in alllinks %}
+				    <li><a href="{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>
+				    {% if link.menutitle %}
+				    {{link.menutitle}}
 				    {% else %}
-				        {% assign domain = site.github.url %}
+				    {{ link.title }}
 				    {% endif %}
-				    <li><a href="{{ domain }}{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>{{ link.title }}</a></li>
+				</a></li>
 				{% endfor %}
 		    </ul>
 		</nav>

blog.md

@@ -1,4 +1,6 @@
 ---
 layout: post-index
 title: All Blog Posts
+menutitle: Blog
+menuorder: 4
 ---

index.md

@@ -1,6 +1,8 @@
 ---
 layout: page
 excerpt: "About Me..."
+menutitle: Home
+menuorder: 1
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

presentations.md

@@ -1,5 +1,6 @@
 ---
 layout: presentation-post-index
-title: Presentations
+menutitle: Presentations
+menuorder: 2
 excerpt: "Recent Presentations"
 ---

resume.md

@@ -1,5 +1,7 @@
 ---
 layout: resume
+menuorder: 3
+menutitle: Resume
 ---
 ## Currently