diff --git a/.gitignore b/.gitignore
index 7c37bcaa9..4d8fc240c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
npm-debug.log
_config.viosey.yml
+
+node_modules
diff --git a/_config.yml b/_config.yml
index f6c720d97..b4180622a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,7 +13,7 @@ head:
url:
rss:
daily_pic: "#"
- logo:
+ logo: "#"
# ---------------------------------------------------------------
@@ -85,15 +85,17 @@ fonts: Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "
# SNS Menu
sns:
email: youremail@email.com
- twitter: "https://twitter.com/twitter"
facebook: "https://www.facebook.com/facebook"
+ twitter: "https://twitter.com/twitter"
googleplus: "https://www.google.com/"
- weibo:
- instagram:
- tumblr:
- github:
- linkedin:
- zhihu:
+ weibo:
+ instagram:
+ tumblr:
+ github:
+ linkedin:
+ zhihu:
+ bilibili:
+ telegram:
# SNS Share Switch
sns_share:
@@ -116,7 +118,9 @@ sidebar_categories: false
# Pages Menu
pages:
- #about: "/about"
+ #About:
+ #link: "/about"
+ #icon: person
# Qrcode for redirect at other device
qrcode: false
@@ -126,12 +130,12 @@ qrcode: false
# ---------------------------------------------------------------
# Comment Systems
-# Available value:
+# Available value of "use":
# duoshuo | disqus
comment:
use:
shortname:
- duoshuo_thread_key: path
+ duoshuo_thread_key_type: path
duoshuo_embed_js_url: "https://static.duoshuo.com/embed.js"
# Search Systems
diff --git a/languages/ar.yml b/languages/ar.yml
index c7a51a8fa..a0394a76f 100644
--- a/languages/ar.yml
+++ b/languages/ar.yml
@@ -9,16 +9,20 @@ post:
older: "أقدم"
newer: "أحدث"
private: "منشور خاص, مخفي مؤقتا"
+ qrcode: "اقرأ هذا المقال على جهاز آخر"
share:
article_rss: "مقالات RSS"
comment_rss: "تعليقات RSS"
toTwitter: "شارك على Twitter"
+ toFacebook: "شارك على Facebook"
toLinkedIn: "شارك على LinkedIn"
+ toTelegram: "شارك على Telegram"
toGplus: "شارك على Google+"
toWeibo: "شارك على Weibo"
+ toQQ: "شارك على QQ"
title:
category: "فئة"
tag: "وسم"
misc:
home: "رئيسية"
- theme: "سمة"
+ theme: "سمة"
\ No newline at end of file
diff --git a/languages/de.yml b/languages/de.yml
index 2da04ee68..57dc879db 100644
--- a/languages/de.yml
+++ b/languages/de.yml
@@ -9,16 +9,20 @@ post:
older: "Älteren"
newer: "Neuren"
private: "Private Beiträge sind temporär verborgen"
+ qrcode: "Lesen Sie diesen Artikel auf anderem Gerät"
share:
article_rss: "Artikel als RSS"
comment_rss: "Kommentare als RSS"
toTwitter: "Auf Twitter teilen"
+ toFacebook: "Auf Facebook teilen"
toLinkedIn: "Auf LinkedIn teilen"
+ toTelegram: "Auf Telegram teilen"
toGplus: "Auf Google+ teilen"
toWeibo: "Auf Weibo teilen"
+ toQQ: "Auf QQ teilen"
title:
category: "Kategorie"
tag: "Tag"
misc:
home: "Home"
- theme: "Theme"
+ theme: "Theme"
\ No newline at end of file
diff --git a/languages/en.yml b/languages/en.yml
index 418e2d61e..21b99bccc 100755
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -1,7 +1,7 @@
sidebar:
homepage: "Home"
archive: "Archives"
- article_num: "Article Number"
+ article_num: "Number of articles"
post:
visitor: "Visitors"
views: "Views"
@@ -16,12 +16,12 @@ share:
toTwitter: "Share to Twitter"
toFacebook: "Share to Facebook"
toLinkedIn: "Share to LinkedIn"
+ toTelegram: "Share to Telegram"
toGplus: "Share to Google+"
toWeibo: "Share to Weibo"
toQQ: "Share to QQ"
- toTelegram: "Share to Telegram"
title:
- category: "Category"
+ category: "Categories"
tag: "Tag"
misc:
home: "Home"
diff --git a/languages/es.yml b/languages/es.yml
index 02054eae3..521ae19ab 100755
--- a/languages/es.yml
+++ b/languages/es.yml
@@ -9,16 +9,20 @@ post:
older: "Mayor"
newer: "Más nuevo"
private: "Mensajes privados, ocultar temporalmente"
+ qrcode: "Lea este artículo en otro dispositivo"
share:
article_rss: "Artículo RSS"
comment_rss: "Comentario RSS"
toTwitter: "Compartir en Twitter"
+ toFacebook: "Compartir en Facebook"
toLinkedIn: "Compartir en LinkedIn"
+ toTelegram: "Compartir en Telegram"
toGplus: "Compartir en Google+"
toWeibo: "Compartir en Weibo"
+ toQQ: "Compartir en QQ"
title:
category: "Categoría"
tag: "Etiqueta"
misc:
home: "Casa"
- theme: "tema"
+ theme: "tema"
\ No newline at end of file
diff --git a/languages/fr.yml b/languages/fr.yml
index 4461b5c72..80081abbb 100755
--- a/languages/fr.yml
+++ b/languages/fr.yml
@@ -1,24 +1,28 @@
sidebar:
homepage: "Accueil"
archive: "Archives"
- article_num: "Numéro d'article"
+ article_num: "Nombre d'articles"
post:
visitor: "Visiteurs"
views: "Vues"
continue: "Continuer la lecture"
older: "Ancien"
newer: "Récent"
- private: "Post privé, caché temporairement"
+ private: "Article privé, caché temporairement"
+ qrcode: "Lire cet article depuis un autre appareil"
share:
- article_rss: "Flux RSS articles"
- comment_rss: "Flux RSS commentaires"
+ article_rss: "Flux RSS des articles"
+ comment_rss: "Flux RSS des commentaires"
toTwitter: "Partager sur Twitter"
+ toFacebook: "Partager sur Facebook"
toLinkedIn: "Partager sur LinkedIn"
+ toTelegram: "Partager sur Telegram"
toGplus: "Partager sur Google+"
toWeibo: "Partager sur Weibo"
+ toQQ: "Partager sur QQ"
title:
- category: "Categorie"
- tag: "Tag"
+ category: "Catégorie"
+ tag: "Libellé"
misc:
home: "Accueil"
- theme: "Theme"
+ theme: "Thème"
diff --git a/languages/ja.yml b/languages/ja.yml
index 14fdf7a1f..1ce4fed0a 100755
--- a/languages/ja.yml
+++ b/languages/ja.yml
@@ -9,16 +9,20 @@ post:
older: "古い"
newer: "新しい"
private: "プライベート記事、一時的に非表示にします"
+ qrcode: "他のデバイスでこの記事を読む"
share:
article_rss: "記事 RSS"
comment_rss: "論評 RSS"
toTwitter: "Twitter での共有"
+ toFacebook: "Share to Facebook"
toLinkedIn: "LinkedIn での共有"
+ toTelegram: "Telegram での共有"
toGplus: "Google+ での共有"
toWeibo: "Weibo での共有"
+ toQQ: "Share to QQ"
title:
category: "カテゴリー"
tag: "ラベル"
misc:
home: "ホーム"
- theme: "テーマ"
+ theme: "テーマ"
\ No newline at end of file
diff --git a/languages/ms.yml b/languages/ms.yml
index 0ec644bca..a2c0594bc 100644
--- a/languages/ms.yml
+++ b/languages/ms.yml
@@ -9,16 +9,20 @@ post:
older: "Lama"
newer: "Baru"
private: "Siaran peribadi, disembunyikan buat sementara"
+ qrcode: "Baca artikel ini pada peranti lain"
share:
article_rss: "RSS Artikel"
comment_rss: "RSS Ulasan"
toTwitter: "Kongsi ke Twitter"
+ toFacebook: "Kongsi ke Facebook"
toLinkedIn: "Kongsi ke LinkedIn"
+ toTelegram: "Kongsi ke Telegram"
toGplus: "Kongsi ke Google+"
toWeibo: "Kongsi ke Weibo"
+ toQQ: "Kongsi ke QQ"
title:
category: "Kategori"
tag: "Tag"
misc:
home: "Laman"
- theme: "Tema"
+ theme: "Tema"
\ No newline at end of file
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
index c9be6e801..4956eb3f3 100755
--- a/languages/zh-CN.yml
+++ b/languages/zh-CN.yml
@@ -16,13 +16,13 @@ share:
toTwitter: "分享到 Twitter"
toFacebook: "分享到 Facebook"
toLinkedIn: "分享到 LinkedIn"
+ toTelegram: "分享到 Telegram"
toGplus: "分享到 Google+"
toWeibo: "分享到微博"
toQQ: "分享到 QQ"
- toTelegram: "分享到 Telegram"
title:
category: "分类"
tag: "标签"
misc:
home: "主页"
- theme: "主题"
+ theme: "主题"
\ No newline at end of file
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
index cd032dab6..c855a08c0 100755
--- a/languages/zh-TW.yml
+++ b/languages/zh-TW.yml
@@ -16,13 +16,13 @@ share:
toTwitter: "分享到 Twitter"
toFacebook: "分享到 Facebook"
toLinkedIn: "分享到 LinkedIn"
+ toTelegram: "分享到 Telegram"
toGplus: "分享到 Google+"
toWeibo: "分享到微博"
toQQ: "分享到 QQ"
- toTelegram: "分享到 Telegram"
title:
category: "分類"
tag: "標籤"
misc:
home: "主頁"
- theme: "主題"
+ theme: "主題"
\ No newline at end of file
diff --git a/layout/_partial/Isolation-post_entry.ejs b/layout/_partial/Isolation-post_entry.ejs
index 5c97a3b83..ad45d1057 100644
--- a/layout/_partial/Isolation-post_entry.ejs
+++ b/layout/_partial/Isolation-post_entry.ejs
@@ -1,73 +1,71 @@
+
+ <% if(post.thumbnail == undefined) { %>
+
+
-
- <% if(post.thumbnail == undefined){ %>
-
-
-
-
-
- <% } else { %>
-
-
-
-
-
-
![](<%= post.thumbnail %>)
- <% } %>
-
-
-
+
+
+ <% } else { %>
+
+
+
+
+
+
![](<%= post.thumbnail %>)
+ <% } %>
+
+
+
-
-
- <%= post.title %>
-
-
-
-
- <%if(post.excerpt){%>
- <%- strip_html(post.excerpt) %>
- <%}else{%>
- <%- strip_html(truncate(post.content,{length: theme.reading.entry_excerpt })) %>
- <%}%>
-
-
- <%= __('post.continue') %>
-
-
-
-
- <%- list_tags(post.tags, {
- show_count: false,
- class: 'post_entry-tags',
- style: 'list',
- separator: ''
+
+
+ <%= post.title %>
+
+
+
+
+ <%if(post.excerpt) {%>
+ <%- strip_html(post.excerpt) %>
+ <%}else{%>
+ <%- strip_html(truncate(post.content,{length: theme.reading.entry_excerpt })) %>
+ <%}%>
+
+
+ <%= __('post.continue') %>
+
+
+
+
+ <%- list_tags(post.tags, {
+ show_count: false,
+ class: 'post_entry-tags',
+ style: 'list',
+ separator: ''
}) %>
-
-
-
-
-
\ No newline at end of file
+
+
+
+
diff --git a/layout/_partial/Paradox-post-info.ejs b/layout/_partial/Paradox-post-info.ejs
index 9668a813a..d95fdb765 100755
--- a/layout/_partial/Paradox-post-info.ejs
+++ b/layout/_partial/Paradox-post-info.ejs
@@ -13,15 +13,15 @@
-
+
- <% if(theme.qrcode == true){ %>
+ <% if(theme.qrcode == true) { %>
diff --git a/layout/_partial/Paradox-post-thumbnail.ejs b/layout/_partial/Paradox-post-thumbnail.ejs
index 90891d1bf..857671deb 100755
--- a/layout/_partial/Paradox-post-thumbnail.ejs
+++ b/layout/_partial/Paradox-post-thumbnail.ejs
@@ -1,8 +1,5 @@
diff --git a/layout/_partial/Paradox-post_entry-thumbnail.ejs b/layout/_partial/Paradox-post_entry-thumbnail.ejs
index 7a87b47d7..c71f5e851 100755
--- a/layout/_partial/Paradox-post_entry-thumbnail.ejs
+++ b/layout/_partial/Paradox-post_entry-thumbnail.ejs
@@ -1,16 +1,13 @@
diff --git a/layout/_partial/Paradox-post_entry.ejs b/layout/_partial/Paradox-post_entry.ejs
index acb3f4417..7de7961d3 100755
--- a/layout/_partial/Paradox-post_entry.ejs
+++ b/layout/_partial/Paradox-post_entry.ejs
@@ -1,26 +1,25 @@
-
- <% if(post.thumbnail == undefined){ %>
- <% if(theme.thumbnail.purecolor == undefined){ %>
-
-
- <% } else { %>
-
-
- <% } %>
- <% } else { %>
-
-
+ <% if(!post.thumbnail) { %>
+ <% if(!theme.thumbnail.purecolor) { %>
+
+
+ <% } else { %>
+
+
+ <% } %>
+ <% } else { %>
+
+
- <%if(post.excerpt){%>
+ <%if(post.excerpt) {%>
<%- strip_html(post.excerpt) %>
<%}else{%>
<%- strip_html(truncate(post.content,{length: theme.reading.entry_excerpt })) %>
@@ -51,20 +50,18 @@
style: 'none'
}) %>
-
- <% if(theme.comment.use == "duoshuo"){ %>
+
+ <% if(theme.comment.use == "duoshuo") { %>
|
<% } %>
-
+
-
-
diff --git a/layout/_partial/Paradox-search.ejs b/layout/_partial/Paradox-search.ejs
index 4c2b96228..01a16f9af 100644
--- a/layout/_partial/Paradox-search.ejs
+++ b/layout/_partial/Paradox-search.ejs
@@ -1,46 +1,44 @@
-<% if( theme.search.use == "google" ){ %>
-
-
-
+<% if( theme.search.use === 'google' ) { %>
+
+
+
-
-
+
+
<% } %>
-<% if( theme.search.use == "swiftype" ){ %>
-
-
-
+<% if( theme.search.use === 'swiftype' ) { %>
+
+
+
-
-
+
+
<% } %>
-<% if( theme.search.use == "local" ){ %>
-
-
-
-
-
-
+<% if( theme.search.use === 'local' ) { %>
+
+
+
-
-<% } %>
\ No newline at end of file
+
+
+
+<% } %>
diff --git a/layout/_partial/blog_info.ejs b/layout/_partial/blog_info.ejs
index 35f316e2d..7719a9d2c 100755
--- a/layout/_partial/blog_info.ejs
+++ b/layout/_partial/blog_info.ejs
@@ -2,11 +2,11 @@
- <%- partial("_partial/Paradox-search") %>
+ <%- partial('_partial/Paradox-search') %>
-
+
@@ -25,9 +25,9 @@
Pages
diff --git a/layout/_partial/comment.ejs b/layout/_partial/comment.ejs
index 7e24cc084..c38a12cf3 100755
--- a/layout/_partial/comment.ejs
+++ b/layout/_partial/comment.ejs
@@ -1,17 +1,17 @@
-<% if(theme.comment.use == "duoshuo"){ %>
+<% if(theme.comment.use === 'duoshuo') { %>
- <%- partial("_widget/duoshuo") %>
+ <%- partial('_widget/duoshuo') %>
<% } %>
-<% if(theme.comment.use == "disqus"){ %>
+<% if(theme.comment.use === 'disqus') { %>
-
-
-<% } %>
\ No newline at end of file
+
+
+<% } %>
diff --git a/layout/_partial/config_css.ejs b/layout/_partial/config_css.ejs
index eb6271b30..e202f69b1 100644
--- a/layout/_partial/config_css.ejs
+++ b/layout/_partial/config_css.ejs
@@ -3,14 +3,14 @@
-<% if(theme.background.bing.enable == true){ %>
+<% if(theme.background.bing.enable === true) { %>
-<% } else if(theme.background.bgimg == undefined){ %>
+<% } else if(!theme.background.bgimg) { %>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/layout/_partial/daily_pic.ejs b/layout/_partial/daily_pic.ejs
index 7d5c9b08c..3bbdde649 100755
--- a/layout/_partial/daily_pic.ejs
+++ b/layout/_partial/daily_pic.ejs
@@ -1,15 +1,15 @@
-
+
diff --git a/layout/_partial/footer-left.ejs b/layout/_partial/footer-left.ejs
index 91fc18280..2a68b0c7a 100644
--- a/layout/_partial/footer-left.ejs
+++ b/layout/_partial/footer-left.ejs
@@ -1,73 +1,100 @@
diff --git a/layout/_partial/footer-option.ejs b/layout/_partial/footer-option.ejs
index a9e37a7c4..5ad22795f 100644
--- a/layout/_partial/footer-option.ejs
+++ b/layout/_partial/footer-option.ejs
@@ -1,34 +1,37 @@
-<% if(theme.leancloud.enable == true){ %>
+<% if(theme.leancloud.enable === true) { %>
-
-
+
+
<%- partial("_widget/leancloud-views") %>
<% } %>
-<% if(theme.busuanzi.enable == true){ %>
+<% if(theme.busuanzi.enable === true) { %>
<% } %>
-<% if(theme.comment.use == "duoshuo"){ %>
+<% if(theme.comment.use == "duoshuo") { %>
<% } %>
-<% if(theme.comment.use == "disqus"){ %>
+<% if(theme.comment.use === 'disqus') { %>
-
-<% } %>
\ No newline at end of file
+
+<% } %>
diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
index 82da741bc..23a5aae08 100755
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@@ -1,29 +1,34 @@
\ No newline at end of file
+
+ <% } %>
+
diff --git a/layout/_partial/footer_top.ejs b/layout/_partial/footer_top.ejs
index 298375b92..2f39d7e42 100755
--- a/layout/_partial/footer_top.ejs
+++ b/layout/_partial/footer_top.ejs
@@ -2,4 +2,4 @@
-
\ No newline at end of file
+
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index f0a34b1ff..5523d43c2 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -1,38 +1,43 @@
-
+ Version: 1.2.6 -->
+
<%
var title = page.title;
- if (is_archive()){
- title = __("sidebar.archive");
+ if (is_archive()) {
+ title = __('sidebar.archive');
- if (is_month()){
+ if (is_month()) {
title += ': ' + page.year + '/' + page.month;
- } else if (is_year()){
+ }
+ else if (is_year()) {
title += ': ' + page.year;
}
- } else if (is_category()){
- title = __("title.category") + ': ' + page.category;
- } else if (is_tag()){
- title = __("title.tag") + ': ' + page.tag;
+ }
+ else if (is_category()) {
+ title = __('title.category') + ': ' + page.category;
+ }
+ else if (is_tag()) {
+ title = __('title.tag') + ': ' + page.tag;
}
%>
- <% if (title){ %><%= title %> | <% } %><%= config.title %>
+ <% if (title) { %>
+ <%= title + ' | ' %>
+ <% } %>
+ <%= config.title %>
-
+
-
-
+
+
@@ -40,7 +45,7 @@
-
+
@@ -48,53 +53,52 @@
-
+
-
+
-
+
-
+
-
-
-
+
<%- css("css/material.min") %>
<%- css("css/style.min") %>
<%- partial("_partial/config_css") %>
- <%- js("js/jquery.min") %>
-
- <%- css("css/highlight/" + theme.reading.code_highlight ) %>
-
-
-
-
+ <%- js("js/jquery.min") %>
+
+ <%- css("css/highlight/" + theme.reading.code_highlight ) %>
+
+
+
+
- <% if (site.data.head){ %>
- <% for (var i in site.data.head){ %>
-
- <%- site.data.head[i] %>
+ <% if (site.data.head) { %>
+ <% for (var i in site.data.head) { %>
+ <%- site.data.head[i] %>
<% } %>
<% } %>
-
\ No newline at end of file
+
diff --git a/layout/_partial/import_js.ejs b/layout/_partial/import_js.ejs
index 09681487c..196ca42ac 100644
--- a/layout/_partial/import_js.ejs
+++ b/layout/_partial/import_js.ejs
@@ -1,43 +1,47 @@
-<%- js("js/highlight.min") %>
-<%- js("js/js.min") %>
-<%- partial("_partial/nprogress") %>
+<%- js('js/highlight.min') %>
+<%- js('js/js.min') %>
+<%- partial('_partial/nprogress') %>
-<% if( theme.js_effect.smoothscroll == true ){ %>
- <%- js("js/smoothscroll") %>
+<% if( theme.js_effect.smoothscroll === true ) { %>
+ <%- js('js/smoothscroll') %>
<% } %>
-<%- partial("_partial/footer-option") %>
+<%- partial('_partial/footer-option') %>
-<% if( theme.search.use == "swiftype" ){ %>
- <%- partial("_widget/search-swiftype-js") %>
+<% if( theme.search.use === 'swiftype' ) { %>
+ <%- partial('_widget/search-swiftype-js') %>
<% } %>
-<% if( theme.search.use == "local" ){ %>
- <%- partial("_widget/search-local-js") %>
+<% if( theme.search.use === 'local' ) { %>
+ <%- partial('_widget/search-local-js') %>
-
+ if(inputArea) {
+ inputArea.onfocus = function() {
+ getSearchFile();
+ }
+ }
+
<% } %>
-<% if (page.mathjax){ %>
+<% if (page.mathjax) { %>
<%- partial('_widget/mathjax') %>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/layout/_partial/isolate-sns_list.ejs b/layout/_partial/isolate-sns_list.ejs
index 6aebb36bb..4efca7cd5 100644
--- a/layout/_partial/isolate-sns_list.ejs
+++ b/layout/_partial/isolate-sns_list.ejs
@@ -1,65 +1,64 @@
diff --git a/layout/_partial/isolate_info.ejs b/layout/_partial/isolate_info.ejs
index 7066a5569..616f12e7e 100644
--- a/layout/_partial/isolate_info.ejs
+++ b/layout/_partial/isolate_info.ejs
@@ -1,59 +1,59 @@
\ No newline at end of file
+
+ <%- partial('_partial/isolate-sns_list') %>
+
+
diff --git a/layout/_partial/nprogress.ejs b/layout/_partial/nprogress.ejs
index 15f21fe03..8c3022e8e 100755
--- a/layout/_partial/nprogress.ejs
+++ b/layout/_partial/nprogress.ejs
@@ -1,11 +1,11 @@
-<%- js("js/nprogress") %>
+<%- js('js/nprogress') %>
\ No newline at end of file
+
diff --git a/layout/_partial/post-content.ejs b/layout/_partial/post-content.ejs
index a9df5bebd..1ffdadc77 100755
--- a/layout/_partial/post-content.ejs
+++ b/layout/_partial/post-content.ejs
@@ -1,15 +1,14 @@
- <% if(theme.scheme == "Paradox"){ %>
- <%- page.content %>
- <% } %>
-
- <% if(theme.scheme == "Isolation"){ %>
-
-
- <%- page.title %>
-
- <%- page.content %>
-
- <% } %>
-
-
\ No newline at end of file
+ <% if(theme.scheme === 'Paradox') { %>
+ <%- page.content %>
+ <% } %>
+
+ <% if(theme.scheme === 'Isolation') { %>
+
+
+ <%- page.title %>
+
+ <%- page.content %>
+
+ <% } %>
+
diff --git a/layout/_partial/post-header.ejs b/layout/_partial/post-header.ejs
index c204bc840..8d3c9c23b 100755
--- a/layout/_partial/post-header.ejs
+++ b/layout/_partial/post-header.ejs
@@ -1,48 +1,48 @@
-<% if(theme.scheme == "Paradox"){ %>
-
- <% if(page.thumbnail == undefined){ %>
- <% if(theme.thumbnail.purecolor == undefined){%>
-
-
- <%- partial('_partial/Paradox-post-thumbnail') %>
- <% } else { %>
-
-
- <% } %>
- <% }else{ %>
-
-
- <% } %>
-
- <%- page.title%>
-
-
+<% if(theme.scheme === 'Paradox') { %>
+
+ <% if(!page.thumbnail) { %>
+ <% if(!theme.thumbnail.purecolor) {%>
+
+
+ <%- partial('_partial/Paradox-post-thumbnail') %>
+ <% } else { %>
+
+
+ <% } %>
+ <% }else{ %>
+
+
+ <% } %>
+
+ <%- page.title %>
+
+
+<% } %>
+
+<% if(theme.scheme === 'Isolation') { %>
+
+
+ <% if(!page.thumbnail) { %>
+
+
+
+
+
+ <% } else { %>
+
+
+
+
+
+
![](<%= page.thumbnail %>)
+ <% } %>
+
<% } %>
-
-<% if(theme.scheme == "Isolation"){ %>
-
-
- <% if(page.thumbnail == undefined){ %>
-
-
-
-
-
- <% } else { %>
-
-
-
-
-
-
![](<%= page.thumbnail %>)
- <% } %>
-
-<% } %>
\ No newline at end of file
diff --git a/layout/_partial/post-info-share.ejs b/layout/_partial/post-info-share.ejs
index c84cf0ed8..9af31f3b9 100755
--- a/layout/_partial/post-info-share.ejs
+++ b/layout/_partial/post-info-share.ejs
@@ -3,89 +3,88 @@
share
diff --git a/layout/_partial/post-nav.ejs b/layout/_partial/post-nav.ejs
index 1a3123a60..9c8f711f4 100644
--- a/layout/_partial/post-nav.ejs
+++ b/layout/_partial/post-nav.ejs
@@ -1,13 +1,12 @@
\ No newline at end of file
+
diff --git a/layout/_partial/sidebar-footer.ejs b/layout/_partial/sidebar-footer.ejs
index af3efc271..0dcdbfc77 100755
--- a/layout/_partial/sidebar-footer.ejs
+++ b/layout/_partial/sidebar-footer.ejs
@@ -1,30 +1,30 @@
-
diff --git a/layout/_partial/sidebar-header.ejs b/layout/_partial/sidebar-header.ejs
index 1949f9026..18acedd17 100755
--- a/layout/_partial/sidebar-header.ejs
+++ b/layout/_partial/sidebar-header.ejs
@@ -4,8 +4,12 @@
+
clear_all
+
+
+
+
+
\ No newline at end of file
+
diff --git a/layout/_partial/sidebar-navigation.ejs b/layout/_partial/sidebar-navigation.ejs
index 85c284d64..11805b579 100755
--- a/layout/_partial/sidebar-navigation.ejs
+++ b/layout/_partial/sidebar-navigation.ejs
@@ -2,10 +2,10 @@
diff --git a/layout/_partial/sidebar-sponsor.ejs b/layout/_partial/sidebar-sponsor.ejs
index bfed7a729..92e80e85d 100755
--- a/layout/_partial/sidebar-sponsor.ejs
+++ b/layout/_partial/sidebar-sponsor.ejs
@@ -1,8 +1,7 @@
-<% if(theme.img.upyun_logo == undefined){ %>
-<% } else { %>
+<% if(theme.img.upyun_logo) { %>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/layout/_partial/sidebar.ejs b/layout/_partial/sidebar.ejs
index e5b75d9f4..0eb108546 100755
--- a/layout/_partial/sidebar.ejs
+++ b/layout/_partial/sidebar.ejs
@@ -1,23 +1,22 @@
-
+
-
diff --git a/layout/_partial/toc_button.ejs b/layout/_partial/toc_button.ejs
index b5062e993..213c98553 100755
--- a/layout/_partial/toc_button.ejs
+++ b/layout/_partial/toc_button.ejs
@@ -1,29 +1,36 @@
-<% if(theme.scheme == "Paradox"){ %>
-
-
-
-
- format_list_numbered
-
+<% if(theme.scheme == "Paradox") { %>
+
+
-
-<% } %>
\ No newline at end of file
+
+
+ format_list_numbered
+
+
+
+<% } %>
diff --git a/layout/_widget/disqus.ejs b/layout/_widget/disqus.ejs
index 410b48b73..bac55b869 100644
--- a/layout/_widget/disqus.ejs
+++ b/layout/_widget/disqus.ejs
@@ -1,18 +1,19 @@
\ No newline at end of file
+ (function() { // DON'T EDIT BELOW THIS LINE
+ var d = document;
+ var s = d.createElement('script');
+ s.src = '//<%= theme.comment.shortname %>.disqus.com/embed.js';
+ s.setAttribute('data-timestamp', + new Date());
+ (d.head || d.body).appendChild(s);
+ })();
+ },1500);
+ });
+
diff --git a/layout/_widget/duoshuo.ejs b/layout/_widget/duoshuo.ejs
index 5ffe5a7e5..163c9de38 100644
--- a/layout/_widget/duoshuo.ejs
+++ b/layout/_widget/duoshuo.ejs
@@ -12,9 +12,10 @@
\ No newline at end of file
+
diff --git a/layout/_widget/leancloud-like.ejs b/layout/_widget/leancloud-like.ejs
index 939801047..a699ebe85 100644
--- a/layout/_widget/leancloud-like.ejs
+++ b/layout/_widget/leancloud-like.ejs
@@ -1,79 +1,78 @@
\ No newline at end of file
+ function addCount(Like) {
+ var Like = AV.Object.extend('Like');
+ url = $('.leancloud-like_num').attr('id').trim();
+ title = $('.leancloud-like_num').attr('data-flag-title').trim();
+ var query = new AV.Query(Like);
+ query.equalTo('url', url);
+ query.find({
+ success: function(results) {
+ if (results.length > 0) {
+ var like = results[0];
+ like.fetchWhenSave(true);
+ like.increment('time');
+ like.save(null, {
+ success: function(like) {
+ var content = like.get('time') + ' ' + $(document.getElementById(url)).text();
+ $(document.getElementById(url)).text(content);
+ },
+ error: function(like, error) {
+ console.log('Failed to save Visitor num, with error message: ' + error.message);
+ }
+ });
+ } else {
+ var newlike = new Like();
+ newlike.set('title', title);
+ newlike.set('url', url);
+ newlike.set('time', 1);
+ newlike.save(null, {
+ success: function(newlike) {
+ console.log('newlike.get(\'time\')='+newlike.get('time'));
+ var content = newlike.get('time') + ' ' + $(document.getElementById(url)).text();
+ $(document.getElementById(url)).text(content);
+ },
+ error: function(newlike, error) {
+ console.log('Failed to create');
+ }
+ });
+ }
+ },
+ error: function(error) {
+ console.log('Error:' + error.code + ' ' + error.message);
+ }
+ });
+ }
+ $(function() {
+ var Like = AV.Object.extend('Like');
+ if ($('.leancloud-like_num').length === 1) {
+ addCount(Like);
+ } else if ($('.post-title-link').length > 1) {
+ showTime(Like);
+ }
+ });
+
diff --git a/layout/_widget/leancloud-views.ejs b/layout/_widget/leancloud-views.ejs
index e7f44a5f4..edf1d1977 100644
--- a/layout/_widget/leancloud-views.ejs
+++ b/layout/_widget/leancloud-views.ejs
@@ -1,79 +1,78 @@
\ No newline at end of file
+ function addCount(Counter) {
+ var Counter = AV.Object.extend('Counter');
+ url = $('.leancloud-views_num').attr('id').trim();
+ title = $('.leancloud-views_num').attr('data-flag-title').trim();
+ var query = new AV.Query(Counter);
+ query.equalTo('url', url);
+ query.find({
+ success: function(results) {
+ if (results.length > 0) {
+ var counter = results[0];
+ counter.fetchWhenSave(true);
+ counter.increment('time');
+ counter.save(null, {
+ success: function(counter) {
+ var content = counter.get('time') + ' ' + $(document.getElementById(url)).text();
+ $(document.getElementById(url)).text(content);
+ },
+ error: function(counter, error) {
+ console.log('Failed to save Visitor num, with error message: ' + error.message);
+ }
+ });
+ } else {
+ var newcounter = new Counter();
+ newcounter.set('title', title);
+ newcounter.set('url', url);
+ newcounter.set('time', 1);
+ newcounter.save(null, {
+ success: function(newcounter) {
+ console.log('newcounter.get(\'time\')='+newcounter.get('time'));
+ var content = newcounter.get('time') + ' ' + $(document.getElementById(url)).text();
+ $(document.getElementById(url)).text(content);
+ },
+ error: function(newcounter, error) {
+ console.log('Failed to create');
+ }
+ });
+ }
+ },
+ error: function(error) {
+ console.log('Error:' + error.code + ' ' + error.message);
+ }
+ });
+ }
+ $(function() {
+ var Counter = AV.Object.extend('Counter');
+ if ($('.leancloud-views_num').length === 1) {
+ addCount(Counter);
+ } else if ($('.post-title-link').length > 1) {
+ showTime(Counter);
+ }
+ });
+
diff --git a/layout/_widget/leancloud-views_num.ejs b/layout/_widget/leancloud-views_num.ejs
index dd3b2287b..9dd4d9a48 100644
--- a/layout/_widget/leancloud-views_num.ejs
+++ b/layout/_widget/leancloud-views_num.ejs
@@ -1,3 +1,3 @@
<%= __('post.views') %>
-
\ No newline at end of file
+
diff --git a/layout/_widget/mathjax.ejs b/layout/_widget/mathjax.ejs
index 97c5bfd68..c3edb7ec5 100644
--- a/layout/_widget/mathjax.ejs
+++ b/layout/_widget/mathjax.ejs
@@ -14,4 +14,4 @@
});
\ No newline at end of file
+
diff --git a/layout/_widget/page-gallery.ejs b/layout/_widget/page-gallery.ejs
index 1a170ad6a..264f3374e 100644
--- a/layout/_widget/page-gallery.ejs
+++ b/layout/_widget/page-gallery.ejs
@@ -1,92 +1,93 @@
<%- css("css/gallery.min") %>
-
-
-
-
-
+
+
+
+
+
-
-
- <% if (site.data.gallery){ %>
- <% for (var i in site.data.gallery){ %>
-
-
- <%= i %>
- <%= site.data.gallery[i].descr %>
-
- <% } %>
- <% } %>
-
-
-
-
+
+
+ <% if (site.data.gallery) { %>
+ <% for (var i in site.data.gallery) { %>
+
+
+ <%= i %>
+ <%= site.data.gallery[i].descr %>
+
+ <% } %>
+ <% } %>
+
+
+
+
-
+
-
- <%- js("js/jquery.min") %>
- <%- js("js/gallery/jquery.poptrox.min") %>
- <%- js("js/gallery/skel.min") %>
- <%- js("js/gallery/util.min") %>
- <%- js("js/gallery/main.min") %>
-
\ No newline at end of file
+
+ <%- js('js/jquery.min') %>
+ <%- js('js/gallery/jquery.poptrox.min') %>
+ <%- js('js/gallery/skel.min') %>
+ <%- js('js/gallery/util.min') %>
+ <%- js('js/gallery/main.min') %>
+
-
-
-
-
- <% if(theme.scheme == "Isolation"){ %>
-
- <%- partial("_partial/isolate_info") %>
- <% } %>
-
-
-
-
-
-
-
- <% if(theme.scheme == "Paradox"){ %>
-
-
- <% } %>
-
- <%- body %>
-
- <% if(theme.scheme == "Paradox"){ %>
- <%- partial('_partial/sidebar') %>
- <% } %>
-
- <% if( (theme.scheme == "Paradox") && (is_post() || is_home() || is_archive() || is_category() || (page.totop == true) ) ){ %>
-
- <%- partial("_partial/footer_top") %>
- <% } %>
-
- <%- partial("_partial/footer") %>
-
- <%- partial("_partial/import_js") %>
-
-
-
-
-
- <% } %>
+ <%- partial('_partial/head') %>
+
+ <% if(page.layout === 'gallery') { %>
+
+ <%- partial('_widget/page-gallery') %>
+ <% } else { %>
+
+
+ <% if(theme.scheme === 'Isolation') { %>
+
+ <%- partial('_partial/isolate_info') %>
+ <% } %>
+
+
+
+
+
+
+
+ <% if(theme.scheme === 'Paradox') { %>
+
+
+ <% } %>
+
+ <%- body %>
+
+ <% if(theme.scheme === 'Paradox') { %>
+ <%- partial('_partial/sidebar') %>
+ <% } %>
+
+ <% if( (theme.scheme === 'Paradox') && (is_post() || is_home() || is_archive() || is_category() || (page.totop === true) ) ) { %>
+
+ <%- partial('_partial/footer_top') %>
+ <% } %>
+
+ <%- partial('_partial/footer') %>
+
+ <%- partial('_partial/import_js') %>
+
+
+
+ <% } %>