Skip to content

Commit bfaacfd

Browse files
ruibabyruibaby
authored
Merge pull request #7 from halo-dev/require-1.3.0
Require 1.3.0
2 parents 1bc17be + f193500 commit bfaacfd

10 files changed

Lines changed: 66 additions & 40 deletions

File tree

‎_includes/external.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/jquery@1.11.3/dist/jquery.min.js"></script>
2-
<script type="text/javascript" src="${static!}/js/main.js"></script>
2+
<script type="text/javascript" src="${theme_base!}/js/main.js"></script>

‎_includes/read-more.ftl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<section class="read-more">
2-
<#if prePost??>
2+
<#if prevPost??>
33
<div class="read-more-item">
44
<span class="read-more-item-dim">最近的文章</span>
5-
<h2 class="post-list__post-title post-title"><a href="${context!}/archives/${prePost.url!}" title="link to ${prePost.title!}">${prePost.title!}</a></h2>
6-
<p class="excerpt">${prePost.summary!}&hellip;</p>
5+
<h2 class="post-list__post-title post-title"><a href="${prevPost.fullPath!}" title="link to ${prevPost.title!}">${prevPost.title!}</a></h2>
6+
<p class="excerpt">${prevPost.summary!}&hellip;</p>
77
<div class="post-list__meta">
8-
<time datetime="${prePost.createTime}" class="post-list__meta--date date">${prePost.createTime?string("yyyy-MM-dd")}</time>
9-
<a class="btn-border-small" href="${context!}/archives/${prePost.url!}">继续阅读</a></div>
8+
<time datetime="${prevPost.createTime}" class="post-list__meta--date date">${prevPost.createTime?string("yyyy-MM-dd")}</time>
9+
<a class="btn-border-small" href="${prevPost.fullPath!}">继续阅读</a></div>
1010
</div>
1111
</#if>
1212

1313
<#if nextPost??>
1414
<div class="read-more-item">
1515
<span class="read-more-item-dim">更早的文章</span>
16-
<h2 class="post-list__post-title post-title"><a href="${context!}/archives/${nextPost.url!}" title="link to ${nextPost.title!}">${nextPost.title!}</a></h2>
16+
<h2 class="post-list__post-title post-title"><a href="${nextPost.fullPath!}" title="link to ${nextPost.title!}">${nextPost.title!}</a></h2>
1717
<p class="excerpt">${nextPost.summary!}&hellip;</p>
1818
<div class="post-list__meta">
1919
<time datetime="${nextPost.createTime}" class="post-list__meta--date date">${nextPost.createTime?string("yyyy-MM-dd")}</time>
20-
<a class="btn-border-small" href="${context!}/archives/${nextPost.url!}">继续阅读</a>
20+
<a class="btn-border-small" href="${nextPost.fullPath!}">继续阅读</a>
2121
</div>
2222
</div>
2323
</#if>

‎_includes/side-panel.ftl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<header class="panel-cover <#if is_post?? || is_sheet??>panel-cover--collapsed</#if>" style="background-image: url('${settings.cover_image!"${static!}/assets/images/background-cover.jpg"}')">
1+
<header class="panel-cover <#if is_post?? || is_sheet??>panel-cover--collapsed</#if>" style="background-image: url('${settings.cover_image!"${theme_base!}/assets/images/background-cover.jpg"}')">
22
<div class="panel-main">
33

44
<div class="panel-main__inner panel-inverted">
55
<div class="panel-main__content">
66

7-
<a href="${context!}/#blog" title="前往 ${options.blog_title!} 的主页" class="blog-button"><img src="${user.avatar!}" width="80" alt="${options.blog_title!} logo" class="panel-cover__logo logo" /></a>
8-
<h1 class="panel-cover__title panel-title"><a href="${context!}/#blog" title="link to homepage for ${options.blog_title!}" class="blog-button">${options.blog_title!}</a></h1>
7+
<a href="${blog_url!}/#blog" title="前往 ${blog_title!} 的主页" class="blog-button"><img src="${user.avatar!}" width="80" alt="${blog_title!} logo" class="panel-cover__logo logo" /></a>
8+
<h1 class="panel-cover__title panel-title"><a href="${blog_url!}/#blog" title="link to homepage for ${blog_title!}" class="blog-button">${blog_title!}</a></h1>
99
<#if settings.subtitle?? && settings.subtitle!=''>
1010
<span class="panel-cover__subtitle panel-subtitle">${settings.subtitle!}</span>
1111
</#if>
@@ -21,7 +21,7 @@
2121
<div>
2222
<nav class="cover-navigation cover-navigation--primary">
2323
<ul class="navigation">
24-
<li class="navigation__item"><a href="${context!}/#blog" title="${settings.blog_button_description!}" class="blog-button">${settings.blog_button_title!}</a></li>
24+
<li class="navigation__item"><a href="${blog_url!}/#blog" title="${settings.blog_button_description!}" class="blog-button">${settings.blog_button_title!}</a></li>
2525
<@menuTag method="list">
2626
<#list menus?sort_by('priority') as menu>
2727
<li class="navigation__item"><a href="${menu.url}" target="${menu.target!}" title="${menu.name}">${menu.name}</a></li>

