Fixes and enhancements. [7]

_config.yml

@@ -217,7 +217,13 @@ post_meta:
   created_at: true
   updated_at: false
   categories: true
-
+
+# Post wordcount display settings
+# Dependies: https://github.com/willin/hexo-wordcount
+post_wordcount:
+  item_text: true
+  wordcount: false
+  min2read: false
 
 # Wechat Subscriber
 #wechat_subscriber:
@@ -300,10 +306,13 @@ mathjax:
 # See: https://www.google.com/webmasters/
 #google_site_verification:
 
-
 # Google Analytics
 #google_analytics:
 
+# Yandex Webmaster tools verification setting
+# See: https://webmaster.yandex.ru/
+#yandex_site_verification:
+
 # CNZZ count
 #cnzz_siteid:
 
@@ -339,6 +348,15 @@ facebook_comments_plugin:
   width: 100%       # default width is 550px
   scheme: light     # default scheme is light (light or dark)
 
+# VKontakte API Support.
+# To get your AppID visit https://vk.com/editapp?act=create
+vkontakte_api:
+  enable: false
+  app_id:       #<app_id>
+  like:         true
+  comments:     true
+  num_of_posts: 10
+
 
 # Show number of visitors to each article.
 # You can visit https://leancloud.cn get AppID and AppKey.

languages/default.yml

@@ -2,6 +2,7 @@ title:
   archive: Archive
   category: Category
   tag: Tag
+  schedule: Schedule
 
 author: Author
 
@@ -12,6 +13,7 @@ menu:
   tags: Tags
   about: About
   search: Search
+  schedule: Schedule
   sitemap: Sitemap
 
 sidebar:
@@ -28,6 +30,8 @@ post:
   untitled: Untitled
   toc_empty: This post does not have a Table of Contents
   visitors: Visitors
+  wordcount: Words count in article
+  min2read: Reading time
 
 page:
   totally: Totally

languages/en.yml

@@ -1,19 +1,19 @@
 title:
   archive: Archive
   category: Category
-  schedule: Schedule
   tag: Tag
+  schedule: Schedule
 
 author: Author
 
 menu:
   home: Home
   archives: Archives
   categories: Categories
-  schedule: Schedule
   tags: Tags
   about: About
   search: Search
+  schedule: Schedule
   sitemap: Sitemap
 
 sidebar:
@@ -30,6 +30,8 @@ post:
   untitled: Untitled
   toc_empty: This post does not have a Table of Contents
   visitors: Visitors
+  wordcount: Words count in article
+  min2read: Reading time
 
 page:
   totally: Totally

languages/ru.yml

@@ -2,6 +2,7 @@ title:
   archive: Архив
   category: Категория
   tag: Тэг
+  schedule: Календарь
 
 author: Author
 
@@ -12,6 +13,7 @@ menu:
   tags: Тэги
   about: О сайте
   search: Поиск
+  schedule: Календарь
   sitemap: Карта сайта
 
 sidebar:
@@ -28,6 +30,8 @@ post:
   untitled: Без имени
   toc_empty: Эта запись без оглавления
   visitors: Просмотров
+  wordcount: Кол-во слов в статье
+  min2read: Время чтения в минутах
 
 page:
   totally: Всего

layout/_macro/post.swig

@@ -172,11 +172,6 @@
             {% endif %}
           {% endif %}
 
-          {% if not is_index and theme.facebook_sdk.enable and theme.facebook_sdk.like_button %}
-            <span class="post-meta-divider">|</span>
-            <div class="fb-like" data-layout="button_count" data-share="true"></div>
-          {% endif %}
-
           {# LeanCould PageView #}
           {% if theme.leancloud_visitors.enable %}
              <span id="{{ url_for(post.path) }}" class="leancloud_visitors" data-flag-title="{{ post.title }}">
@@ -198,6 +193,38 @@
             </span>
           {% endif %}
 
+          {% if theme.post_wordcount.wordcount or theme.post_wordcount.min2read %}
+            <div class="post-wordcount">
+              {% if theme.post_wordcount.wordcount %}
+                <span class="post-meta-item-icon">
+                  <i class="fa fa-file-word-o"></i>
+                </span>
+                  {% if theme.post_wordcount.item_text %}
+                    <span class="post-meta-item-text">{{ __('post.wordcount') }}</span>
+                  {% endif %}
+                    <span title="{{ __('post.wordcount') }}" }}">
+                      {{ wordcount(post.content) }}
+                    </span>
+              {% endif %}
+
+              {% if theme.post_wordcount.wordcount and theme.post_wordcount.min2read %}
+                <span class="post-meta-divider">|</span>
+              {% endif %}
+
+              {% if theme.post_wordcount.min2read %}
+                <span class="post-meta-item-icon">
+                  <i class="fa fa-clock-o"></i>
+                </span>
+                  {% if theme.post_wordcount.item_text %}
+                    <span class="post-meta-item-text">{{ __('post.min2read') }}</span>
+                  {% endif %}
+                    <span title="{{ __('post.min2read') }}" }}">
+                      {{ min2read(post.content) }}
+                    </span>
+              {% endif %}
+            </div>
+          {% endif %}
+
           {% if post.description and (not theme.excerpt_description or not is_index) %}
               <div class="post-description">
                   {{ post.description }}
