Now blog can be reorganized in header (alshedivat#1996)

Fixes alshedivat#1559 alshedivat#1795

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

_config.yml

@@ -123,7 +123,6 @@ bing_site_verification:  # out your bing-site-verification ID (Bing Webmaster)
 # -----------------------------------------------------------------------------
 
 blog_name: # blog_name will be displayed in your blog page, disable block
-blog_nav_title: # your blog must have a title for it to be displayed in the nav bar
 blog_description:
 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 }}

blog/index.html → _pages/blog.md

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

_pages/projects.md

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

_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">