hexo-theme-solitude 1.1.0 → 1.1.3

package/README.md

@@ -1,8 +1,28 @@
-![](https://github.com/DuoSco/Hexo-theme-solitude/assets/74389842/78b527e5-7d8e-456d-b190-859acd9ffdec)
+<div align="right">
+  语言:
+  中文 / 
+  <a title="English" href="/README_EN.md">English</a>
+</div>
+
+<p align="center"><img width="400" src="/source/img/logo-horizontal_version.png"></p>
+
+<p align="center">一款优雅的 Hexo 主题</p>
+<p align="center">"在宁静的孤独中心探索内心，我们以简约之美引领优雅生活"</p>
+
+<p align="center">
+  <a title="Hexo Version" target="_blank" href="https://hexo.io/zh-cn/"><img alt="Hexo Version" src="https://img.shields.io/badge/Hexo-%3E%3D%205.3.0-orange?style=flat"></a>
+  <a title="Node Version" target="_blank" href="https://nodejs.org/zh-cn/"><img alt="Node Version" src="https://img.shields.io/badge/Node-%3E%3D%2010.13.0-yellowgreen?style=flat"></a>
+  <a title="npm Downloads" target="_blank" href="https://www.npmjs.com/package/hexo-theme-solitude"><img alt="GitHub Forks" src="https://img.shields.io/npm/dt/hexo-theme-solitude?color=red&label=npm"></a>
+  <a title="License" target="_blank" href="https://github.com/DuoSco/Hexo-theme-solitude/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/DuoSco/Hexo-Theme-solitude.svg?style=flat"></a>
+  <a title="GitHub Release" target="_blank" href="https://github.com/DuoSco/Hexo-theme-solitude/releases"><img alt="GitHub Release" src="https://img.shields.io/github/v/release/DuoSco/Hexo-theme-solitude?style=flat"></a>
+  <a title="GitHub Commits" target="_blank" href="https://github.com/DuoSco/Hexo-Theme-solitude/commits/master"><img alt="GitHub Commits" src="https://img.shields.io/github/commit-activity/m/DuoSco/Hexo-Theme-solitude.svg?style=flat&color=brightgreen&label=commits"></a>
+</p>
+
+![](/source/img/solitude-show.jpg)
 
 主题预览: 👋[Demo](https://solitude.wzsco.top/) | [王卓Sco](https://blog.wzsco.top/)
 
-文档: [📖文档](https://docs.wzsco.top/)
+主题文档: 📖[Solidude 文档](https://docs.wzsco.top/)
 
 主题交流群：`文档内有群二维码和链接`
 
@@ -16,6 +36,22 @@
 git clone -b main https://github.com/DuoSco/Hexo-theme-solitude.git themes/solitude
 ```
 
+如果想要安装比较新的 dev 分支，可以在博客根目录里安装开发版
+
+```powershell
+git clone -b dev https://github.com/DuoSco/Hexo-theme-solitude.git themes/solitude
+```
+
+### npm 安装
+
+> 此方法只支持 Hexo 5.0.0 以上版本。通过 npm 安装并不会在 themes 里生成主题文件夹，而是在 node_modules 里生成
+
+在博客根目录里执行：
+
+```powershell
+npm install hexo-theme-solitude
+```
+
 ## ⚙ 应用主题
 
 修改hexo配置文件`_config.yml`，把主题改为`solitude`
@@ -24,38 +60,39 @@ git clone -b main https://github.com/DuoSco/Hexo-theme-solitude.git themes/solit
 theme: solitude
 ```
 
-## 更好的配置
-- macos/linux
-  在博客根目录运行
+## 🛠️ 更好的配置
+
+- macos/linux 在博客根目录运行
+
 ```bash
 cp -rf ./themes/solitude/_config.yml ./_config.solitude.yml
 ```
-- windows
-  复制```/themes/solitude/_config.yml```此文件到hexo根目录，并重命名为```_config.solitude.yml```
 
-## 赞助我们
+- windows 复制 `/themes/solitude/_config.yml` 此文件到hexo根目录，并重命名为 `_config.solitude.yml`
+
+## 🎁 赞助我们
 
-由于我们是为爱发电，域名和一些零零散散的API都是由开发者承担费用，并且没有收入（学生），希望能够得到一些补充吧，谢谢🙏，即使没有赞助我们也会用心开发。
+由于我们是为爱发电，域名和一些零零散散的支出都是由开发者在承担费用，如果可以，希望能够得到你的赞赏，非常感谢！🙏 当然了，即使没有赞助我们也会用心开发。
 
-[王卓Sco](https://afdian.net/a/wleelw0u0) &nbsp;  [亦封](https://afdian.net/a/yife68)
+[王卓Sco](https://afdian.net/a/wleelw0u0) &nbsp;  [亦小封](https://afdian.net/a/yife68)
 
 ## ✨ 贡献者
-> 欢迎你对本主题做出贡献
 
-[贡献指南](https://opensource.guide/zh-hans/how-to-contribute/#%E5%A6%82%E4%BD%95%E6%8F%90%E4%BA%A4%E8%B4%A1%E7%8C%AE)
+<a href="https://github.com/DuoSco/Hexo-theme-solitude/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=DuoSco/Hexo-theme-solitude" />
+</a>
 
-### 主题参与开发
+特别冠名：
 [@王卓Sco](https://github.com/wleelw)
-[@亦封](https://github.com/yife68)
+[@亦小封](https://github.com/yife68)
 [@rootlex](https://github.com/rootlexme)
 [@timigomen](https://github.com/timigomen)
 [@Glannons](https://github.com/Glannons)
 [@Adil](https://github.com/adil-zhang)
 
-### 主题设计
-[@张洪Heo](https://github.com/zhheo)
-### 域名提供
-[@王卓Sco](https://github.com/wleelw)
+**本主题为 [Heo](https://blog.zhheo.com/) 的衍生主题，由 [@张洪Heo](https://github.com/zhheo) 作者全权授权、设计！**
+
+> 欢迎你对本主题做出贡献！ [贡献指南](https://opensource.guide/zh-hans/how-to-contribute/#%E5%A6%82%E4%BD%95%E6%8F%90%E4%BA%A4%E8%B4%A1%E7%8C%AE)
 
-## 仓库统计
+## 📊 仓库统计
 ![仓库统计](https://repobeats.axiom.co/api/embed/75ec216f1d0b289e1b6a92f585342f3eeeeb0fdd.svg "Repobeats analytics image")

package/README_EN.md

@@ -0,0 +1,98 @@
+<div align="right">
+  Language:
+  English / 
+  <a title="English" href="/README.md">中文</a>
+</div>
+
+<p align="center"><img width="400" src="/source/img/logo-horizontal_version.png"></p>
+
+<p align="center">An elegant Hexo theme</p>
+<p align="center">"Explore the inner self in peaceful solitude, leading a life of simplicity and elegance."</p>
+
+<p align="center">
+  <a title="Hexo Version" target="_blank" href="https://hexo.io/zh-cn/"><img alt="Hexo Version" src="https://img.shields.io/badge/Hexo-%3E%3D%205.3.0-orange?style=flat"></a>
+  <a title="Node Version" target="_blank" href="https://nodejs.org/zh-cn/"><img alt="Node Version" src="https://img.shields.io/badge/Node-%3E%3D%2010.13.0-yellowgreen?style=flat"></a>
+  <a title="npm Downloads" target="_blank" href="https://www.npmjs.com/package/hexo-theme-solitude"><img alt="GitHub Forks" src="https://img.shields.io/npm/dt/hexo-theme-solitude?color=red&label=npm"></a>
+  <a title="License" target="_blank" href="https://github.com/DuoSco/Hexo-theme-solitude/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/DuoSco/Hexo-Theme-solitude.svg?style=flat"></a>
+  <a title="GitHub Release" target="_blank" href="https://github.com/DuoSco/Hexo-theme-solitude/releases"><img alt="GitHub Release" src="https://img.shields.io/github/v/release/DuoSco/Hexo-theme-solitude?style=flat"></a>
+  <a title="GitHub Commits" target="_blank" href="https://github.com/DuoSco/Hexo-Theme-solitude/commits/master"><img alt="GitHub Commits" src="https://img.shields.io/github/commit-activity/m/DuoSco/Hexo-Theme-solitude.svg?style=flat&color=brightgreen&label=commits"></a>
+</p>
+
+![](/source/img/solitude-show.jpg)
+
+Theme Preview: 👋[Demo](https://solitude.wzsco.top/) | [王卓Sco](https://blog.wzsco.top/)
+
+Theme Document: [📖Solidude Document](https://docs.wzsco.top/)
+
+Theme discussion group：`The usage document above contains a QR code`
+
+## 💻 Installation
+
+### Installation via Git
+
+Install the stable version in the root of your blog directory 【Recommended】
+
+```powershell
+git clone -b main https://github.com/DuoSco/Hexo-theme-solitude.git themes/solitude
+```
+
+If you want to install the latest development version, you can install the dev branch in the root of your blog directory
+
+```powershell
+git clone -b dev https://github.com/DuoSco/Hexo-theme-solitude.git themes/solitude
+```
+
+### Installation via npm
+
+> This method only supports Hexo versions above 5.0.0. Installing through npm will not generate a theme folder in themes, but in node_modules instead.
+
+Execute the following command in the root of your blog directory:
+
+```powershell
+npm install hexo-theme-solitude
+```
+
+## ⚙ Applying the Theme
+
+Modify the hexo configuration file `_config.yml` and change the theme to `solitude`
+
+```
+theme: solitude
+```
+
+## 🛠️ Better Configuration
+
+- MacOS/Linux Run the following command in the root of your blog directory
+
+```bash
+cp -rf ./themes/solitude/_config.yml ./_config.solitude.yml
+```
+
+- Windows Copy the file `/themes/solitude/_config.yml` to the root directory of your Hexo installation and rename it as `_config.solitude.yml`
+
+## 🎁 Sponsor Us
+
+As we generate power for Love, the domain name and some scattered expenses are borne by the developers. If possible, we hope to receive your appreciation. Thank you very much! 🙏 Of course, even without sponsorship, we will strive to continue developing.
+
+[王卓Sco](https://afdian.net/a/wleelw0u0) &nbsp;  [亦小封](https://afdian.net/a/yife68)
+
+## ✨ Contributors
+
+<a href="https://github.com/DuoSco/Hexo-theme-solitude/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=DuoSco/Hexo-theme-solitude" />
+</a>
+
+Special thanks to：
+[@王卓Sco](https://github.com/wleelw)
+[@亦小封](https://github.com/yife68)
+[@rootlex](https://github.com/rootlexme)
+[@timigomen](https://github.com/timigomen)
+[@Glannons](https://github.com/Glannons)
+[@Adil](https://github.com/adil-zhang)
+
+**This theme is a derivative theme of [Heo](https://blog.zhheo.com/), designed and authorized by the author [张洪Heo](https://github.com/zhheo)!**
+
+> Welcome to contribute to this theme!  [Contribution Guide](https://opensource.guide/zh-hans/how-to-contribute/#%E5%A6%82%E4%BD%95%E6%8F%90%E4%BA%A4%E8%B4%A1%E7%8C%AE)
+
+## 📊 Repository Statistics
+![Repository Statistics](https://repobeats.axiom.co/api/embed/75ec216f1d0b289e1b6a92f585342f3eeeeb0fdd.svg "Repobeats analytics image")

package/_config.yml

@@ -3,8 +3,8 @@ site:
   name: # 左上角显示内容
     class:  text #i_class/text/img
     custom: Solitude #自定义内容 例如：scoicon sco-logo / 王卓Sco / https://p.sondy.top/logo.png
-  siteIcon: https://bu.dusays.com/2023/10/31/6540daf117d20.png # 网页icon
-  icon: https://bu.dusays.com/2023/10/31/6540daf117d20.png # 页脚的icon、加载动画默认的icon
+  siteIcon: https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg # 网页icon
+  icon: https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg # 页脚的icon、加载动画默认的icon
   icp:  # ICP 例如：湘ICP备2023015327号
 
 
@@ -14,59 +14,59 @@ nav:
   left:
     enable: false
     menu:
-#      项目:
-#        Solitude:
-#          icon: https://bu.dusays.com/2023/10/31/6540daf117d20.png
-#          url: https://github.com/DuoSco/Hexo-Theme-solitude
+  #      项目:
+  #        Solitude:
+  #          icon: https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg
+  #          url: https://github.com/DuoSco/Hexo-Theme-solitude
 
-# 导航栏内容
+  # 导航栏内容
   menu:
-#    文库:
-#      url: false
-#      child:
-#        文章列表:
-#          url: /archives/
-#          icon: scoicon sco-folder-fill
-#        全部分类:
-#          url: /categories/
-#          icon: scoicon sco-checkbox-multiple-blank-fill
-#        全部标签:
-#          url: /tags/
-#          icon: scoicon sco-price-tag-fill
-#    友链:
-#      url: false
-#      child:
-#        鱼塘:
-#          url: /moments/
-#          icon: scoicon sco-wifi-fill
-#        友情链接:
-#          url: /links/
-#          icon: scoicon sco-group-fill
-#        宝藏博主:
-#          url: javascript:travelling()
-#          icon: scoicon sco-gift-fill
-#    我的:
-#      url: false
-#      child:
-#        装备:
-#          url: /equipment/
-#          icon: scoicon sco-laptop-line
-#        工具箱:
-#          url: /tlink/
-#          icon: scoicon sco-tools-fill
-#    关于:
-#      url: false
-#      child:
-#        关于本站:
-#          url: /about/
-#          icon: scoicon sco-contacts-fill
+  #    文库:
+  #      url: false
+  #      child:
+  #        文章列表:
+  #          url: /archives/
+  #          icon: scoicon sco-folder-fill
+  #        全部分类:
+  #          url: /categories/
+  #          icon: scoicon sco-checkbox-multiple-blank-fill
+  #        全部标签:
+  #          url: /tags/
+  #          icon: scoicon sco-price-tag-fill
+  #    友链:
+  #      url: false
+  #      child:
+  #        鱼塘:
+  #          url: /moments/
+  #          icon: scoicon sco-wifi-fill
+  #        友情链接:
+  #          url: /links/
+  #          icon: scoicon sco-group-fill
+  #        宝藏博主:
+  #          url: javascript:travelling()
+  #          icon: scoicon sco-gift-fill
+  #    我的:
+  #      url: false
+  #      child:
+  #        装备:
+  #          url: /equipment/
+  #          icon: scoicon sco-laptop-line
+  #        工具箱:
+  #          url: /tlink/
+  #          icon: scoicon sco-tools-fill
+  #    关于:
+  #      url: false
+  #      child:
+  #        关于本站:
+  #          url: /about/
+  #          icon: scoicon sco-contacts-fill
 
 
   # 导航栏右侧快捷菜单 (true,false)
   right: # @todo 允许用户自定义
-    travellings: true   #开往
-    random: true        # 随机文章跳转
-    console: true       #控制台
+    travellings: false   #开往
+    random: false        # 随机文章跳转
+    console: false       #控制台
 
 # 自定义icon
 icon:
@@ -76,9 +76,9 @@ icon:
 hometop:
   bbtime: false # 即刻顶部是否开启
   banner:
-    enable: true # 是否打开顶部banner
+    enable: false # 是否打开顶部banner
     title: 宁静致远<br>热爱生活 # 左上角显示文字
-    url: WWW.WZSCO.TOP # title下方小字
+    url: Hexo-Theme-Solitude # title下方小字
     # 轮播icon
     icon:
       HTML:
@@ -124,7 +124,7 @@ hometop:
   # 右侧置顶列表（在文章的front matter中添加“recommend: true”）
   recommendList:
     sup: 置顶 # 左上角显示文字
-    title: 主题文档 # 左下角大字
+    title: Solitude主题文档 # 左下角大字
     url: https://docs.wzsco.top/ # 点击跳转链接
     img: /img/default.png # 显示背景
     color: '#ff0000' # 背景颜色
@@ -149,7 +149,7 @@ aside:
   # 侧边栏个人信息卡片
   card:
     author:
-      img: https://bu.dusays.com/2023/10/31/6540daf117d20.png # 头像
+      img: https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg # 头像
       js: https://cdn3.codesign.qq.com/icons/XgRxnjPG4VZLmqr/latest/iconfont.js # 自定义图标js（用于显示带颜色的状态表情）
       state: "#sco-smile" # 状态表情（使用symbol）
     content: 分享自己对编程的<b>热爱</b>，对美好生活的<b>向往</b>，对知识海洋<b>探索历程</b>。 # 文案1
@@ -183,7 +183,7 @@ aside:
   history:
     enable: false
     title: #【选填】留空将默认显示为：那年今日
-    icon: 
+    icon:
   # 页面目录
   toc:
     post: true # 在文章页显示
@@ -196,7 +196,7 @@ aside:
     pv: false # 访问量
     uv: false # 访客数
     updatetime: false # 最后更新日期
-    runtimeenable: true # 建站时间
+    runtimeenable: false # 建站时间
     runtime: '2023-04-20 00:00:00' # 格式：yyyy-MM-dd hh-mm-ss
 
 # Footer Settings
@@ -205,41 +205,41 @@ footer:
   # 底部上方一排图标
   information:
     left: # 左侧显示图标
-#      Github:
-#        icon: scoicon sco-bilibili-line
-#        url: https://github.com/wleelw
-#      Mail:
-#        icon: scoicon sco-mail-line
-#        url: mailto:wleelw@wzsco.top
+    #      Github:
+    #        icon: scoicon sco-bilibili-line
+    #        url: https://github.com/wleelw
+    #      Mail:
+    #        icon: scoicon sco-mail-line
+    #        url: mailto:wleelw@wzsco.top
     right: # 右侧显示图标
-#      Bilibili:
-#        icon: scoicon sco-bilibili-line
-#        url: https://space.bilibili.com/1329819902
-#      抖音:
-#        icon: scoicon sco-douyin-fill
-#        url: https://v.douyin.com/iJsLc8jt/
+  #      Bilibili:
+  #        icon: scoicon sco-bilibili-line
+  #        url: https://space.bilibili.com/1329819902
+  #      抖音:
+  #        icon: scoicon sco-douyin-fill
+  #        url: https://v.douyin.com/iJsLc8jt/
   # 底部导航栏
   group: # 从左至右
-#    导航:
-#      归档: /archives/
-#      分类: /categories/
-#      标签: /tags/
-#    服务:
-#      阿里云: https://aliyun.com/
-#      51la统计: https://v6.51.la/
-#      百度统计: https://tongji.baidu.com/
-#    支持:
-#      打赏记录: /about/
-#    协议:
-#      Cookies: /cookies/
-#      用户协议: /privacy/
-#      版权协议: /copyright/
+  #    导航:
+  #      归档: /archives/
+  #      分类: /categories/
+  #      标签: /tags/
+  #    服务:
+  #      阿里云: https://aliyun.com/
+  #      51la统计: https://v6.51.la/
+  #      百度统计: https://tongji.baidu.com/
+  #    支持:
+  #      打赏记录: /about/
+  #    协议:
+  #      Cookies: /cookies/
+  #      用户协议: /privacy/
+  #      版权协议: /copyright/
 
   # 底部随机友链
   randomlink: false
   # rss
   rss:
-    enable: true
+    enable: false
     wechatOA: # 微信公众号链接
     emailOA:  # 邮箱链接
     rss:  # rss订阅链接
@@ -263,18 +263,18 @@ post:
     copyright: 原创
   # 顶部文章简介
   meta:
-    date: true # 发布日期
-    updated: true # 更新日期
-    locate: true # 位置
-    wordcount: true # 字数
-    readtime: true # 访问
-    pv: true # 浏览量
-    comment: true # 评论数
+    date: false # 发布日期
+    updated: false # 更新日期
+    locate: false # 位置
+    wordcount: false # 字数
+    readtime: false # 访问
+    pv: false # 浏览量
+    comment: false # 评论数
   # 打赏
   award:
     enable: false # 开启后文章底部显示打赏按钮
-    wechat: https://p.sondy.top/blog/img/20230913203219.png!cover # 微信收款码
-    alipay: https://p.sondy.top/blog/img/20230916173807.png!cover # 支付宝收款码
+    wechat: https://bu.dusays.com/2023/11/07/6549e79364fa3.png # 微信收款码
+    alipay: https://bu.dusays.com/2023/11/07/6549e79d02bd6.png # 支付宝收款码
     url: /about # 打赏统计页面链接
   # 文章颜色获取
   covercolor: #文章cover取色
@@ -282,7 +282,7 @@ post:
     local: true
 
 # 关于界面
-about: true
+about: false
 
 # 404 页面
 errorpage:
@@ -292,29 +292,29 @@ errorpage:
 
 # 懒加载
 lazyload:
-  enable: true
+  enable: false
   placeholder: /img/loading.gif # 加载中显示图片
   errorimg: /img/error_load.png # 加载失败显示图片
 
 # 图片灯箱
-lightbox: true
+lightbox: false
 
 #代码高亮增强
 hightlight:
-  enable: true
+  enable: false
   hightlimit: 200
 
 # 加载动画
 loading:
-  fullpage: true
-  pace: true
+  fullpage: false
+  pace: false
 
 # 第三方设置
 thirdparty:
-  wordcount: true # 字数统计
+  wordcount: false # 字数统计
   busuanzi:
-    enable: true
-    usecomment: true #当评论系统开启时文章页面使用评论系统的统计数据
+    enable: false
+    usecomment: false #当评论系统开启时文章页面使用评论系统的统计数据
   search: # 搜索
     algolia_search:
       enable: false
@@ -326,12 +326,34 @@ thirdparty:
       CDN:
 
   aplayer: # 播放器
-    enable: true
+    enable: false
     server: tencent # netease, tencent, kugou, xiami, baidu
     id: 8651639768 # 歌单ID
     api: "https://api.injahow.cn/meting/?server=:server&type=:type&id=:id&auth=:auth&r=:r" #自定义api
   #中控台拓展
-  consolePlus: true
+  consolePlus: false
+
+  ai: # 文章页面AI
+    enable: false
+    key: # 前往tianli-AI 购买
+    rec_method: # 推荐文章方式（all:匹配数据库所有文章、web:仅当前博客文章）默认：web
+
+  # 朋友圈配置
+  circle:
+    api: https://circle.sondy.top/  # api 地址
+    error_img: /img/theme/avatar.png # 头像加载失败显示错误图片
+    sort_rule: created # 排序规则
+    expire_days: 1 # 文章缓存天数
+    page_init_number: 12 # 默认加载文章数，默认10
+    page_turning_number: 12 # 加载更多文章数，默认10
+    angle: # 钓鱼
+      enable: false
+    appjs: '/lib/circle.min.js' # 主题appjs
+    bundlejs: '/lib/bundle.min.js' # 主题bundejs
+
+  # 文章统计
+  echarts:
+    js: https://cdn.bootcdn.net/ajax/libs/echarts/5.4.2/echarts.min.js
 
 # 评论
 comment:
@@ -341,28 +363,6 @@ comment:
     lang: 'zh-CN'
     accessToken:  # accessToken
 
-ai: # 文章页面AI
-  enable: false
-  key: # 前往tianli-AI 购买
-  rec_method: # 推荐文章方式（all:匹配数据库所有文章、web:仅当前博客文章）默认：web
-
-# 朋友圈配置
-circle:
-  api: https://circle.sondy.top/  # api 地址
-  error_img: /img/theme/avatar.png # 头像加载失败显示错误图片
-  sort_rule: created # 排序规则
-  expire_days: 1 # 文章缓存天数
-  page_init_number: 12 # 默认加载文章数，默认10
-  page_turning_number: 12 # 加载更多文章数，默认10
-  angle: # 钓鱼
-    enable: false
-  appjs: '/lib/circle.min.js' # 主题appjs
-  bundlejs: '/lib/bundle.min.js' # 主题bundejs
-
-# 文章统计
-echarts:
-  js: https://cdn.bootcdn.net/ajax/libs/echarts/5.4.2/echarts.min.js
-
 # 插入代码到头部 </head> 之前 和 底部 </body> 之前
 # 插入额外代码 如：统计，广告等
 extends:

package/layout/page/about.ejs

@@ -9,5 +9,7 @@
     <%- partial('partial/compoment/about/other' ) %>
     <%- partial('partial/compoment/about/award' ) %>
 </div>
-<script src="<%= theme.echarts.js %>" rel="external nofollow"></script>
+<% if(theme.thirdparty.echarts.enable){%>
+    <%- js(theme.thirdparty.echarts.js) %>
+<%} %>
 <% } %>

package/layout/page/circle.ejs

@@ -1,5 +1,5 @@
 <%- partial('partial/compoment/circle/banner') %>
-<% if(theme.circle.angle.enable){ %>
+<% if(theme.thirdparty.circle.angle.enable){ %>
     <%- partial('partial/compoment/circle/angle') %>
 <% } %>
 <%- partial('partial/compoment/circle/content') %>

package/layout/page/echarts.ejs

@@ -1,14 +1 @@
-<script src="<%= theme.echarts.js %>" rel="external nofollow"></script>
-
-<main class="layout hide-aside" id="content-inner">
-    <div id="page">
-        <%- page.content %>
-        <% if(page.comment){ %>
-            <%- partial('partial/compoment/third-party/comments/comment') %>
-        <% } %>
-    </div>
-
-    <% if(page.aside){%>
-        <%- partial('partial/compoment/aside/aside') %>
-    <%} %>
-</main>
+<%- page.content %>

package/layout/page/links.ejs

@@ -1,7 +1,7 @@
 <div class="flink" id="banners">
     <%- partial('partial/compoment/links/banner') %>
 </div>
-<% if(theme.circle.angle.enable){ %>
+<% if(theme.thirdparty.circle.angle.enable){ %>
     <%- partial('partial/compoment/links/angle') %>
 <% } %>
 <div class="flink" id="article-container">