hexo-theme-solitude 1.5.11 → 1.6.1

package/languages/en.yml

@@ -1,3 +1,5 @@
+more: More
+
 theme:
   dark: dark
   light: light
@@ -6,15 +8,21 @@ copy:
   success: Copied
   error: Copied failed
 
+copy_copyright:
+  author: Author
+  link: Link
+  source: Source
+  info: Copyright is owned by the author. For commercial reprints, please contact the author for authorization. For non-commercial reprints, please indicate the source.
+
 lately:
-  second: second
-  minute: minute
-  hour: hour
-  day: day
-  month: month
-  year: year
-  ago: ago
-  error: NaN
+  second: ' second'
+  minute: ' minute'
+  hour: ' hour'
+  day: ' day'
+  month: ' month'
+  year: ' year'
+  ago: ' ago'
+  error: ' NaN'
 
 chs:
   chs_tw: Traditional Chinese
@@ -29,28 +37,23 @@ page:
   404: Page not found
 
 home:
-  categoryBar:
-    home: Home
-    more: More
-  recent-post:
-    sticky: Sticky
-    new: New
-    read: Unread
-  top-group:
-    recommend: Favor
-    recommendmore: More
+  home: Home
+  sticky: Sticky
+  new: New
+  read: Unread
+  recommendmore: More
 
 post:
-  meta_reprint: Reprint or translation
-  meta_original: Original
-  meta_cc: This article is a ${cc} article, pay attention to the copyright.
-  meta_posted: Posted on
-  meta_updated: Last updated on
-  meta_wordcount: Word count
-  meta_minread: Reading time
-  meta_ip: The author's IP belongs to
-  meta_pv: PV
-  meta_comment: Comments
+  reprint: Reprint
+  original: Original
+  copyright: This article is a ${cc} article, pay attention to the copyright.
+  posted: Posted on
+  updated: Last updated on
+  wordcount: Word count
+  minread: Reading time
+  ip: The author's IP belongs to
+  pv: PV
+  comment: Comments
 
 nav:
   site_name_title: Back to home
@@ -61,13 +64,9 @@ nav:
   console: Console
 
 award:
-  wechat: Wechat
-  alipay: Alipay
-  about:
-    tip: Thanks
-    tip1: Tipping
-    tip2: Thank you for giving me the strength to move forward.
-    title: List of appreciation
+  thanks: Thanks
+  tipping: Tipping
+  title: List of appreciation
 
 
 search:
@@ -103,8 +102,7 @@ console:
   archive_unit: Posts
 
 sidebar:
-  title1: Features
-  title2: Tags
+  function: Function
   darkmode: Display mode
 
 footer:
@@ -122,30 +120,14 @@ cookies:
 music:
   hit: Paused
 
-rightmenu:
-  copytext: Copy the selected
-  pastetext: Paste the text
-  commenttext: Quote to comment
-  newwindow: A new window opens
-  copylink: Copy the link address
-  copyimg: Copy this image
-  downloadimg: Download this image
-  search: Search on the site
-  music:
-    toggle: Play music
-    back: Switch to the previous track
-    forward: Switch to the next track
-    playlist: See all songs
-    copyMusicName: Reproduction Song Name
-  randomPost: Feel free to wander around
-  categories: Article classification
-  tags: Article tags
-  copyaddress: Copy the address
-  commentBarrage: Turn off trending reviews
-  dark: Dark
-  light: Light
-  chs_to_cht: Traditional
-  cht_to_chs: Simplified
-
 404:
-  button: Back to home
+  button: Back to home
+
+link:
+  banner:
+    toComment: Application link
+    random: Random Visit
+  random: You are about to ⌈ ${name} ⌋ , security unknown.
+
+keyboard:
+  title: Blog shortcuts

package/languages/zh-CN.yml

@@ -1,3 +1,5 @@
+more: 更多
+
 # Language: 简体中文
 theme:
   dark: 已切换至深色模式
@@ -38,37 +40,29 @@ nav:
   console: 中控台
 
 home:
