hexo-theme-solitude 1.6.0 → 1.7.0

package/layout/includes/console.pug

@@ -1,14 +1,15 @@
 div#console
     div.close-btn(onclick="sco.hideConsole()")
         i.solitude.st-close-fill
-    if theme.comment.newComment
+    if theme.console_plus
         div.console-card-group
-            div.console-card-group-left
-                div.console-card#card-newest-comments(onclick="sco.hideConsole()")
-                    div.card-content
-                        div.author-content-item-tips= _p('console.comment_tip')
-                        div.author-content-item-title= _p('console.comment_title')
-                    div.aside-list
+            if theme.console_plus && theme.comment.newest_comment.enable
+                div.console-card-group-left
+                    div.console-card#card-newest-comments(onclick="sco.hideConsole()")
+                        div.card-content
+                            div.author-content-item-tips= _p('console.comment_tip')
+                            div.author-content-item-title= _p('console.comment_title')
+                        div.aside-list
 
             div.console-card-group-right
                 div.console-card.tags(onclick="sco.hideConsole()")
@@ -25,21 +26,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 || {}
@@ -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

@@ -22,17 +22,69 @@
         }
     }
 
-    let translate = 'undefined';
-    if (theme.translate && theme.translate.enable) {
-        translate = JSON.stringify({
-            defaultEncoding: theme.translate.defaultEncoding,
-            translateDelay: theme.translate.translateDelay,
-        });
+    const sayhello2 = theme.aside.card.sayhello2.map(item => `"${item}"`) || [];
+
+    let comment = false
+
+    if (theme.comment.type === 'twikoo') {
+        comment = JSON.stringify({
+            avatar: theme.comment.avatar,
+            url: theme.comment.twikoo.envId,
+            commentBarrage: theme.comment.enable,
+            accessToken: theme.comment.twikoo.accessToken,
+            owo: {
+                body: '.OwO-body',
+                item: '.OwO-items li'
+            }
+        })
     }
 
-    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}"`) || [];
+    if (theme.comment.type === 'waline') {
+        comment = JSON.stringify({
+            avatar: theme.comment.avatar,
+            url: theme.comment.waline.envId,
+            commentBarrage: theme.comment.enable,
+            owo: {
+                body: '.wl-emoji-popup',
+                item: '.wl-tab-wrapper button'
+            }
+        })
+    }
+
+    if (theme.comment.type === 'valine') {
+        comment = JSON.stringify({
+            avatar: theme.comment.avatar,
+            url: theme.comment.valine.serverURLs,
+            commentBarrage: theme.comment.enable,
+            appId: theme.comment.valine.appId,
+            appKey: theme.comment.valine.appKey,
+            owo: {
+                body: '.vwrap',
+                item: '.vemojis i'
+            }
+        })
+    }
+
+    let post_ai = false
+
+    if (theme.post_ai.enable) {
+        post_ai = JSON.stringify({
+            key: theme.post_ai.key,
+            talk: theme.post_ai.talk,
+            randomPost: theme.post_ai.randomPost,
+        })
+    }
+
+    let copyright = false;
+    if (theme.copy.enable && theme.copy.copyright.enable) {
+        copyright = JSON.stringify({
+            limit: theme.copy.copyright.limit,
+            author: _p("copy_copyright.author") + ': ' + config.author,
+            link: _p("copy_copyright.link") + ': ',
+            source: _p("copy_copyright.source") + ': ' + config.title,
+            info: _p("copy_copyright.info")
+        })
+    }
 
 script.
     const GLOBAL_CONFIG = {
@@ -44,6 +96,7 @@ script.
             enable: !{theme.lazyload.enable},
             error: '!{theme.lazyload.errorimg}'
         },
+        copyright: !{copyright},
         highlight: {
             enable: !{theme.highlight.enable},
             limit: !{theme.highlight.limit},
@@ -51,7 +104,7 @@ script.
             copy: !{theme.highlight.copy},
             syntax: '!{config.syntax_highlighter}'
         },
