1. fix Traditional Chinese and Simplified Chinese Conversion

2. Add the option to hidden the aside items #2 3. Add the option to change subtitle 4. Add the option to change the font 5. fix read-mode and night-mode 6. fix the bugs of the cover #2
2026-04-16 17:40:55 +08:00 · 2019-06-14 01:41:53 +08:00
parent b4ae5c6c3e
commit 79971d49db
23 changed files with 780 additions and 832 deletions
--- a/layout/includes/additional-js.pug
+++ b/layout/includes/additional-js.pug
@@ -10,40 +10,6 @@ if (theme.local_search && theme.local_search.enable)
  script(async src=url_for('/js/search/local-search.js'))


-if theme.translate && theme.translate.enable
-  script(src=url_for('/js/tw_cn.js'))
-  script.
-    $(document).ready(function() { 
-      initializeChineseConversion();
-    });
-    function simplifyTextInPage(simplified) {
-      if (simplified) {
-        $(document.body).t2s();
-        $('#translateLink').addClass('simplified');
-        $('#translateLink').text('繁');
-      } else {
-        $(document.body).s2t();
-        $('#translateLink').removeClass('simplified');
-        $('#translateLink').text('簡');
-      }
-    }
-    function initializeChineseConversion() {
-      var simplified = +Cookies.get('simplified');
-      // ?lang=zh-Hans, ?lang=zh-Hant
-      var scriptCode = /[?&;]lang=[^&;]*(Han[st])/i.exec(window.location.search);
-      if (scriptCode) {
-        simplified = +(scriptCode[1].match(/Hans/i) != null);
-        Cookies.set('simplified', simplified, {expires: 7, path: '/'});
-      }
-      simplifyTextInPage(simplified);
-      $('#translateLink').click(function() {
-        simplified = +!simplified;
-        Cookies.set('simplified', simplified, {expires: 7, path: '/'});
-        simplifyTextInPage(simplified);
-        $(this).blur();
-      });
-    }
-
 if theme.nightshift.enable
  script(src=url_for('js/nightshift.js'))

@@ -60,39 +26,24 @@ if theme.activate_power_mode.enable
    POWERMODE.shake = true; // turn off shake
    document.body.addEventListener('input', POWERMODE);

+if theme.translate && theme.translate.enable
+  script(src=url_for('/js/tw_cn.js'))
+  script.
+    translateInitilization()


-
-
-//- script(src="https://unpkg.com/aos@next/dist/aos.js")
-//- script.
-//-     $(".recent-post-item,.card_widget,#archive,.tag-cloud,#tag,.category-content,#category,#page,.flink").attr("data-aos","slide-up");
-//-     AOS.init();
-
-
-script(src="https://cdn.jsdelivr.net/npm/instant.page@1.2.2/instantpage.min.js" type="module")
-
-//- if is_post()
-//-   script(src="https://cdn.jsdelivr.net/npm/typed.js@2.0.9")
-//-   script.
-//-     var typed = new Typed("#typed", {
-//-     stringsElement: '#post-title-effects',
-//-     typeSpeed: 150,
-//-     loop: true,
-//-     backSpeed: 100
-//-     });
-
-if is_home()
-  script(src="https://cdn.jsdelivr.net/npm/typed.js@2.0.9")
+if is_home() && theme.subtitle.enable
+  script(src="https://cdn.jsdelivr.net/npm/typed.js@2.0.9")    
  script.
    var typed = new Typed(".subtitle", {
-    strings: ["今日事,今日畢", "Never put off till tomorrow what you can do today"],
+    strings: ['!{theme.subtitle.sub1}','!{theme.subtitle.sub2}'],
    startDelay: 300,
    typeSpeed: 100,
    loop: true,
    backSpeed: 50
    });
