From d2dec34f6bc3b7997c6b4c71bc7b9fc4cf5989c2 Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Fri, 24 Mar 2017 20:01:23 +0300
Subject: [PATCH] some site fixes

---
 _config.yml           |  9 +++------
 _layouts/default.html | 10 +++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/_config.yml b/_config.yml
index 7129575..0db1f1c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,7 +1,7 @@
 source:      .
 destination: ./_site
-plugins:     ./_plugins
-layouts:     ./_layouts
+plugins_dir: ./_plugins
+layouts_dir: ./_layouts
 include:     ['.htaccess']
 exclude:     ['.gitignore','Gemfile','Gemfile.lock','README.md']
 keep_files:  ['.git','.svn']
@@ -12,9 +12,6 @@ future:      true
 limit_posts: 0
 highlighter: pygments
 
-# dropped in 3.0
-#relative_permalinks: true
-
 permalink:     pretty
 paginate_path: 'blog/:num'
 
@@ -52,7 +49,7 @@ kramdown:
   entity_output: as_char
   toc_levels: 1..6
   smart_quotes: lsquo,rsquo,ldquo,rdquo
-  use_coderay: false
+  enable_coderay: false
 
   coderay:
     coderay_wrap: div
diff --git a/_layouts/default.html b/_layouts/default.html
index 7b82f8a..a5bb414 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -28,25 +28,25 @@
       </script>
     <![endif]-->
     {% include google_analytics.html %}
-    {% if page.share == true %}
+    {% if page.share == true or layout.share == true %}
       {% include header_sharethis.html %}
     {% endif %}
   </head>
 
 {{ content }}
 
-{% if page.comment == true %}
+{% if page.comment == true or layout.comment == true %}
   {% include comment.html %}
 {% endif %}
 
       </section>
       <footer>
-        {% if page.back == 1 %}
+        {% if page.back == 1 or layout.back == 1 %}
           {% include footer_back.html %}
-        {% elsif page.back == 2 %}
+        {% elsif page.back == 2 or layout.back == 2 %}
           {% include footer_fullback.html %}
         {% endif %}
-        {% if page.share == true %}
+        {% if page.share == true or layout.share == true %}
           {% include footer_sharethis.html %}
         {% endif %}
         {% include footer_sign.html %}