‎_includes/social.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<#if settings.rss!true>
4646
<!-- RSS -->
4747
<li class="navigation__item">
48-
<a href="${context!}/feed.xml" rel="author" title="RSS" target="_blank">
48+
<a href="${rss_url!}" rel="author" title="RSS" target="_blank">
4949
<i class='social fa fa-rss'></i>
5050
<span class="label">RSS</span>
5151
</a>

‎_layouts/default.ftl‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#macro default title keywords description canonical>
1+
<#macro default title canonical>
22
<!DOCTYPE html>
33
<html>
44

@@ -8,33 +8,34 @@
88
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
99

1010
<title>${title!}</title>
11-
<meta name="description" content="${description!}">
11+
<meta name="keywords" content="${meta_keywords!}">
12+
<meta name="description" content="${meta_description!}">
1213
<meta name="author" content="Wei Wang">
1314

1415
<meta name="twitter:card" content="summary">
1516
<meta name="twitter:title" content="${title!}">
16-
<meta name="twitter:description" content="${description!}">
17+
<meta name="twitter:description" content="${meta_description!}">
1718

1819
<meta property="og:type" content="article">
1920
<meta property="og:title" content="${title!}">
20-
<meta property="og:description" content="${description!}">
21+
<meta property="og:description" content="${meta_description!}">
2122

2223
<@global.head/>
2324

24-
<link rel="stylesheet" href="${static!}/css/main.css">
25+
<link rel="stylesheet" href="${theme_base!}/css/main.css">
2526
<link href="//cdn.jsdelivr.net/npm/font-awesome@4.1.0/css/font-awesome.min.css" rel="stylesheet">
2627

2728
<script src="//cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.min.js"></script>
2829

2930
<link rel="canonical" href="${canonical!}">
30-
<link rel="alternate" type="application/rss+xml" title="${options.blog_title!}" href="${context!}/feed.xml">
31+
<link rel="alternate" type="application/rss+xml" title="${blog_title!}" href="${rss_url!}">
3132

3233

