diff --git a/assets/js/third-party/others/counter.js b/assets/js/third-party/others/counter.js index 6027bee..8cb9098 100644 --- a/assets/js/third-party/others/counter.js +++ b/assets/js/third-party/others/counter.js @@ -1,35 +1,31 @@ /* Page's view & comment counter plugin */ NexT.plugins.others.counter = function() { - let busz_postview = false; let pageview_js = undefined; let comment_js = undefined; - const busz = NexT.CONFIG.busuanzi; - if (busz != undefined && busz.pageview) { - busz_postview = true; - } + const post_meta = NexT.CONFIG.postmeta; - // Here can append others pageview & comment plugin - const waline = NexT.CONFIG.waline; - if (waline != undefined){ - if(!busz_postview && waline.cfg.pageview) { - pageview_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[0]); - NexT.utils.getScript(pageview_js, function(){ - Waline.pageviewCount({ - serverURL: waline.cfg.serverurl + const views = post_meta.views; + if(views != undefined && views.enable) { + if (views.plugin == 'waline') { + pageview_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[0]); + NexT.utils.getScript(pageview_js, function(){ + Waline.pageviewCount({ + serverURL: NexT.CONFIG.waline.cfg.serverurl + }); }); - }); + } } - if (waline.cfg.comment) { - comment_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[1]); - NexT.utils.getScript(comment_js, function(){ - Waline.commentCount({ - serverURL: waline.cfg.serverurl + const comments = post_meta.comments; + if (comments != undefined && comments.enable) { + if (comments.plugin == 'waline') { + comment_js = NexT.utils.getCDNResource(NexT.CONFIG.page.waline.js[1]); + NexT.utils.getScript(comment_js, function(){ + Waline.commentCount({ + serverURL: NexT.CONFIG.waline.cfg.serverurl + }); }); - }); + } } - } - - } \ No newline at end of file diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index a19f7e7..29ee80e 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -478,6 +478,18 @@ params: categories: true wordCount: true readTime: true + # 是否开启评论数显示 + comments: + enable: true + # 评论统计插件,暂只支持waline + # Comment counter plugin, only support waline + plugin: waline + # 是否开启页面访问数显示 + views: + enable: true + # 页面访问统计插件,支持busuanzi, waline, leancloud + # Page views counter plugin, support: busuanzi, waline, leancloud + plugin: waline # 文章底部的设置 # Post footer settings @@ -937,8 +949,6 @@ params: busuanzi: visitorsIcon: fa fa-user viewsIcon: fa fa-eye - postViews: true - # --------------------------------------------------------------- # 内容搜索服务 diff --git a/layouts/partials/head/analytics.html b/layouts/partials/head/analytics.html index a18be0f..c720c61 100644 --- a/layouts/partials/head/analytics.html +++ b/layouts/partials/head/analytics.html @@ -7,6 +7,6 @@ {{ if isset .Site.Params.analytics "google" }} {{ partial "_thirdparty/analytics/google.html" . }} {{ end }} -{{ if isset .Site.Params.analytics "busuanzi" }} +{{ if or (isset .Site.Params.analytics "busuanzi") (eq .Site.Params.postMeta.views.plugin "busuanzi") }} {{ partial "_thirdparty/analytics/busuanzi.html" . }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/head/config.html b/layouts/partials/head/config.html index f0ae8ea..777f8a4 100644 --- a/layouts/partials/head/config.html +++ b/layouts/partials/head/config.html @@ -8,7 +8,7 @@ }} {{/* Append waline pageview & comment plugin */}} -{{ if and .Site.Params.waline ( or .Site.Params.waline.pageView .Site.Params.waline.comment) }} +{{ if or (eq .Site.Params.postMeta.views.plugin "waline") (eq .Site.Params.postMeta.comments.plugin "waline") }} {{ $counter := dict "js" .Site.Data.resources.plugins.waline.js }} diff --git a/layouts/partials/init.html b/layouts/partials/init.html index d2576a9..5fb5214 100644 --- a/layouts/partials/init.html +++ b/layouts/partials/init.html @@ -58,6 +58,16 @@ {{ $config = merge $config $localSearch }} {{ end }} +{{ with .Site.Params.postMeta }} + {{ $postmeta := dict + "views" .views + "comments" .comments + }} + {{ $config = merge $config (dict "postmeta" $postmeta) }} +{{ else }} + +{{ end }} + {{ if .Site.Params.algoliaSearch.enable }} {{ $algoliaSearch := dict "js" .Site.Data.resources.algolia @@ -127,11 +137,6 @@ {{ $config = merge $config (dict "lawidget" $lawidget) }} {{ end }} -{{ with .Site.Params.analytics.busuanzi }} -{{ $busz := dict "pageview" .postViews }} -{{ $config = merge $config (dict "busuanzi" $busz) }} -{{ end }} - {{ $globalVars.Set "config" $config }} {{ with .Site.Params.customFilePath }} diff --git a/layouts/partials/post/header.html b/layouts/partials/post/header.html index 39096f0..f5324d0 100644 --- a/layouts/partials/post/header.html +++ b/layouts/partials/post/header.html @@ -22,21 +22,19 @@ {{ end }} {{ end }} {{ if $.IsHome }} {{ else }} {{ end }} -{{ $isComment := and (.Scratch.Get "isComment") .Site.Params.waline.comment }} +{{ $comments := .Site.Params.postMeta.comments.enable }}
diff --git a/layouts/partials/post/header_meta/comments.html b/layouts/partials/post/header_meta/comments.html index fd8ee56..d5dd017 100644 --- a/layouts/partials/post/header_meta/comments.html +++ b/layouts/partials/post/header_meta/comments.html @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/layouts/partials/post/header_meta/views.html b/layouts/partials/post/header_meta/views.html index a3d1298..b3f022d 100644 --- a/layouts/partials/post/header_meta/views.html +++ b/layouts/partials/post/header_meta/views.html @@ -1,8 +1,8 @@ +{{ if .Site.Params.postMeta.views.enable }} {{ $pageViewId := "" }} -{{ if .Site.Params.leancloudVisitors.enable }} +{{ if eq .Site.Params.postMeta.views.plugin "leancloud" }} {{ $pageViewId = "leancloud-visitors-count" }} -{{ end }} -{{ if .Site.Params.analytics.busuanzi.postViews }} +{{ else if eq .Site.Params.postMeta.views.plugin "busuanzi" }} {{ $pageViewId = "busuanzi_value_page_pv" }} {{ end }}