hexo-theme-stellar 1.24.0 → 1.25.0

package/_config.yml

@@ -1,6 +1,6 @@
 ######## Stellar info ########
 stellar:
-  version: '1.24.0'
+  version: '1.25.0'
   homepage: 'https://xaoxuu.com/wiki/stellar/'
   repo: 'https://github.com/xaoxuu/hexo-theme-stellar'
   cdn_css: # Use cdn links instead of /css/main.css
@@ -18,42 +18,65 @@ open_graph:
 
 
 ######## Sidebar ########
-sidebar:
-  logo:
-    avatar: '[config.avatar](/about/)' # you can set avatar link in _config.yml or '[https://xxx.png](/about/)'
-    title: '[config.title](/)' # you can set html tag like: '[<img no-lazy height="32px" src="xxx"/>](/)'
-  menu:
-    # post: '[btn.blog](/)'
-    # wiki: '[btn.wiki](/wiki/)'
-    # friends: '[友链](/friends/)'
-    # about: '[关于](/about/)'
-  # Sidebar widgets
-  widgets:
-    #### 自动生成的页面 ####
-    # 主页
-    home: search, recent, timeline # for home
-    # 博客索引页
-    blog_index: search_blog, recent, timeline # for categories/tags/archives
-    # 文档索引页
-    wiki_index: search_docs, recent, timeline # for wiki
-    # 其它（404）
-    others: search, recent, timeline # for 404 and ...
-    #### 手动创建的页面 ####
-    # 文章内页
-    post: search_blog, toc, ghrepo, ghissues # for pages using 'layout:post'
-    # 文档内页
-    wiki: search, toc, ghissues, related # for pages using 'layout:wiki'
-    # 其它 layout:page 的页面
-    page: toc, search # for custom pages using 'layout:page'
-
-######## Index ########
-post-index: # 近期发布 分类 标签 归档 and ...
-  # '朋友文章': /friends/rss/
+# 左上角显示的 logo 区域，包含图标、大标题、副标题
+logo:
+  avatar: '[config.avatar](/about/)' # you can set avatar link in _config.yml or '[https://xxx.png](/about/)'
+  title: '[config.title](/)' # you can set html tag like: '[<img no-lazy height="32px" src="xxx"/>](/)'
+  subtitle: '' # '文字1 | 文字2' (鼠标放上去会切换到文字2)
+
+# 侧边栏主功能导航菜单
+# 自己可以增加任意的键值对
+# 键：就是 menu_id，后面需要用到
+# 值：就是显示的 md 链接，方括号内支持文字和图片标签
+menu:
+  # post: '[btn.blog](/)'
+  # wiki: '[btn.wiki](/wiki/)'
+  # friends: '[友链](/friends/)'
+  # about: '[关于](/about/)'
 
 
 ######## Main ########
-breadcrumb:
-  home: home # config.title / config.author / home or custom content
+# 站点主结构树
+site_tree:
+  # 主页配置
+  home:
+    sidebar: search, recent, timeline
+  # 博客配置
+  blog:
+    base_dir: blog # 只影响自动生成的页面路径
+    menu_id: post # 未在 front-matter 中指定 menu_id 时，layout 为 post 的页面默认使用这里配置的 menu_id
+    sidebar: search_blog, recent, timeline # for categories/tags/archives
+    nav_tabs:  # 近期发布 分类 标签 专栏 归档 and ...
+      # '朋友文章': /friends/rss/
+  # 博客文章配置
+  post:
+    menu_id: post # 未在 front-matter 中指定 menu_id 时，layout 为 post 的页面默认使用这里配置的 menu_id
+    sidebar: search_blog, toc, related, ghrepo, ghissues # for pages using 'layout:post'
+  # 博客专栏配置
+  topic:
+    base_dir: topic # 只影响自动生成的页面路径
+    menu_id: post # 未在 front-matter 中指定 menu_id 时，layout 为 topic 的页面默认使用这里配置的 menu_id
+    sidebar: search_blog, toc, related # for topic
+  # wiki配置
+  wiki:
+    base_dir: wiki # 只影响自动生成的页面路径
+    menu_id: wiki # 未在 front-matter 中指定 menu_id 时，layout 为 wiki 的页面默认使用这里配置的 menu_id
+    sidebar: search_docs, ghissues, related, recent, timeline # for wiki
+  # 作者信息配置
+  author: 
+    base_dir: author # 只影响自动生成的页面路径
+    menu_id: post
+    sidebar: search_blog, recent, timeline
+  # 错误页配置
+  error_page:
+    menu_id: post
+    '404': '/404.html'
+    sidebar: search, recent, timeline
+  # 其它自定义页面配置 layout: page
+  page:
+    sidebar: toc, search
+
+
 
 ######## Article ########
 article:
@@ -189,16 +212,16 @@ comments:
 footer:
   social:
     # github:
-    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/08a41b181ce68.svg"/>'
+    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/08a41b181ce68.svg"/>'
     #   url: /
     # music:
-    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/3845874.svg"/>'
+    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/3845874.svg"/>'
     #   url: /
     # unsplash:
-    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/3616429.svg"/>'
+    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/3616429.svg"/>'
     #   url: /
     # comments:
-    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/942ebbf1a4b91.svg"/>'
+    #   icon: '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/942ebbf1a4b91.svg"/>'
     #   url: /about/#comments
   sitemap:
     # '博客':
@@ -443,7 +466,7 @@ style:
     underline: true # true / false
   animated_avatar:
     animate: auto # auto, always
-    background: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/avatar/round/rainbow64@3x.webp
+    background: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/avatar/round/rainbow64@3x.webp
   codeblock:
     scrollbar: 4px
     highlightjs_theme: https://gcore.jsdelivr.net/gh/highlightjs/cdn-release@11.7.0/build/styles/atom-one-dark.min.css
@@ -455,12 +478,13 @@ style:
     search: 'linear-gradient(to right, #04F3FF, #08FFC6, #DDF730, #FFBD19, #FF1FE0, #C418FF, #04F3FF)'
 
 default:
-  avatar: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/avatar/round/3442075.svg
-  link: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/link/8f277b4ee0ecd.svg
-  cover: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/cover/76b86c0226ffd.svg
-  image: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/image/2659360.svg
-  project: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/image/2779789.png
-  banner: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/banner/books.jpg
+  avatar: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/avatar/round/3442075.svg
+  link: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/link/8f277b4ee0ecd.svg
+  cover: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/cover/76b86c0226ffd.svg
+  image: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/image/2659360.svg
+  project: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/image/2779789.png
+  banner: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/banner/books.jpg
+  topic: https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/image/10433048.png
 
 api_host:
   ghapi: https://api.github.com

package/languages/en.yml

@@ -2,6 +2,7 @@ btn:
   home: Home
   blog: Blog
   wiki: Wiki
+  topic: Topic
   recent_publish: Recent
   all_wiki: All Products
   category: Category
@@ -23,7 +24,7 @@ meta:
   related_posts: Related Posts
   comment_title: Join the discussion
   back_to_top: Back to top
-  more: 'More %s'
+  more: More
   created_author: '%s posted on'
   created: 'Posted on'
   updated: 'Updated on'

package/languages/zh-CN.yml

@@ -2,6 +2,7 @@ btn:
   home: 主页
   blog: 文章
   wiki: 项目
+  topic: 专栏
   recent_publish: 近期发布
   all_wiki: 所有项目
   category: 分类
@@ -23,7 +24,7 @@ meta:
   related_posts: 您可能感兴趣的文章
   comment_title: 快来参与讨论吧
   back_to_top: 回到顶部
-  more: '更多「%s」'
+  more: 更多
   created_author: 本文由 %s 发布于
   created: 发布于
   updated: 更新于

package/languages/zh-TW.yml

@@ -2,6 +2,7 @@ btn:
   home: 首頁
   blog: 網誌
   wiki: Wiki
+  topic: 專欄
   recent_publish: 近期發布
   all_wiki: 所有 Wiki
   category: 分類
@@ -23,7 +24,7 @@ meta:
   related_posts: 您可能感興趣的文章
   comment_title: 參與討論
   back_to_top: 回到頁首
-  more: '更多「%s」'
+  more: 更多
   created_author: 本文由 %s 發布於
   created: 發布於
   updated: 更新於

package/layout/404.ejs

@@ -1,12 +1,10 @@
 <%
-page.menu_id = '404';
-page.layout = '404';
 page.comment_title = '';
 page.header = 'auto';
 page.robots = 'none';
 %>
 <article class='md-text error-page'>
-  <h1><img id='error' src='https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/404/1c830bfcd517d.svg' alt='404'></h1>
+  <h1><img id='error' src='https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/404/1c830bfcd517d.svg' alt='404'></h1>
   <p class='what'>
     <strong>
       <%- __('page.error.what') %>

package/layout/_partial/head.ejs

@@ -26,7 +26,7 @@ function generate_description() {
   if (theme.open_graph && theme.open_graph.enable) {
     return '';
   }
-  if (page.layout == 'wiki' && page.wiki) {
+  if (page.wiki) {
     let proj = theme.wiki.tree[page.wiki];
     if (proj && proj.description) {
       return '<meta name="description" content="' + proj.description + '">';

package/layout/_partial/main/article/article_footer.ejs

@@ -38,11 +38,7 @@ function layoutDiv() {
   }
 
   var license = ''
-  if (page.layout == 'post') {
-    if (theme.article.license && (page.license != false)) {
-      license = page.license || theme.article.license
-    }
-  } else if (page.layout == 'wiki' && page.wiki) {
+  if (page.wiki) {
     let proj = theme.wiki.tree[page.wiki]
     if (page.license != null) {
       license = page.license || theme.article.license
@@ -53,6 +49,10 @@ function layoutDiv() {
         license = proj.license
       }
     }
+  } else if (page.layout == 'post') {
+    if (theme.article.license && (page.license != false)) {
+      license = page.license || theme.article.license
+    }
   }
   if (license.length > 0) {
     var author = null
@@ -75,15 +75,15 @@ function layoutDiv() {
   }
 
   var showSharePlugin = false
-  if (page.layout == 'post') {
-    showSharePlugin = page.share != false
-  } else if (page.layout == 'wiki' && page.wiki) {
+  if (page.wiki) {
     let proj = theme.wiki.tree[page.wiki]
     if (page.share != null) {
       showSharePlugin = page.share == true
     } else if (proj != null) {
       showSharePlugin = proj.share == true
     }
+  } else if (page.layout == 'post') {
+    showSharePlugin = page.share != false
   }
   if (theme.article.share && showSharePlugin) {
     function socialButtons() {
@@ -101,8 +101,8 @@ function layoutDiv() {
             el += '&title=' + (page.seo_title || (page.title + ' - ' + config.title));
             if (page.layout == 'post' && page.cover) {
               el += '&pics=' + page.cover;
-            } else if (page.layout == 'wiki' && page.logo && page.logo.src) {
-              el += '&pics=' + page.logo.src;
+            } else if (page.layout == 'wiki' && page.icon) {
+              el += '&pics=' + page.icon;
             }
             el += '&summary=' + truncate(page.description || strip_html(page.excerpt || page.content), {length: 120});
             el += '"';
@@ -114,13 +114,13 @@ function layoutDiv() {
           }
           el += '>';
           if (item == 'wechat') {
-            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/b32ef3da1162a.svg"/>';
+            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/b32ef3da1162a.svg"/>';
           } else if (item == 'weibo') {
-            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/80c07e4dbb303.svg"/>';
+            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/80c07e4dbb303.svg"/>';
           } else if (item == 'email') {
-            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/a1b00e20f425d.svg"/>';
+            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/a1b00e20f425d.svg"/>';
           } else if (item == 'link') {
-            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/social/8411ed322ced6.svg"/>';
+            el += '<img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/social/8411ed322ced6.svg"/>';
           }
           el += '</a>';
         }

package/layout/_partial/main/article/read_next.ejs

@@ -1,15 +1,15 @@
 <%
 function layoutDiv() {
-  var prev,next;
-  var title = __('meta.read_next');
-  var title_prev = __('meta.prev');
-  var title_next = __('meta.next');
-  if (page.layout === 'post') {
-    prev = page.prev;
-    next = page.next;
-    title_prev = __('meta.newer');
-    title_next = __('meta.older');
-  } else if (page.layout === 'wiki' && page.wiki && page.wiki.length > 0) {
+  var prev,next
+  var title = __('meta.read_next')
+  title_prev = __('meta.newer')
+  title_next = __('meta.older')
+  if (page.layout === 'post' || page.layout === 'topic') {
+    prev = page.prev
+    next = page.next
+  } else if (page.layout === 'wiki' && page.wiki?.length > 0) {
+    var title_prev = __('meta.prev');
+    var title_next = __('meta.next');
     let proj = theme.wiki.tree[page.wiki];
     if (proj) {
       let ps = proj.pages?.filter(p => p.path == page.path)

package/layout/_partial/main/navbar/breadcrumb.ejs

@@ -5,15 +5,6 @@ function layoutDiv() {
     return el;
   }
   var home_title = __("btn.home");
-  if (theme.breadcrumb && theme.breadcrumb.home) {
-    if (theme.breadcrumb.home === 'config.title') {
-      home_title = config.title;
-    } else if (theme.breadcrumb.home === 'config.author') {
-      home_title = config.author;
-    } else if (theme.breadcrumb.home !== 'home') {
-      home_title = theme.breadcrumb.home;
-    }
-  }
   if (page.layout === "post") {
     var firstCat = "";
     if (page.categories && page.categories.length > 0) {
@@ -63,7 +54,38 @@ function layoutDiv() {
     
     el += '</div>';
     el += '</div>';
-  } else if (page.layout === "wiki" && page.wiki && page.wiki.length > 0) {
+  } else if (page.layout === 'topic' && page.topic?.length > 0) {
+    el += '<div class="bread-nav fs12">';
+    el += '<div class="left">';
+    el += '<div id="breadcrumb">';
+    var nodes = [];
+    // home
+    el += '<a class="cap breadcrumb" id="home" href="' + url_for(config.root) + '">' + home_title + '</a>';
+    nodes.push('/');
+    // menu_id
+    el += '<span class="sep"></span>';
+    let url = url_for(theme.site_tree.topic.base_dir);
+    nodes.push(url);
+    el += '<a class="cap breadcrumb" id="menu" href="' + url + '">' + __("btn.topic") + '</a>';
+    // 专栏名
+    let topicObject = theme.topic.tree[page.topic];
+    if (topicObject != null) {
+      let url_proj = url_for(topicObject.homepage?.path);
+      if (nodes.includes(url_proj) === false) {
+        el += '<span class="sep"></span>';
+        el += '<a class="cap breadcrumb" id="proj" href="' + url_proj + '">' + (topicObject.name || topicObject.title) + '</a>';
+      }
+    }
+    el += '</div>';
+    // 更新日期
+    el += '<div id="post-meta">';
+    el += `
+    <span>${__("meta.updated")}&nbsp;<time datetime="${date_xml(page.updated)}">${date(page.updated, config.date_format)}</time></span>
+    `;
+    el += '</div>';
+    el += '</div>';
+    el += '</div>';
+  } else if (page.layout === "wiki" && page.wiki?.length > 0) {
     el += '<div class="bread-nav fs12">';
     el += '<div class="left">';
     el += '<div id="breadcrumb">';
@@ -73,12 +95,12 @@ function layoutDiv() {
     nodes.push('/');
     // menu_id
     el += '<span class="sep"></span>';
-    if (page.menu_id && theme.sidebar.menu[page.menu_id] && md_link(theme.sidebar.menu[page.menu_id])) {
-      let url = url_for(md_link(theme.sidebar.menu[page.menu_id]));
+    if (page.menu_id && theme.menu[page.menu_id] && md_link(theme.menu[page.menu_id])) {
+      let url = url_for(md_link(theme.menu[page.menu_id]));
       nodes.push(url);
-      el += '<a class="cap breadcrumb" id="menu" href="' + url + '">' + __(md_text(theme.sidebar.menu[page.menu_id])) + '</a>';
+      el += '<a class="cap breadcrumb" id="menu" href="' + url + '">' + __(md_text(theme.menu[page.menu_id])) + '</a>';
     } else {
-      let url = url_for(config.wiki_dir || "/wiki/");
+      let url = url_for(theme.site_tree.wiki.base_dir);
       nodes.push(url);
       el += '<a class="cap breadcrumb" id="menu" href="' + url + '">' + __("btn.wiki") + '</a>';
     }

package/layout/_partial/main/navbar/{list_post.ejs → nav_tabs_blog.ejs}

@@ -29,6 +29,14 @@ function layoutDiv() {
     }
   }
   
+  if (theme.topic?.publish_list?.length > 0) {
+    if (page.layout == 'index_topic') {
+      el += '<a class="active" href="' + url_for(theme.site_tree.topic.base_dir) + '">' + __("btn.topic") + '</a>';
+    } else {
+      el += '<a href="' + url_for(theme.site_tree.topic.base_dir) + '">' + __("btn.topic") + '</a>';
+    }
+  }
+  
   if (site.posts && site.posts.length > 0) {
     if (is_archive()) {
       el += '<a class="active" href="' + url_for(config.archive_dir) + '">' + __("btn.archives") + '</a>';
@@ -37,15 +45,15 @@ function layoutDiv() {
     }
   }
   
-  if (theme['post-index']) {
-    const obj = theme['post-index'];
-    for (let key of Object.keys(obj)) {
+  const { nav_tabs } = theme.site_tree.blog
+  if (nav_tabs) {
+    for (let key of Object.keys(nav_tabs)) {
       // 当 page 的末尾为 index.html 或者处于该 page 的某个子页面时也应该匹配
-      // if (full_url_for(page.path) == full_url_for(obj[key])) {
-      if (full_url_for(page.path).startsWith(full_url_for(obj[key]))){
-        el += '<a class="active" href="' + url_for(obj[key]) + '">' + key + '</a>';
+      // if (full_url_for(page.path) == full_url_for(nav_tabs[key])) {
+      if (full_url_for(page.path).startsWith(full_url_for(nav_tabs[key]))){
+        el += '<a class="active" href="' + url_for(nav_tabs[key]) + '">' + key + '</a>';
       } else {
-        el += '<a href="' + url_for(obj[key]) + '">' + key + '</a>';
+        el += '<a href="' + url_for(nav_tabs[key]) + '">' + key + '</a>';
       }
     }
   }

package/layout/_partial/main/navbar/{list_wiki.ejs → nav_tabs_wiki.ejs}

@@ -8,7 +8,7 @@ function layoutDiv() {
   if (page.filter === false) {
     el += ' class="active"';
   }
-  el += ' href="' + url_for(config.wiki_dir || "/wiki/") + '">' + __("btn.all_wiki") + '</a>';
+  el += ' href="' + url_for(theme.site_tree.wiki.base_dir) + '">' + __("btn.all_wiki") + '</a>';
   el += '</a>';
   // 项目分类
   const { shelf, all_tags } = theme.wiki;
@@ -24,6 +24,20 @@ function layoutDiv() {
       el += '</a>';
     }
   }
+
+  const { nav_tabs } = theme.site_tree.wiki
+  if (nav_tabs) {
+    for (let key of Object.keys(nav_tabs)) {
+      // 当 page 的末尾为 index.html 或者处于该 page 的某个子页面时也应该匹配
+      // if (full_url_for(page.path) == full_url_for(nav_tabs[key])) {
+      if (full_url_for(page.path).startsWith(full_url_for(nav_tabs[key]))){
+        el += '<a class="active" href="' + url_for(nav_tabs[key]) + '">' + key + '</a>';
+      } else {
+        el += '<a href="' + url_for(nav_tabs[key]) + '">' + key + '</a>';
+      }
+    }
+  }
+
   el += '</nav>';
   el += '</div>';
   return el;

package/layout/_partial/main/post_list/post_card.ejs

@@ -69,18 +69,7 @@ function div_default() {
   // meta
   el += '<div class="meta cap">';
   el += '<span class="cap" id="post-meta">';
-  // author
-  var author = null
-  if (theme.authors) {
-    if (page.author?.length > 0 && theme.authors[page.author] != null) {
-      author = theme.authors[page.author]
-    } else {
-      author = theme.default_author
-    }
-  }
-  if (author) {
-    el += author.name + '&nbsp;'
-  }
+  
   // time
   el += __("meta.created") + '&nbsp;' + '<time datetime="' + date_xml(post.date) + '">' + date(post.date, config.date_format) + '</time>';
   el += '</span>';
@@ -102,7 +91,7 @@ function div_default() {
     }
   }
   if (post.pin) {
-    el += '<span class="pin"><img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.9/badge/3279dd441df8b.svg"/></span>';
+    el += '<span class="pin"><img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/badge/3279dd441df8b.svg"/></span>';
   }
   el += '</div>';
   el += '</article>';

package/layout/_partial/main/post_list/topic_card.ejs

@@ -0,0 +1,16 @@
+<%
+function layoutDiv() {
+  var el = '';
+  el += '<article class="md-text">';
+  el += `<div class="preview"><img src="${topic.icon ? topic.icon : theme.default.topic}"/></div>`
+  el += '<div class="excerpt">';
+  el += '<h2 class="post-title">' + (topic.title || topic.name) + '</h2>';
+  if (topic.description) {
+    el += '<p>' + topic.description + '</p>';
+  }
+  el += '</div>';
+  el += '</article>';
+  return el;
+}
+%>
+<%- layoutDiv() %>

package/layout/_partial/sidebar/header.ejs

@@ -32,19 +32,18 @@ function layoutDiv() {
   el += '">';
 
   el += '<div class="logo-wrap">';
-  if (md_text(theme.sidebar.logo.avatar)) {
-    el += '<a class="avatar" href="' + url_for(md_link(theme.sidebar.logo.avatar) || "/") + '">';
+  if (md_text(theme.logo.avatar)) {
+    el += '<a class="avatar" href="' + url_for(md_link(theme.logo.avatar) || "/") + '">';
     if (theme.style.animated_avatar.animate) {
       el += '<div class="bg" style="opacity:0;background-image:url(' + theme.style.animated_avatar.background + ');"></div>';
     }
-    el += '<img no-lazy class="avatar" src="' + md_text(theme.sidebar.logo.avatar) + '">';
+    el += '<img no-lazy class="avatar" src="' + md_text(theme.logo.avatar) + '">';
     el += '</a>';
   }
-  let main = md_text(theme.sidebar.logo.title);
+  let main = md_text(theme.logo.title);
   if (main) {
-    let url = md_link(theme.sidebar.logo.title);
-    let sub = config.subtitle;
-    el += layoutTitle(main, url, sub);
+    let url = md_link(theme.logo.title);
+    el += layoutTitle(main, url, theme.logo.subtitle);
   }
   el += '</div>';
 

package/layout/_partial/sidebar/index.ejs

@@ -1,32 +1,35 @@
 <%
-var proj;
-if (page.layout === 'wiki' && page.wiki) {
-  proj = theme.wiki.tree[page.wiki];
-}
-// 默认组件
-if (page.sidebar == undefined) {
-  if (page.layout == 'post' && page.content) {
-    page.sidebar = theme.sidebar.widgets.post;
-  } else if (page.layout == 'wiki' && page.wiki) {
-    let proj = theme.wiki.tree[page.wiki];
-    if (proj?.sidebar) {
-      page.sidebar = proj.sidebar;
-    } else {
-      page.sidebar = theme.sidebar.widgets.wiki;
-    }
-  } else if (is_home()) {
-    page.sidebar = theme.sidebar.widgets.home;
+if (page.sidebar == null) {
+  const { site_tree } = theme
+  var sidebar
+  if (is_home()) {
+    sidebar = site_tree.home.sidebar
   } else if (is_category() || is_tag() || is_archive() || ['categories', 'tags', 'archives'].includes(page.layout)) {
-    page.sidebar = theme.sidebar.widgets.blog_index;
-  } else if (['wiki_index'].includes(page.layout)) {
-    page.sidebar = theme.sidebar.widgets.wiki_index;
-  } else if (['404', undefined].includes(page.layout)) {
-    page.sidebar = theme.sidebar.widgets.others;
-  } else if (page.layout == 'page') {
-    page.sidebar = theme.sidebar.widgets.page;
+    sidebar = site_tree.blog.sidebar
+  } else if (page.layout === 'index_topic' || page.layout === 'topic') {
+    sidebar = site_tree.topic.sidebar
+  } else if (page.layout === 'index_wiki' || page.layout === 'wiki') {
+    sidebar = site_tree.wiki.sidebar
+  } else if (page.layout === '404') {
+    sidebar = site_tree.error_page.sidebar
+  } else if (page.layout === 'page') {
+    sidebar = site_tree.page.sidebar
+  } else if (page.layout === 'post') {
+    sidebar = site_tree.post.sidebar
+  } else if (page.layout == null) {
+    sidebar = site_tree.page.sidebar
   } else {
-    page.sidebar = [];
+    sidebar = []
+  }
+
+  if (page.layout === 'topic' && page.topic && theme.topic?.tree[page.topic]?.sidebar) {
+    sidebar = theme.topic.tree[page.topic].sidebar
+  }
+  if (page.layout == 'wiki' && page.wiki && theme.wiki?.tree[page.wiki]?.sidebar) {
+    sidebar = theme.wiki.tree[page.wiki].sidebar
   }
+  
+  page.sidebar = sidebar
 }
 
 // parse array string
@@ -51,21 +54,25 @@ function layoutTitle(main, url, sub) {
 }
 function layoutWidgets() {
   var el = '';
+  var proj;
+  if (page.layout === 'wiki' && page.wiki) {
+    proj = theme.wiki.tree[page.wiki];
+  }
   el += '<div class="widgets">';
   if (page.layout == 'wiki' && proj && page.menu_id == 'wiki') {
     el += '<widget class="widget-wrapper logo-wrap wiki"><div class="widget-body">';
     // all products
-    el += '<a style="filter: grayscale(100%)" class="wiki-home cap" href="' + url_for(config.wiki_dir) + '">';
+    el += '<a style="filter: grayscale(100%)" class="wiki-home cap" href="' + url_for(theme.site_tree.wiki.base_dir) + '">';
     el += '<svg aria-hidden="true" viewBox="0 0 16 16" width="1.2em" height="1.2em" fill="currentColor"><path fill-rule="evenodd" d="M7.78 12.53a.75.75 0 01-1.06 0L2.47 8.28a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L4.81 7h7.44a.75.75 0 010 1.5H4.81l2.97 2.97a.75.75 0 010 1.06z"></path></svg>';
     el += __('btn.all_wiki');
     el += '</a>';
     // this product
     if (proj == undefined) {
       // 如果没有项目名，则使用menu中显示的名字
-      if (page.menu_id && theme.sidebar.menu[page.menu_id] && md_link(theme.sidebar.menu[page.menu_id])) {
+      if (page.menu_id && theme.menu[page.menu_id] && md_link(theme.menu[page.menu_id])) {
         proj = {
-          path: md_link(theme.sidebar.menu[page.menu_id]),
-          wiki: __(md_text(theme.sidebar.menu[page.menu_id]))
+          path: md_link(theme.menu[page.menu_id]),
+          wiki: __(md_text(theme.menu[page.menu_id]))
         };
       }
     }
@@ -134,6 +141,7 @@ function layoutFooterDiv() {
     return '';
   }
 }
+
 %>
 <% if (page.header == undefined || page.header == 'left' || page.header == 'auto') { %>
   <%- partial('header', {where: 'sidebar'}) %>