hexo-theme-stellar 1.25.0 → 1.26.0

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

@@ -0,0 +1,20 @@
+<%
+function layoutDiv() {
+  const wikiObject = theme.wiki.tree[page.wiki]
+  var el = ''
+  // 文档列表页
+  el += `<span class="sep"></span>`
+  const wikiIndexPageURL = url_for(theme.site_tree.index_wiki.base_dir)
+  el += `<a class="cap breadcrumb" id="menu" href="${wikiIndexPageURL}">${__("btn.wiki")}</a>`
+  if (wikiObject) {
+    // 文档项目名
+    const wikiHomePageURL = url_for(wikiObject.homepage?.path);
+    if (wikiHomePageURL != wikiIndexPageURL) {
+      el += `<span class="sep"></span>`
+      el += `<a class="cap breadcrumb" id="proj" href="${wikiHomePageURL}">${wikiObject.name || wikiObject.title}</a>`
+    }
+  }
+  return el
+}
+%>
+<%- layoutDiv() %>

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

@@ -0,0 +1,32 @@
+<%
+function layoutDiv() {
+  // 作者
+  const author = theme.authors ? (theme.authors[page.author] || theme.default_author) : null
+  var el = ''
+  el += `<div id="post-meta">`
+  if (page.wiki) {
+    el += `<span class="author">${__("meta.updated") + __("symbol.colon")}</span>`
+    el += `<time datetime="${date_xml(page.updated)}">${date(page.updated, config.date_format)}</time>`
+    el += `</span>`
+  } else {
+    if (author) {
+      const link = `<a href="${url_for(author.path)}">${author.name}</a>`
+      el += `<span class="author">${__("meta.created_author", link) + __("symbol.colon")}</span>`
+    } else {
+      el += `<span class="author">${__("meta.created") + __("symbol.colon")}</span>`
+    }
+    // 发布日期
+    el += `<span class="created">`
+    el += `<time datetime="${date_xml(page.date)}">${date(page.date, config.date_format)}</time>`
+    el += `</span>`
+    // 更新日期
+    el += `<span class="updated">`
+    el += `${__("symbol.comma") + __("meta.updated") + __("symbol.colon")}`
+    el += `<time datetime="${date_xml(page.updated)}">${date(page.updated, config.date_format)}</time>`
+    el += `</span>`
+  }
+  el += `</div>`
+  return el
+}
+%>
+<%- layoutDiv() %>

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

@@ -0,0 +1,25 @@
+<%
+function layoutDiv() {
+  const repo = page.repo || theme.wiki.tree[page.wiki]?.repo
+  if (repo == null) {
+    return ''
+  }
+  return `
+  <div class="right ghrepo stellar-ghinfo-api" api="${theme.api_host.ghapi}/repos/${repo}">
+    <a class="repo-link bold" href="https://github.com/${repo}">
+      ${icon('github:repo')}
+      <span type="text">${repo}</span>
+    </a>
+    <a class="repo-link" href="https://github.com/${repo}/stargazers">
+      ${icon('github:star')}
+      <span type="text" id="stargazers_count">0</span><span>stars</span>
+    </a>
+    <a class="repo-link" href="https://github.com/${repo}/forks">
+      ${icon('github:fork')}
+      <span type="text" id="forks_count">0</span><span>forks</span>
+    </a>
+  </div>
+  `
+}
+%>
+<%- layoutDiv() %>

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

@@ -31,9 +31,9 @@ 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>';
+      el += '<a class="active" href="' + url_for(theme.site_tree.index_topic.base_dir) + '">' + __("btn.topic") + '</a>';
     } else {
-      el += '<a href="' + url_for(theme.site_tree.topic.base_dir) + '">' + __("btn.topic") + '</a>';
+      el += '<a href="' + url_for(theme.site_tree.index_topic.base_dir) + '">' + __("btn.topic") + '</a>';
     }
   }
   
@@ -45,7 +45,7 @@ function layoutDiv() {
     }
   }
   