@@ -294,6 +321,24 @@
         </div>
       {% endif %}
 
+      {% if not is_index %}
+        {% if (theme.vkontakte_api.enable and theme.vkontakte_api.like) or (theme.facebook_sdk.enable and theme.facebook_sdk.like_button) %}
+          <div class="social-like">
+            {% if theme.vkontakte_api.enable and theme.vkontakte_api.like %}
+              <div class="vk_like">
+                <span id="vk_like"></span>
+              </div>
+            {% endif %}
+
+            {% if theme.facebook_sdk.enable and theme.facebook_sdk.like_button %}
+              <div class="fb_like">
+                <div class="fb-like" data-layout="button_count" data-share="true"></div>
+              </div>
+            {% endif %}
+          </div>
+        {% endif %}
+      {% endif %}
+
       {% if not is_index and (post.prev or post.next) %}
         <div class="post-nav">
           <div class="post-nav-next post-nav-item">

layout/_partials/comments.swig

@@ -11,6 +11,8 @@
            data-width="{{ theme.facebook_comments_plugin.width }}"
            data-colorscheme="{{ theme.facebook_comments_plugin.scheme }}">
       </div>
+    {% elseif theme.vkontakte_api.enable and theme.vkontakte_api.comments %}
+      <div id="vk_comments"></div>
     {% elseif theme.disqus_shortname %}
       <div id="disqus_thread">
         <noscript>

layout/_partials/head.swig

@@ -13,6 +13,11 @@
 {% endif %}
 
 
+{% if theme.yandex_site_verification %}
+  <meta name="yandex-verification" content="{{ theme.yandex_site_verification }}" />
+{% endif %}
+
+
 {% if theme.baidu_site_verification %}
   <meta name="baidu-site-verification" content="{{ theme.baidu_site_verification }}" />
 {% endif %}

layout/_scripts/third-party/analytics.swig

@@ -1,6 +1,7 @@
 {% include 'analytics/facebook-sdk.swig' %}
+{% include 'analytics/vkontakte-api.swig' %}
 {% include 'analytics/google-analytics.swig' %}
 {% include 'analytics/baidu-analytics.swig' %}
 {% include 'analytics/tencent-analytics.swig' %}
 {% include 'analytics/cnzz-analytics.swig' %}
-{% include 'analytics/application-insights.swig' %}
+{% include 'analytics/application-insights.swig' %}

layout/_scripts/third-party/analytics/vkontakte-api.swig

@@ -0,0 +1,27 @@
+{% if theme.vkontakte_api.enable %}
+
+	<div id="vk_api_transport"></div>
+	<script type="text/javascript">
+		window.vkAsyncInit = function() {
+			VK.init({
+				apiId: {{ theme.vkontakte_api.app_id }}
+			});
+
+			{% if theme.vkontakte_api.like %}
+				VK.Widgets.Like("vk_like", {type: "mini", height: 20});
+			{% endif %}
+
+			{% if page.comments and theme.vkontakte_api.comments %}
+				VK.Widgets.Comments("vk_comments", {limit: {{  theme.vkontakte_api.num_of_posts }}, attach: "*"});
+			{% endif %}
+		};
+		setTimeout(function() {
+			var el = document.createElement("script");
+			el.type = "text/javascript";
+			el.src = "//vk.com/js/api/openapi.js";
+			el.async = true;
+			document.getElementById("vk_api_transport").appendChild(el);
+		}, 0);
+	</script>
+
+{% endif %}

source/css/_common/components/post/post-meta.styl

@@ -43,3 +43,25 @@
 .posts-expand .post-comments-count {
   +mobile() { display: none; }
 }
+.social-like {
+  font-size: 14px;
+  height: 20px;
+  text-align: center;
+  border-top: 1px solid #eee;
+  padding-top: 9px;
+  margin-top: 45px;
+  display: flex;
+  justify-content: center;
+}
+
+.vk_like {
+  width: 85px;
+  height: 21px;
+  padding-top: 7px;
+  align-self: center;
+}
+
+.fb_like {
+  height: 30px;
+  align-self: center;
+}

source/css/_common/components/post/post-nav.styl

@@ -1,6 +1,6 @@
 .post-nav {
   display: table;
-  margin-top: 60px;
+  margin-top: 15px;
   width: 100%;
   border-top: 1px solid $gainsboro;
 }