hexo-theme-stellar 1.44.0 → 2.0.0-rc.2

package/_data/widgets.yml

@@ -34,7 +34,7 @@ toc:
   collapse: false # true / false / auto
   # 编辑本文按钮
   edit_this_page: # 从开头开始匹配替换
-    '_posts/': # https://github.com/xaoxuu/xaoxuu.com/blob/main/source/_posts/
+    '_posts/':
     'wiki/stellar/': https://github.com/xaoxuu/hexo-theme-stellar-docs/blob/main/
 
 # GitHub 用户信息

package/languages/en.yml

@@ -6,6 +6,8 @@ btn:
   notebook: Notebook
   recent_publish: Recent
   all_wiki: All Products
+  all_topic: All Topics
+  all_notebook: All Notebooks
   category: Category
   categories: Categories
   tag: Tag
@@ -21,6 +23,16 @@ btn:
   comments: Join Discussion
   expand_posts: Show %s more posts
   collapse_posts: Collapse
+  search: Search
+
+menu:
+  blog: Blog
+  categories: Categories
+  tags: Tags
+  topic: Topic
+  archives: Archives
+  friends: Friends
+  about: About
 
 meta:
   recent_update: Recent Update
@@ -69,13 +81,51 @@ page:
 
 search:
   search: Search
-  search_in: Search in %s
+  scope_all: All
+  scope_blog: Blog
   no_results: No Results!
+  close: Close search
+
+settings:
+  label: Settings
+  title: Settings
+  profile:
+    title: Profile
+    avatar: Avatar
+    nickname: Nickname
+    email: Email
+    url: URL
+    save: Save
+    logout: Log out
+    provider_managed: '%s manages comment identity outside the theme. Profile editing and logout are unavailable here.'
+    provider_unknown: The current comment provider
+  cache:
+    title: Cache
+    search: Search cache
+    dynamic: Data cache
+    all: All caches
+    clear: 'Clear %s'
+  about:
+    title: About
+    empty: No information configured.
+    open_link: 'Open link for %s'
+  result:
+    success: Done.
+    partial: Partially completed. Some browser storage could not be changed.
+    failure: Failed. Browser storage is unavailable.
+  validation:
+    name: Enter a nickname of up to 80 characters.
+    email: Enter a valid email address or leave it blank.
+    url: Enter an HTTP(S) URL or leave it blank.
 
 message:
   copied: Copied!
+  copy_denied: Clipboard permission was denied
+  copy_unsupported: Clipboard requires a supported browser and HTTPS
   fetching_latest_release: '%s is fetching the latest release…'
-  theme_switched:
+  loading: Loading
+  loading_failed: Failed to load. Please try again later.
+  color_scheme_switched:
     light: Switched to Light Mode
     dark: Switched to Dark Mode
     auto: Switched to Auto Mode
@@ -89,6 +139,13 @@ symbol:
   page: "Page %s"
 
 tag_plugins:
+  okr:
+    status:
+      in_track: On Track
+      at_risk: At Risk
+      off_track: Delayed
+      finished: Completed
+      unfinished: Incomplete
   mbti:
     title: 'My MBTI Type: %s (%s)'
     types:

package/languages/zh-CN.yml

@@ -6,6 +6,8 @@ btn:
   notebook: 笔记本
   recent_publish: 近期发布
   all_wiki: 所有项目
+  all_topic: 所有专栏
+  all_notebook: 所有笔记本
   category: 分类
   categories: 分类
   tag: 标签
@@ -21,6 +23,16 @@ btn:
   comments: 参与讨论
   expand_posts: 展开其余 %s 篇
   collapse_posts: 收起
+  search: 搜索
+
+menu:
+  blog: 博客
+  categories: 分类
+  tags: 标签
+  topic: 专栏
+  archives: 归档
+  friends: 友链
+  about: 关于
 
 meta:
   recent_update: 最近更新
@@ -69,13 +81,51 @@ page:
 
 search:
   search: 站内搜索
-  search_in: 在 %s 中搜索
+  scope_all: 全站
+  scope_blog: 博客
   no_results: 没有找到内容！