-  
+
+if is_home()  
  script.
    //首頁fullpage
    function alignContent() {
@@ -130,3 +81,4 @@ if is_home()


 script(async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js")
+script(src="https://cdn.jsdelivr.net/npm/instant.page@1.2.2/instantpage.min.js" type="module")
--- a/layout/includes/aside.pug
+++ b/layout/includes/aside.pug
@@ -1,125 +1,132 @@
-.card_widget.card-author
-  .card-content
-    .post_data
-      .data-item.text-center
-        img.lozad(data-src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
-        p.author-info__name.text-center= config.author
-        p.author-info__description.text-center= config.description
-
-    .post_data.data_config
-      if site.posts.length
+if theme.aside.card_author
+  .card_widget.card-author
+    .card-content
+      .post_data
        .data-item.text-center
-          .data_link
-            a(href=url_for(config.archive_dir) + '/')
-              p.headline= _p('aside.articles') 
-              p.length_num= site.posts.length
+          img.lozad(data-src=theme.avatar || url_for('/img/avatar.png') onerror=`onerror=null;src='${theme.lodding_bg.flink}'`)
+          p.author-info__name.text-center= config.author
+          p.author-info__description.text-center= config.description

-      if site.tags.length
-        .data-item.text-center       
-          .data_link
-            a(href=url_for(config.tag_dir) + '/' )
-              p.headline= _p('aside.tags')
-              p.length_num= site.tags.length
-
-      if site.categories.length
-        .data-item.text-center      
-          .data_link
-            a(href=url_for(config.category_dir) + '/')
-              p.headline= _p('aside.categories') 
-              p.length_num= site.categories.length
-
-    .post_data.text-center
-      a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') )=  _p('aside.card_bookmark') || 'Follow Me'
-      
-   
-   
-    if(theme.social)
      .post_data.data_config
-        #aside-social-icons 
-          each url, icon in theme.social
-            a.social-icon.data-item(href=url target="_blank")
-              i(class=icon)
+        if site.posts.length
+          .data-item.text-center
+            .data_link
+              a(href=url_for(config.archive_dir) + '/')
+                p.headline= _p('aside.articles') 
+                p.length_num= site.posts.length

-.card_widget.card-announcement
-  .card-content
-    .item_headline
-      i.fa.fa-bullhorn.card-announcement-animation(aria-hidden="true")
-      span= _p('aside.card_announcement')
-    .announcement_content= theme.announcement.content
+        if site.tags.length
+          .data-item.text-center       
+            .data_link
+              a(href=url_for(config.tag_dir) + '/' )
+                p.headline= _p('aside.tags')
+                p.length_num= site.tags.length

-.card_widget.card-recent-post
-  .card-content
-    .item_headline
-      i.fa.fa-history(aria-hidden="true")
-      span= _p('aside.card_recent_post')
-    .aside_recent_item
-      - site.posts.sort('date', -1).limit(5).each(function(article){
-        .aside_recent_post
-          - var link = article.link || article.path
-            a(href=url_for(link))
-              - var post_cover = article.cover
-              - var default_post_cover = theme.default_cover
-              .aside_post_cover
-                if (post_cover)
-                  img.aside_post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
-                else
-                  img.aside_post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
-              div#aside_title
-                .aside_post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title')
-                if (theme.post_meta.date_type)
-                  - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
-                  time.aside_post_meta.post-meta__date #[=date(article[date_type], config.date_format)]
+        if site.categories.length
+          .data-item.text-center      
+            .data_link
+              a(href=url_for(config.category_dir) + '/')
+                p.headline= _p('aside.categories') 
+                p.length_num= site.categories.length
+
+      .post_data.text-center
+        a#bookmark-it.data-item.bookmark.bookmarke--primary.bookmark--animated(href="javascript:;" title= _p('aside.card_bookmark') )=  _p('aside.card_bookmark') || 'Follow Me'
+        
    
-      - })
+    
+      if(theme.social)
+        .post_data.data_config
+          #aside-social-icons 
+            each url, icon in theme.social
+              a.social-icon.data-item(href=url target="_blank")
+                i(class=icon)
+
+if theme.aside.card_announcement
+  .card_widget.card-announcement
+    .card-content
+      .item_headline
+        i.fa.fa-bullhorn.card-announcement-animation(aria-hidden="true")
+        span= _p('aside.card_announcement')
+      .announcement_content= theme.announcement.content
+
+if theme.aside.card_recent_post
+  .card_widget.card-recent-post
+    .card-content
+      .item_headline
+        i.fa.fa-history(aria-hidden="true")
+        span= _p('aside.card_recent_post')
+      .aside_recent_item
+        - site.posts.sort('date', -1).limit(5).each(function(article){
+          .aside_recent_post
+            - var link = article.link || article.path
+              a(href=url_for(link))
+                - var post_cover = article.cover
+                - var default_post_cover = theme.default_cover
+                .aside_post_cover
+                  if (post_cover)
+                    img.aside_post_bg.lozad(data-src=`${post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
+                  else
+                    img.aside_post_bg.lozad(data-src=`${default_post_cover}` onerror=`onerror=null;src='${theme.lodding_bg.post_page}'` title=article.title || _p('no_title'))
+                div#aside_title
+                  .aside_post_title(href=url_for(link) title=article.title || _p('no_title'))= article.title || _p('no_title')
+                  if (theme.post_meta.date_type)
+                    - var date_type = theme.post_meta.date_type == 'updated' ? 'updated' : 'date'
+                    time.aside_post_meta.post-meta__date #[=date(article[date_type], config.date_format)]
      
-.card_widget.card-categories
-  .card-content
-    .item_headline
-      i.fa.fa-folder-open(aria-hidden="true")
-      span= _p('aside.card_categories')
-    ul.aside_category_item
-      - site.categories.sort('name').each(function(category){
-        li.aside_category_list
-          a.aside_category_list_link(href='/' + `${category.path}`)
-            span.aside_category_list_name= category.name
-            span.aside_category_list_length= category.length
-      - })
+        - })

-.card_widget.card-tags
-  .card-content
-    .item_headline
-      i.fa.fa-tags(aria-hidden="true")
-      span= _p('aside.card_tags')
-    .card-tag-cloud!= tagcloud({min_font: 16, max_font: 24, amount: 200, color: true, start_color: '#999', end_color: '#000'})
+if theme.aside.card_categories   
+  .card_widget.card-categories
+    .card-content
+      .item_headline
+        i.fa.fa-folder-open(aria-hidden="true")
+        span= _p('aside.card_categories')
+      ul.aside_category_item
+        - site.categories.sort('name').each(function(category){
+          li.aside_category_list
+            a.aside_category_list_link(href='/' + `${category.path}`)
+              span.aside_category_list_name= category.name
+              span.aside_category_list_length= category.length
+        - })

-.card_widget.card-archives
-  .card-content
-    .item_headline
-      i.fa.fa-archive(aria-hidden="true")
-      span= _p('aside.card_archives')
-    div.archives_item!= list_archives({type:'monthly',format: 'YYYY年MM月'})
+if theme.aside.card_tags
+  .card_widget.card-tags
+    .card-content
+      .item_headline
+        i.fa.fa-tags(aria-hidden="true")
+        span= _p('aside.card_tags')
+      .card-tag-cloud!= tagcloud({min_font: 16, max_font: 24, amount: 200, color: true, start_color: '#999', end_color: '#000'})

-.card_widget.card-webinfo
-  .card-content
-    .item_headline
-        i.fa.fa-line-chart(aria-hidden="true")
-        span= _p('aside.card_webinfo.headline')
-    .webinfo
-      .webinfo_item
-        .webinfo_article_name= _p('aside.card_webinfo.article_name') + " :"
-        .webinfo_article_count= site.posts.length      
-      if theme.runtimeshow.enable
+if theme.aside.card_archives
+  .card_widget.card-archives
+    .card-content
+      .item_headline
+        i.fa.fa-archive(aria-hidden="true")
+        span= _p('aside.card_archives')
+      div.archives_item!= list_archives({type:'monthly',format: 'YYYY年MM月'})
+
+if theme.aside.card_webinfo
+  .card_widget.card-webinfo
+    .card-content
+      .item_headline
+          i.fa.fa-line-chart(aria-hidden="true")
+          span= _p('aside.card_webinfo.headline')
+      .webinfo
        .webinfo_item
-          .webinfo_runtime_name= _p('aside.card_webinfo.runtime_name') + " :"
-          #webinfo_runtime_count.webinfo_runtime_count
-          script#runtionshow(src=url_for('js/runtimeshow.js') start_date=theme.runtimeshow.start_date)       
-      
-      if theme.busuanzi.site_uv 
-        .webinfo_item       
-          .webinfo_site_uv_name= _p('aside.card_webinfo.site_uv_name') + " :"
-          .webinfo_site_uv_count#busuanzi_value_site_uv
-      if theme.busuanzi.site_pv
-        .webinfo_item
-          .webinfo_site_name= _p('aside.card_webinfo.site_pv_name') + " :"
-          .webinfo_site_pv_count#busuanzi_value_site_pv
+          .webinfo_article_name= _p('aside.card_webinfo.article_name') + " :"
+          .webinfo_article_count= site.posts.length      
+        if theme.runtimeshow.enable
+          .webinfo_item
+            .webinfo_runtime_name= _p('aside.card_webinfo.runtime_name') + " :"
+            #webinfo_runtime_count.webinfo_runtime_count
+            script#runtionshow(src=url_for('js/runtimeshow.js') start_date=theme.runtimeshow.start_date)       
+        
+        if theme.busuanzi.site_uv 
+          .webinfo_item       
+            .webinfo_site_uv_name= _p('aside.card_webinfo.site_uv_name') + " :"
+            .webinfo_site_uv_count#busuanzi_value_site_uv
+        if theme.busuanzi.site_pv
+          .webinfo_item
+            .webinfo_site_name= _p('aside.card_webinfo.site_pv_name') + " :"
+            .webinfo_site_pv_count#busuanzi_value_site_pv

--- a/layout/includes/config.pug
+++ b/layout/includes/config.pug
@@ -26,14 +26,39 @@
      }
    })
  }
+
+  if (theme.translate && theme.translate.enable){
+    var defaultEncoding;
+    translate = JSON.stringify({
+      defaultEncoding: theme.translate.defaultEncoding,
+      translateDelay: theme.translate.translateDelay,
+      cookieDomain: theme.translate.cookieDomain,
+      msgToTraditionalChinese: theme.translate.msgToTraditionalChinese,
+      msgToSimplifiedChinese: theme.translate.msgToSimplifiedChinese
+    })
+  }
+
+
+
+
+
 script.
  var GLOBAL_CONFIG = { 
    root: '!{config.root}',
    algolia: !{algolia},
    localSearch: !{localSearch},
+    translate: !{translate},
+    highlight_copy: '!{theme.highlight_copy}',
    copy: {
      success: '!{_p("copy.success")}',
      error: '!{_p("copy.error")}',
      noSupport: '!{_p("copy.noSupport")}'
+    },
+    bookmark: {
+      title: '!{_p("bookmark.title")}',
+      message_prev: '!{_p("bookmark.message_prev")}',
+      message_next: '!{_p("bookmark.message_next")}'
    }
-  } 
+    
+  }
+
--- a/layout/includes/head.pug
+++ b/layout/includes/head.pug
@@ -52,8 +52,7 @@ if (theme.gitalk && theme.gitalk.enable)
    script(src="https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js")
  script(src="https://cdn.jsdelivr.net/npm/blueimp-md5@2.10.0/js/md5.min.js")

-//- if (theme.pwa && theme.pwa.enable)
-//-   link(rel="manifest" href=theme.pwa.manifest)
+

 if (theme.pwa && theme.pwa.enable)
  link(rel="manifest" href=theme.pwa.manifest)
@@ -69,8 +68,6 @@ if (theme.pwa && theme.pwa.enable)
    link(rel="icon" type="image/png" sizes="16x16" href=theme.pwa.favicon_16_16)
  if(theme.pwa.mask_icon)
    link(rel="mask-icon" href=theme.pwa.mask_icon color="#5bbad5")
-  if(theme.pwa.shortcut_icon)
-    link(rel="shortcut icon", href=theme.pwa.shortcut_icon)


 if theme.baidu_analytics
--- a/layout/includes/layout.pug
+++ b/layout/includes/layout.pug
@@ -32,7 +32,7 @@ html(lang=config.language)
    meta(name="author" content=pageAuthor)
    meta(name="copyright" content=pageCopyright)
    meta(name ="format-detection" content="telephone=no")
-    //- !=favicon_tag(config.favicon || theme.favicon || '/favicon.ico')
+    !=favicon_tag(config.favicon || theme.favicon || '/favicon.ico')
    if theme.stylesheets !== undefined && theme.stylesheets.length > 0
      each url in theme.stylesheets
        link(rel='stylesheet', href=url_for(url))
--- a/layout/includes/rightside.pug
+++ b/layout/includes/rightside.pug
@@ -1,11 +1,9 @@
 section#rightside.rightside
  if theme.readmode.enable && is_post()
-    i#readmode.fa.fa-book  
-  i#font_plus.fa.fa-plus
-  i#font_minus.fa.fa-minus
-  if page.comments !== false && !is_home() && !is_archive()
-    i#to_comment.fa.fa-comments-o 
+    i#readmode.fa.fa-book(title=_p('rightside.readmode_title')) 
+  i#font_plus.fa.fa-plus(title=_p('rightside.font_plus_title'))
+  i#font_minus.fa.fa-minus(title=_p('rightside.font_minus_title'))
  if theme.translate && theme.translate.enable
-    a#translateLink.translate_chn_to_cht=theme.translate.show 
+    a#translateLink.translate_chn_to_cht(href="javascript:translatePage();" title=_p('rightside.translate_title'))= theme.translate.default
  if theme.nightshift.enable
-    i#nightshift.fa.fa-moon-o.nightshift
+    i#nightshift.fa.fa-moon-o.nightshift(title=_p('rightside.night_mode_title'))