root index and better url handling

Author: jamiebuilds

_includes/navigation.html

@@ -2,7 +2,12 @@
 
 <nav class="navbar navbar-static-top navbar-light">
   <div class="container">
-    <a href="/{{vars_active_language.tag}}/" class="navbar-brand">Yarn</a>
+
+    {% if vars_active_language.tag == "en" %}
+      <a href="{{site.baseurl}}/" class="navbar-brand">Yarn</a>
+    {% else %}
+      <a href="{{url_base}}/" class="navbar-brand">Yarn</a>
+    {% endif %}
 
     <button class="navbar-toggler hidden-lg-up pull-xs-right" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="exCollapsingNavbar2" aria-expanded="false" aria-label="Toggle navigation">
       <!-- &#9776; -->
@@ -11,13 +16,13 @@
     <div class="collapse navbar-toggleable-md" id="navbar">
       <ul class="nav navbar-nav">
         <li class="nav-item">
-          <a class="nav-link" href="/{{vars_active_language.tag}}/docs/getting-started">{{i18n.site_nav_getting_started}}</a>
+          <a class="nav-link" href="{{url_base}}/docs/getting-started">{{i18n.site_nav_getting_started}}</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="/{{vars_active_language.tag}}/docs">{{i18n.site_nav_documentation}}</a>
+          <a class="nav-link" href="{{url_base}}/docs">{{i18n.site_nav_documentation}}</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="/blog">{{i18n.site_nav_blog}}</a>
+          <a class="nav-link" href="{{site.baseurl}}/blog">{{i18n.site_nav_blog}}</a>
         </li>
       </ul>
 
@@ -30,7 +35,7 @@
           <div class="dropdown-menu" aria-labelledby="dropdownNavLanguage">
             {% for language in site.data.languages %}
               {% if language.enabled %}
-                <a href="/{{language.tag}}/{{vars_url_relative}}"
+                <a href="{{site.baseurl}}/{{language.tag}}/{{vars_url_relative}}"
                   class="dropdown-item{% if vars_active_language.tag == language.tag %} active{% endif %}">
                   {{language.name}}
                 </a>

_includes/vars.html

@@ -1,6 +1,6 @@
-{% assign vars_url_parts = page.url | split: '/' | shift %}
+{% assign vars_url_parts = page.url | split: "/" | shift %}
 {% assign vars_url_language = vars_url_parts[0] %}
-{% assign vars_url_relative = vars_url_parts | shift | join: '/' | replace: '.html', '' %}
+{% assign vars_url_relative = vars_url_parts | shift | join: "/" | replace: ".html", "" %}
 
 {% assign vars_temp_matched_languages = site.data.languages | where: "tag", vars_url_language %}
 {% assign vars_active_language = vars_temp_matched_languages[0] %}
@@ -10,3 +10,5 @@
 {% endunless %}
 
 {% assign i18n = site.data.i18n[vars_active_language.tag] %}
+
+{% assign url_base = site.baseurl | append: "/" | append: vars_active_language.tag %}

en/index.html

@@ -1,4 +1,3 @@
 ---
 layout: pages/homepage
-redirect_from: /
 ---

index.html

@@ -0,0 +1,4 @@
+---
+layout: pages/homepage
+redirect_from: /en/
+---