+  close: 关闭搜索
+
+settings:
+  label: 设置
+  title: 设置
+  profile:
+    title: 个人资料
+    avatar: 头像
+    nickname: 昵称
+    email: Email
+    url: URL
+    save: 保存
+    logout: 退出登录
+    provider_managed: '%s 的评论身份不由主题管理，无法在此编辑或退出。'
+    provider_unknown: 当前评论服务
+  cache:
+    title: 缓存
+    search: 搜索缓存
+    dynamic: 数据缓存
+    all: 全部缓存
+    clear: '清除「%s」'
+  about:
+    title: 关于
+    empty: 暂未配置相关信息。
+    open_link: '打开「%s」链接'
+  result:
+    success: 操作成功。
+    partial: 操作部分完成，部分浏览器存储无法修改。
+    failure: 操作失败，浏览器存储不可用。
+  validation:
+    name: 请输入不超过 80 个字符的昵称。
+    email: 请输入有效的 Email，或留空。
+    url: 请输入 HTTP(S) URL，或留空。
 
 message:
   copied: 复制成功
+  copy_denied: 未获得剪贴板权限
+  copy_unsupported: 当前浏览器不支持剪贴板或页面不是 HTTPS
   fetching_latest_release: '%s 正在获取最新版本…'
-  theme_switched:
+  loading: 正在加载
+  loading_failed: 加载失败，请稍后重试。
+  color_scheme_switched:
     light: 切换到浅色模式
     dark: 切换到深色模式
     auto: 切换到跟随系统配色
@@ -89,6 +139,13 @@ symbol:
   page: "第 %s 页"
 
 tag_plugins:
+  okr:
+    status:
+      in_track: 正常
+      at_risk: 风险
+      off_track: 延期
+      finished: 已完成
+      unfinished: 未完成
   mbti:
     title: 我的 MBTI 人格：%s（%s）
     types:

package/languages/zh-TW.yml

@@ -6,6 +6,8 @@ btn:
   notebook: 筆記本
   recent_publish: 近期發布
   all_wiki: 所有文檔
+  all_topic: 所有專欄
+  all_notebook: 所有筆記本
   category: 分類
   categories: 分類
   tag: 標籤
@@ -21,6 +23,16 @@ btn:
   comments: 參與討論
   expand_posts: 展開其餘 %s 篇
   collapse_posts: 收起
+  search: 搜尋
+
+menu:
+  blog: 網誌
+  categories: 分類
+  tags: 標籤
+  topic: 專欄
+  archives: 封存
+  friends: 友鏈
+  about: 關於
 
 meta:
   recent_update: 最近更新
@@ -69,13 +81,51 @@ page:
 
 search:
   search: 站內搜尋
-  search_in: 在 %s 中搜尋
+  scope_all: 全站
+  scope_blog: 部落格
   no_results: 沒有找到內容！
+  close: 關閉搜尋
+
+settings:
+  label: 設定
+  title: 設定
+  profile:
+    title: 個人資料
+    avatar: 頭像
+    nickname: 暱稱
+    email: Email
+    url: URL
+    save: 儲存
+    logout: 登出
+    provider_managed: '%s 的留言身分不由主題管理，無法在此編輯或登出。'
+    provider_unknown: 目前留言服務
+  cache:
+    title: 快取
+    search: 搜尋快取
+    dynamic: 資料快取
+    all: 全部快取
+    clear: '清除「%s」'
+  about:
+    title: 關於
+    empty: 尚未設定相關資訊。
+    open_link: '開啟「%s」連結'
+  result:
+    success: 操作成功。
+    partial: 操作部分完成，部分瀏覽器儲存空間無法修改。
+    failure: 操作失敗，瀏覽器儲存空間無法使用。
+  validation:
+    name: 請輸入不超過 80 個字元的暱稱。
+    email: 請輸入有效的 Email，或留空。
+    url: 請輸入 HTTP(S) URL，或留空。
 
 message:
   copied: 複製成功
+  copy_denied: 未取得剪貼簿權限
+  copy_unsupported: 目前瀏覽器不支援剪貼簿或頁面不是 HTTPS
   fetching_latest_release: '%s 正在取得最新版本…'
-  theme_switched:
+  loading: 正在載入
+  loading_failed: 載入失敗，請稍後再試。
+  color_scheme_switched:
     light: 切換到淺色模式
     dark: 切換到深色模式
     auto: 切換到跟隨系統配色
