hexo-theme-stellar 1.24.1 → 1.26.0

package/layout/_partial/widgets/related.ejs

@@ -1,34 +1,65 @@
 <%
-function layoutDiv() {
-  if (page.layout !== "wiki") {
-    return '';
+function relatedPostsInTopic() {
+  if (page.topic?.length == 0) {
+    return ''
+  }
+  const topic = theme.topic.tree[page.topic]
+  if (topic == null) {
+    return ''
+  }
+  var el = ''
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} post-list">`
+  el += `<div class="widget-header dis-select">`
+  el += `<span class="name">${__('btn.topic') + __('symbol.colon') + topic.name}</span>`
+  el += `</div>`
+  el += `<div class="widget-body">`
+  for (let post of topic.pages) {
+    const isActive = post.path == page.path
+    el += `<a class="item${isActive ? ' active' : ''}" href="${url_for(post.path)}">`
+    el += `<span class="title">${post.title}</span>`
+    if (isActive) {
+      el += icon('default:bookmark.active')
+    }
+    el += `</a>`
   }
-  let thisItemObject = theme.wiki.tree[page.wiki];
+  el += `</div>`
+  el += `</widget>`
+  return el
+}
+function relatedWiki() {
+  let thisItemObject = theme.wiki.tree[page.wiki]
   if (thisItemObject == null) {
-    return '';
+    return ''
   }
-  const relatedItems = thisItemObject.relatedItems;
-  var el = '';
+  const relatedItems = thisItemObject.relatedItems
+  var el = ''
   for (let relatedItem of relatedItems) {
-    el += '<widget class="widget-wrapper related">';
-    el += '<div class="widget-header cap theme dis-select">';
-    el += '<span class="name">' + __('meta.more', relatedItem.name) + '</span>';
-    el += '</div>';
-    el += '<div class="widget-body related-posts">';
+    el += `<widget class="widget-wrapper${scrollreveal(' ')} post-card">`
+    el += `<div class="widget-header dis-select">`
+    el += `<span class="name">${__('meta.more') + __('symbol.colon') + relatedItem.name}</span>`
+    el += `</div>`
+    el += `<div class="widget-body">`
     for (let id of relatedItem.items) {
       // 同一个分组中的其它项目
-      let item = theme.wiki.tree[id];
-      el += '<a class="item wiki" href="' + url_for(item.homepage?.path) + '">';
-      el += '<span class="title">' + item.title + '</span>';
+      let item = theme.wiki.tree[id]
+      el += `<a class="item wiki" href="${url_for(item.homepage?.path)}">`
+      el += `<span class="title">${item.title}</span>`
       if (item.description && item.description.length > 0) {
-        el += '<span class="excerpt">' + item.description + '</span>';
+        el += `<span class="excerpt">${item.description}</span>`
       }
-      el += '</a>';
+      el += `</a>`
     }
-    el += '</div>';
-    el += '</widget>';
+    el += `</div>`
+    el += `</widget>`
+  }
+  return el
+}
+function layoutDiv() {
+  if (page.wiki?.length > 0) {
+    return relatedWiki()
+  } else if (page.topic?.length > 0) {
+    return relatedPostsInTopic()
   }
-  return el;
 }
 %>
 <%- layoutDiv() %>

package/layout/_partial/widgets/search.ejs

@@ -1,40 +0,0 @@
-<%
-function layoutDiv() {
-  var el = '<widget class="widget-wrapper search">'
-  el += '<div class="widget-body">'
-  el += '<div class="search-wrapper" id="search-wrapper">'
-  el += '<form class="search-form">'
-  var filter = ''
-  if (item.filter == 'auto') {
-    if (page.layout == 'wiki') {
-      let matches = page.path.match(/(.*?)\/(.*?)\//i)
-      if (matches?.length > 0) {
-        filter = matches[0]
-      }
-    }
-  } else {
-    if (item.filter?.length > 0) {
-      filter = item.filter
-    }
-  }
-  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 += '<svg t="1705074644177" class="icon search-icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1560" width="200" height="200"><path d="M1008.839137 935.96571L792.364903 719.491476a56.783488 56.783488 0 0 0-80.152866 0 358.53545 358.53545 0 1 1 100.857314-335.166073 362.840335 362.840335 0 0 1-3.689902 170.145468 51.248635 51.248635 0 1 0 99.217358 26.444296 462.057693 462.057693 0 1 0-158.255785 242.303546l185.930047 185.725053a51.248635 51.248635 0 0 0 72.568068 0 51.248635 51.248635 0 0 0 0-72.978056z" fill="#111111" p-id="1561"></path><path d="M616.479587 615.969233a50.428657 50.428657 0 0 0-61.498362-5.534852 174.655348 174.655348 0 0 1-177.525271 3.484907 49.403684 49.403684 0 0 0-58.833433 6.76482l-3.074918 2.869923a49.403684 49.403684 0 0 0 8.609771 78.10292 277.767601 277.767601 0 0 0 286.992355-5.739847 49.403684 49.403684 0 0 0 8.404776-76.667958z" fill="#00C569" p-id="1562"></path></svg>'
-  el += '</form>'
-  el += '<div id="search-result"></div>'
-  el += '<div class="search-no-result">' + __('search.no_results') + '</div>'
-  el += '</div>'
-  el += '</div>'
-  el += '</widget>'
-  return el
-}
-%>
-<%- layoutDiv() %>

package/layout/_partial/widgets/tagcloud.ejs

@@ -8,9 +8,9 @@ function layoutDiv() {
   delete opts['title'];
   delete opts['layout'];
   opts.class = 'tag ';
-  el += '<widget class="widget-wrapper tagcloud">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} tagcloud">`
     if (item.title) {
-      el += '<div class="widget-header cap theme dis-select">';
+      el += '<div class="widget-header dis-select">';
       el += '<span class="name">' + item.title + '</span>';
       el += '</div>';
     }

package/layout/_partial/widgets/timeline.ejs

@@ -4,9 +4,9 @@ function layoutDiv() {
   if (item.api == undefined) {
     return el;
   }
-  el += '<widget class="widget-wrapper timeline">';
+  el += `<widget class="widget-wrapper${scrollreveal(' ')} timeline">`
     if (item.title) {
-      el += '<div class="widget-header cap theme dis-select">';
+      el += '<div class="widget-header dis-select">';
       el += '<span class="name">' + item.title + '</span>';
       el += '</div>';
     }

package/layout/_partial/widgets/toc.ejs

@@ -1,108 +1,116 @@
 <%
-let proj = theme.wiki.tree[page.wiki];
-
-function layoutToc() {
+const proj = theme.wiki.tree[page.wiki]
+var hasTOC = true
+function layoutTocBody() {
   if (toc(page.content).length > 0) {
+    hasTOC = true
     return toc(page.content, {
       list_number: item.list_number,
       min_depth: item.min_depth,
       max_depth: item.max_depth
     });
   }
-  return '';
+  hasTOC = false
+  return ''
 }
 
 function layoutTocHeader(title) {
-  var el = '';
-  el += '<div class="widget-header cap dis-select">';
-  el += '<span class="name">' + (title || page.title || __("meta.toc")) + '</span>';
-  el += '</div>';
-  return el;
+  var el = ''
+  el += `<div class="widget-header dis-select">`
+  el += `<span class="name">${title || __("meta.toc")}</span>`
+  el += `</div>`
+  return el
 }
 
 function layoutDocTree(pages) {
-  var el = '';
+  var el = ''
   for (let p of pages) {
     if (p.title == null || p.title.length == 0) {
-      continue;
+      continue
     }
-    let isActive = '';
+    let isActive = ''
     if (p.path === page.path) {
-      isActive += ' active';
+      isActive += ' active'
     }
-    el += '<div class="doc-tree' + isActive + '">';
+    el += `<div class="doc-tree${isActive}">`
     if (proj.pages.length > 1) {
       let href = url_for(p.path);
       if (p.is_homepage) {
         href += '#start'
       }
-      el += '<a class="doc-tree-link' + isActive + '" href="' + href + '">';
-      el += '<span class="toc-text">' + p.title + '</span>';
-      el += '</a>';
+      el += `<a class="doc-tree-link${isActive}" href="${href}">`
+      el += `<span class="toc-text">${p.title}</span>`
+      if (isActive.length > 0) {
+        el += icon('default:bookmark.active')
+      }
+      el += `</a>`
     }
     if (p.path === page.path) {
-      el += layoutToc();
+      el += layoutTocBody()
     }
-    el += '</div>';
+    el += `</div>`
   }
-  return el;
+  return el
 }
 
 
 function layoutDiv(fallback) {
-  var type = '';
-  if (proj && proj.pages) {
-    if (proj.pages.length > 1) {
-      type = 'multi';
-    } else {
-      type = 'single';
-    }
+  var type = ''
+  if (proj?.pages) {
+    type = proj.pages.length > 1 ? 'multi' : 'single'
   } else {
-    let toc_content = toc(page.content);
+    let toc_content = toc(page.content)
     if (toc_content && toc_content.length > 0) {
-      type = 'single';
+      type = 'single'
     }
   }
 
-  var el = '';
+  var el = ''
   if (type.length > 0) {
-    el += `<widget class="widget-wrapper toc ${type}" id="data-toc" collapse="${item.collapse}">`;
-    if (page.layout !== 'wiki') {
-      // post 布局
-      el += layoutTocHeader(page.toc_title);
-      el += '<div class="widget-body fs14">';
-      el += '<div class="doc-tree active">';
-      el += layoutToc();
-      el += '</div>';
-      el += '</div>';
-    } else if (proj) {
+    el += `<widget class="widget-wrapper${scrollreveal(' ')} toc ${type}" id="data-toc" collapse="${item.collapse}">`
+    if (proj) {
       // wiki 布局
       if (proj.sections && proj.sections.length > 0 && proj.pages.length > 1) { // 多 pages
         for (let sec of proj.sections) {
           if (sec.pages.length == 0) {
-            continue;
+            continue
           }
           if (sec.title?.length > 0) {
-            el += layoutTocHeader(sec.title);
+            el += layoutTocHeader(sec.title)
           }
-          el += '<div class="widget-body fs14">';
-          el += layoutDocTree(sec.pages);
-          el += '</div>';
+          el += `<div class="widget-body fs14">`
+          el += layoutDocTree(sec.pages)
+          el += `</div>`
         }
       } else { // 单 page
         if (proj.pages.length == 1) {
-          el += layoutTocHeader(page.toc_title);
+          el += layoutTocHeader()
+        }
+        el += `<div class="widget-body fs14">`
+        el += layoutDocTree(proj.pages)
+        el += `</div>`
+        if (hasTOC == false) {
+          return ''
         }
-        el += '<div class="widget-body fs14">';
-        el += layoutDocTree(proj.pages);
-        el += '</div>';
       }
-    }
-    el += '</widget>';
+    } else {
+      // post 布局
+      el += layoutTocHeader()
+      el += `<div class="widget-body fs14">`
+      el += `<div class="doc-tree active">`
+      el += layoutTocBody()
+      el += `</div>`
+      el += `</div>`
+      if (hasTOC == false) {
+        return ''
+      }
+    } 
+    el += `</widget>`
   } else if (item.fallback) {
-    el += partial(item.fallback, {item: theme.data.widgets[item.fallback]});
+    const fallback = theme.widgets[item.fallback]
+    el += partial(fallback.layout, {item: fallback})
   }
-  return el;
+  return el
 }
 
 %>

package/layout/archive.ejs

@@ -4,7 +4,7 @@ if (page.menu_id == undefined) {
   page.menu_id = 'post';
 }
 if (page.author) {
-  page.header = 'auto';
+  page.header = false;
 }
 function layoutArchiveList() {
   var el = ''
@@ -13,7 +13,7 @@ function layoutArchiveList() {
     el += partial('_partial/main/navbar/author_banner')
   } else {
     page.title = __('btn.archives')
-    el += partial('_partial/main/navbar/list_post')
+    el += partial('_partial/main/navbar/nav_tabs_blog')
   }
   el += `<div class="post-list archives">`
   var years = []
@@ -24,7 +24,7 @@ function layoutArchiveList() {
     }
   })
   for (let year of years) {
-    el += `<article class="${scrollreveal()}" id="archive">`
+    el += `<article class="${scrollreveal('')}" id="archive">`
   	el += `<div class='archive-header h4'>${year}</div>`
     site.posts.sort('date', -1).filter(function (post) {
       post.year = date(post.date, 'YYYY')

package/layout/categories.ejs

@@ -7,9 +7,9 @@ if (page.menu_id == undefined) {
 <% if (site.categories.length) { %>
   <% page.title = __('btn.categories'); %>
   <% page.layout = 'categories'; %>
-  <%- partial('_partial/main/navbar/list_post') %>
+  <%- partial('_partial/main/navbar/nav_tabs_blog') %>
   <div class='post-list'>
-    <article class='<%- scrollreveal() %>' id='cats'>
+    <article class='<%- scrollreveal("") %>' id='cats'>
       <% site.categories.sort('path').each(function(category){ %>
         <div>
           <a class="<%= category.parent ? 'cat child' : 'cat'%>" href="<%= url_for(category.path) %>">

package/layout/index.ejs

@@ -1,10 +1,6 @@
 <%
 if (page.menu_id == undefined) {
-  if (page.layout === 'wiki_index' && page.wiki) {
-    page.menu_id = 'wiki';
-  } else {
-    page.menu_id = 'post';
-  }
+  page.menu_id = 'post';
 }
 if (page.title && page.wiki) {
   page.robots = 'noindex,follow';
@@ -16,7 +12,7 @@ function layout_post_card(layout, post, content) {
   if (layout == 'post' && post.cover != undefined && post.poster != undefined) {
     layout += ' photo';
   }
-  el += '<a class="post-card ' + layout + ' ' + scrollreveal() + '" href="' + url_for(post.link || post.path) + '">';
+  el += `<a class="post-card${scrollreveal(' ')} ${layout}" href="${url_for(post.link || post.path)}">`
   el += content;
   el += '</a>';
   return el;
@@ -25,65 +21,17 @@ function layout_post_card(layout, post, content) {
 function layout_post_list(partial) {
   var el = '';
   el += '<div class="post-list post">';
-  if (is_home()) {
-    // pinned posts
-    if (page.current == 1) {
-      var pinned = site.posts.filter(post => post.pin != undefined).sort((config.index_generator && config.index_generator.order_by) || '-date');
-      pinned.forEach((post, i) => {
-        el += layout_post_card('post', post, partial(post));
-      });
-    }
-    // unpinned posts
-    page.posts.each(function(post){
-      if (post.pin == undefined) {
-        el += layout_post_card('post', post, partial(post));
-      }
-    })
-  } else {
-    page.posts.each(function(post){
-      el += layout_post_card('post', post, partial(post));
-    })
-  }
+  page.posts.each(function(post){
+    el += layout_post_card('post', post, partial(post));
+  })
   el += '</div>';
   return el;
 }
 
-function layout_wiki_list(partial) {
-  var el = '';
-  const { shelf, tree } = theme.wiki;
-  for (let pid of shelf) {
-    let proj = tree[pid];
-    if (proj == null) {
-      continue;
-    }
-    if (proj.pages == undefined || proj.pages.length === 0) {
-      continue;
-    }
-    if (page.filter === false) {
-      // wikiList
-      el += '<div class="post-list wiki">';
-      el += layout_post_card('wiki', proj.homepage, partial(proj));
-      el += '</div>';
-    } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
-      // filtered wikiList
-      el += '<div class="post-list wiki filter">';
-      el += layout_post_card('wiki', proj.homepage, partial(proj));
-      el += '</div>';
-    }
-  }
-  return el;
-}
 %>
 
-<% if (page.menu_id === 'post') { %>
-  <%- partial('_partial/main/navbar/list_post') %>
-  <%- layout_post_list(function(post){
-    return partial('_partial/main/post_list/post_card', {post: post})
-  }) %>
-  <%- partial('_partial/main/post_list/paginator') %>
-<% } else if (page.menu_id === 'wiki') { %>
-  <%- partial('_partial/main/navbar/list_wiki') %>
-  <%- layout_wiki_list(function(proj){
-    return partial('_partial/main/post_list/wiki_card', {proj: proj})
-  }) %>
-<% } %>
+<%- partial('_partial/main/navbar/nav_tabs_blog') %>
+<%- layout_post_list(function(post){
+  return partial('_partial/main/post_list/post_card', {post: post})
+}) %>
+<%- partial('_partial/main/post_list/paginator') %>

package/layout/index_topic.ejs

@@ -0,0 +1,28 @@
+<%
+function layout_topic_list(partial) {
+  var el = ''
+  const { publish_list, tree } = theme.topic
+  for (let id of publish_list) {
+    const topic = tree[id]
+    if (topic == null) {
+      continue
+    }
+    el += `<div class="post-list wiki topic">`
+    el += `<a class="post-card wiki topic${scrollreveal(' ')}" href="${url_for(topic.homepage?.path || '/')}">`
+    el += partial(topic)
+    el += `</a>`
+    el += `</div>`
+  }
+  return el
+}
+function layoutDiv() {
+  var el = ''
+  el += partial('_partial/main/navbar/nav_tabs_blog')
+  el += layout_topic_list(function(topic) {
+    return partial('_partial/main/post_list/topic_card', {topic: topic})
+  })
+  return el
+}
+%>
+
+<%- layoutDiv() %>

package/layout/index_wiki.ejs

@@ -0,0 +1,42 @@
+<%
+function layout_wiki_list(partial) {
+  var el = ''
+  const { shelf, tree } = theme.wiki
+  for (let pid of shelf) {
+    let proj = tree[pid]
+    if (proj == null) {
+      continue
+    }
+    if (proj.pages == undefined || proj.pages.length === 0) {
+      continue
+    }
+    if (page.filter === false) {
+      // wikiList
+      el += `<div class="post-list wiki">`
+      el += `<a class="post-card wiki${scrollreveal(' ')}" href="${url_for(proj.homepage?.path || '/')}">`
+      el += partial(proj)
+      el += `</a>`
+      el += `</div>`
+    } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
+      // filtered wikiList
+      el += `<div class="post-list wiki filter">`
+      el += `<a class="post-card wiki${scrollreveal(' ')}" href="${url_for(proj.homepage?.path || '/')}">`
+      el += partial(proj)
+      el += `</a>`
+      el += `</div>`
+    }
+  }
+  return el
+}
+
+function layoutDiv() {
+  var el = ''
+  el += partial('_partial/main/navbar/nav_tabs_wiki')
+  el += layout_wiki_list(function(proj) {
+    return partial('_partial/main/post_list/wiki_card', {proj: proj})
+  })
+  return el
+}
+%>
+
+<%- layoutDiv() %>

package/layout/layout.ejs

@@ -1,21 +1,53 @@
-<!DOCTYPE html>
-<html lang='<%- page.lang %>'>
-<%- partial('_partial/head') %>
-<body>
-  <%- partial('_partial/cover/index') %>
-  <div class='l_body' id='start'>
-    <aside class='l_left' layout='<%- page.layout %>'>
-    <%- partial('_partial/sidebar/index') %>
-    </aside>
-    <div class='l_main<%- page.content ? "" : " list" %>'>
-      <%- partial('_partial/main/header/index') %>
-      <%- body %>
-      <%- partial('_partial/main/footer') %>
-      <%- partial('_partial/menubtn') %>
-    </div>
-  </div>
-  <div class='scripts'>
-    <%- partial('_partial/scripts/index') %>
-  </div>
-</body>
-</html>
+<%
+// 页面类型：索引页面还是内容页面
+var page_type = 'index'
+if (['post', 'page', 'wiki', null].includes(page.layout)) {
+  if (!page.nav_tabs) {
+    page_type = 'content'
+  }
+}
+// 文章类型：技术类文章/文学类文章
+var article_type = theme.article.type
+if (page.type?.length > 0) {
+  article_type = page.type
+}
+// 是否缩进
+var indent = false
+if (page.indent != null) {
+  indent = page.indent
+} else if (theme.topic.tree[page.topic]?.indent != null) {
+  indent = theme.topic.tree[page.topic]?.indent
+} else if (theme.wiki.tree[page.wiki]?.indent != null) {
+  indent = theme.wiki.tree[page.wiki]?.indent
+} else if (theme.article.indent != null) {
+  indent = theme.article.indent
+} else {
+  indent = article_type === 'story'
+}
+
+var html = `<!DOCTYPE html>`
+html += `<html lang="${page.lang}">`
+  html += partial('_partial/head')
+  html += `<body>`
+    html += partial('_partial/cover/index')
+    html += `<div class="l_body ${page_type} ${article_type}" id="start" layout="${page.layout}" ${indent ? 'text-indent' : ''}>`
+      html += `<aside class="l_left">`
+        html += `<div class="sidebar-container${theme.style.sidebar?.blur ? ' sidebar-blur' : ''}">`
+          html += partial('_partial/sidebar/index')
+        html += `</div>`
+      html += `</aside>`
+      html += `<div class="l_main" id="main">`
+        html += partial('_partial/sidebar/logo', {where: 'main'})
+        html += body
+        html += partial('_partial/main/footer')
+        html += partial('_partial/menubtn')
+        html += `<div class="main-mask" onclick="sidebar.toggle()"></div>`
+      html += `</div>`
+    html += `</div>`
+    html += `<div class="scripts">`
+      html += partial('_partial/scripts/index')
+    html += `</div>`
+  html += `</body>`
+html += `</html>`
+%>
+<%- html %>