3334
<#if settings.prettify_enable!false>
3435
<#if is_post?? || is_sheet??>
35-
<script src="${static!}/lib/prettify/js/prettify.min.js"></script>
36-
<link rel="stylesheet" href="${static!}/lib/prettify/css/prettify.min.css">
37-
<link rel="stylesheet" href="${static!}/lib/prettify/css/${settings.prettify_theme!}.min.css">
36+
<script src="${theme_base!}/lib/prettify/js/prettify.min.js"></script>
37+
<link rel="stylesheet" href="${theme_base!}/lib/prettify/css/prettify.min.css">
38+
<link rel="stylesheet" href="${theme_base!}/lib/prettify/css/${settings.prettify_theme!}.min.css">
3839
<script>
3940
$(function() {
4041
$('pre').addClass('prettyprint linenums').attr('style', 'overflow:auto;');

‎index.ftl‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,40 @@
11
<#include "_layouts/default.ftl">
2-
<#include "_includes/pagination.ftl">
3-
<@default title="${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}">
2+
<@default title="${blog_title!}" canonical="${blog_url!}">
43
<div class="main-post-list hidden">
54

65
<ol class="post-list">
76
<#list posts.content as post>
87
<li>
9-
<h2 class="post-list__post-title post-title"><a href="${context!}/archives/${post.url!}" title="访问 ${post.title!}">${post.title!}</a></h2>
8+
<h2 class="post-list__post-title post-title"><a href="${post.fullPath!}" title="访问 ${post.title!}">${post.title!}</a></h2>
109
<p class="excerpt">${post.summary!}&hellip;</p>
1110
<div class="post-list__meta">
1211
<time datetime="${post.createTime}" class="post-list__meta--date date">${post.createTime?string("yyyy-MM-dd")}</time>
1312
<span class="post-list__meta--tags tags">
1413
<#if post.tags?? && post.tags?size gt 0>
1514
<#list post.tags as tag>
1615
&#8226;
17-
<a href="${context!}/tags/${tag.slugName}#blog">${tag.name}</a>&nbsp
16+
<a href="${tag.fullPath!}#blog">${tag.name}</a>&nbsp
1817
</#list>
1918
</#if>
2019
</span>
21-
<a class="btn-border-small" href="${context!}/archives/${post.url}">继续阅读</a></div>
20+
<a class="btn-border-small" href="${post.fullPath!}">继续阅读</a></div>
2221
<hr class="post-list__divider" />
2322
</li>
2423
</#list>
2524
</ol>
26-
<@nav url = "${context!}/"></@nav>
25+
<hr class="post-list__divider " />
26+
<nav class="pagination" role="navigation">
27+
<#if posts.totalPages gt 1>
28+
<@paginationTag method="index" page="${posts.number}" total="${posts.totalPages}" display="3">
29+
<#if pagination.hasPrev>
30+
<a class="newer-posts pagination__newer btn btn-small btn-tertiary" href="${pagination.prevPageFullPath!}#blog">&larr; 最近</a>
31+
</#if>
32+
<span class="pagination__page-number">${posts.number+1} / ${posts.totalPages}</span>
33+
<#if pagination.hasNext>
34+
<a class="older-posts pagination__older btn btn-small btn-tertiary" href="${pagination.nextPageFullPath!}#blog">更早 &rarr;</a>
35+
</#if>
36+
</@paginationTag>
37+
</#if>
38+
</nav>
2739
</div>
2840
</@default>

‎post.ftl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<#include "_layouts/default.ftl">
22
<#include "_includes/comments.ftl">
3-
<@default title="${post.title!} - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${post.summary!}" canonical="${context!}/archives/${post.url}">
3+
<@default title="${post.title!} - ${blog_title!}" canonical="${post.fullPath!}">
44
<article class="post-container post-container--single" itemscope itemtype="http://schema.org/BlogPosting">
55
<header class="post-header">
66
<div class="post-meta">
@@ -9,16 +9,16 @@
99
<#if tags?? && tags?size gt 0>
1010
<#list tags as tag>
1111
&#8226;
12-
<a href="${context!}/tags/${tag.slugName}#blog">${tag.name}</a>&nbsp;
12+
<a href="${tag.fullPath!}#blog">${tag.name}</a>&nbsp;
1313
</#list>
1414
</#if>
1515
</span>
1616
</div>
17-
<h1 class="post-title">${post.title}</h1>
17+
<h1 class="post-title">${post.title!}</h1>
1818
</header>
1919

2020
<section class="post">
21-
${post.formatContent}
21+
${post.formatContent!}
2222
</section>
2323
</article>
2424

‎sheet.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<#include "_layouts/default.ftl">
22
<#include "_includes/comments.ftl">
3-
<@default title="${sheet.title!} - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/s/${sheet.url}">
3+
<@default title="${sheet.title!} - ${blog_title!}" canonical="${sheet.fullPath!}">
44
<article class="post-container post-container--single" itemscope itemtype="http://schema.org/BlogPosting">
55
<header class="post-header">
66
<div class="post-meta">

‎tag.ftl‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,39 @@
11
<#include "_layouts/default.ftl">
2-
<@default title="标签：${tag.name} - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/tags/${tag.slugName}">
2+
<@default title="标签：${tag.name} - ${blog_title!}" canonical="${tag.fullPath!}">
33
<div class="main-post-list hidden">
44
<ol class="post-list">
55
<#list posts.content as post>
66
<li>
7-
<h2 class="post-list__post-title post-title"><a href="${context!}/archives/${post.url}" title="访问 ${post.title}">${post.title}</a></h2>
7+
<h2 class="post-list__post-title post-title"><a href="${post.fullPath!}" title="访问 ${post.title!}">${post.title!}</a></h2>
88
<p class="excerpt">${post.summary}...</p>
99
<div class="post-list__meta">
1010
<time datetime="${post.createTime}" class="post-list__meta--date date">${post.createTime?string("yyyy-MM-dd")}</time>
1111
<span class="post-list__meta--tags tags">
1212
<#if post.tags?? && post.tags?size gt 0>
1313
<#list post.tags as tag>
1414
&#8226;
15-
<a href="${context!}/tags/${tag.slugName}#blog">${tag.name}</a>&nbsp;
15+
<a href="${tag.fullPath!}#blog">${tag.name}</a>&nbsp;
1616
</#list>
1717
</#if>
1818
</span>
19-
<a class="btn-border-small" href="${context!}/archives/${post.url}">继续阅读</a></div>
19+
<a class="btn-border-small" href="${post.fullPath!}">继续阅读</a></div>
2020
<hr class="post-list__divider" />
2121
</li>
2222
</#list>
2323
</ol>
24-
<#include "_includes/pagination.ftl">
25-
<@nav url = "${context!}/tags/${tag.slugName}/"></@nav>
24+
<hr class="post-list__divider " />
25+
<nav class="pagination" role="navigation">
26+
<#if posts.totalPages gt 1>
27+
<@paginationTag method="tagPosts" page="${posts.number}" total="${posts.totalPages}" display="3" slug="${tag.slug!}">
28+
<#if pagination.hasPrev>
29+
<a class="newer-posts pagination__newer btn btn-small btn-tertiary" href="${pagination.prevPageFullPath!}#blog">&larr; 最近</a>
30+
</#if>
31+
<span class="pagination__page-number">${posts.number+1} / ${posts.totalPages}</span>
32+
<#if pagination.hasNext>
33+
<a class="older-posts pagination__older btn btn-small btn-tertiary" href="${pagination.nextPageFullPath!}#blog">更早 &rarr;</a>
34+
</#if>
35+
</@paginationTag>
36+
</#if>
37+
</nav>
2638
</div>
2739
</@default>

‎theme.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ description:
77
logo:
88
website: https://github.com/halo-dev/halo-theme-vno
99
repo: https://github.com/halo-dev/halo-theme-vno
10-
version: 1.4
10+
version: 1.4.1
11+
require: 1.3.0

0 commit comments

Comments
 (0)