-  categoryBar:
-    home: 首页
-    more: 更多
-  recent-post:
-    sticky: 置顶
-    new: 最新
-    read: 未读
-  top-group:
-    recommend: 荐
-    recommendmore: 更多推荐
+  home: 首页
+  sticky: 置顶
+  new: 最新
+  read: 未读
+  recommend: 荐
+  recommendmore: 更多推荐
 
 post:
-  meta_reprint: 转载或翻译
-  meta_original: 原创
-  meta_cc: 该文章为${cc}文章，注意版权协议
-  meta_posted: 发布于
-  meta_updated: 最后更新于
-  meta_wordcount: 文章字数
-  meta_minread: 阅读耗时
-  meta_ip: 作者IP归属地为
-  meta_pv: 文章热度
-  meta_comment: 评论数
+  reprint: 转载或翻译
+  original: 原创
+  cc: 该文章为${cc}文章，注意版权协议
+  posted: 发布于
+  updated: 最后更新于
+  wordcount: 文章字数
+  minread: 阅读耗时
+  ip: 作者IP归属地为
+  pv: 文章热度
+  comment: 评论数
 
 award:
-  wechat: 微信
-  alipay: 支付宝
-  about:
-    tip: 致谢
-    tip1: 赞赏作者
-    tip2: 感谢你赐予我前进的力量
-    title: 赞赏名单
+  thanks: 致谢
+  tipping: 赞赏作者
+  title: 赞赏名单
 
 search:
   empty: 找不到你查询的内容：${query}
@@ -103,8 +97,7 @@ console:
   archive_unit: 篇
 
 sidebar:
-  title1: 功能
-  title2: 标签
+  function: 功能
   darkmode: 显示模式
 
 footer:
@@ -122,30 +115,14 @@ cookies:
 music:
   hit: 音乐已暂停
 
-rightmenu:
-  copytext: 复制选中文本
-  pastetext: 粘贴文本
-  commenttext: 引用到评论
-  newwindow: 新窗口打开
-  copylink: 复制链接地址
-  copyimg: 复制此图片
-  downloadimg: 下载此图片
-  search: 站内搜索
-  music:
-    toggle: 播放音乐
-    back: 切换到上一首
-    forward: 切换到下一首
-    playlist: 查看所有歌曲
-    copyMusicName: 复制歌名
-  randomPost: 随便逛逛
-  categories: 文章分类
-  tags: 文章标签
-  copyaddress: 复制地址
-  commentBarrage: 关闭热评
-  dark: 深色模式
-  light: 浅色模式
-  chs_to_cht: 轉為繁體
-  cht_to_chs: 转为简体
-
 404:
-  button: 返回首页
+  button: 返回首页
+
+link:
+  banner:
+    toComment: 申请友链
+    random: 随机访问
+  random: 您即将前往 ⌈ ${name} ⌋ , 安全性未知
+
+keyboard:
+  title: 博客快捷键

package/languages/zh-TW.yml

@@ -1,3 +1,5 @@
+more: 更多
+
 # Language: 繁體中文 (台灣)
 theme:
   dark: 已切換至深色模式
@@ -38,37 +40,29 @@ nav:
   console: 中控台
 
 home:
-  categoryBar:
-    home: 首頁
-    more: 更多
-  recent-post:
-    sticky: 置頂
-    new: 最新
-    read: 未讀
-  top-group:
-    recommend: 荐
-    recommendmore: 更多推薦
+  home: 首頁
+  sticky: 置頂
+  new: 最新
+  read: 未讀
+  recommend: 荐
+  recommendmore: 更多推薦
 
 post:
-  meta_reprint: 轉載或翻譯
-  meta_original: 原創
-  meta_cc: 該文章為${cc}文章，注意版權協議
-  meta_posted: 發布於
-  meta_updated: 最後更新於
-  meta_wordcount: 文章字數
-  meta_minread: 閱讀耗時
-  meta_ip: 作者IP歸屬地為
-  meta_pv: 文章熱度
-  meta_comment: 評論數
+  reprint: 轉載或翻譯
+  original: 原創
+  cc: 該文章為${cc}文章，注意版權協議
+  posted: 發布於
+  updated: 最後更新於
+  wordcount: 文章字數
+  minread: 閱讀耗時
+  ip: 作者IP歸屬地為
+  pv: 文章熱度
+  comment: 評論數
 
 award:
-  wechat: 微信
-  alipay: 支付寶
-  about:
-    tip: 致謝
-    tip1: 贊助作者
-    tip2: 感謝你賜予我前進的力量
-    title: 贊助作者
+  thanks: 致謝
+  tipping: 贊助作者
+  title: 讚賞名單
 
 search:
   empty: 找不到你查詢的內容：${query}
@@ -103,8 +97,7 @@ console:
   archive_unit: 篇
 
 sidebar:
-  title1: 功能
-  title2: 標籤
+  function: 功能
   darkmode: 顯示模式
 
 footer:
@@ -122,30 +115,14 @@ cookies:
 music:
   hit: 音樂已暫停
 
-rightmenu:
-  copytext: 複製選中文本
-  pastetext: 粘貼文本
-  commenttext: 引用到評論
-  newwindow: 新窗口打開
-  copylink: 複製連結位址
-  copyimg: 複製此圖片
-  downloadimg: 下載此圖片
-  search: 站內搜索
-  music:
-    toggle: 播放音樂
-    back: 切換到上一首
-    forward: 切換到下一首
-    playlist: 查看所有歌曲
-    copyMusicName: 複製歌名
-  randomPost: 随便逛逛
-  categories: 文章分類
-  tags: 文章標籤
-  copyaddress: 複製位址
-  commentBarrage: 關閉熱評
-  dark: 深色模式
-  light: 淺色模式
-  chs_to_cht: 轉為繁體
-  cht_to_chs: 转为简体
-
 404:
-  button: 返回首頁
+  button: 返回首頁
+
+link:
+  banner:
+    toComment: 申請友鏈
+    random: 隨機訪問
+  random: 您即將前往 ⌈ ${name} ⌋ ， 安全性未知
+
+keyboard:
+  title: 博客快捷鍵

package/layout/404.pug

@@ -7,7 +7,7 @@ block content
             .error-info
                 h1.error_title 404
                 .error_subtitle= theme.errorpage.text
-                a.button--animated(href="/")
+                a.button--animated(href=url_for("/"))
                     i.solitude.st-external-link
                     =_p('404.button')
 

package/layout/includes/console.pug

@@ -25,21 +25,21 @@ div#console
 
     div.button-group
         div.console-btn-item
-            a.darkmode_switchbutton(onclick="sco.switchDarkMode()", title=_p('console.switch_darkmode'), href="javascript:void(0);")
+            span.darkmode_switchbutton(onclick="sco.switchDarkMode()", title=_p('console.switch_darkmode'))
                 i.solitude.st-moon-clear-fill
         div.console-btn-item#consoleHideAside
-            a.asideSwitch(onclick="sco.switchHideAside()", title=_p('console.switch_hideAside'), href="javascript:void(0);")
+            span.asideSwitch(onclick="sco.switchHideAside()", title=_p('console.switch_hideAside'))
                 i.solitude.st-side-bar-fill
         if theme.keyboard.enable
             div.console-btn-item#consoleKeyboard(onclick="sco.switchKeyboard()")
-                a.keyboardSwitch(title=_p('console.switch_keyboard'), href="javascript:void(0);")
+                span.keyboardSwitch(title=_p('console.switch_keyboard'))
                     i.solitude.st-keyboard-box-fill
         if theme.capsule.enable
             div.console-btn-item#consoleMusic(onclick="sco.musicToggle()")
-                a.music-switch(title=_p('console.switch_music'), href="javascript:void(0);")
+                span.music-switch(title=_p('console.switch_music'))
                     i.solitude.st-disc-fill
         if theme.comment.enable && theme.comment.commentBarrage
             div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()")
-                a.commentBarrage
+                span.commentBarrage
                     i.solitude.st-chat-fill
     div.console-mask(onclick="sco.hideConsole()")

package/layout/includes/footer.pug

