Now blog can be reorganized in header (#1996)

Fixes #1559 #1795

Signed-off-by: George Araújo <george.gcac@gmail.com>

_config.yml

@@ -19,7 +19,7 @@ lang: en # the language of your site (for example: en, fr, cn, ru, etc.)
 icon: ⚛️  # the emoji used as the favicon (alternatively, provide image name in /assets/img/)
 
 url: https://alshedivat.github.io # the base hostname & protocol for your site
-baseurl: /al-folio # the subpath of your site, e.g. /blog/
+baseurl: /al-folio # the subpath of your site, e.g. /blog/. Leave blank for root
 last_updated: false # set to true if you want to display last updated in the footer
 impressum_path:  # set to path to include impressum link in the footer, use the same path as permalink in a page, helps to conform with EU GDPR
 
@@ -121,7 +121,6 @@ bing_site_verification:  # out your bing-site-verification ID (Bing Webmaster)
 # -----------------------------------------------------------------------------
 
 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/
 

_includes/header.html

@@ -51,16 +51,6 @@
                   {%- endif -%}
                 </a>
               </li>
-              {% 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 }}">{{ site.blog_nav_title }}
-                  {%- if page.url contains 'blog' -%}
-                  <span class="sr-only">(current)</span>
-                  {%- endif -%}
-                </a>
-              </li>
-              {%- endif %}
 
               <!-- Other pages -->
               {%- assign sorted_pages = site.pages | sort: "nav_order" -%}
@@ -90,9 +80,14 @@
                 </div>
               </li>
               {%- else %}
-              <li class="nav-item {% if page.title == p.title %}active{% endif %}">
-                <a class="nav-link" href="{{ p.url | relative_url }}">{{ p.title }}
-                  {%- if page.title == p.title -%}
+              <li class="nav-item {% if page.url contains p.permalink %}active{% endif %}">
+                {%- if p.permalink contains '/blog/' %}
+                {%- assign url = '/blog/' -%}
+                {%- else -%}
+                {%- assign url = p.url -%}
+                {%- endif -%}
+                <a class="nav-link" href="{{ url | relative_url }}">{{ p.title }}
+                  {%- if page.url contains p.url -%}
                   <span class="sr-only">(current)</span>
                   {%- endif -%}
                 </a>

_includes/metadata.html

@@ -24,7 +24,7 @@
         {%- capture title -%}{{ site.title }}{%- endcapture -%}
     {%- endif -%}
     {% if page.url == '/blog/index.html' %}
-        {{ site.blog_nav_title }} | {{ title }}
+            {{ page.title }} | {{ title }}
     {%- elsif page.title != "blank" and page.url != "/" -%}
         {%- if page.title == nil or page.title == "" -%}
             {{ page.date | date: "%Y" }} | {{ title }}

_pages/blog.md

@@ -1,6 +1,9 @@
 ---
 layout: default
+permalink: /blog/
 title: blog
+nav: true
+nav_order: 1
 pagination:
   enabled: true
   collection: posts

_pages/cv.md

@@ -3,7 +3,7 @@ layout: cv
 permalink: /cv/
 title: cv
 nav: true
-nav_order: 4
+nav_order: 5
 cv_pdf: example_pdf.pdf
 description: This is a description of the page. You can modify it in '_pages/cv.md'. You can also change or remove the top pdf download button.
 toc:

_pages/dropdown.md

@@ -2,7 +2,7 @@
 layout: page
 title: submenus
 nav: true
-nav_order: 7
+nav_order: 8
 dropdown: true
 children:
     - title: publications
@@ -10,4 +10,7 @@ children:
     - title: divider
     - title: projects
       permalink: /projects/
+    - title: divider
+    - title: blog
+      permalink: /blog/
 ---

_pages/profiles.md

@@ -4,7 +4,7 @@ permalink: /people/
 title: people
 description: members of the lab or group
 nav: true
-nav_order: 6
+nav_order: 7
 
 profiles:
   # if you want to include more than one profile, just replicate the following block

_pages/projects.md

@@ -4,7 +4,7 @@ title: projects
 permalink: /projects/
 description: A growing collection of your cool projects.
 nav: true
-nav_order: 2
+nav_order: 3
 display_categories: [work, fun]
 horizontal: false
 ---

_pages/publications.md

@@ -4,7 +4,7 @@ permalink: /publications/
 title: publications
 description: publications by categories in reversed chronological order. generated by jekyll-scholar.
 nav: true
-nav_order: 1
+nav_order: 2
 ---
 <!-- _pages/publications.md -->
 <div class="publications">

_pages/repositories.md

@@ -4,7 +4,7 @@ permalink: /repositories/
 title: repositories
 description: Edit the `_data/repositories.yml` and change the `github_users` and `github_repos` lists to include your own GitHub profile and repositories.
 nav: true
-nav_order: 3
+nav_order: 4
 ---
 
 ## GitHub users

_pages/teaching.md

@@ -4,7 +4,7 @@ permalink: /teaching/
 title: teaching
 description: Materials for courses you taught. Replace this text with your description.
 nav: true
-nav_order: 5
+nav_order: 6
 ---
 
 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.