';
// this product
- var proj;
- if (page.layout === 'wiki' && page.wiki) {
- proj = theme.wiki.tree[page.wiki];
- }
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]))
};
}
}
@@ -142,6 +139,7 @@ function layoutFooterDiv() {
return '';
}
}
+
%>
<% if (page.header == undefined || page.header == 'left' || page.header == 'auto') { %>
<%- partial('header', {where: 'sidebar'}) %>
diff --git a/layout/_partial/sidebar/menu.ejs b/layout/_partial/sidebar/menu.ejs
index 7896983..52fde0e 100644
--- a/layout/_partial/sidebar/menu.ejs
+++ b/layout/_partial/sidebar/menu.ejs
@@ -6,8 +6,8 @@ function layoutDiv() {
el += ' mobile-hidden';
}
el += '">';
- for (let id of Object.keys(theme.sidebar.menu)) {
- let item = theme.sidebar.menu[id];
+ for (let id of Object.keys(theme.menu)) {
+ let item = theme.menu[id];
if (item == undefined || item.length == 0) {
continue;
}
diff --git a/layout/_partial/widgets/related.ejs b/layout/_partial/widgets/related.ejs
index 6733ebe..4667d7a 100644
--- a/layout/_partial/widgets/related.ejs
+++ b/layout/_partial/widgets/related.ejs
@@ -1,25 +1,4 @@
<%
-function relatedPosts() {
- const { categories } = page;
- if (categories.length == 0) {
- return ''
- }
- const relatedItem = categories.data[0]
- var el = ''
- el += `
`
- return el
-}
function relatedPostsInTopic() {
if (page.topic?.length == 0) {
return ''
@@ -74,8 +53,6 @@ function relatedWiki() {
function layoutDiv() {
if (page.layout == 'wiki') {
return relatedWiki()
- } else if (page.layout == 'post') {
- return relatedPosts()
} else if (page.layout == 'topic') {
return relatedPostsInTopic()
}
diff --git a/layout/categories.ejs b/layout/categories.ejs
index 3b6dd7d..d275f98 100755
--- a/layout/categories.ejs
+++ b/layout/categories.ejs
@@ -7,7 +7,7 @@ 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') %>
<% site.categories.sort('path').each(function(category){ %>
diff --git a/layout/index.ejs b/layout/index.ejs
index fa33141..6fdba21 100755
--- a/layout/index.ejs
+++ b/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';
@@ -48,42 +44,10 @@ function layout_post_list(partial) {
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 += '';
- el += layout_post_card('wiki', proj.homepage, partial(proj));
- el += '
';
- } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
- // filtered wikiList
- el += '';
- el += layout_post_card('wiki', proj.homepage, partial(proj));
- el += '
';
- }
- }
- 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') %>
\ No newline at end of file
diff --git a/layout/index_topic.ejs b/layout/index_topic.ejs
index ca776e1..d9857fc 100644
--- a/layout/index_topic.ejs
+++ b/layout/index_topic.ejs
@@ -1,12 +1,4 @@
<%
-if (page.menu_id == undefined) {
- if (page.layout === 'wiki_topic' && page.topic) {
- page.menu_id = 'blog'
- } else {
- page.menu_id = 'post'
- }
-}
-
function layout_topic_list(partial) {
var el = ''
const { publish_list, tree } = theme.topic
@@ -25,7 +17,7 @@ function layout_topic_list(partial) {
}
function layoutDiv() {
var el = ''
- el += partial('_partial/main/navbar/list_post')
+ el += partial('_partial/main/navbar/nav_tabs_blog')
el += layout_topic_list(function(topic) {
return partial('_partial/main/post_list/topic_card', {topic: topic})
})
diff --git a/layout/index_wiki.ejs b/layout/index_wiki.ejs
new file mode 100644
index 0000000..1314772
--- /dev/null
+++ b/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 += ``
+ } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
+ // filtered wikiList
+ el += ``
+ }
+ }
+ 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() %>
\ No newline at end of file
diff --git a/layout/page.ejs b/layout/page.ejs
index da2b84e..562cf7f 100755
--- a/layout/page.ejs
+++ b/layout/page.ejs
@@ -9,8 +9,8 @@ function layoutTitle() {
}
function layoutDiv() {
var el = '';
- if (page.post_list) {
- el += partial('_partial/main/navbar/list_post');
+ if (page.nav_tabs) {
+ el += partial('_partial/main/navbar/nav_tabs_blog');
}
if (page.h1 || page.title || (page.content && page.content.length > 0)) {
el += partial('_partial/main/navbar/breadcrumb');
diff --git a/layout/tags.ejs b/layout/tags.ejs
index 078d7e8..5a2b9e2 100755
--- a/layout/tags.ejs
+++ b/layout/tags.ejs
@@ -7,7 +7,7 @@ if (page.menu_id == undefined) {
<% if (site.tags.length) { %>
<% page.title = __('btn.tags'); %>
<% page.layout = 'tags'; %>
- <%- partial('_partial/main/navbar/list_post') %>
+ <%- partial('_partial/main/navbar/nav_tabs_blog') %>
<% site.tags.sort('length', -1).each(function(tag){ %>
diff --git a/layout/topic.ejs b/layout/topic.ejs
index f6fb264..6d2f135 100644
--- a/layout/topic.ejs
+++ b/layout/topic.ejs
@@ -2,11 +2,8 @@
if (page.menu_id == undefined) {
page.menu_id = 'post'
}
-if (page.layout == undefined) {
- page.layout = 'index_topic'
-}
if (page.title == undefined) {
- page.title = __('btn.wiki')
+ page.title = __('btn.topic')
}
function layoutTitle() {
const title = page.h1 != null ? page.h1 : page.title;
@@ -17,23 +14,15 @@ function layoutTitle() {
}
}
%>
-<% if (page.layout === 'index_topic') { %>
- <%- partial('index') %>
-<% } else { %>
- <%
- if (page.header == undefined) {
- page.header = 'auto';
- }
- %>
- <%- partial('_partial/main/navbar/breadcrumb') %>
- <%- scrollreveal() %>'>
- <%- layoutTitle() %>
- <%- markdown(page.content) %>
- <% if (theme.plugins.tianli_gpt.enable && ['all', 'topic'].includes(theme.plugins.tianli_gpt.field)) { %>
- <%- partial('_partial/plugins/ai/tianli_gpt') %>
- <% } %>
- <%- partial('_partial/main/article/article_footer') %>
-
- <%- partial('_partial/main/article/read_next') %>
- <%- partial('_partial/plugins/comments/layout') %>
+
+<%- partial('_partial/main/navbar/breadcrumb') %>
+<%- scrollreveal() %>'>
+<%- layoutTitle() %>
+<%- markdown(page.content) %>
+<% if (theme.plugins.tianli_gpt.enable && ['all', 'topic'].includes(theme.plugins.tianli_gpt.field)) { %>
+<%- partial('_partial/plugins/ai/tianli_gpt') %>
<% } %>
+<%- partial('_partial/main/article/article_footer') %>
+
+<%- partial('_partial/main/article/read_next') %>
+<%- partial('_partial/plugins/comments/layout') %>
\ No newline at end of file
diff --git a/layout/wiki.ejs b/layout/wiki.ejs
index c7ead00..2cda033 100755
--- a/layout/wiki.ejs
+++ b/layout/wiki.ejs
@@ -2,9 +2,6 @@
if (page.menu_id == undefined) {
page.menu_id = 'wiki';
}
-if (page.layout == undefined) {
- page.layout = 'wiki_index';
-}
if (page.title == undefined) {
if (page.tagName) {
page.title = page.tagName;
@@ -21,23 +18,15 @@ function layoutTitle() {
}
}
%>
-<% if (page.layout === 'wiki_index') { %>
- <%- partial('index') %>
-<% } else { %>
- <%
- if (page.header == undefined) {
- page.header = 'auto';
- }
- %>
- <%- partial('_partial/main/navbar/breadcrumb') %>
- <%- scrollreveal() %>'>
- <%- layoutTitle() %>
- <%- page.content %>
- <% if (theme.plugins.tianli_gpt.enable && ['all', 'wiki'].includes(theme.plugins.tianli_gpt.field)) { %>
- <%- partial('_partial/plugins/ai/tianli_gpt') %>
- <% } %>
- <%- partial('_partial/main/article/article_footer') %>
-
- <%- partial('_partial/main/article/read_next') %>
- <%- partial('_partial/plugins/comments/layout') %>
+
+<%- partial('_partial/main/navbar/breadcrumb') %>
+<%- scrollreveal() %>'>
+<%- layoutTitle() %>
+<%- page.content %>
+<% if (theme.plugins.tianli_gpt.enable && ['all', 'wiki'].includes(theme.plugins.tianli_gpt.field)) { %>
+<%- partial('_partial/plugins/ai/tianli_gpt') %>
<% } %>
+<%- partial('_partial/main/article/article_footer') %>
+
+<%- partial('_partial/main/article/read_next') %>
+<%- partial('_partial/plugins/comments/layout') %>
\ No newline at end of file
diff --git a/scripts/events/lib/authors.js b/scripts/events/lib/authors.js
index d776fd8..e9857ef 100644
--- a/scripts/events/lib/authors.js
+++ b/scripts/events/lib/authors.js
@@ -6,7 +6,7 @@
module.exports = ctx => {
var authors = ctx.locals.get('data').authors || {}
- let basePath = ctx.config.author_dir || 'author'
+ let basePath = ctx.theme.config.root.author.base_dir
// url
for (let key of Object.keys(authors)) {
let author = authors[key]
diff --git a/scripts/events/lib/config.js b/scripts/events/lib/config.js
index f7fcd13..8fbcbd5 100644
--- a/scripts/events/lib/config.js
+++ b/scripts/events/lib/config.js
@@ -56,8 +56,8 @@ module.exports = hexo => {
hexo.theme.config.data['widgets'] = widgets;
// default menu
- if (hexo.theme.config.sidebar.menu == undefined) {
- hexo.theme.config.sidebar.menu = [];
+ if (hexo.theme.config.menu == undefined) {
+ hexo.theme.config.menu = [];
}
};
diff --git a/scripts/events/lib/doc_tree.js b/scripts/events/lib/doc_tree.js
index c95b113..0386d26 100644
--- a/scripts/events/lib/doc_tree.js
+++ b/scripts/events/lib/doc_tree.js
@@ -177,7 +177,7 @@ module.exports = ctx => {
}
all_tags[tag_name] = {
name: tag_name,
- path: (ctx.config.wiki_dir || 'wiki') + '/tags/' + tag_name + '/index.html',
+ path: (ctx.theme.config.root.wiki.base_dir) + '/tags/' + tag_name + '/index.html',
items: items
}
})
diff --git a/scripts/generators/404.js b/scripts/generators/404.js
index 942532a..294042c 100644
--- a/scripts/generators/404.js
+++ b/scripts/generators/404.js
@@ -3,8 +3,13 @@
*/
hexo.extend.generator.register('404', function (locals) {
+ const { root } = hexo.theme.config
return {
- path: '/404.html',
- layout: ['404']
+ path: root.error_page['404'],
+ layout: ['404'],
+ data: {
+ layout: '404',
+ menu_id: root.error_page.menu_id
+ }
}
-});
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/scripts/generators/author.js b/scripts/generators/author.js
index 0af80c0..91301dc 100644
--- a/scripts/generators/author.js
+++ b/scripts/generators/author.js
@@ -3,7 +3,7 @@
*/
hexo.extend.generator.register('author', function (locals) {
- const { authors } = hexo.theme.config
+ const { root, authors } = hexo.theme.config
var pages = []
for (let key of Object.keys(authors)) {
const author = authors[key]
@@ -14,7 +14,8 @@ hexo.extend.generator.register('author', function (locals) {
path: author.path,
layout: ['archive'],
data: {
- 'author': author
+ author: author,
+ menu_id: root.author.menu_id
}
})
}
diff --git a/scripts/generators/categories.js b/scripts/generators/categories.js
index 2d4a018..bb8dac5 100644
--- a/scripts/generators/categories.js
+++ b/scripts/generators/categories.js
@@ -6,10 +6,10 @@ hexo.extend.generator.register('categories', function (locals) {
if (locals.categories && locals.categories.length > 0) {
return {
path: hexo.config.category_dir + '/index.html',
- data: locals.posts,
- layout: ['categories']
+ layout: ['categories'],
+ data: locals.posts
}
} else {
- return {};
+ return {}
}
-});
+})
diff --git a/scripts/generators/tags.js b/scripts/generators/tags.js
index 40a07b8..eb1cd2a 100644
--- a/scripts/generators/tags.js
+++ b/scripts/generators/tags.js
@@ -6,10 +6,10 @@ hexo.extend.generator.register('tags', function (locals) {
if (locals.tags && locals.tags.length > 0) {
return {
path: hexo.config.tag_dir + '/index.html',
- data: locals.posts,
- layout: ['tags']
+ layout: ['tags'],
+ data: locals.posts
}
} else {
- return {};
+ return {}
}
-});
+})
diff --git a/scripts/generators/topic.js b/scripts/generators/topic.js
index e1f7777..380d659 100644
--- a/scripts/generators/topic.js
+++ b/scripts/generators/topic.js
@@ -3,18 +3,19 @@
*/
hexo.extend.generator.register('topic', function (locals) {
- const { topic } = hexo.theme.config
+ const { root, topic } = hexo.theme.config
const topicIdList = Object.keys(topic.tree)
if (topicIdList.length == 0) {
return {}
}
var ret = []
ret.push({
- path: (hexo.theme.config.base_dir.topic) + '/index.html',
+ path: root.topic.base_dir + '/index.html',
+ layout: ['index_topic'],
data: {
- layout: 'index_topic'
- },
- layout: ['index_topic']
+ layout: 'index_topic',
+ menu_id: root.topic.menu_id
+ }
})
return ret
})
diff --git a/scripts/generators/wiki.js b/scripts/generators/wiki.js
index 29ecfa8..94f2499 100644
--- a/scripts/generators/wiki.js
+++ b/scripts/generators/wiki.js
@@ -3,34 +3,35 @@
*/
hexo.extend.generator.register('wiki', function (locals) {
- var hasWiki = false;
- locals.pages.forEach((page, i) => {
- if (page.layout == 'wiki') {
- hasWiki = true;
- }
- });
- if (hasWiki) {
- var ret = [];
- ret.push({
- path: (hexo.config.wiki_dir || 'wiki') + '/index.html',
- data: {'filter': false},
- layout: ['wiki']
- });
- if (hexo.theme.config.wiki && hexo.theme.config.wiki.all_tags) {
- for (let id of Object.keys(hexo.theme.config.wiki.all_tags)) {
- let tag = hexo.theme.config.wiki.all_tags[id];
- ret.push({
- path: tag.path,
- data: {
- 'filter': true,
- 'tagName': tag.name
- },
- layout: ['wiki']
- });
- }
- }
- return ret;
- } else {
- return {};
+ const { root, wiki } = hexo.theme.config
+ const wikiIdList = Object.keys(wiki.tree)
+ if (wikiIdList.length == 0) {
+ return {}
}
-});
+ var ret = []
+ ret.push({
+ path: root.wiki.base_dir + '/index.html',
+ layout: ['index_wiki'],
+ data: {
+ layout: 'index_wiki',
+ menu_id: root.wiki.menu_id,
+ filter: false
+ }
+ })
+ if (wiki.all_tags) {
+ for (let id of Object.keys(wiki.all_tags)) {
+ let tag = wiki.all_tags[id]
+ ret.push({
+ path: tag.path,
+ layout: ['index_wiki'],
+ data: {
+ layout: 'index_wiki',
+ menu_id: root.wiki.menu_id,
+ filter: true,
+ tagName: tag.name
+ }
+ })
+ }
+ }
+ return ret
+})
diff --git a/scripts/helpers/parse_config.js b/scripts/helpers/parse_config.js
index 50e48f4..afdac5a 100644
--- a/scripts/helpers/parse_config.js
+++ b/scripts/helpers/parse_config.js
@@ -1,6 +1,6 @@
/**
- * md_link(theme.sidebar.menu['home']) is '/'
- * md_text(theme.sidebar.menu['home']) is 'Home'
+ * md_link(theme.menu['home']) is '/'
+ * md_text(theme.menu['home']) is 'Home'
*/
'use strict';