@@ -7,7 +7,7 @@ div#st-footer-bar
         else if theme.site.name.class === 'text'
             span.solitude= theme.site.name.custom
     div.footer-bar-description= __('footer.description').replace(/\$\{title}/, config.title + " - " + config.subtitle)
-    a.footer-bar-link(href="/")= __('footer.learnmore')
+    a.footer-bar-link(href=url_for('/'))= __('footer.learnmore')
 div#footer_deal
     - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left || {}
     - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right || {}
@@ -17,7 +17,7 @@ div#footer_deal
         a.deal_link(href=url_for(trim(array[0])), title=label)
             i.solitude(class=array[1])
 
-    div#footer_mini_logo.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
+    div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
         img(src=theme.site.icon, alt=_p('nav.backtop'))
 
     each value, label in rightInfo
@@ -38,7 +38,7 @@ div#st-footer
         div.footer-group
             div.footer-title-group
                 h3.footer-title= _p('footer.randomlink')
-                a.random-friends-btn(href="javascript:randomLinksList();")
+                button.random-friends-btn(onclick='randomLinksList()', title=_p('footer.randomlink'))
                     i.solitude.st-refresh-line
             div.footer-links#friend-links-in-footer
 div#footer-bar
@@ -46,14 +46,14 @@ div#footer-bar
         div.footer-bar-left
             if moment(theme.aside.siteinfo.runtime).year() === new Date().getFullYear()
                 div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} By 
-                    a.footer-bar-link(href="/")= config.author
+                    a.footer-bar-link(href=url_for("/"))= config.author
             else
                 div.copyright © #{moment(theme.aside.siteinfo.runtime).year()} - #{new Date().getFullYear()} By 
-                    a.footer-bar-link(href="/")= config.author
+                    a.footer-bar-link(href=url_for("/"))= config.author
         div.footer-bar-right
             each item in theme.footer.links
                 a.footer-bar-link(href=url_for(item.url), title=item.name)= item.name
-            a.footer-bar-link.cc(href=theme.footer.license)
+            a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright')
                 i.solitude.st-copyright-line
                 i.solitude.st-creative-commons-by-line
                 i.solitude.st-creative-commons-nc-line
@@ -63,7 +63,7 @@ if theme.footer.privacy
         div.cookies-window-title= __('cookies.title')
         div.cookies-window-content
             span.cookies-tip= __('cookies.tip')
-            a.cookies-link(href=theme.footer.privacy, title=_p('cookies.privacy'))
+            a.cookies-link(href=url_for(theme.footer.privacy), title=_p('cookies.privacy'))
                 i.solitude.st-right-btn-fill
 if theme.comment.enable && theme.comment.commentBarrage
     div.comment-barrage.needEndHide

package/layout/includes/head/config.pug

@@ -30,6 +30,19 @@
         });
     }
 
+    let copyright = 'undefined';
+    if (theme.copy.enable && theme.copy.copyright.enable) {
+        copyright = JSON.stringify({
+            limitCount: theme.copy.copyright.limit_count,
+            languages: {
+                author: _p("copy_copyright.author") + ': ' + config.author,
+                link: _p("copy_copyright.link") + ': ',
+                source: _p("copy_copyright.source") + ': ' + config.title,
+                info: _p("copy_copyright.info")
+            }
+        })
+    }
+
     const commentInfoStart = theme.comment.randomInfoStart.map(item => `"${item}"`) || [];
     const commentInfoEnd = theme.comment.randomInfoEnd.map(item => `"${item}"`) || [];
     const sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || [];
@@ -110,17 +123,10 @@ script.
             }
         },
         lightbox: '!{ theme.mediumZoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null")}',
-        rightside: {
-            enable: !{theme.rightside.enable}
-        },
         ai: {
             enable: !{theme.post_ai.enable},
             key: '!{theme.post_ai.key}',
-            talk: '!{theme.post_ai.talk}',
+            talk: "!{theme.post_ai.talk}",
             randomPost: !{theme.post_ai.randomPost},
-        },
-        music: {
-            enable: !{theme.music.enable},
-        },
-        translate: !{translate},
+        }
     };