-  const { nav_tabs } = theme.site_tree.blog
+  const { nav_tabs } = theme.site_tree.index_blog
   if (nav_tabs) {
     for (let key of Object.keys(nav_tabs)) {
       // 当 page 的末尾为 index.html 或者处于该 page 的某个子页面时也应该匹配

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

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

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

@@ -1,5 +1,5 @@
 <% if ((is_home() || is_category() || is_tag()) && page.total > 1) { %>
-  <div class='paginator-wrap dis-select'>
+  <div class='paginator-wrap dis-select<%- scrollreveal(' ') %>'>
   <%- paginator({
     prev_text: '',
     next_text: '',

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

@@ -46,7 +46,7 @@ function div_default() {
 
   // 标题
   el += '<h2 class="post-title">';
-  el += (post.title || post.seo_title) ? (post.title || post.seo_title) : date(post.date, config.date_format);
+  el += post.title ? post.title : date(post.date, config.date_format);
   el += '</h2>';
 
   // 摘要
@@ -90,8 +90,8 @@ function div_default() {
       }
     }
   }
-  if (post.pin) {
-    el += '<span class="pin"><img src="https://gcore.jsdelivr.net/gh/cdn-x/placeholder@1.0.12/badge/3279dd441df8b.svg"/></span>';
+  if (post.sticky) {
+    el += `<span class="pin">${icon('default:pin')}</span>`
   }
   el += '</div>';
   el += '</article>';

package/layout/_partial/menubtn.ejs

@@ -1,5 +1,5 @@
 <div class='float-panel mobile-only blur' style='display:none'>
   <button type='button' class='sidebar-toggle mobile' onclick='sidebar.toggle()'>
-    <svg class="icon" style="width: 1em; height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15301"><path d="M566.407 808.3c26.9-0.1 49.3-20.8 51.6-47.6-1.9-27.7-23.9-49.7-51.6-51.6h-412.6c-28.2-1.4-52.6 19.5-55.5 47.6 2.3 26.8 24.6 47.5 51.6 47.6h416.5v4z m309.3-249.9c26.9-0.1 49.3-20.8 51.6-47.6-2.2-26.8-24.6-47.5-51.6-47.6h-721.9c-27.7-2.8-52.5 17.4-55.3 45.1-0.1 0.8-0.1 1.7-0.2 2.5 0.9 27.2 23.6 48.5 50.7 47.6H875.707z m-103.1-245.9c26.9-0.1 49.3-20.8 51.6-47.6-0.4-28.3-23.2-51.1-51.5-51.6h-618.9c-29.5-1.1-54.3 21.9-55.5 51.4v0.2c1.4 27.8 25.2 49.2 53 47.8 0.8 0 1.7-0.1 2.5-0.2h618.8z" p-id="15302"></path><path d="M566.407 808.3c26.9-0.1 49.3-20.8 51.6-47.6-1.9-27.7-23.9-49.7-51.6-51.6h-412.6c-28.2-1.4-52.6 19.5-55.5 47.6 1.9 27.7 23.9 49.7 51.6 51.6h416.5z m309.3-249.9c26.9-0.1 49.3-20.8 51.6-47.6-2.2-26.8-24.6-47.5-51.6-47.6h-721.9c-27.7-2.8-52.5 17.4-55.3 45.1-0.1 0.8-0.1 1.7-0.2 2.5 0.9 27.2 23.6 48.5 50.7 47.6H875.707z m-103.1-245.9c26.9-0.1 49.3-20.8 51.6-47.6-0.4-28.3-23.2-51.1-51.5-51.6h-618.9c-29.5-1.1-54.3 21.9-55.5 51.4v0.2c1.4 27.8 25.2 49.2 53 47.8 0.8 0 1.7-0.1 2.5-0.2h618.8z" p-id="15303"></path></svg>
+    <%- icon('default:sidebar') %>
   </button>
 </div>

package/layout/_partial/plugins/ai/tianli_gpt.ejs

@@ -1,8 +1,9 @@
-<% if (page.layout === 'post' || (page.layout === 'wiki' && page.wiki && page.wiki.length > 0)) { %>
+<% if (page.layout === 'post' || (page.wiki?.length > 0)) { %>
   <script>
-    let tianliGPT_postSelector = '.md-text.content.<%= page.layout === "post" ? "post" : "wiki" %>';
+    let tianliGPT_postSelector = 'article.content';
     let tianliGPT_key = '<%= theme.plugins.tianli_gpt.api %>';
     let tianliGPT_typingAnimate = '<%= theme.plugins.tianli_gpt.typingAnimate %>';
+    let tianliGPT_wordLimit = <%= theme.plugins.tianli_gpt.limit %>;
   </script>
-  <script defer src="https://cdn1.tianli0.top/gh/zhheo/Post-Abstract-AI@0.13/tianli_gpt.js"></script>
+<script defer src="https://cdn1.tianli0.top/gh/zhheo/Post-Abstract-AI@0.15.2/tianli_gpt.min.js"></script>
 <% } %>

package/layout/_partial/plugins/comments/artalk/layout.ejs

@@ -11,7 +11,7 @@ function layoutDiv() {
       el += ' ' + key + '="' + cfg[key] + '"';
     }
   }
-  el += '><svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg></div>';
+  el += `>${icon('default:loading')}</div>`
   return el;
 }
 %>

package/layout/_partial/plugins/comments/artalk/script.ejs

@@ -11,7 +11,7 @@
       var artalk = Artalk.init({
         el: '#artalk_container',
         pageKey: path,
-        pageTitle: '<%= page.title || page.seo_title %>',
+        pageTitle: '<%= page.title %>',
         server: '<%= theme.comments.artalk.server %>',
         placeholder: '<%= theme.comments.artalk.placeholder %>',
         site: '<%= config.title %>',

package/layout/_partial/plugins/comments/beaudar/layout.ejs

@@ -17,6 +17,6 @@ function layoutDiv() {
 }
 %>
 
-<svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg>
+<%- icon('default:loading') %>
 
 <%- layoutDiv() %>

package/layout/_partial/plugins/comments/giscus/layout.ejs

@@ -17,6 +17,6 @@ function layoutDiv() {
 }
 %>
 
-<svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg>
+<%- icon('default:loading') %>
 
 <%- layoutDiv() %>

package/layout/_partial/plugins/comments/layout.ejs

@@ -12,8 +12,8 @@ if (theme.comments.service && theme.comments.service.length > 0) {
   }
 }
 // 合并项目评论
-let proj = theme.wiki.tree[page.wiki];
-if (loadComment && page.layout == 'wiki' && page.wiki && (proj != null)) {
+const proj = theme.wiki.tree[page.wiki]
+if (loadComment && (proj != null)) {
   if (proj.comment_title != undefined && page.comment_title == undefined) {
     if (['utterances', 'beaudar', 'giscus'].includes(theme.comments.service)) {
       page.comment_title = proj.comment_title;
@@ -31,7 +31,7 @@ if (cmt.service && page[cmt.service]) {
 page.cmt = cmt;
 %>
 <% if (loadComment) { %>
-  <div class='related-wrap md-text reveal' id="comments">
+  <div class="related-wrap md-text<%- scrollreveal(' ') %>" id="comments">
     <section class='header cmt-title cap theme'>
       <%- page.comment_title != undefined ? markdown(page.comment_title) : __('meta.comment_title') %>
     </section>

package/layout/_partial/plugins/comments/twikoo/layout.ejs

@@ -11,7 +11,7 @@ function layoutDiv() {
       el += ' ' + key + '="' + cfg[key] + '"';
     }
   }
-  el += '><svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg></div>';
+  el += `>${icon('default:loading')}</div>`
   return el;
 }
 %>

package/layout/_partial/plugins/comments/utterances/layout.ejs

@@ -17,6 +17,6 @@ function layoutDiv() {
 }
 %>
 
-<svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg>
+<%- icon('default:loading') %>
 
 <%- layoutDiv() %>

package/layout/_partial/plugins/comments/waline/layout.ejs

@@ -11,7 +11,7 @@ function layoutDiv() {
       el += ' ' + key + '="' + cfg[key] + '"';
     }
   }
-  el += '><svg class="loading" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2709"><path d="M832 512c0-176-144-320-320-320V128c211.2 0 384 172.8 384 384h-64zM192 512c0 176 144 320 320 320v64C300.8 896 128 723.2 128 512h64z" p-id="2710"></path></svg></div>';
+  el += `>${icon('default:loading')}</div>`
   return el;
 }
 %>

package/layout/_partial/sidebar/index.ejs

@@ -1,14 +1,24 @@
 <%
+
+const wiki = theme.wiki.tree[page.wiki]
+const topic = theme.topic.tree[page.topic]
+
 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)) {
-    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.index_blog.sidebar
+  } else if (page.layout === 'index_topic') {
+    // 专栏列表页等同于博客列表页
+    sidebar = site_tree.index_blog.sidebar
+  } else if (page.topic?.length > 0) {
+    // 专栏文章内页等同于普通文章内页
+    sidebar = site_tree.post.sidebar
+  } else if (page.layout === 'index_wiki') {
+    sidebar = site_tree.index_wiki.sidebar
+  } else if (page.wiki?.length > 0) {
     sidebar = site_tree.wiki.sidebar
   } else if (page.layout === '404') {
     sidebar = site_tree.error_page.sidebar
@@ -22,16 +32,17 @@ if (page.sidebar == null) {
     sidebar = []
   }
 
-  if (page.layout === 'topic' && page.topic && theme.topic?.tree[page.topic]?.sidebar) {
-    sidebar = theme.topic.tree[page.topic].sidebar
+  if (topic?.sidebar) {
+    sidebar = topic.sidebar
   }
-  if (page.layout == 'wiki' && page.wiki && theme.wiki?.tree[page.wiki]?.sidebar) {
-    sidebar = theme.wiki.tree[page.wiki].sidebar
+  if (wiki?.sidebar) {
+    sidebar = wiki.sidebar
   }
-  
+
   page.sidebar = sidebar
 }
 
+
 // parse array string
 if (typeof page.sidebar == 'string') {
   page.sidebar = page.sidebar.replace(/ /g, '').split(',');
@@ -54,36 +65,7 @@ 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(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.menu[page.menu_id] && md_link(theme.menu[page.menu_id])) {
-        proj = {
-          path: md_link(theme.menu[page.menu_id]),
-          wiki: __(md_text(theme.menu[page.menu_id]))
-        };
-      }
-    }
-    if (proj != undefined) {
-      let main = proj.name || proj.title || page.wiki || page.title;
-      let url = proj.homepage.path;
-      let sub = proj.subtitle;
-      el += layoutTitle(main, url, sub);
-    }
-    el += '</div></widget>';
-  }
   if (page.sidebar) {
     page.sidebar.forEach((w, i) => {
       let name = ''
@@ -93,8 +75,8 @@ function layoutWidgets() {
       } else if (typeof w == 'object' && w.override) {
         name = w.override
       }
-      if (name in theme.data.widgets) {
-        Object.assign(widget, theme.data.widgets[name])
+      if (name in theme.widgets) {
+        Object.assign(widget, theme.widgets[name])
       }
       if (typeof w == 'object' && (w.override || w.layout)) {
         Object.assign(widget, w)
@@ -108,43 +90,62 @@ function layoutWidgets() {
   return el;
 }
 function layoutFooterDiv() {
-  if (page.layout !== 'wiki' && theme.footer.social) {
-    var el = '<footer class="footer dis-select">';
-    el += '<div class="social-wrap">';
-    for (let id of Object.keys(theme.footer.social)) {
-      let item = theme.footer.social[id];
-      if (item.icon && (item.url || item.onclick)) {
-        el += '<a class="social"';
-        if (item.title) {
-          el += ' title="' + item.title + '"';
-        }
-        if (item.url) {
-          el += ' href="' + url_for(item.url) + '"';
-          if (item.url.includes('://')) {
-            el += ' target="_blank" rel="external nofollow noopener noreferrer"';
-          } else {
-            el += ' rel="noopener noreferrer"';
-          }
-        } else if (item.onclick) {
-          item.onclick = item.onclick.replace(/"|\'/g, '&quot;');
-          el += ' onclick="' + item.onclick + '"';
+  const { social } = theme.footer
+  if (social == null) {
+    return ''
+  }
+  var el = '<footer class="footer dis-select">';
+  el += '<div class="social-wrap">';
+  for (let id of Object.keys(social)) {
+    let item = social[id];
+    if (item.icon && (item.url || item.onclick)) {
+      el += '<a class="social"';
+      if (item.title) {
+        el += ' title="' + item.title + '"';
+      }
+      if (item.url) {
+        el += ' href="' + url_for(item.url) + '"';
+        if (item.url.includes('://')) {
+          el += ' target="_blank" rel="external nofollow noopener noreferrer"';
+        } else {
+          el += ' rel="noopener noreferrer"';
         }
-        el += '>';
-        el += item.icon;
-        el += '</a>';
+      } else if (item.onclick) {
+        item.onclick = item.onclick.replace(/"|\'/g, '&quot;');
+        el += ' onclick="' + item.onclick + '"';
       }
+      el += '>';
+      el += item.icon;
+      el += '</a>';
     }
-    el += '</div>';
-    el += '</footer>';
-    return el;
-  } else {
-    return '';
   }
+  el += '</div>';
+  el += '</footer>';
+  return el;
+}
+
+function layoutLogo() {
+  return partial('logo', {where: 'sidebar'})
 }
 
+function layoutNavArea() {
+  var search = {}
+  if (page.search) {
+    search = page.search
+  } else if (wiki?.search) {
+    search = wiki.search
+  } else if (topic?.search) {
+    search = topic.search
+  }
+  var el = ''
+  el += `<div class="nav-area">`
+  el += partial('search', {item: search})
+  el += partial('menu', {where: 'sidebar'})
+  el += `</div>`
+  return el
+}
 %>
-<% if (page.header == undefined || page.header == 'left' || page.header == 'auto') { %>
-  <%- partial('header', {where: 'sidebar'}) %>
-<% } %>
+<%- layoutLogo() %>
+<%- layoutNavArea() %>
 <%- layoutWidgets() %>
 <%- layoutFooterDiv() %>

package/layout/_partial/sidebar/logo.ejs

@@ -0,0 +1,87 @@
+<%
+var logo = theme.logo
+if (page.logo) {
+  logo = Object.assign({}, logo, page.logo)
+} else if (theme.wiki.tree[page.wiki]) {
+  const proj = theme.wiki.tree[page.wiki]
+  var l = proj.logo
+  if (l) {
+    logo = l
+  } else if (proj.name || proj.icon) {
+    logo = {
+      icon: proj.icon || theme.default.project,
+      title: `[${proj.name || proj.title}](${url_for(proj.homepage?.path || '')})`,
+      subtitle: proj.subtitle
+    }
+  }
+} else if (theme.topic.tree[page.topic]) {
+  const topic = theme.topic.tree[page.topic]
+  var l = topic.logo
+  if (l) {
+    logo = l
+  } else if (topic.name || topic.icon) {
+    logo = {
+      icon: topic.icon || theme.default.topic,
+      title: `[${topic.name || topic.title}](${url_for(topic.homepage?.path || '')})`,
+      subtitle: topic.subtitle
+    }
+  }
+}
+
+// logo.icon, logo.title, logo.subtitle, logo.url
+function layoutTitle(main, url, sub) {
+  var el = ''
+  el += `<a class="title" href="${url_for(url || "/")}">`
+  el += `<div class="main" ff="title">${main}</div>`
+  if (sub) {
+    const arr = sub.split('|')
+    if (arr.length > 1) {
+      el += `<div class="sub normal cap">${arr.shift().trim()}</div>`
+      el += `<div class="sub hover cap" style="opacity:0">${arr.join('|')}</div>`
+    } else {
+      el += `<div class="sub cap">${sub}</div>`
+    }
+  }
+  el += `</a>`
+  return el
+}
+
+function layoutDiv() {
+  if (where == 'main') {
+    if (page.header == false) {
+      return ''
+    }
+    // 内容页如果未设置 header 则不显示
+    if (page.header == null) {
+      if (!page.nav_tabs) { // 如果有 nav_tabs 就代表是列表页
+        if (page.layout === 'post' || page.layout === 'page' || page.wiki) {
+          return ''
+        }
+      }
+    }
+  }
+  var el = ''
+  el += `<header class="header${where == 'main' ? ' mobile-only' : ''}">`
+  el += `<div class="logo-wrap">`
+  if (logo.icon) {
+    el += `<div class="icon"><img no-lazy class="icon" src="${md_text(logo.icon)}"></div>`
+  } else if (md_text(logo.avatar)) {
+    el += `<a class="avatar" href="${url_for(md_link(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(logo.avatar)}">`
+    el += `</a>`
+  }
+  const main = md_text(logo.title)
+  if (main) {
+    let url = md_link(logo.title)
+    el += layoutTitle(main, url, logo.subtitle)
+  }
+  el += `</div>`
+  el += '</header>'
+  return el
+}
+%>
+
+<%- layoutDiv() %>

package/layout/_partial/sidebar/menu.ejs

@@ -1,26 +1,31 @@
 <%
 function layoutDiv() {
-  var el = '';
-  el += '<nav class="menu dis-select';
-  if (where == 'main') {
-    el += ' mobile-hidden';
-  }
-  el += '">';
-  for (let id of Object.keys(theme.menu)) {
-    let item = theme.menu[id];
-    if (item == undefined || item.length == 0) {
-      continue;
+  var el = ''
+  el += `<nav class="menu dis-select${where == 'main' ? ' mobile-hidden' : ''}">`
+  for (let item of theme.menubar.items) {
+    if (item == undefined || item.id == null || item.url == null) {
+      continue
+    }
+    el += `<a class="nav-item${item.id == page.menu_id ? ' active' : ''}" title="${item.title}" href="${url_for(item.url)}"`
+    if (item.theme?.length > 0) {
+      el += ` style="color:${item.theme}"`
     }
-    el += '<a class="nav-item';
-    if (id == page.menu_id) {
-      el += ' active';
+    el += `>`
+    if (item.icon?.length > 0) {
+      if (item.icon.startsWith('<')) {
+        el += item.icon
+      } else if (theme.icons[item.icon]) {
+        el += theme.icons[item.icon]
+      } else {
+        el += `<img no-lazy src="${item.icon}">`
+      }
+    } else {
+      el += `<span>${__(item.title)}</span>`
     }
-    el += '" href="' + url_for(md_link(item)) + '">';
-    el += __(md_text(item));
-    el += '</a>';
+    el += `</a>`
   }
-  el += '</nav>';
-  return el;
+  el += `</nav>`
+  return el
 }
 %>
 

package/layout/_partial/sidebar/search.ejs

@@ -0,0 +1,42 @@
+<%
+if (item.filter == null) {
+  item.filter = 'auto'
+}
+function layoutDiv() {
+  var el = ''
+  el += `<div class="search-wrapper" id="search-wrapper">`
+  el += `<form class="search-form">`
+  var filter = ''
+  if (item.filter == 'auto') {
+    if (page.wiki) {
+      let matches = page.path.match(/(.*?)\/(.*?)\//i)
+      if (matches?.length > 0) {
+        filter = matches[0]
+      }
+    }
+  } else {
+    if (item.filter?.length > 0) {
+      filter = item.filter
+    }
+  }
+  el += `<a class="search-button" onclick="document.getElementById(&quot;search-input&quot;).focus();">`
+  el += icon('default:search')
+  el += `</a>`
+  el += `<input type="text" class="search-input" id="search-input"`
+  if (filter.length > 0) {
+    if (!filter.startsWith('/')) {
+      filter = '/' + filter
+    }
+    el += ` data-filter="${filter}"`
+    el += ` placeholder="${item.placeholder || __('search.search_in', filter)}">`
+  } else {
+    el += ` placeholder="${item.placeholder || __('search.search')}">`
+  }
+  el += `</form>`
+  el += `<div id="search-result"></div>`
+  el += `<div class="search-no-result">${__('search.no_results')}</div>`
+  el += `</div>`
+  return el
+}
+%>
+<%- layoutDiv() %>