feat: 可設置首頁文章不顯示內容/description

feat: 主頁文章時間和文章頁文章時間可以配置顯示日期還是相對時間
feat: top_img 可配置 [留空（默認色）/顏色/漸變色/圖片鏈接/ false（不顯示top_img）]
feat: footer可配置背景 [留空/false(默認色)/顏色/漸變色/圖片鏈接/true(跟top_img一樣)]
improvement: preloader 在 pjax 下 每個頁面都會加載
improvement: 修改判斷，避免用户設置2個lightbox 而導致報錯（只能設置一個）
improvement: 精確時間顯示 （剛剛/幾分鐘前/幾小時前/幾天前/幾個月前）
improvement: 刪除不必要的語言文件和css
chore: update hexo-renderer-stylus to 2.0.1

layout/includes/additional-js.pug

@@ -33,7 +33,7 @@ div
     !=partial('includes/loading/loading-js', {}, {cache:theme.fragment_cache})
 
   .js-pjax
-    if is_home() && theme.subtitle.enable
+    if theme.subtitle.enable && is_home() && theme.index_img !== false
       include ./third-party/subtitle.pug
 
     include ./third-party/math/index.pug

layout/includes/head.pug

@@ -10,7 +10,6 @@
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
 
-- var pageDescription = page_description()
 - var pageKeywords
 - if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
 - else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
@@ -23,7 +22,6 @@ meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
 meta(name="viewport" content="width=device-width,initial-scale=1")
 title= tabTitle
-meta(name="description" content!=pageDescription)
 if pageKeywords
   meta(name="keywords" content=pageKeywords)
 meta(name="author" content=pageAuthor)
@@ -35,6 +33,9 @@ if theme.disable_baidu_transformation
   meta(http-equiv="Cache-Control" content="no-transform")
   meta(http-equiv="Cache-Control" content="no-siteapp")
 
+//- Open_Graph
+include ./head/Open_Graph.pug
+
 !=favicon_tag(theme.favicon || config.favicon)
 link(rel="canonical" href=urlNoIndex())
 
@@ -44,14 +45,6 @@ link(rel="canonical" href=urlNoIndex())
 //- 網站驗證
 !=partial('includes/head/site_verification', {}, {cache:theme.fragment_cache})
 
-//- Open_Graph
-include ./head/Open_Graph.pug
-
-if theme.facebook_comments.app_id
-  meta(property="fb:app_id" content=theme.facebook_comments.app_id )
-if theme.facebook_comments.user_id
-  meta(property="fb:admins" content=theme.facebook_comments.user_id)
-
 //- PWA
 if (theme.pwa && theme.pwa.enable)
   !=partial('includes/head/pwa', {}, {cache:theme.fragment_cache})

layout/includes/head/Open_Graph.pug

@@ -1,12 +1,11 @@
-- var contentType = is_post() ? 'article' : 'website'
-
 if theme.Open_Graph_meta
-  meta(property="og:type" content=contentType)
-  meta(property="og:title" content=pageTitle)
-  meta(property="og:url" content=urlNoIndex())
-  meta(property="og:site_name" content=config.title)
-  meta(property="og:description" content!=pageDescription)
-  meta(property="og:image" content=full_url_for(page.cover || theme.avatar.img))
-  meta(property="article:published_time" content=date_xml(page.date))
-  meta(property="article:modified_time" content=date_xml(page.updated))
-  meta(name="twitter:card" content="summary")
+  - let contentType = is_post() ? 'article' : 'website'
+  - let metaImage = full_url_for(page.cover || theme.avatar.img)
+  - let fb_appId = theme.facebook_comments.app_id || ''
+  - let fb_admins = theme.facebook_comments.user_id || ''
+
+  != open_graph({type: contentType, image: metaImage, fb_admins: fb_admins, fb_app_id: fb_appId})
+
+else
+  meta(name="description" content=page_description())
+

layout/includes/head/config.pug

@@ -61,10 +61,6 @@
   let Snackbar = 'undefined';
   if (theme.snackbar && theme.snackbar.enable) {
     Snackbar = JSON.stringify({
-      bookmark: {
-        message_prev: _p("Snackbar.bookmark.message_prev"),
-        message_next: _p("Snackbar.bookmark.message_next")
-      },
       chs_to_cht: _p("Snackbar.chs_to_cht"),
       cht_to_chs: _p("Snackbar.cht_to_chs"),
       day_to_night: _p("Snackbar.day_to_night"),
@@ -94,12 +90,6 @@
     })
   }
 
-  let date_suffix = JSON.stringify({
-    one_hour: _p("date_suffix.one_hour"),
-    hours: _p("date_suffix.hours"),
-    day: _p('date_suffix.day')
-  })
-
 script.
   var GLOBAL_CONFIG = { 
     root: '!{config.root}',
@@ -114,16 +104,21 @@ script.
       error: '!{_p("copy.error")}',
       noSupport: '!{_p("copy.noSupport")}'
     },
-    bookmark: {
-      message_prev: '!{_p("Snackbar.bookmark.message_prev")}',
-      message_next: '!{_p("Snackbar.bookmark.message_next")}'
+    relativeDate: {
+      homepage: !{theme.post_meta.page.date_format === 'relative'},
+      post: !{theme.post_meta.post.date_format === 'relative'}
     },
     runtime: '!{theme.runtimeshow.enable ? _p("aside.card_webinfo.runtime.unit") : ""}',
-    date_suffix: !{date_suffix},
+    date_suffix: {
+      just: '!{_p("date_suffix.just")}',
+      min: '!{_p("date_suffix.min")}',
+      hour: '!{_p("date_suffix.hour")}',
+      day: '!{_p("date_suffix.day")}',
+      month: '!{_p("date_suffix.month")}'
+    },
     copyright: !{copyright},
     ClickShowText: !{ClickShowText},
-    medium_zoom: !{theme.medium_zoom},
-    fancybox: !{theme.fancybox},
+    lightbox: '!{ theme.medium_zoom ? "mediumZoom" : (theme.fancybox ? "fancybox" : "null" )}',
     Snackbar: !{Snackbar},
     justifiedGallery: {
       js: '!{theme.CDN.justifiedGallery_js}',
@@ -144,7 +139,7 @@ script.
         expiry: now.getTime() + expiryDay,
       }
       localStorage.setItem(key, JSON.stringify(item))
-      },
+    },
 
     get: function getWithExpiry(key) {
       const itemStr = localStorage.getItem(key)

layout/includes/head/noscript.pug

@@ -1,9 +1,14 @@
 noscript. 
   <style type="text/css">
-  #nav {
-    opacity: 1
-  }
-  .justified-gallery img {
-    opacity: 1
-  }
+    #nav {
+      opacity: 1
+    }
+    .justified-gallery img {
+      opacity: 1
+    }
+
+    #recent-posts time,
+    #post-meta time {
+      display: inline !important
+    }
   </style>

layout/includes/header/index.pug

@@ -1,43 +1,60 @@
-if is_home()
-  - var top_img = theme.index_img || theme.default_top_img
-else if is_post()
-  - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
-else if is_archive()
-  - var top_img = theme.archive_img || theme.default_top_img
-else if is_tag()
-  - var top_img = theme.tag_img || theme.default_top_img
-else if is_category()
-  - var top_img = theme.category_img || theme.default_top_img
+if page.top_img !== false
+  if is_post()
+    - var top_img = page.top_img || page.cover || page.randomcover || theme.default_top_img
+  else if is_page()
+    - var top_img = page.top_img || theme.default_top_img
+  else if is_tag()
+    - var top_img = theme.tag_per_img && theme.tag_per_img[page.tag] 
+    - top_img = top_img ? top_img : (theme.tag_img !== false ? theme.tag_img || theme.default_top_img : false)
+  else if is_category()
+    - var top_img = theme.category_per_img && theme.category_per_img[page.category]
+    - top_img = top_img ? top_img : (theme.category_img !== false ? theme.category_img || theme.default_top_img : false)
+  else if is_home()
+    - var top_img = theme.index_img !== false ? theme.index_img || theme.default_top_img : false
+  else if is_archive()
+    - var top_img = theme.archive_img !== false ? theme.archive_img || theme.default_top_img : false
+  else
+    - var top_img = page.top_img || theme.default_top_img
+
+  if theme.douban
+    - var doubanExist = false
+    if is_current('/movies/', [strict])
+      - var top_img = theme.douban.movies_img !== false ? theme.douban.movies_img || theme.default_top_img : false
+      - doubanExist = true
+    else if is_current('/books/', [strict])
+      - var top_img = theme.douban.books_img !== false ? theme.douban.books_img || theme.default_top_img : false
+      - doubanExist = true
+    else if is_current('/games/', [strict])
+      - var top_img = theme.douban.games_img !== false ? theme.douban.games_img || theme.default_top_img : false
+      - doubanExist = true
+
+  if top_img !== false
+    - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url(${url_for(top_img)})` : `background: ${top_img}`
+    - var bg_img = top_img ? imgSource : ''
+    - var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
+    - var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
+    - is_post() ? isHomeClass = 'post-bg' : isHomeClass
+  else
+    - var isHomeClass = 'no-top-img'
 else
-  - var top_img = page.top_img || theme.default_top_img
-
-if theme.douban
-  if is_current('/movies/', [strict])
-    - var top_img = theme.douban.movies_img || theme.default_top_img
-  else if is_current('/books/', [strict])
-    - var top_img = theme.douban.books_img || theme.default_top_img
-  else if is_current('/games/', [strict])
-    - var top_img = theme.douban.games_img || theme.default_top_img
-
-- var bg_img = top_img && top_img !== true ? `background-image: url(${url_for(top_img)})` : ''
-- var site_title = is_archive() ? _p('page.archives') : page.title || page.tag || page.category || config.title
-- var isHomeClass = is_home() ? 'full_page' : 'not-index-bg'
-- is_post() ? isHomeClass = 'post-bg' : isHomeClass
+  - var top_img = false
+  - var isHomeClass = 'no-top-img'
 
 header#page-header(class=isHomeClass style=bg_img)
   !=partial('includes/header/nav', {}, {cache:theme.fragment_cache})
-  if is_home()
-    #site-info
-      h1#site_title=site_title
-      #site_subtitle
-        span#subtitle
-      if(theme.social)
-        #site_social_icons
-          !=fragment_cache('social', function(){return partial('includes/header/social')})
-    #scroll_down
-      i.fas.fa-angle-down.scroll-down-effects
-  else if is_post()
-    include ./post-info.pug 
-  else
-    #page_site-info
-      h1#site_title=site_title
+  if top_img !== false
+    if is_post()
+      include ./post-info.pug
+    else if is_home() 
+      #site-info
+        h1#site_title=site_title
+        #site_subtitle
+          span#subtitle
+        if(theme.social)
+          #site_social_icons
+            !=fragment_cache('social', function(){return partial('includes/header/social')})
+      #scroll_down
+        i.fas.fa-angle-down.scroll-down-effects
+    else
+      #page_site-info
+        h1#site_title=site_title

layout/includes/layout.pug

@@ -33,9 +33,16 @@ html(lang=config.language data-theme=theme.display_mode)
           else
             block content
       
-      - var footer_bg = theme.footer_bg == false ? '' : bg_img
-      - var is_bg = theme.footer_bg == false ? 'color' : 'photo'
-      footer#footer(style=footer_bg data-type=is_bg)
+      - var footerBg = theme.footer_bg
+      if (footerBg)
+        if (footerBg === true)
+          - var footer_bg = bg_img
+        else
+          - var footer_bg = theme.footer_bg.indexOf('/') !== -1 ? `background-image: url(${url_for(footerBg)})` : `background: ${footerBg}`
+      else
+        - var footer_bg = ''
+
+      footer#footer(style=footer_bg)
         !=partial('includes/footer', {}, {cache:theme.fragment_cache})
 
     include ./rightside.pug

layout/includes/loading/loading-js.pug

@@ -1,6 +1,13 @@
 script.
-  var endLoading = function () {
-    document.body.style.overflow = 'auto';
-    document.getElementById('loading-box').classList.add("loaded")
+  var preloader = {
+    endLoading: () => {
+      document.body.style.overflow = 'auto';
+      document.getElementById('loading-box').classList.add("loaded")
+    },
+    initLoading: () => {
+      document.body.style.overflow = '';
+      document.getElementById('loading-box').classList.remove("loaded")
+
+    }
   }
-  window.addEventListener('load',endLoading)
+  window.addEventListener('load',()=> {preloader.endLoading()})

layout/includes/mixins/post-ui.pug

@@ -57,21 +57,24 @@ mixin postUI(posts)
                   span.article-meta__link #[='•']
 
         //- Display the article introduction on homepage
-        if theme.index_post_content.method == 1
-          .content!= article.description
-        else if theme.index_post_content.method == 2
-          if article.description
+        case theme.index_post_content.method
+          when false
+            - break
+          when 1
             .content!= article.description
-          else
+          when 2
+            if article.description
+              .content!= article.description
+            else
+              - const content = strip_html(article.content)
+              - let expert = content.substring(0, theme.index_post_content.length) 
+              - content.length > theme.index_post_content.length ? expert += ' ...' : ''
+              .content!= expert
+          default
             - const content = strip_html(article.content)
             - let expert = content.substring(0, theme.index_post_content.length) 
             - content.length > theme.index_post_content.length ? expert += ' ...' : ''
             .content!= expert
-        else
-          - const content = strip_html(article.content)
-          - let expert = content.substring(0, theme.index_post_content.length) 
-          - content.length > theme.index_post_content.length ? expert += ' ...' : ''
-          .content!= expert
 
     if theme.ad && theme.ad.index
       if (index + 1) % 3 == 0

layout/includes/third-party/pjax.pug

@@ -52,10 +52,14 @@ script.
 
     // prismjs
     typeof Prism === 'object' && Prism.highlightAll()
+
+    typeof preloader === 'object' && preloader.endLoading()
   })
 
 
   document.addEventListener('pjax:send', function () {
+    typeof preloader === 'object' && preloader.initLoading()
+    
     if (window.aplayers) {
       for (let i = 0; i < window.aplayers.length; i++) {
         if (!window.aplayers[i].options.fixed) {

layout/includes/widget/card_recent_post.pug

@@ -7,18 +7,18 @@
       - let postLimit = theme.aside.card_recent_post.limit === 0 ? site.posts.length : theme.aside.card_recent_post.limit || 5
       - let sort = theme.aside.card_recent_post.sort === 'updated' ? 'updated' : 'date'
       - site.posts.sort(sort, -1).limit(postLimit).each(function(article){
-        .aside-list-item
-          - let link = article.link || article.path
-          - let title = article.title || _p('no_title')
-          - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-aside-cover' : ''
-          - let post_cover = article.cover
+        - let link = article.link || article.path
+        - let title = article.title || _p('no_title')
+        - let no_cover = article.cover === false || !theme.cover.aside_enable ? 'no-cover' : ''
+        - let post_cover = article.cover
+        .aside-list-item(class=no_cover)
           if post_cover && theme.cover.aside_enable
             a.thumbnail(href=url_for(link) title=title)
               if theme.lazyload.enable
                 img(data-lazy-src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
               else
                 img(src=url_for(post_cover) onerror=`this.onerror=null;this.src='${url_for(theme.error_img.post_page)}'` alt=title)
-          .content(class=no_cover)
+          .content
             a.title(href=url_for(link) title=title)= title
             if theme.aside.card_recent_post.sort === 'updated'
               time(datetime=date_xml(article.updated) title=_p('post.updated') + ' ' + full_date(article.updated)) #[=date(article.updated, config.date_format)]

layout/page.pug

@@ -25,10 +25,12 @@ block content
         !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})
   else
     #page
-      if theme.douban && theme.douban.meta
-        if (is_current('/movies/', [strict]) || is_current('/books/', [strict]) || is_current('/games/', [strict]))
-          meta(name="referrer" content="no-referrer")
-      #article-container!= page.content
+      if theme.douban && theme.douban.meta && doubanExist
+        meta(name="referrer" content="no-referrer")
+      #article-container
+        if top_img === false
+          h1.page-title= page.title
+        != page.content
       if page.comments !== false && theme.comments && theme.comments.use
         - var commentsJsLoad = true
         !=partial('includes/third-party/comments/index', {}, {cache:theme.fragment_cache})

layout/post.pug

@@ -2,6 +2,9 @@ extends includes/layout.pug
 
 block content
   article#post(class="")
+    if top_img === false
+      include includes/header/post-info.pug
+
     #article-container.post-content!=page.content
     include includes/post/post-copyright.pug
     .tag_share