-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from halo-dev/require-1.3.0
Require 1.3.0
- Loading branch information
Showing
10 changed files
with
66 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| <script type="text/javascript" src="//cdn.jsdelivr.net/npm/jquery@1.11.3/dist/jquery.min.js"></script> | ||
| <script type="text/javascript" src="${static!}/js/main.js"></script> | ||
| <script type="text/javascript" src="${theme_base!}/js/main.js"></script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,40 @@ | ||
| <#include "_layouts/default.ftl"> | ||
| <#include "_includes/pagination.ftl"> | ||
| <@default title="${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}"> | ||
| <@default title="${blog_title!}" canonical="${blog_url!}"> | ||
| <div class="main-post-list hidden"> | ||
|
|
||
| <ol class="post-list"> | ||
| <#list posts.content as post> | ||
| <li> | ||
| <h2 class="post-list__post-title post-title"><a href="${context!}/archives/${post.url!}" title="访问 ${post.title!}">${post.title!}</a></h2> | ||
| <h2 class="post-list__post-title post-title"><a href="${post.fullPath!}" title="访问 ${post.title!}">${post.title!}</a></h2> | ||
| <p class="excerpt">${post.summary!}…</p> | ||
| <div class="post-list__meta"> | ||
| <time datetime="${post.createTime}" class="post-list__meta--date date">${post.createTime?string("yyyy-MM-dd")}</time> | ||
| <span class="post-list__meta--tags tags"> | ||
| <#if post.tags?? && post.tags?size gt 0> | ||
| <#list post.tags as tag> | ||
| • | ||
| <a href="${context!}/tags/${tag.slugName}#blog">${tag.name}</a>  | ||
| <a href="${tag.fullPath!}#blog">${tag.name}</a>  | ||
| </#list> | ||
| </#if> | ||
| </span> | ||
| <a class="btn-border-small" href="${context!}/archives/${post.url}">继续阅读</a></div> | ||
| <a class="btn-border-small" href="${post.fullPath!}">继续阅读</a></div> | ||
| <hr class="post-list__divider" /> | ||
| </li> | ||
| </#list> | ||
| </ol> | ||
| <@nav url = "${context!}/"></@nav> | ||
| <hr class="post-list__divider " /> | ||
| <nav class="pagination" role="navigation"> | ||
| <#if posts.totalPages gt 1> | ||
| <@paginationTag method="index" page="${posts.number}" total="${posts.totalPages}" display="3"> | ||
| <#if pagination.hasPrev> | ||
| <a class="newer-posts pagination__newer btn btn-small btn-tertiary" href="${pagination.prevPageFullPath!}#blog">← 最近</a> | ||
| </#if> | ||
| <span class="pagination__page-number">${posts.number+1} / ${posts.totalPages}</span> | ||
| <#if pagination.hasNext> | ||
| <a class="older-posts pagination__older btn btn-small btn-tertiary" href="${pagination.nextPageFullPath!}#blog">更早 →</a> | ||
| </#if> | ||
| </@paginationTag> | ||
| </#if> | ||
| </nav> | ||
| </div> | ||
| </@default> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,39 @@ | ||
| <#include "_layouts/default.ftl"> | ||
| <@default title="标签：${tag.name} - ${options.blog_title!}" keywords="${options.seo_keywords!}" description="${options.seo_description!}" canonical="${context!}/tags/${tag.slugName}"> | ||
| <@default title="标签：${tag.name} - ${blog_title!}" canonical="${tag.fullPath!}"> | ||
| <div class="main-post-list hidden"> | ||
| <ol class="post-list"> | ||
| <#list posts.content as post> | ||
| <li> | ||
| <h2 class="post-list__post-title post-title"><a href="${context!}/archives/${post.url}" title="访问 ${post.title}">${post.title}</a></h2> | ||
| <h2 class="post-list__post-title post-title"><a href="${post.fullPath!}" title="访问 ${post.title!}">${post.title!}</a></h2> | ||
| <p class="excerpt">${post.summary}...</p> | ||
| <div class="post-list__meta"> | ||
| <time datetime="${post.createTime}" class="post-list__meta--date date">${post.createTime?string("yyyy-MM-dd")}</time> | ||
| <span class="post-list__meta--tags tags"> | ||
| <#if post.tags?? && post.tags?size gt 0> | ||
| <#list post.tags as tag> | ||
| • | ||
| <a href="${context!}/tags/${tag.slugName}#blog">${tag.name}</a> | ||
| <a href="${tag.fullPath!}#blog">${tag.name}</a> | ||
| </#list> | ||
| </#if> | ||
| </span> | ||
| <a class="btn-border-small" href="${context!}/archives/${post.url}">继续阅读</a></div> | ||
| <a class="btn-border-small" href="${post.fullPath!}">继续阅读</a></div> | ||
| <hr class="post-list__divider" /> | ||
| </li> | ||
| </#list> | ||
| </ol> | ||
| <#include "_includes/pagination.ftl"> | ||
| <@nav url = "${context!}/tags/${tag.slugName}/"></@nav> | ||
| <hr class="post-list__divider " /> | ||
| <nav class="pagination" role="navigation"> | ||
| <#if posts.totalPages gt 1> | ||
| <@paginationTag method="tagPosts" page="${posts.number}" total="${posts.totalPages}" display="3" slug="${tag.slug!}"> | ||
| <#if pagination.hasPrev> | ||
| <a class="newer-posts pagination__newer btn btn-small btn-tertiary" href="${pagination.prevPageFullPath!}#blog">← 最近</a> | ||
| </#if> | ||
| <span class="pagination__page-number">${posts.number+1} / ${posts.totalPages}</span> | ||
| <#if pagination.hasNext> | ||
| <a class="older-posts pagination__older btn btn-small btn-tertiary" href="${pagination.nextPageFullPath!}#blog">更早 →</a> | ||
| </#if> | ||
| </@paginationTag> | ||
| </#if> | ||
| </nav> | ||
| </div> | ||
| </@default> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters