hexo-theme-fluid 1.9.7 → 1.9.9

package/README.md

@@ -111,18 +111,16 @@ layout: about
 <table>
   <thead>
     <tr>
-      <th align="center" style="width: 240px;">
-        <a href="https://flowus.cn/share/eebf2144-8db7-4d68-b31e-bc2c116871de">
-          <img src="https://github-production-user-asset-6210df.s3.amazonaws.com/32983588/243899272-092eeb46-9172-4c10-9e72-53561ff37a00.png" height="200px"><br>
-          <sub>首席赞助商 ORENCEAI</sub><br>
-          <sub>全新的 ChatGPT 人工智能对话平台</sub>
-        </a>
-      </th>
       <th align="center" style="width: 240px;">
         <a href="https://www.jetbrains.com/?from=hexo-theme-fluid">
           <img src="https://raw.githubusercontent.com/fluid-dev/static/690616966f34a58d66aa15ac7b550dd7bbc03967/hexo-theme-fluid/jetbrains.svg" height="200px"><br>
           <sub>免费开发工具提供方 JetBrains</sub><br>
-          <sub>专注于创建智能开发工具</sub>
+        </a>
+      </th>
+      <th align="center" style="width: 240px;">
+        <a href="https://dartnode.com">
+          <img src="https://dartnode.com/branding/DN-Open-Source-sm.png" height="200px"><br>
+          <sub>免费 VPS 提供方 DartNode</sub><br>
         </a>
       </th>
     </tr>
@@ -146,21 +144,12 @@ layout: about
 <table>
   <thead>
     <tr>
-      <th align="center" style="width: 240px;">
+      <th align="center" width="240">
         <div>
           <img src="https://github.com/fluid-dev/static/blob/master/hexo-theme-fluid/sponsor.png?s=200&v=4" height="200px" alt="微信赞赏码"><br>
           <sub>微信赞赏码</sub>
         </div>
       </th>
-      <th align="center" style="width: 240px;">
-        <div>
-          <a href="https://etherscan.io/address/0x0021395954710be29c0BFDCB3f98f4D2fa5A1448">
-            <img src="https://avatars.githubusercontent.com/u/6250754?s=200&v=4" height="200px" alt="ERC20 Token">
-          </a>
-          <br>
-          <sub>ERC20 Token: 0x0021395954710<br>be29c0BFDCB3f98f4D2fa5A1448</sub>
-        </div>
-      </th>
     </tr>
   </thead>
 </table>

package/_config.yml

@@ -24,7 +24,7 @@ favicon: /img/fluid.png
 # Icon for Apple touch
 apple_touch_icon: /img/fluid.png
 
-# 浏览器标签页中的标题分隔符，效果： 文章名 - 站点名
+# 浏览器标签页中的标题分隔符，效果：文章名 - 站点名
 # Title separator in browser tab, eg: article - site
 tab_title_separator: " - "
 
@@ -62,7 +62,7 @@ code:
     highlightjs:
       # 在链接中挑选 style 填入
       # Select a style in the link
-      # See: https://highlightjs.org/static/demo/
+      # See: https://highlightjs.org/demo/
       style: "github gist"
       style_dark: "dark"
 
@@ -109,8 +109,10 @@ fun_features:
     element: h1,h2,h3,h4,h5,h6
     # Options: left | right
     placement: left
-    # Options: hover | always | touch
+
+    # Options: hover | always
     visible: hover
+
     # Options: § | # | ❡
     icon: ""
 
@@ -128,7 +130,7 @@ fun_features:
 dark_mode:
   enable: true
   # 默认的选项（当用户手动切换后则不再按照默认模式），选择 `auto` 会优先遵循 prefers-color-scheme，其次按用户本地时间 18 点到次日 6 点之间进入暗色模式
-  # Default option (when the visitor switches manually, the default mode is no longer followed), choosing `auto` will give priority to prefers-color-scheme, and then enter the dark mode from 18:00 to 6:00 in the visitor’s local time
+  # Default option (when the visitor switches manually, the default mode is no longer followed), choosing `auto` will give priority to prefers-color-scheme, and then enter the dark mode from 18:00 to 6:00 in the visitor's local time
   # Options: auto | light | dark
   default: auto
 
@@ -154,7 +156,7 @@ color:
   navbar_text_color_dark: "#d0d0d0"
 
   # 副标题字体色
-  # Color of navigation bar text
+  # Color of subtitle text
   subtitle_color: "#fff"
   subtitle_color_dark: "#d0d0d0"
 
@@ -239,7 +241,7 @@ custom_css:
 
 # 网页访问统计
 # Analysis of website visitors
-web_analytics:  # 网页访问统计
+web_analytics:
   enable: false
 
   # 遵循访客浏览器"请勿追踪"的设置，如果开启则不统计其访问
@@ -265,16 +267,6 @@ web_analytics:  # 网页访问统计
     sid:
     cid:
 
-  # 51.la 站点统计 ID
-  # 51.la analytics
-  # See: https://www.51.la/user/site/index
-  woyaola:  # 51.la 站点统计 ID，参见
-
-  # 友盟/cnzz 站点统计 web_id
-  # cnzz analytics
-  # See: https://web.umeng.com/main.php?c=site&a=show
-  cnzz:
-
   # LeanCloud 计数统计，可用于 PV UV 展示，如果 `web_analytics: enable` 没有开启，PV UV 展示只会查询不会增加
   # LeanCloud count statistics, which can be used for PV UV display. If `web_analytics: enable` is false, PV UV display will only query and not increase
   leancloud:
@@ -290,6 +282,54 @@ web_analytics:  # 网页访问统计
     # If true, ignore localhost & 127.0.0.1
     ignore_local: false
 
+  # OpenKounter 计数统计（基于 EdgeOne Pages），可用于 PV UV 展示
+  # OpenKounter count statistics (based on EdgeOne Pages), which can be used for PV UV display
+  # See: https://github.com/Mintimate/open-kounter
+  openkounter:
+    # OpenKounter API 服务器地址
+    # OpenKounter API server URL
+    server_url: https://open-kounter.mintimate.cn
+    # 统计页面时获取路径的属性，通常使用 window.location.pathname
+    # Get the attribute of the page path during statistics
+    path: window.location.pathname
+    # 开启后不统计本地路径（localhost、127.0.0.1、[::1]）
+    # If true, ignore localhost & 127.0.0.1 & [::1]
+    ignore_local: false
+
+  # Umami Analytics，仅支持自部署。如果要展示 PV UV 需要填写所有配置项，否则只填写 `src` 和 `website_id` 即可
+  # Umami Analytics, only Self-host support. If you want to display PV UV need to set all config items, otherwise only set 'src' and 'website_id'
+  # See: https://umami.is/docs
+  umami:
+    # umami js 文件地址，需要在 umami 后台创建站点后获取
+    # umami js file url, get after create website in umami
+    src:
+
+    # umami 的 website id，需要在 umami 后台创建站点后获取
+    # umami website id, get after create website in umami
+    website_id:
+
+    # 如果你只想统计特定的域名可以填入此字段，多个域名通过逗号分隔，这可以避免统计 localhost。
+    # If you only want to tracker to specific domains you can fill in this field, multiple domain names are separated by commas, which can avoid tracker localhost
+    domains:
+
+    # 用于统计 PV UV 的开始时间，格式为 "YYYY-MM-DD"
+    # statistics on the start time, the format is "YYYY-MM-DD"
+    start_time: 2024-01-01
+
+    # 新建一个 umami viewOnly 用户，然后通过 login api 获取该用户 token
+    # create an umami viewOnly user, and then get user token through the login api
+    token:
+
+    # 填写 umami 部署的服务器地址，如 "https://umami.example.com"
+    # server url of umami deployment, such as "https://umami.example.com"
+    api_server:
+
+# Canonical 用于向 Google 搜索指定规范网址，开启前确保 hexo _config.yml 中配置 `url: http://yourdomain.com`
+# Canonical, to specify a canonical URL for Google Search, need to set up `url: http://yourdomain.com` in hexo _config.yml
+# See: https://support.google.com/webmasters/answer/139066
+canonical:
+  enable: false
+
 # 对页面中的图片和评论插件进行懒加载处理，可见范围外的元素不会提前加载
 # Lazy loading of images and comment plugin on the page
 lazyload:
@@ -309,7 +349,7 @@ lazyload:
 
 # 图标库，包含了大量社交类图标，主题依赖的不包含在内，因此可自行修改，详见 https://hexo.fluid-dev.com/docs/icon/
 # Icon library, which includes many social icons, does not include those theme dependent, so your can modify link by yourself. See: https://hexo.fluid-dev.com/docs/en/icon/
-iconfont: //at.alicdn.com/t/font_1736178_lbnruvf0jn.css
+iconfont: //at.alicdn.com/t/c/font_1736178_k526ubmyhba.css
 
 
 #---------------------------
@@ -373,6 +413,10 @@ search:
 # 首屏图片的相关配置
 # Config of the big image on the first screen
 banner:
+  # 是否开启所有页面的随机头图，仅在页面对应 banner_img 为空时生效，将图片放在 source/img/random/ 目录下
+  # Enable random banner for all pages, only works when banner_img is empty, put images in the directory `source/img/random/`
+  random_img: false
+
   # 视差滚动，图片与板块会随着屏幕滚动产生视差效果
   # Scrolling parallax
   parallax: true
@@ -430,9 +474,9 @@ footer:
   statistics:
     enable: false
 
-    # 统计数据来源，使用 leancloud 需要设置 `web_analytics: leancloud` 中的参数；使用 busuanzi 不需要额外设置，但是有时不稳定，另外本地运行时 busuanzi 显示统计数据很大属于正常现象，部署后会正常
-    # Data source. If use leancloud, you need to set the parameter in `web_analytics: leancloud`
-    # Options: busuanzi | leancloud
+    # 统计数据来源，使用 leancloud, umami, openkounter 需要设置 `web_analytics` 中对应的参数；使用 busuanzi 不需要额外设置，但是有时不稳定，另外本地运行时 busuanzi 显示统计数据很大属于正常现象，部署后会正常
+    # Data source. If use leancloud, umami, openkounter, you need to set the parameter in `web_analytics`
+    # Options: busuanzi | leancloud | umami | openkounter
     source: "busuanzi"
 
   # 国内大陆服务器的备案信息
@@ -463,7 +507,7 @@ index:
   # Available: 0 - 100
   banner_img_height: 100
 
-  # 头图黑色蒙版的不透明度，available: 0 - 1.0， 1 是完全不透明
+  # 头图黑色蒙版的不透明度，available: 0 - 1.0，1 是完全不透明
   # Opacity of the banner mask, 1.0 is completely opaque
   # Available: 0 - 1.0
   banner_mask_alpha: 0.3
@@ -473,8 +517,8 @@ index:
   slogan:
     enable: true
 
-    # 为空则按 hexo config.subtitle 显示
-    # If empty, text based on `subtitle` in hexo config
+    # 为空则按 hexo config.subtitle 显示，支持列表格式来实现随机选择一行文字显示
+    # If empty, text based on `subtitle` in hexo config, support list format to random selection of a row for display
     text: "An elegant Material-Design theme for Hexo"
 
     # 通过 API 接口作为首页副标题的内容，必须返回的是 JSON 格式，如果请求失败则按 text 字段显示，该功能必须先开启 typing 打字机功能
@@ -575,7 +619,7 @@ post:
       enable: false
       # 统计数据来源
       # Data Source
-      # Options: busuanzi | leancloud
+      # Options: busuanzi | leancloud | umami
       source: "busuanzi"
 
   # 在文章开头显示文章更新时间，该时间默认是 md 文件更新时间，可通过 front-matter 中 `updated` 手动指定（和 date 一样格式）
@@ -624,6 +668,9 @@ post:
   # Table of contents (TOC) in the sidebar
   toc:
     enable: true
+    # 进入文章时是否默认展开全部目录
+    # Expand all TOC items on enter
+    expand_all: true
 
     # 置于板块的左侧或右侧
     # place in the board
@@ -644,7 +691,8 @@ post:
     enable: true
 
     # CreativeCommons license
-    # Options: BY | BY-SA | BY-ND | BY-NC | BY-NC-SA | BY-NC-ND
+    # See: https://creativecommons.org/share-your-work/cclicenses/
+    # Options: BY | BY-SA | BY-ND | BY-NC | BY-NC-SA | BY-NC-ND | ZERO
     license: 'BY'
 
     # 显示作者
@@ -752,11 +800,16 @@ utterances:
 # See: https://disqus.com
 disqus:
   shortname:
-  # 以下为 Disqusjs 支持, 国内用户如果想使用 Disqus 建议配合使用
-  # The following are Disqusjs configurations, please ignore if DisqusJS is not required
+  # 以下为 Disqusjs 支持, 国内用户如果想使用 Disqus 建议配合使用，支持填入多个 apikey，建议自行搭建 api 端点
+  # The following are Disqusjs configurations, please ignore if DisqusJS is not required, it supports filling in multiple apikeys, it is recommended to build the API endpoint by yourself
   # See: https://github.com/SukkaW/DisqusJS
   disqusjs: false
   apikey:
+    - 'KEY1'
+    #- 'KEY2'
+  api: https://disqus.skk.moe/disqus/
+  admin:
+  adminLabel:
 
 # Gitalk
 # 基于 GitHub Issues
@@ -955,7 +1008,7 @@ about:
   name: "Fluid"
   intro: "An elegant theme for Hexo"
   # 更多图标可从 https://hexo.fluid-dev.com/docs/icon/ 查找，`class` 代表图标的 css class，添加 `qrcode` 后，图标不再是链接而是悬浮二维码
-  # More icons can be found from https://hexo.fluid-dev.com/docs/en/icon/  `class` is the css class of the icon. If adding `qrcode`, The icon is no longer a link, but a hovering QR code
+  # More icons can be found from https://hexo.fluid-dev.com/docs/en/icon/  `class` is the css class of the icon. If adding `qrcode`, the icon is no longer a link, but a hovering QR code
   icons:
     - { class: "iconfont icon-github-fill", link: "https://github.com", tip: "GitHub" }
     - { class: "iconfont icon-douban-fill", link: "https://douban.com", tip: "豆瓣" }
@@ -1057,7 +1110,7 @@ static_prefix:
   internal_css: /css
   internal_img: /img
 
-  anchor: https://lib.baomitu.com/anchor-js/4.3.1/
+  anchor: https://lib.baomitu.com/anchor-js/5.0.0/
 
   github_markdown: https://lib.baomitu.com/github-markdown-css/4.0.0/
 
@@ -1087,7 +1140,7 @@ static_prefix:
 
   valine: https://lib.baomitu.com/valine/1.5.1/
 
-  waline: https://cdn.staticfile.org/waline/2.15.5/
+  waline: https://lib.baomitu.com/waline/3.6.0/
 
   gitalk: https://lib.baomitu.com/gitalk/1.8.0/
 

package/languages/de.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Alle Aufrufe: {}'
@@ -67,3 +68,7 @@ search:
   keyword: 'Stichwort'
 
 noscript_warning: 'Blog funktioniert am besten mit aktiviertem JavaScript'
+
+darkmode:
+  light: 'Hell'
+  dark: 'Dunkel'

package/languages/en.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Views: {}'
@@ -67,3 +68,7 @@ search:
   keyword: 'Keyword'
 
 noscript_warning: 'Blog works best with JavaScript enabled'
+
+darkmode:
+  light: 'Light'
+  dark: 'Dark'

package/languages/eo.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Vidoj: {}'
@@ -67,3 +68,7 @@ search:
   keyword: 'ŝlosivorto'
 
 noscript_warning: 'Blogo funkcias plej bone kun JavaScript ebligita'
+
+darkmode:
+  light: 'Hela'
+  dark: 'Malhela'

package/languages/es.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Compartir igual'
     NC: 'NC - No comercial'
     ND: 'ND - Sin obras derivadas'
+    ZERO: 'CC0 - Sin derechos autorales'
 
 footer:
   pv: 'Vistas: {}'
@@ -67,3 +68,7 @@ search:
   keyword: 'Palabra clave'
 
 noscript_warning: 'El blog funciona mejor con JavaScript habilitado'
+
+darkmode:
+  light: 'Claro'
+  dark: 'Oscuro'

package/languages/ja.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: '閲覧合計数: {}'
@@ -67,3 +68,7 @@ search:
   keyword: 'キーワード'
 
 noscript_warning: 'ブログは JavaScript を有効にすると最適に機能します'
+
+darkmode:
+  light: 'ライト'
+  dark: 'ダーク'

package/languages/ru.yml

@@ -22,7 +22,7 @@ tag:
   title: 'Теги'
   subtitle: 'Теги'
   post_total: '%d сообщений всего'
-  
+
 about:
   menu: 'О'
   title: 'О'
@@ -57,6 +57,7 @@ post:
     SA: 'SA - Share-alike'
     NC: 'NC - Non-commercial'
     ND: 'ND - No derivative works'
+    ZERO: 'CC0 - No Copyright'
 
 footer:
   pv: 'Просмотров: {}'
@@ -67,3 +68,7 @@ search:
   keyword: 'Ключевое слово'
 
 noscript_warning: 'Блог лучше всего работает с включенным JavaScript'
+
+darkmode:
+  light: 'Светлая'
+  dark: 'Тёмная'

package/languages/zh-CN.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - 相同方式共享'
     NC: 'NC - 非商业性使用'
     ND: 'ND - 禁止演绎'
+    ZERO: 'CC0 - 无版权'
 
 footer:
   pv: '总访问量 {} 次'
@@ -67,3 +68,7 @@ search:
   keyword: '关键词'
 
 noscript_warning: '博客在允许 JavaScript 运行的环境下浏览效果更佳'
+
+darkmode:
+  light: '开灯'
+  dark: '关灯'

package/languages/zh-HK.yml

@@ -57,6 +57,7 @@ post:
     SA: 'SA - 相同方式共享'
     NC: 'NC - 非商業性使用'
     ND: 'ND - 禁止演繹'
+    ZERO: 'CC0 - 無著作權'
 
 footer:
   pv: '總訪問量 {} 次'
@@ -67,3 +68,7 @@ search:
   keyword: '關鍵字'
 
 noscript_warning: '博客在允許 JavaScript 運行的環境下瀏覽效果更佳'
+
+darkmode:
+  light: '開燈'
+  dark: '關燈'

package/languages/zh-TW.yml

@@ -52,11 +52,12 @@ post:
     posted: '發布於'
     updated: '更新於'
     licensed: '許可協議'
-    CC: 'CC - 知識共享許可協議'
-    BY: 'BY - 署名'
-    SA: 'SA - 相同方式共享'
-    NC: 'NC - 非商業性使用'
-    ND: 'ND - 禁止演繹'
+    CC: 'CC - 創用 CC 授權'
+    BY: 'BY - 姓名標示'
+    SA: 'SA - 相同方式分享'
+    NC: 'NC - 非商業性'
+    ND: 'ND - 禁止改作'
+    ZERO: 'CC0 - 公眾領域貢獻宣告'
 
 footer:
   pv: '總訪問量 {} 次'
@@ -66,4 +67,8 @@ search:
   title: '搜尋'
   keyword: '關鍵字'
 
-noscript_warning: '博客在允許 JavaScript 運行的環境下瀏覽效果更佳'
+noscript_warning: '部落格在允許 JavaScript 執行的環境下瀏覽效果更佳'
+
+darkmode:
+  light: '開燈'
+  dark: '關燈'

package/layout/_partials/comments/cusdis.ejs

@@ -1,6 +1,7 @@
 <% if (theme.cusdis.host && theme.cusdis.app_id) { %>
-  <div class="cusdis" style="width:100%">
+  <div class="cusdis" style="width:100%; overflow:visible; min-height:480px;">
     <div id="cusdis_thread"
+      style="width:100%; overflow:visible;"
       data-host="<%= theme.cusdis.host %>"
       data-app-id="<%= theme.cusdis.app_id %>"
       data-page-id="<%= md5(page.path) %>"
@@ -15,6 +16,37 @@
       Fluid.utils.createScript('<%= url_join(theme.cusdis.host,
         `/js/widget/lang/${ String(theme.cusdis.lang || 'zh-cn').toLowerCase() }.js`) %>');
       Fluid.utils.createScript('<%= url_join(theme.cusdis.host, 'js/cusdis.es.js') %>');
+
+      // 取消容器滚动条，尝试让 iframe 展开显示
+      var container = document.querySelector('.cusdis');
+      var thread = document.querySelector('#cusdis_thread');
+      if (container) container.style.overflow = 'visible';
+      if (thread) thread.style.overflow = 'visible';
+
+      // 等待 widget 加载后调整 iframe 样式
+      setTimeout(function() {
+        try {
+          var iframe = thread && thread.querySelector('iframe');
+          if (iframe) {
+            iframe.style.width = '100%';
+            iframe.style.border = 'none';
+            iframe.style.overflow = 'visible';
+            iframe.style.minHeight = '600px';
+            iframe.setAttribute('scrolling', 'no');
+
+            // 若同源，尝试根据内容自适应高度
+            try {
+              var doc = iframe.contentDocument || iframe.contentWindow.document;
+              if (doc && doc.body) {
+                iframe.style.height = doc.body.scrollHeight + 'px';
+              }
+            } catch (e) {
+            }
+          }
+        } catch (e) {
+        }
+      }, 600);
+
       var schema = document.documentElement.getAttribute('data-user-color-scheme');
       if (schema) {
         document.querySelector('#cusdis_thread').dataset.theme = schema

package/layout/_partials/comments/disqus.ejs

@@ -8,7 +8,12 @@
           Fluid.utils.createScript('<%= url_join(theme.static_prefix.disqusjs, 'disqus.js') %>', function() {
             new DisqusJS({
               shortname: '<%= theme.disqus.shortname %>',
-              apikey: '<%= theme.disqus.apikey %>'
+              apikey: <%- JSON.stringify(theme.disqus.apikey) %>,
+              api: '<%= theme.disqus.api %>',
+              url: '<%= page.permalink %>',
+              identifier: '<%= url_for(page.path) %>',
+              admin: '<%= theme.disqus.admin %>',
+              adminLabel: '<%= theme.disqus.adminLabel %>'
             });
           });
         });

package/layout/_partials/comments/waline.ejs

@@ -1,9 +1,9 @@
 <% if (theme.waline.serverURL) { %>
   <div id="waline"></div>
-  <script type="text/javascript">
+  <script type="module">
     Fluid.utils.loadComments('#waline', function() {
-      Fluid.utils.createCssLink('<%= url_join(theme.static_prefix.waline, 'waline.min.css') %>')
-      Fluid.utils.createScript('<%= url_join(theme.static_prefix.waline, 'waline.min.js') %>', function() {
+      Fluid.utils.createCssLink('<%= url_join(theme.static_prefix.waline, 'waline.css') %>')
+      import('<%= url_join(theme.static_prefix.waline, 'waline.js') %>').then(({ init }) => {
         var options = Object.assign(
           <%- JSON.stringify(theme.waline || {}) %>,
           {
@@ -11,7 +11,7 @@
             path: <%= theme.waline.path %>
           }
         )
-        Waline.init(options);
+        init(options);
         Fluid.utils.waitElementVisible('#waline .vcontent', () => {
           var imgSelector = '#waline .vcontent img:not(.vemoji)';
           Fluid.plugins.imageCaption(imgSelector);

package/layout/_partials/css.ejs

@@ -8,7 +8,7 @@
 
 <!-- 主题依赖的图标库，不要自行修改 -->
 <!-- Do not modify the link that theme dependent icons -->
-<%- css('//at.alicdn.com/t/font_1749284_hj8rtnfg7um.css') %>
+<%- css('//at.alicdn.com/t/c/font_1749284_5i9bdhy70f8.css') %>
 
 <%- css(theme.static_prefix.iconfont || theme.iconfont) %>
 

package/layout/_partials/footer/statistics.ejs

@@ -1,6 +1,6 @@
 <div class="statistics">
-  <% var pv_texts = (theme.footer.statistics.pv_format || __('footer.pv')).split('{}') %>
-  <% var uv_texts = (theme.footer.statistics.uv_format || __('footer.uv')).split('{}') %>
+  <% let pv_texts = (theme.footer.statistics.pv_format || __('footer.pv')).split('{}') %>
+  <% let uv_texts = (theme.footer.statistics.uv_format || __('footer.uv')).split('{}') %>
 
   <% if (theme.footer.statistics.source === 'leancloud') { %>
     <% if (pv_texts.length >= 2) { %>
@@ -19,6 +19,23 @@
     <% } %>
     <% import_js(theme.static_prefix.internal_js, 'leancloud.js', 'defer') %>
 
+  <% } else if (theme.footer.statistics.source === 'openkounter') { %>
+    <% if (pv_texts.length >= 2) { %>
+      <span id="openkounter-site-pv-container" style="display: none">
+        <%- pv_texts[0] %>
+        <span id="openkounter-site-pv"></span>
+        <%- pv_texts[1] %>
+      </span>
+    <% } %>
+    <% if (uv_texts.length >= 2) { %>
+      <span id="openkounter-site-uv-container" style="display: none">
+        <%- uv_texts[0] %>
+        <span id="openkounter-site-uv"></span>
+        <%- uv_texts[1] %>
+      </span>
+    <% } %>
+    <% import_js(theme.static_prefix.internal_js, 'openkounter.js', 'defer') %>
+
   <% } else if (theme.footer.statistics.source === 'busuanzi') { %>
     <% if (pv_texts.length >= 2) { %>
       <span id="busuanzi_container_site_pv" style="display: none">
@@ -35,5 +52,23 @@
       </span>
     <% } %>
     <% import_js(theme.static_prefix.busuanzi, 'busuanzi.pure.mini.js', 'defer') %>
+
+  <% } else if (theme.footer.statistics.source === 'umami') { %>
+    <% if (pv_texts.length >= 2) { %>
+      <span id="umami-site-pv-container" style="display: none">
+        <%- pv_texts[0] %>
+        <span id="umami-site-pv"></span>
+        <%- pv_texts[1] %>
+      </span>
+    <% } %>
+    <% if (uv_texts.length >= 2) { %>
+      <span id="umami-site-uv-container" style="display: none">
+        <%- uv_texts[0] %>
+        <span id="umami-site-uv"></span>
+        <%- uv_texts[1] %>
+      </span>
+    <% } %>
+    <% import_js(theme.static_prefix.internal_js, 'umami-view.js', 'defer') %>
   <% } %>
+
 </div>

package/layout/_partials/footer.ejs

@@ -11,8 +11,4 @@
     <!-- 备案信息 ICP for China -->
     <%- partial('_partials/footer/beian.ejs') %>
   <% } %>
-  <% if(theme.web_analytics.cnzz) { %>
-    <!-- cnzz Analytics Icon -->
-    <span id="cnzz_stat_icon_<%= theme.web_analytics.cnzz %>" style="display: none"></span>
-  <% } %>
 </div>

package/layout/_partials/head.ejs

@@ -15,8 +15,13 @@ var ogConfig = Object.assign({ image: ogImage && url_for(ogImage) }, theme.open_
 
 <head>
   <meta charset="UTF-8">
+
   <link rel="apple-touch-icon" sizes="76x76" href="<%= url_for(theme.apple_touch_icon) %>">
   <link rel="icon" href="<%= url_for(theme.favicon) %>">
+  <% if (theme.canonical.enable) { %>
+    <link rel="canonical" href="<%= url_join(config.url, page.canonical_path.replace('index.html', '')) %>"/>
+  <% } %>
+
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0, shrink-to-fit=no">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <% if (theme.force_https) { %>