From 68f4d640d6217e7331c5e7dfd01680314b166178 Mon Sep 17 00:00:00 2001
From: Damien CORNEAU <corneadoug@gmail.com>
Date: Wed, 7 Sep 2016 15:02:57 +0900
Subject: [PATCH 1/2] Backport
 https://github.com/plusjade/jekyll-bootstrap/pull/293

---
 _includes/JB/setup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_includes/JB/setup b/_includes/JB/setup
index 96a4a8d4514..2b0bf704dc5 100644
--- a/_includes/JB/setup
+++ b/_includes/JB/setup
@@ -17,7 +17,7 @@
     {% if site.JB.ASSET_PATH %}
       {% assign ASSET_PATH = site.JB.ASSET_PATH %}
     {% else %}
-      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
-    {% endif %}  
+      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{% if page.theme.name %}{{ page.theme.name }}{% else if %}{{ layout.theme.name }}{% endif %}{% endcapture %}
+    {% endif %}
   {% endif %}
-{% endcapture %}{% assign jbcache = nil %}
\ No newline at end of file
+{% endcapture %}{% assign jbcache = nil %}

From f774bb0a6e171e45ba5ff77d421b49dfb5dd96c6 Mon Sep 17 00:00:00 2001
From: Damien CORNEAU <corneadoug@gmail.com>
Date: Wed, 7 Sep 2016 15:17:01 +0900
Subject: [PATCH 2/2] Add extension to pages_list links

---
 _includes/JB/pages_list | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/JB/pages_list b/_includes/JB/pages_list
index 181d90fb139..7856efdbc36 100644
--- a/_includes/JB/pages_list
+++ b/_includes/JB/pages_list
@@ -28,9 +28,9 @@ Usage:
       {% for cat in node.group %}
         {% if cat == group %}
           {% if page.url == node.url %}
-            <li class="active"><a href="{{ BASE_PATH }}{{node.url}}" class="active">{{node.title}}</a></li>
+            <li class="active"><a href="{{ BASE_PATH }}{{node.url}}.html" class="active">{{node.title}}</a></li>
           {% else %}
-            <li><a href="{{ BASE_PATH }}{{node.url}}">{{node.title}}</a></li>
+            <li><a href="{{ BASE_PATH }}{{node.url}}.html">{{node.title}}</a></li>
           {% endif %}
         {% endif %}
       {% endfor %}