Merge pull request #28 from dnoneill/refactor

fix menu
NCSU-Libraries · Jul 1, 2021 · aecd431 · aecd431
2 parents 79ddcba + 324c371
commit aecd431
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -1,12 +1,5 @@
 # Site navigation links
-- title: Home
-  url: /
+- title: 
+  url: 
+  menuorder: 
 
-- title: Presentations
-  url: /presentations/
-
-- title: Resume
-  url: /resume/
-
-- title: Blog
-  url: /blog/
diff --git a/_includes/_navigation.html b/_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 %}
-				    {% if link.url contains 'http' %}
-				        {% assign domain = '' %}
-				        {% else %}
-				        {% assign domain = site.github.url %}
+		    	{% assign links = site.pages | where_exp: "item", "item.menuorder != nil" %}
+		    	{% assign alllinks = links | concat: site.data.navigation | sort: 'menuorder' %}
+		        {% for link in alllinks %}
+				    <li><a href="{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>
+				    {% if link.menutitle %}
+				    {{link.menutitle}}
+				    {% else %}
+				    {{ 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>

diff --git a/blog.md b/blog.md
@@ -1,4 +1,6 @@
 ---
 layout: post-index
 title: All Blog Posts
+menutitle: Blog
+menuorder: 4
 ---
diff --git a/index.md b/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.

diff --git a/presentations.md b/presentations.md
@@ -1,5 +1,6 @@
 ---
 layout: presentation-post-index
-title: Presentations
+menutitle: Presentations
+menuorder: 2
 excerpt: "Recent Presentations"
 ---
diff --git a/resume.md b/resume.md
@@ -1,5 +1,7 @@
 ---
 layout: resume
+menuorder: 3
+menutitle: Resume
 ---
 ## Currently