From d1286fb6ea3fc168be7b9811a2936e286bf06682 Mon Sep 17 00:00:00 2001
From: Rohan Deb Sarkar <rohandebsarkar@gmail.com>
Date: Fri, 13 May 2022 00:37:04 +0530
Subject: [PATCH] Add support for `nav_order` and Fix hardcoded navbar titles
 (#664)

---
 _config.yml             |  3 ++-
 _includes/header.html   | 22 ++++++++++++++--------
 _includes/metadata.html |  6 ++++--
 _pages/dropdown.md      |  1 +
 _pages/projects.md      |  1 +
 _pages/publications.md  |  1 +
 _pages/teaching.md      |  1 +
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/_config.yml b/_config.yml
index 8984beca70fa..3a73b98df0dc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -83,7 +83,8 @@ panelbear_analytics:  # panelbear analytics site ID (format: XXXXXXXXX)
 # Blog
 # -----------------------------------------------------------------------------
 
-blog_name:  # your blog must have a name for it to show up in the nav bar
+blog_name: al-folio # blog_name will be displayed in your blog page
+blog_nav_title: blog # your blog must have a title for it to be displayed in the nav bar
 blog_description: a simple whitespace theme for academics
 permalink: /blog/:year/:title/
 
diff --git a/_includes/header.html b/_includes/header.html
index 6e067663c79a..e33b64fd54a9 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -4,7 +4,7 @@
       <!-- Nav Bar -->
       <nav id="navbar" class="navbar navbar-light navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
         <div class="container">
-          {% if page.title != "about" -%}
+          {% if page.permalink != '/' -%}
           <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/">
               {%- if site.title == "blank" -%}<span class="font-weight-bold">{{ site.first_name }}</span> {{ site.middle_name }}  {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif -%}
           </a>
@@ -25,19 +25,25 @@
           <div class="collapse navbar-collapse text-right" id="navbarNav">
             <ul class="navbar-nav ml-auto flex-nowrap">
 
+              {%- for page in site.pages -%}
+                {% if page.permalink == '/' %}
+                  {% assign about_title = page.title %}
+                {% endif %}
+              {% endfor %}
+
               <!-- About -->
-              <li class="nav-item {% if page.title == 'about' %}active{% endif %}">
-                <a class="nav-link" href="{{ '/' | relative_url }}">about
-                  {%- if page.title == "about" -%}
+              <li class="nav-item {% if page.permalink == '/' %}active{% endif %}">
+                <a class="nav-link" href="{{ '/' | relative_url }}">{{ about_title }}
+                  {%- if page.permalink == '/' -%}
                   <span class="sr-only">(current)</span>
                   {%- endif -%}
                 </a>
               </li>
-              {% if site.blog_name %}
+              {% if site.blog_nav_title %}
               <!-- Blog -->
               <li class="nav-item {% if page.url contains 'blog' %}active{% endif %}">
-                <a class="nav-link" href="{{ '/blog/' | relative_url }}">blog
-                  {%- if page.title == "blog" -%}
+                <a class="nav-link" href="{{ '/blog/' | relative_url }}">{{ site.blog_nav_title }}
+                  {%- if page.url contains 'blog' -%}
                   <span class="sr-only">(current)</span>
                   {%- endif -%}
                 </a>
@@ -45,7 +51,7 @@
               {%- endif %}
 
               <!-- Other pages -->
-              {%- assign sorted_pages = site.pages | sort: "title" -%}
+              {%- assign sorted_pages = site.pages | sort: "nav_order" -%}
               {%- for p in sorted_pages -%}
               {%- if p.nav and p.autogen == nil -%}
               {%- if p.dropdown %}
diff --git a/_includes/metadata.html b/_includes/metadata.html
index 941b75d3bbde..ce58cc3e47f0 100644
--- a/_includes/metadata.html
+++ b/_includes/metadata.html
@@ -18,8 +18,10 @@
     {%- else -%}
         {%- capture title -%}{{ site.title }}{%- endcapture -%}
     {%- endif -%}
-    {%- if page.title != "blank" and page.url != "/" -%}
-        {{ title }} | {{ page.title }}
+    {% if page.url == '/blog/index.html' %}
+        {{ site.blog_nav_title }} | {{ title }}
+    {%- elsif page.title != "blank" and page.url != "/" -%}
+        {{ page.title }} | {{ title }}
     {%- else -%}
         {{ title }}
     {%- endif -%}
diff --git a/_pages/dropdown.md b/_pages/dropdown.md
index 578b3723cf7e..caef522350c4 100644
--- a/_pages/dropdown.md
+++ b/_pages/dropdown.md
@@ -2,6 +2,7 @@
 layout: page
 title: submenus
 nav: true
+nav_order: 3
 dropdown: true
 children: 
     - title: publications
diff --git a/_pages/projects.md b/_pages/projects.md
index d7b5c7410565..9b632f21f80c 100644
--- a/_pages/projects.md
+++ b/_pages/projects.md
@@ -4,6 +4,7 @@ title: projects
 permalink: /projects/
 description: A growing collection of your cool projects.
 nav: false
+nav_order: 1
 display_categories: [work, fun]
 horizontal: false
 ---
diff --git a/_pages/publications.md b/_pages/publications.md
index 22dab5461409..758d4b7b2ec9 100644
--- a/_pages/publications.md
+++ b/_pages/publications.md
@@ -5,6 +5,7 @@ title: publications
 description: List of publications by Horacio Chacon-Torrico.
 years: [2022,2021,2020,2019,2013]
 nav: true
+nav_order: 2
 ---
 <!-- _pages/publications.md -->
 <div class="publications">
diff --git a/_pages/teaching.md b/_pages/teaching.md
index a7440e37237f..9cd0772b4272 100644
--- a/_pages/teaching.md
+++ b/_pages/teaching.md
@@ -4,6 +4,7 @@ permalink: /teaching/
 title: teaching
 description: Materials for courses you taught. Replace this text with your description.
 nav: false
+nav_order: 2
 ---
 
 For now, this page is assumed to be a static description of your courses. You can convert it to a collection similar to `_projects/` so that you can have a dedicated page for each course.