package/layout/includes/head/opengraph.pug

@@ -1,10 +1,10 @@
-if theme.opengraph.enable
+if theme.OpenGraph.enable
     -
         const coverVal = page.cover || theme.site.siteIcon
         let ogOption = {
             type: is_post() ? 'article' : 'website',
             image: coverVal ? full_url_for(coverVal) : '',
-            ...theme.opengraph.options
+            ...theme.OpenGraph.options
         }
     -
     != open_graph(ogOption)

package/layout/includes/head/pwa.pug

@@ -4,16 +4,16 @@ if theme.pwa.enable
     if theme.pwa.theme_color
         meta(name="msapplication-TileColor" content=theme.pwa.theme_color)
     if theme.pwa.mask_icon
-        link(rel="mask-icon", href=theme.pwa.mask_icon, color=theme.pwa.theme_color)
+        link(rel="mask-icon", href=url_for(theme.pwa.mask_icon), color=theme.pwa.theme_color)
     if theme.pwa.apple_touch_icon
         link(rel="apple-touch-icon" sizes="180x180" href=url_for(theme.pwa.apple_touch_icon))
     if theme.pwa.favicon_16_16
-        link(rel="icon", type="image/png", sizes="16x16", href=theme.pwa.favicon_16_16)
+        link(rel="icon", type="image/png", sizes="16x16", href=url_for(theme.pwa.favicon_16_16))
     if theme.pwa.favicon_32_32
-        link(rel="icon", type="image/png", sizes="32x32", href=theme.pwa.favicon_32_32)
+        link(rel="icon", type="image/png", sizes="32x32", href=url_for(theme.pwa.favicon_32_32))
     if theme.pwa.bookmark_icon
-        link(rel="bookmark", href=theme.pwa.bookmark_icon)
+        link(rel="bookmark", href=url_for(theme.pwa.bookmark_icon))
 else
     meta(name="apple-mobile-web-app-capable", content=config.title)
-    link(rel="bookmark", href=theme.site.siteIcon)
-    link(rel="apple-touch-icon", href=theme.site.siteIcon, sizes="180x180")
+    link(rel="bookmark", href=url_for(theme.site.siteIcon))
+    link(rel="apple-touch-icon", href=url_for(theme.site.siteIcon), sizes="180x180")

package/layout/includes/head.pug

@@ -17,7 +17,7 @@ meta(name="viewport" content="width=device-width, initial-scale=1")
 
 title= title + subtitle
 noscript= _p('head.noscript')
-link(rel="icon", href=theme.site.siteIcon)
+link(rel="icon", href=url_for(theme.site.siteIcon))
 
 // index.css
 link(rel="stylesheet", href=url_for(theme.cdn.main_css))

package/layout/includes/inject/body.pug

@@ -20,10 +20,6 @@ div
     if theme.mermaid
         script(src=url_for(theme.cdn.mermaid_js))
 
-    if theme.rightside.enable
-        include ../widgets/rightside/index
-        script(src=url_for(theme.cdn.rightside_js))
-
     if theme.display_mode.universe
         script(src=url_for(theme.cdn.universe_js))
         script.

package/layout/includes/inject/head.pug

@@ -2,7 +2,6 @@ each item in theme.verify_site || []
     meta(name=item.name, content=item.content)
 
 link(rel="stylesheet", href=url_for(theme.cdn.solitude_css))
-link(rel="stylesheet", href=url_for(theme.cdn.snackbar_css))
 
 // aplayer
 if theme.capsule.enable || theme.music.enable
@@ -78,7 +77,7 @@ script.
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.5.11",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.6.1",
         "border-radius:5px 0 0 5px;padding: 5px 10px;color:white;background:#ff3842;",
         "padding: 5px 10px;color:white;background:#3e9f50;",
         "border-radius:0 5px 5px 0;padding: 5px 10px;background:#0084ff;color:white;"

package/layout/includes/keyboard.pug

@@ -1,6 +1,6 @@
 - const list = theme.keyboard.list || []
 #keyboard-tips
-    .keyboardTitle= '博客快捷键'
+    .keyboardTitle=_p('keyboard.title')
     .keyboardList
         each item in list
             .keyboardItem