@@ -89,6 +139,13 @@ symbol:
   page: "第 %s 頁"
 
 tag_plugins:
+  okr:
+    status:
+      in_track: 正常
+      at_risk: 風險
+      off_track: 延期
+      finished: 已完成
+      unfinished: 未完成
   mbti:
     title: 我的 MBTI 人格：%s（%s）
     types:

package/layout/404.ejs

@@ -1,10 +1,13 @@
 <%
-page.comment_title = '';
-page.header = false;
 page.robots = 'none';
+var errorProfile = stellar_config('profiles.error') || {}
+var errorComments = comments_model(page, errorProfile.comments)
 %>
 <article class='md-text error-page'>
-  <h1><img id='error' src='<%- theme.style.error_page %>' alt='404'></h1>
+  <% var errorImage = errorProfile.image %>
+  <% if (errorImage) { %>
+    <h1><img id='error' src='<%- errorImage %>' alt='404'></h1>
+  <% } %>
   <p class='what'>
     <strong>
       <%- __('page.error.what') %>
@@ -16,4 +19,4 @@ page.robots = 'none';
   <br><br>
   <a class='button' id='back' href="<%- config.root %>"><%- __('page.error.action') %></a>
 </article>
-<%- partial('_partial/comments/layout') %>
+<%- partial('_partial/comments/layout', {comments: errorComments}) %>

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