-        randomlinks: !{theme.footer.randomlink},
+        randomlink: !{theme.footer.randomlink},
         lang: {
             theme: {
                 dark: '!{_p('theme.dark')}',
@@ -80,7 +133,11 @@ script.
             chs: {
                 chs_to_cht: '!{_p('chs.chs_tw')}',
                 cht_to_chs: '!{_p('chs.chs_cn')}',
-            }
+            },
+            barrage: {
+                title: '!{_p('commentBarrage.title')}',
+            },
+            f12: '!{_p('f12')}',
         },
         aside: {
             sayhello: {
@@ -95,32 +152,7 @@ script.
         covercolor: {
             enable: !{theme.post.covercolor.enable}
         },
-        comment: {
-            enable: !{theme.comment.enable},
-            type: '!{theme.comment.type}',
-            commentBarrage: !{theme.comment.commentBarrage && theme.comment.enable},
-            randomInfoStart: [!{commentInfoStart}],
-            randomInfoEnd: [!{commentInfoEnd}],
-            twikoo: {
-                url: '!{theme.comment.twikoo.envId}',
-                accessToken: '!{theme.comment.twikoo.accessToken}'
-            },
-            waline: {
-                url: '!{theme.comment.waline.envId}',
-            }
-        },
+        comment: !{comment},
         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}',
-            randomPost: !{theme.post_ai.randomPost},
-        },
-        music: {
-            enable: !{theme.music.enable},
-        },
-        translate: !{translate},
+        post_ai: !{post_ai}
     };

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

@@ -14,16 +14,16 @@ div
     script(src=url_for(theme.cdn.main))
     script(src=url_for(theme.cdn.utils))
 
+    if theme.comment.enable && theme.comment.type === 'valine'
+        // md5
+        script(src=url_for(theme.cdn.blueimp_md5))
+
     // lately
     script(src=url_for(theme.cdn.lately_js))
 
     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.
@@ -51,7 +51,7 @@ div
         script(src=url_for(theme.cdn.swiper_js))
 
     if theme.post_ai.enable
-        script(src=url_for(theme.cdn.sco_ai_js))
+        script(src=url_for(theme.cdn.efu_ai))
 
     if theme.capsule.enable || theme.music.enable
         script(src=url_for(theme.cdn.aplayer_js))
@@ -78,14 +78,14 @@ div
         case theme.comment.type
             when 'twikoo'
                 script(src=url_for(theme.cdn.twikoo))
-            when 'waline'
-                script(src=url_for(theme.cdn.waline_js))
         if theme.comment.commentBarrage
             case theme.comment.type
                 when 'twikoo'
                     script(src=url_for(theme.cdn.twikoo_commentBarrage))
                 when 'waline'
                     script(src=url_for(theme.cdn.waline_commentBarrage))
+                when 'valine'
+                    script(src=url_for(theme.cdn.valine_commentBarrage))
 
     if theme.music.enable
         script(src=url_for(theme.cdn.music_js))

package/layout/includes/inject/head.pug

@@ -73,11 +73,45 @@ script.
                     document.documentElement.classList.remove('hide-aside')
                 }
             }
+
+            win.getCSS = (url, id = false) => new Promise((resolve, reject) => {
+                const link = document.createElement('link')
+                link.rel = 'stylesheet'
+                link.href = url
+                if (id) link.id = id
+                link.onerror = reject
+                link.onload = link.onreadystatechange = function () {
+                    const loadState = this.readyState
+                    if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+                    link.onload = link.onreadystatechange = null
+                    resolve()
+                }
+                document.head.appendChild(link)
+            })
+
+            win.getScript = (url, attr = {}) => new Promise((resolve, reject) => {
+                const script = document.createElement('script')
+                script.src = url
+                script.async = true
+                script.onerror = reject
+                script.onload = script.onreadystatechange = function () {
+                    const loadState = this.readyState
+                    if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
+                    script.onload = script.onreadystatechange = null
+                    resolve()
+                }
+
+                Object.keys(attr).forEach(key => {
+                    script.setAttribute(key, attr[key])
+                })
+
+                document.head.appendChild(script)
+            })
         }
     )(window)
 
     console.log(
-        "%c Program: Hexo %c Theme: Solitude %c Version: v1.6.0",
+        "%c Program: Hexo %c Theme: Solitude %c Version: v1.7.0",
         "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/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/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')

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

@@ -8,14 +8,14 @@ mixin info
             if post.sticky && is_home()
                 span.article-meta.sticky-warp
                     i.solitude.st-thumbtack-solid.sticky.orange
-                    span.sticky.orange= _p('home.recent-post.sticky')
+                    span.sticky.orange= _p('home.sticky')
             each category in post.categories.data
                 span.original= category.name
 
             if post.prev == null && is_home()
-                span.original= _p('home.recent-post.new')
+                span.original= _p('home.new')
 
-            a.unvisited-post(href=url_for(post.path))= _p('home.recent-post.read')
+            a.unvisited-post(href=url_for(post.path))= _p('home.read')
 
         a.article-title(href=url_for(post.path), title=post.title)= post.title
 
@@ -41,7 +41,7 @@ mixin info
     div.article-meta-wrap
         span.article-meta.tags
             each tag in post.tags.data
-                a.article-meta__tags(href=tag.path, onclick="event.stopPropagation();")
+                a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
                     span.tags-punctuation=tag.name
 
         span.post-meta-date

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

@@ -3,7 +3,7 @@ each post in filteredPosts
     .recent-post-item
         .post_cover
             a(href=url_for(post.path), title=post.title)
-                span.recent-post-top-text= _p('home.top-group.recommend')
+                span.recent-post-top-text= _p('home.recommend')
                 img.post_bg(alt=post.title, src=post.cover)
         .recent-post-info
             a.article-title(href=url_for(post.path), title=post.title)= post.title
@@ -16,7 +16,7 @@ mixin todayCardContent
     .banner-button-group
         a.banner-button(onclick="window.event.cancelBubble=true;sco.hideTodayCard();")
             i.solitude.st-add-fill
-            span.banner-button-text= _p('home.top-group.recommendmore')
+            span.banner-button-text= _p('home.recommendmore')
 
 case theme.hometop.recommendList.url.startsWith('/')
     when true

package/layout/includes/widgets/nav/group.pug

@@ -7,7 +7,7 @@ if menu
                 .back-menu-list
                     each data, label in value
                         - var array = data.split('||')
-                        a.back-menu-item(href=url_for(trim(array[0])), title=index)
+                        a.back-menu-item(href=url_for(trim(array[0])), title=label)
                             if array[1]
-                                img.nolazyload.back-menu-item-icon(src=trim(array[1]), alt=index)
+                                img.nolazyload.back-menu-item-icon(src=trim(array[1]), alt=label)
                             span.back-menu-item-text= label

package/layout/includes/widgets/nav/right.pug

@@ -1,7 +1,7 @@
 - var custom = theme.nav.right.custom || []
 each item in custom
     .nav-button(id=item.id)
-        a.site-page(href=item.url || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
+        a.site-page(href=url_for(item.url) || 'javascript:void(0);', onclick=item.onclick, title=item.title || '')
             i.solitude(class=item.icon || '')
 if theme.nav.right.random
     .nav-button#randomPost_button

package/layout/includes/widgets/page/about/award.pug

@@ -4,8 +4,8 @@
 if site.data.about.rewardList
     .author-content
         .author-content-item.single.reward
-            .author-content-item-tips= _p('award.about.tip')
-            span.author-content-item-title= _p('award.about.title')
+            .author-content-item-tips= _p('award.thanks')
+            span.author-content-item-title= _p('award.title')
             .author-content-item-description
                 = award.description
             .reward-list-all
@@ -22,18 +22,17 @@ if site.data.about.rewardList
                 if theme.post.award.enable
                     .post-reward
                         .post-reward(onclick="AddRewardMask()")
-                        .reward-button(title=_p('award.about.tip1'))
+                        .reward-button(title=_p('award.tipping'))
                             i.solitude.st-hand-heart-fill
-                            = _p('award.about.tip1')
+                            = _p('award.tipping')
                         .reward-main
                             ul.reward-all
-                                span.reward-title= _p('award.about.tip2')
+                                span.reward-title= theme.post.award.title
                                 ul.reward-group
-                                    - var rewards = [{image: theme.post.award.wechat, description: _p('award.wechat')}, {image: theme.post.award.alipay, description: _p('award.alipay')}]
+                                    - var rewards = theme.post.award.list
                                     each reward in rewards
                                         li.reward-item
-                                            a(href=reward.image, target="_blank")
-                                                img.post-qr-code-img(alt=reward.description, src=reward.image)
-                                            .post-qr-code-desc= reward.description
+                                            img.post-qr-code-img(alt=reward.name, src=reward.qcode, style="border-color:" + reward.color)
+                                            .post-qr-code-desc= reward.name
             .reward-list-tips
                 p= award.tips.replace('{sum}', sum.toFixed(2))

package/layout/includes/widgets/page/about/hobbies.pug

@@ -32,6 +32,6 @@ if site.data.about.likes
                         .tips= like.subtips
                         if like.button
                             .banner-button-group
-                                a.banner-button(href=like.button_link)
+                                a.banner-button(href=url_for(like.button_link))
                                     i.solitude.st-right-btn-fill
                                     span.banner-button-text= like.button_text

package/layout/includes/widgets/page/about/other.pug

@@ -10,7 +10,7 @@
                 #statistic
                 .post-tips
                     | 统计信息来自
-                    a(href="https://invite.51.la/1NzKqTeb?target=V6") 51la网站统计
+                    a(href="https://v6.51.la/") 51la网站统计
 
             script.
                 fetch("#{tj.url}")

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

@@ -10,6 +10,6 @@
         if page.rightbtn
             .banner-button-group
                 - const isInternalLink = page.rightbtnlink.startsWith('/')
-                a.banner-button(onclick=isInternalLink ? `pjax.loadUrl("${page.rightbtnlink}")` : null, href=isInternalLink ? null : page.rightbtnlink, target=isInternalLink ? null : "_blank")
+                a.banner-button(onclick=isInternalLink ? `pjax.loadUrl("${page.rightbtnlink}")`: null, href=isInternalLink ? null : url_for(page.rightbtnlink), target=isInternalLink ? null : "_blank")
                     i.solitude.st-right-btn-fill
                     span.banner-button-text= page.rightbtn

package/layout/includes/widgets/page/links/banner.pug

@@ -6,10 +6,11 @@
     if theme.footer.randomlink
         a.banner-button.secondary(onclick="travelling()")
             i.solitude.st-signal-tower-fill
-            span.banner-button-text 随机访问
-    a.banner-button(onclick="sco.scrollToComment()")
-        i.solitude.st-right-btn-fill
-        span.solitude.banner-button-text 申请友链
+            span.banner-button-text=_p('link.banner.random')
+    if theme.comment.enable
+        a.banner-button(onclick="sco.scrollToComment()")
+            i.solitude.st-right-btn-fill
+            span.solitude.banner-button-text=_p('link.banner.toComment')
 
 .tags-group-all.nowrapMove
     .tags-group-wrapper

package/layout/includes/widgets/page/moments/angle.pug

@@ -5,7 +5,7 @@
             i.solitude.st-restart-line
     .title-h2-a-right
         if page.type !== 'links'
-            a.random-post-all(href="/links/", data-pjax-state="") 全部友链
+            a.random-post-all(href=url_for("/links/"), data-pjax-state="") 全部友链
 
 #random-post
 

package/layout/includes/widgets/post/award.pug

@@ -1,24 +1,19 @@
 .post-reward(onclick="AddRewardMask()")
-    .reward-button(title="赞赏作者")
+    .reward-button(title=_p('award.tipping'))
         i.solitude.st-hand-heart-fill
-        | 打赏作者
+        =_p('award.tipping')
     .reward-main
         ul.reward-all
-            span.reward-title 感谢你赐予我前进的力量
+            span.reward-title=theme.post.award.title
             ul.reward-group
-                if theme.post.award.wechat
+                - let list = theme.post.award.list || []
+                for item in list
                     li.reward-item
-                        a(href=theme.post.award.wechat)
-                            img.post-qr-code-img(src=theme.post.award.wechat alt="微信")
-                        .post-qr-code-desc 微信
-                if theme.post.award.alipay
-                    li.reward-item
-                        a(href=theme.post.award.alipay target="_blank")
-                            img.post-qr-code-img(src=theme.post.award.alipay alt="支付宝")
-                        .post-qr-code-desc 支付宝
-            a.reward-main-btn(href=url_for(theme.post.award.url))
-                .reward-text 赞赏者名单
-                .reward-dec 因为你们的支持让我意识到写文章的价值🙏
+                        img.post-qr-code-img.nolazyload(src=item.qcode, alt=item.name, style="border-color: " + item.color)
+                        .post-qr-code-desc=item.name
+            a.reward-main-btn(href=url_for(theme.post.award.appreciators))
+                .reward-text= _p('award.title')
+                .reward-dec=theme.post.award.desc
 
 script.
     function RemoveRewardMask() {