package/layout/includes/loading.pug

@@ -5,7 +5,7 @@ div(id="loading-box" onclick="preloader.endLoading();" style="zoom:1")
 script.
     const preloader = {
         endLoading: () => {
-            document.getElementById('loading-box').classList.add('loaded');
+            document.getElementById('loading-box').classList.toggle('loaded');
         },
         initLoading: () => {
             document.getElementById('loading-box').classList.remove('loaded');

package/layout/includes/nav.pug

@@ -5,7 +5,7 @@ nav#nav.show
                 .back-home-button(tabindex="-1")
                     i.back-home-button-icon.solitude.st-more-fill
                     include ./widgets/nav/group
-            a#site-name(href="/", title=_p('nav.site_name_title'))
+            a#site-name(href=url_for("/"), title=_p('nav.site_name_title'))
                 if theme.site.name.class === 'i_class'
                     i.solitude(class=theme.site.name.custom, style="font-size: 16px;")
                 else if theme.site.name.class === 'img'

package/layout/includes/sidebar.pug

@@ -1,14 +1,30 @@
 div#sidebar(style="zoom: 1;")
     div#menu-mask(style="display: none;")
     div#sidebar-menus
-        span.sidebar-menu-item-title= __('sidebar.title1')
+        .site-data
+            .data-item.is-center
+                .data-item-link
+                    a(href=url_for('/archives/'))
+                        .headline=_p('page.archives')
+                        .length-num=site.posts.find({ parent: { $exists: false } }).length
+            .data-item.is-center
+                .data-item-link
+                    a(href=url_for('/categories/'))
+                        .headline=_p('page.category')
+                        .length-num=site.categories.find({parent: {$exists: false}}).length
+            .data-item.is-center
+                .data-item-link
+                    a(href=url_for('/tags/'))
+                        .headline=_p('page.tag')
+                        .length-num=site.tags.find({parent: {$exists: false}}).length
+        span.sidebar-menu-item-title= __('sidebar.function')
         div.sidebar-menu-item
-            a.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()", href="javascript:void(0);")
+            span.darkmode_switchbutton.menu-child(onclick="sco.switchDarkMode()")
                 i.solitude.st-moon-clear-fill
                 span= __('sidebar.darkmode')
         include ./widgets/nav/group
         include ./widgets/nav/menu.pug
-        span.sidebar-menu-item-title= __('sidebar.title2')
+        span.sidebar-menu-item-title= __('page.tag')
         div.card-widget.card-tags.card-archives.card-webinfo.card-allinfo
             div.card-tag-cloud
                 each tag in site.tags.find({ parent: { $exists: false } }).data

package/layout/includes/widgets/home/banner.pug

@@ -20,4 +20,4 @@ div.tags-group-all
                 .tags-group-icon-pair
                     each key in pair
                         .tags-group-icon(style=`background: ${theme.hometop.banner.icon[key].color}`)
-                            img(src=theme.hometop.banner.icon[key].img, title=key)
+                            img.nolazyload(src=theme.hometop.banner.icon[key].img, title=key)

package/layout/includes/widgets/home/categoryBar.pug

@@ -1,6 +1,6 @@
 .category-bar-items#category-bar-items
     .category-bar-item(class=is_home() ? 'select' : '', id="category-bar-home")
-        a(href="/")= __('home.categoryBar.home')
+        a(href=url_for('/'))= __('home.home')
     each item in site.categories.find({ parent: { $exists: false } }).data
         .category-bar-item(class=select ? (select === item.name ? 'select' : '') : '', id=item.name)
             a(href=url_for(item.path))= item.name
@@ -8,4 +8,4 @@ div.category-bar-right
     if site.categories.find({parent: {$exists: false}}).data.length > 10
         .category-bar-next#category-bar-next(onclick="sco.scrollCategoryBarToRight()")
             i.solitude.st-show-right-line
-    a.category-bar-more(href="/categories/")= __('home.categoryBar.more')
+    a.category-bar-more(href=url_for('/categories/'))= __('more')