@@ -3,8 +3,9 @@ function layoutDiv() {
   var el = '';
   el += `<div class="artalk with-fancybox" id="artalk_container"`;
   let cfg = {};
-  if (page.comment_id) {
-    cfg['comment_id'] = page.comment_id;
+  const commentId = comments.id
+  if (commentId) {
+    cfg['comment_id'] = commentId;
   }
   for (let key of Object.keys(cfg)) {
     if (cfg[key]) {

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

@@ -1,10 +1,10 @@
 <%
 function layoutDiv() {
   var el = '';
-  const cmt = page.cmt;
+  const cmt = comments;
   if (cmt && cmt.service && (cmt.service.length > 0)) {
     const name = cmt.service;
-    const body = cmt[name];
+    const body = cmt.options;
     el += '<div id="' + name + '"';
     for (let key of Object.keys(body)) {
       if (body[key] !== null) {

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

@@ -1,13 +1,10 @@
 <%
 function layoutDiv() {
   var el = '';
-  const cmt = page.cmt;
+  const cmt = comments;
   if (cmt?.service?.length > 0) {
     const name = cmt.service;
-    var body = cmt[name];
-    if (theme.style.prefers_theme != 'auto' && body['data-theme'] == 'preferred_color_scheme') {
-      body['data-theme'] = theme.style.prefers_theme
-    }
+    var body = Object.assign({}, cmt.options);
     el += '<div id="' + name + '"';
     for (let key of Object.keys(body)) {
       if (body[key] !== null) {

package/layout/_partial/comments/layout.ejs

@@ -1,48 +1,19 @@
 <%
-var cmt = {
-  service: page.comments_service || theme.comments.service
-};
-if (cmt.service) {
-  cmt[cmt.service] = Object.assign({}, theme.comments[cmt.service]);
+if (typeof comments === 'undefined') {
+  throw new Error('Stellar v2: comments/layout 必须接收显式 comments 模型')
 }
-var loadComment = false;
-if (cmt.service && cmt.service.length > 0) {
-  if (page.comments == undefined || page.comments != false) {
-    loadComment = true;
-  }
-}
-// 合并项目评论
-const proj = theme.wiki.tree[page.wiki]
-if (loadComment && (proj != null)) {
-  if (proj.comments === false) {
-    loadComment = false;
-    page.comments = false;
-  } else {
-    if (proj.comment_title != undefined && page.comment_title == undefined) {
-      if (['utterances', 'beaudar', 'giscus'].includes(theme.comments.service)) {
-        page.comment_title = proj.comment_title;
-      }
-    }
-    if (proj.comments && proj.comments.service) {
-      cmt = proj.comments;
-      let s = proj.comments.service;
-      cmt[s] = Object.assign({}, theme.comments[s], proj.comments[s]);
-    }
-  }
-}
-if (cmt.service && page[cmt.service]) {
-  Object.assign(cmt[cmt.service], page[cmt.service]);
-}
-page.cmt = cmt;
-page.cmt_rendered = loadComment;
+var commentModel = comments
 %>
-<% if (loadComment) { %>
+<% if (commentModel.enabled) { %>
   <div class="related-wrap md-text<%- scrollreveal(' ') %>" id="comments">
-    <section class='header cmt-title cap theme'>
-      <%- markdown(page.comment_title || theme.comments.comment_title) %>
+    <% var resolvedCommentTitle = commentModel.title == null ? __('btn.comments') : commentModel.title %>
+    <% if (resolvedCommentTitle !== '') { %>
+    <section class="header cmt-title cap theme">
+      <%- markdown(resolvedCommentTitle) %>
     </section>
-    <section class='body cmt-body <%- cmt.service %>'>
-      <%- partial(cmt.service + '/layout') %>
+    <% } %>
+    <section class="body cmt-body <%- commentModel.service %>">
+      <%- partial(commentModel.service + '/layout', {comments: commentModel}) %>
     </section>
   </div>
 <% } %>

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

@@ -3,8 +3,9 @@ function layoutDiv() {
   var el = '';
   el += '<div id="twikoo_container" class="with-fancybox"';
   let cfg = {};
-  if (page.comment_id) {
-    cfg['comment_id'] = page.comment_id;
+  const commentId = comments.id
+  if (commentId) {
+    cfg['comment_id'] = commentId;
   }
   for (let key of Object.keys(cfg)) {
     if (cfg[key]) {

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

@@ -1,10 +1,10 @@
 <%
 function layoutDiv() {
   var el = '';
-  const cmt = page.cmt;
+  const cmt = comments;
   if (cmt && cmt.service && (cmt.service.length > 0)) {
     const name = cmt.service;
-    const body = cmt[name];
+    const body = cmt.options;
     el += '<div id="' + name + '"';
     for (let key of Object.keys(body)) {
       if (body[key] !== null) {

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

@@ -3,8 +3,9 @@ function layoutDiv() {
   var el = '';
   el += '<div id="waline_container" class="waline_thread with-fancybox"';
   let cfg = {};
-  if (page.comment_id) {
-    cfg['comment_id'] = page.comment_id;
+  const commentId = comments.id
+  if (commentId) {
+    cfg['comment_id'] = commentId;
   }
   for (let key of Object.keys(cfg)) {
     if (cfg[key]) {

package/layout/_partial/components/collection-item.ejs

@@ -4,14 +4,20 @@ var entryTitle = entry.title == null ? '' : String(entry.title)
 var entryPrefix = entry.prefix == null ? '' : String(entry.prefix)
 var entryDescription = entry.description == null ? '' : String(entry.description)
 var entryMeta = entry.meta == null ? '' : String(entry.meta)
+var entryType = entry.type === 'button' ? 'button' : 'link'
+var entryIconOnly = entry.iconOnly === true
 var entryClassName = typeof entry.className === 'string' ? entry.className.trim() : ''
-var entryClasses = 'ui-collection__item card-hover card-hover--spotlight'
+var entryModifiers = []
+if (entryIconOnly) {
+  entryModifiers.push('is-icon-only')
+}
 if (entry.active) {
-  entryClasses += ' is-active'
+  entryModifiers.push('is-active')
 }
 if (entryClassName.length > 0) {
-  entryClasses += ' ' + entryClassName
+  entryModifiers.push(entryClassName)
 }
+var entryClasses = ui_classes('', 'collectionItem', entryModifiers.join(' '))
 var entryStyle = ''
 if (entry.theme) {
   entryStyle += '--item-theme:' + String(entry.theme) + ';'
@@ -19,17 +25,29 @@ if (entry.theme) {
 if (entry.depth > 0) {
   entryStyle += '--ui-item-depth:' + parseInt(entry.depth, 10) + ';'
 }
-var entryGradientId = entry.gradientId ? String(entry.gradientId).replace(/[^a-zA-Z0-9_-]/g, '-') : ''
-var entryGradientRef = entry.gradientRef ? String(entry.gradientRef).replace(/[^a-zA-Z0-9_-]/g, '-') : ''
-if (entryGradientId.length > 0 || entryGradientRef.length > 0) {
-  entryStyle += '--item-grad:url(#' + (entryGradientId || entryGradientRef) + ');'
+var showTitle = entry.showTitle !== false && !entryIconOnly
+var hasContent = !entryIconOnly && (showTitle || entryPrefix.length > 0 || entryDescription.length > 0 || entryMeta.length > 0)
+var safeAttrs = ''
+var attrs = entry.attrs && typeof entry.attrs === 'object' && !Array.isArray(entry.attrs) ? entry.attrs : {}
+Object.keys(attrs).forEach(function(name) {
+  if (!/^(?:aria|data)-[a-z0-9_-]+$/i.test(name) && name !== 'title') return
+  var value = attrs[name]
+  if (value == null || value === false) return
+  safeAttrs += ` ${name}="${escape_html(value === true ? name : String(value))}"`
+})
+var tagName = entryType === 'button' ? 'button' : 'a'
+var primaryAttrs = entryType === 'button'
+  ? ' type="button"'
+  : ` href="${escape_html(entry.href)}"`
+if (!Object.prototype.hasOwnProperty.call(attrs, 'title')) {
+  primaryAttrs += ` title="${escape_html(entryTitle)}"`
 }
-var showTitle = entry.showTitle !== false
-var hasContent = showTitle || entryPrefix.length > 0 || entryDescription.length > 0 || entryMeta.length > 0
+if (entry.active) primaryAttrs += ' aria-current="page"'
+if (entryStyle.length > 0) primaryAttrs += ` style="${escape_html(entryStyle)}"`
 %>
-<a class="<%= entryClasses %>" href="<%= entry.href %>" title="<%= entryTitle %>"<% if (entry.active) { %> aria-current="page"<% } %><% if (entryStyle.length > 0) { %> style="<%= entryStyle %>"<% } %>>
+<%- `<${tagName} class="${escape_html(entryClasses)}"${primaryAttrs}${safeAttrs}>` %>
   <%- typeof entry.before === 'string' ? entry.before : '' %>
-  <% if (entry.icon) { %><span class="ui-collection__leading"><%- icon(entry.icon, 'no-lazy', true) %></span><% } %>
+  <% if (entry.icon) { %><span class="ui-icon"><%- icon(entry.icon, 'no-lazy', true) %></span><% } %>
   <% if (hasContent) { %>
     <span class="ui-collection__content">
       <% if (entryPrefix.length > 0) { %><span class="ui-collection__prefix"><%= entryPrefix %></span><% } %>
@@ -40,5 +58,4 @@ var hasContent = showTitle || entryPrefix.length > 0 || entryDescription.length
   <% } %>
   <%- typeof entry.after === 'string' ? entry.after : '' %>
   <% if (entry.active && entry.indicator !== false) { %><span class="ui-collection__indicator"></span><% } %>
-  <% if (entryGradientId.length > 0) { %><%- partial('_partial/sidebar/grad-def', {id: entryGradientId}) %><% } %>
-</a>
+<%- `</${tagName}>` %>

package/layout/_partial/components/collection.ejs

@@ -1,10 +1,10 @@
 <%
 var collectionOptions = typeof options === 'object' && options ? options : {}
 var collectionItems = Array.isArray(collectionOptions.items) ? collectionOptions.items.filter(function(entry) {
-  return entry && entry.href != null
+  return entry && (entry.href != null || entry.type === 'button')
 }) : []
 if (collectionItems.length > 0) {
-var collectionLayout = collectionOptions.layout === 'grid' ? 'grid' : 'list'
+var collectionLayout = ['grid', 'inline'].includes(collectionOptions.layout) ? collectionOptions.layout : 'list'
 var collectionVariant = ['nav', 'summary', 'icon'].includes(collectionOptions.variant) ? collectionOptions.variant : 'nav'
 var collectionDensity = collectionOptions.density === 'compact' ? 'compact' : 'auto'
 var collectionColumns = parseInt(collectionOptions.columns, 10)

package/layout/_partial/cover/index.ejs

@@ -1,7 +1,10 @@
 <%
 function layoutCover() {
-  if (page.wiki) {
-    return partial('wiki_cover')
+  var wikiViewModel = typeof viewModel !== 'undefined' && viewModel?.collection?.profile === 'wiki'
+    ? viewModel
+    : null
+  if (wikiViewModel) {
+    return partial('wiki_cover', {viewModel: wikiViewModel})
   }
   return ''
 }