移植进度10%

This commit is contained in:
julylies 2022-04-15 13:11:12 +08:00
parent e6e7259e8a
commit ac64425506
16 changed files with 295 additions and 350 deletions

59
404.ftl
View File

@ -1,59 +1,5 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="keywords" content="${meta_keywords!}"/>
<meta name="description" content="${meta_description!}" />
<meta name="viewport" content="width=device-width, maximum-scale=1, initial-scale=1"/>
<meta property="og:site_name" content="${blog_title!}">
<#-- 导航面包蟹 未完成-->
<link rel="alternate" type="application/rss+xml" title="atom 1.0" href="${atom_url!}">
<link href="${theme_base!}/source/css/kico.css" rel="stylesheet" type="text/css"/>
<link href="${theme_base!}/source/css/single.css" rel="stylesheet" type="text/css"/>
<link href="https://fastly.jsdelivr.net/gh/FortAwesome/Font-Awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<@global.head />
<#if ! (options.blog_favicon?? && options.blog_favicon!='')>
<link rel="shortcut icon" type="images/x-icon" href="${theme_base!}/source/images/icon.png" sizes="192x192"/>
</#if>
<#-- 背景图片-->
<#if settings.rimage_url?? && settings.rimage_url!=''>
<style>body:before{content: ''; background-image: url(${settings.rimage_url!})}</style>
</#if>
<#-- 自定css 未完成-->
</head>
<body >
<header>
<div class="head-title">
<h4>${blog_title!}</h4>
</div>
<div class="head-action">
<div class="toggle-btn"></div>
<div class="light-btn"></div>
<div class="search-btn"></div>
</div>
<form class="head-search" method="post">
<input type="text" name="s"lde placehor="搜索什么?">
</form>
<nav class="head-menu">
<#-- 菜单未优化-->
<@menuTag method="list">
<#list menus?sort_by('priority') as menu>
<a href="${menu.url}" target="${menu.target!}">${menu.name} </a>
</#list>
</@menuTag>
<#-- <@menuTag method="tree">
<ul>
<#list menus as menu>
<a href="${menu.url!}" target="${menu.target!}">${menu.name!}
<#if menu.children?? && menu.children?size gt 0>
<#list menu.children as child>
<a href="${child.url!}" target="${menu.target!}">${child.name!}</a>
</#list>
</#if>
</#list>
</@menuTag>-->
</nav>
</header>
<#include "header.ftl" />
<@head title="404 - ${blog_title!}"/>
<main>
<div class="wrap">
<div class="error-page">
@ -64,4 +10,3 @@
</div>
</main>
<#include "footer.ftl">
</html>

View File

@ -1,48 +1,49 @@
<#include "module/macro.ftl">
<@layout title="归档 - ${blog_title!}">
<h1>归档</h1>
<ul>
<#list archives as archive>
<h2>${archive.year?c}</h2>
<#list archive.posts as post>
<li>
<a href="${post.fullPath!}">${post.title!}</a>
</li>
</#list>
</#list>
</ul>
<h1>分页</h1>
<#if posts.totalPages gt 1>
<ul>
<@paginationTag method="archives" page="${posts.number}" total="${posts.totalPages}" display="3">
<#if pagination.hasPrev>
<li>
<a href="${pagination.prevPageFullPath!}">
上一页
</a>
</li>
</#if>
<#list pagination.rainbowPages as number>
<li>
<#if number.isCurrent>
<span class="current">第 ${number.page!} 页</span>
<#else>
<a href="${number.fullPath!}">第 ${number.page!} 页</a>
</#if>
</li>
<#include "header.ftl">
<@head title="归档 - ${blog_title!}"/>
<main>
<div class="wrap min">
<section class="home-title">
<h1>归档</h1>
<@categoryTag method="list">
<#list categories as category>
<span><a href="${category.fullPath!}">${category.name!}${category.postCount!}</a></span>
</#list>
<#if pagination.hasNext>
<li>
<a href="${pagination.nextPageFullPath!}">
下一页
</a>
</li>
</#if>
</@paginationTag>
</ul>
<#else>
<span>当前只有一页</span>
</#if>
</@layout>
</@categoryTag>
</section>
<section class="home-posts">
<@postTag method="archive" type="month">
<div class="post-item">
<#list archives as archive>
<h2>${archive.year?c}-${archive.month?c}</h2>
<ul>
<#list archive.posts?sort_by("createTime")?reverse as post>
<li>
<a href="${post.fullPath!}">${post.title!}</a>
<div class="post-meta">
<time class="date">${post.createTime?string('yyyy-MM-dd')}</time>
<span class="category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<span class="tags">
<#list post.tags as tag>
<a href="${tag.fullPath}" class="tag">
${tag.name}
</a>
</#list>
</span>
<span class="comments">${post.commentCount!}°C</span>
</div>
</li>
</#list>
</ul>
</#list>
</div>
</@postTag>
</section>
</div>
</main>
<#include "footer.ftl">

View File

@ -1,13 +1,35 @@
<#include "module/macro.ftl">
<@layout title="分类列表 - ${blog_title!}">
<h1>分类列表</h1>
<ul>
<@categoryTag method="list">
<#if categories?? && categories?size gt 0>
<#list categories as category>
<li><a href="${category.fullPath!}">${category.name}</a></li>
</#list>
</#if>
</@categoryTag>
</ul>
</@layout>
<#include "header.ftl">
<@head title="分类列表 - ${blog_title!}"/>
<main>
<style>
main .tags-list{
display: flex;
flex-wrap: wrap;
}
main .tags-list a{
color: inherit;
border-radius: 2em;
padding: .5em .75em;
margin: 0 .5em .5em 0;
display: inline-block;
transition: border .3s;
border: 1px solid var(--board-border);
}
</style>
<div class="wrap min">
<section class="page-title">
<h2>分类列表</h2>
</section>
<section class="page-content">
<@categoryTag method="list">
<div class="tags-list">
<#if categories?? && categories?size gt 0>
<#list categories as category>
<a href="${category.fullPath!}" title="${category.postCount!}个文章"> ${category.name}(${category.postCount!})</a>
</#list>
</#if>
</@categoryTag>
</section>
</div>
</main>
<#include "footer.ftl">

View File

@ -1,45 +1,5 @@
<#include "module/macro.ftl">
<@layout title="分类:${category.name} - ${blog_title!}">
<h1>分类:${category.name}</h1>
<ul>
<#list posts.content as post>
<li>
<a href="${post.fullPath}">${post.title}</a>
</li>
</#list>
</ul>
<h1>分页</h1>
<#if posts.totalPages gt 1>
<ul>
<@paginationTag method="categoryPosts" page="${posts.number}" total="${posts.totalPages}" display="3" slug="${category.slug!}">
<#if pagination.hasPrev>
<li>
<a href="${pagination.prevPageFullPath!}">
上一页
</a>
</li>
</#if>
<#list pagination.rainbowPages as number>
<li>
<#if number.isCurrent>
<span class="current">第 ${number.page!} 页</span>
<#else>
<a href="${number.fullPath!}">第 ${number.page!} 页</a>
</#if>
</li>
</#list>
<#if pagination.hasNext>
<li>
<a href="${pagination.nextPageFullPath!}">
下一页
</a>
</li>
</#if>
</@paginationTag>
</ul>
<#else>
<span>当前只有一页</span>
</#if>
</@layout>
<#include "header.ftl">
<@head title="分类:${category.name} - ${blog_title!}" />
<h1>分类:${category.name}</h1>
<#include "module/post-list.ftl">
<#include "footer.ftl">

View File

@ -1 +0,0 @@

View File

@ -1,69 +1,6 @@
<#include "header.ftl">
<#include "header.ftl" />
<@head title="${blog_title!}"/>
<#--<h1>公告</h1><#macro greet><font size="+2">Hello Joe!</font><@greet></@greet>
</#macro><p>${settings.index_notice!} </p> -->
<main>
<div class="wrap min">
<section class="home-title">
<h1>${blog_title!}</h1>
<span>${user.description!}</span>
<#-- 待优化-->
<div class="home-social">
<#if settings.home_social?? && settings.home_social != ''>
${settings.home_social!}
</#if>
</div>
</section>
<section class="home-posts">
<#list posts.content as post>
<div class="post-item">
<h2>
<a href="${post.fullPath!}">${post.title!}</a>
</h2>
<p>${post.summary!}</p>
<div class="post-meta">
<time class="date">
${post.createTime?string('yyyy-MM-dd')!}
</time>
<span class="category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<span class="tags">
<#list post.tags as tag>
<a href="${tag.fullPath}" class="tag">${tag.name}</a>
</#list>
</span>
<span class="comments">
${post.commentCount!}°C
</span>
<span class="visits">
${post.visits!}
</span>
</div>
</div>
</#list>
</section>
<section class="page-navigator">
<@paginationTag method="archives" page="${posts.number}" total="${posts.totalPages}" display="3">
<#if pagination.hasPrev>
<a href="${pagination.prevPageFullPath!}">上一页</a>
</#if>
<#list pagination.rainbowPages as number>
<#if number.isCurrent>
<span class="current">${number.page!}</span>
<#else>
<a href="${number.fullPath!}">${number.page!}</a>
</#if>
</#list>
<#if pagination.hasNext>
<a href="${pagination.nextPageFullPath!}">下一页</a>
</#if>
</@paginationTag>
</section>
</div>
</main>
<#include "footer.ftl">
<#include "module/post-list.ftl">
<#include "footer.ftl" />

3
journals.ftl Normal file
View File

@ -0,0 +1,3 @@
<#include "header.ftl">
<@head title="日志 -${blog_title!}" />
<#include "footer.ftl">

View File

@ -1,5 +1,5 @@
<#include "module/macro.ftl">
<@layout title="友情链接 - ${blog_title!}">
<#include "header.ftl">
<@head title="友情链接 -${blog_title!}" />
<h1>友情链接</h1>
<ul>
<@linkTag method="list">
@ -15,4 +15,4 @@
</#if>
</@linkTag>
</ul>
</@layout>
<#include "footer.ftl">

View File

@ -1,44 +0,0 @@
<#macro head title>
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="keywords" content="${meta_keywords!}"/>
<meta name="description" content="${meta_description!}" />
<link href="${theme_base!}/source/css/kico.css" rel="stylesheet" type="text/css"/>
<link href="${theme_base!}/source/css/single.css" rel="stylesheet" type="text/css"/>
<#--
公共 head 代码详情请参考https://docs.halo.run/zh/developer-guide/theme/public-template-tag
包含Favicon自定义 head 等
-->
<@global.head />
<title>${title}</title>
</head>
<body>
<#-- <#include "menu.ftl">
-->
<@menuTag method="list">
<#--
?sort_by('priority'):根据菜单的排序编号排序
-->
<#list menus?sort_by('priority') as menu>
<li>
<a href="${menu.url}" target="${menu.target!}">${menu.name} </a>
</li>
</#list>
</@menuTag>
<#nested >
<#--
公共底部代码详情请参考https://docs.halo.run/zh/developer-guide/theme/public-template-tag
包含:统计代码,底部信息
-->
<script src="${theme_base!}/source/js/kico.js"></script>
<script src="${theme_base!}/source/js/single.js"></script>
<script src="${theme_base!}/source/js/prism.js"></script>
<@global.footer />
</body>
</html>
</#macro>

66
module/post-list.ftl Normal file
View File

@ -0,0 +1,66 @@
<main>
<div class="wrap min">
<#if is_index??>
<section class="home-title">
<h1>${blog_title!}</h1>
<span>${user.description!}</span>
<#-- 待优化-->
<div class="home-social">
<#if settings.home_social?? && settings.home_social != ''>
${settings.home_social!}
</#if>
</div>
</section>
</#if>
<section class="home-posts">
<#list posts.content as post>
<div class="post-item">
<h2>
<a href="${post.fullPath!}">${post.title!}</a>
</h2>
<p>${post.summary!}</p>
<div class="post-meta">
<time class="date">
${post.createTime?string('yyyy-MM-dd')!}
</time>
<span class="category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<span class="tags">
<#list post.tags as tag>
<a href="${tag.fullPath}" class="tag">${tag.name}</a>
</#list>
</span>
<span class="comments">
${post.commentCount!}°C
</span>
<span class="visits">
${post.visits!}
</span>
</div>
</div>
</#list>
</section>
<section class="page-navigator">
<@paginationTag method="archives" page="${posts.number}" total="${posts.totalPages}" display="3">
<#if pagination.hasPrev>
<a href="${pagination.prevPageFullPath!}">上一页</a>
</#if>
<#list pagination.rainbowPages as number>
<#if number.isCurrent>
<span class="current">${number.page!}</span>
<#else>
<a href="${number.fullPath!}">${number.page!}</a>
</#if>
</#list>
<#if pagination.hasNext>
<a href="${pagination.nextPageFullPath!}">下一页</a>
</#if>
</@paginationTag>
</section>
</div>
</main>

View File

@ -1 +1,3 @@
<#include "header.ftl">
<@head title="page -${blog_title!}" />
<#include "footer.ftl">

3
photos.ftl Normal file
View File

@ -0,0 +1,3 @@
<#include "header.ftl">
<@head title="图库 -${blog_title!}" />
<#include "footer.ftl">

View File

@ -1,9 +1,70 @@
<#include "module/macro.ftl">
<@layout title="${post.title!} - ${blog_title!}">
<h1>${post.title!}</h1>
<article>
${post.formatContent!}
</article>
<#include "module/comment.ftl">
<@comment post=post type="post" />
</@layout>
<#include "header.ftl">
<@head title="${post.title!} - ${blog_title!}"/>
<main>
<div class="wrap min">
<section class="post-title">
<h2>${post.title!}</h2>
<div class="post-meta">
<time class="date">${post.createTime?string('yyyy-MM-dd')}</time>
<span class="category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<span class="comments">${post.commentCount!}</span>
<span class="visits">${post.visits!}</span>
</div>
</section>
<article class="post-content">
<blockquote>这篇文章上次修改于${sinceLastTime!}天前,可能其部分内容已经发生变化,如有疑问可询问作者。</blockquote>
${post.formatContent!}
</article>
<section class="post-near">
<ul>
<li>
上一篇:
<#if prevPost??>
<a href="${prevPost.fullPath!}">${prevPost.title!}</a>
<#else>
看完啦 (つд⊂)
</#if>
</li>
<li>
下一篇:
<#if nextPost??>
<a href="${nextPost.fullPath!}">${nextPost.title!}</a>
<#else>
看完啦 (つд⊂)
</#if>
</li>
</ul>
</section>
<section class="post-tags">
<#list post.tags as tag>
<a href="${tag.fullPath}" class="tag">${tag.name}</a>
<#--<#if 1+2 >3 >
<a href="${tag.fullPath}" class="tag">${tag.name}</a>
<#else>
</#if>
-->
</#list>
</section>
<#if settings.author_text?? && settings.author_text!=''>
<section class="post-author">
<figure class="author-avatar">
<img src="https://www.huangdf.xyz/upload/2021/08/logo-4d5e052dd4074b078ba3f982423435d8.jpg" alt="${user.nickname!}" width="200" height="200">
</figure>
<div class="author-info">
<h4>${user.nickname!}</h4>
<p>${settings.author_text!}</p>
</div>
</section>
</#if>
<#include "module/comment.ftl">
<@comment post=post type="post" />
</div>
</main>
<#include "footer.ftl">

View File

@ -1,9 +1,14 @@
<#include "module/macro.ftl">
<@layout title="${sheet.title!} - ${blog_title!}">
<h1>${sheet.title!}</h1>
<article>
<#include "header.ftl">
<@head title="${sheet.title!} - ${blog_title!}"/>
<div class="wrap min">
<section class="post-title">
<h2>${sheet.title!}</h2>
</section>
<article class="post-content">
${sheet.formatContent!}
</article>
<#include "module/comment.ftl">
<@comment post=sheet type="sheet" />
</@layout>
</section>
</div>
<#include "footer.ftl">

49
tag.ftl
View File

@ -1,45 +1,4 @@
<#include "module/macro.ftl">
<@layout title="标签:${tag.name} - ${blog_title!}">
<h1>标签:${tag.name}</h1>
<ul>
<#list posts.content as post>
<li>
<a href="${post.fullPath!}">${post.title}</a>
</li>
</#list>
</ul>
<h1>分页</h1>
<#if posts.totalPages gt 1>
<ul>
<@paginationTag method="tagPosts" page="${posts.number}" total="${posts.totalPages}" display="3" slug="${tag.slug!}">
<#if pagination.hasPrev>
<li>
<a href="${pagination.prevPageFullPath!}">
上一页
</a>
</li>
</#if>
<#list pagination.rainbowPages as number>
<li>
<#if number.isCurrent>
<span class="current">第 ${number.page!} 页</span>
<#else>
<a href="${number.fullPath!}">第 ${number.page!} 页</a>
</#if>
</li>
</#list>
<#if pagination.hasNext>
<li>
<a href="${pagination.nextPageFullPath!}">
下一页
</a>
</li>
</#if>
</@paginationTag>
</ul>
<#else>
<span>当前只有一页</span>
</#if>
</@layout>
<#include "header.ftl">
<@head title="标签:${tag.name} - ${blog_title!}" />
<#include "module/post-list.ftl">
<#include "footer.ftl">

View File

@ -1,13 +1,39 @@
<#include "module/macro.ftl">
<@layout title="标签列表 - ${blog_title!}">
<h1>标签列表</h1>
<ul>
<@tagTag method="list">
<#if tags?? && tags?size gt 0>
<#list tags as tag>
<li><a href="${tag.fullPath!}">${tag.name}</a></li>
</#list>
</#if>
</@tagTag>
</ul>
</@layout>
<#include "header.ftl">
<@head title="标签云 - ${blog_title!}" />
<#--
标签云
@package custom
-->
<main>
<style>
main .tags-list{
display: flex;
flex-wrap: wrap;
}
main .tags-list a{
color: inherit;
border-radius: 2em;
padding: .5em .75em;
margin: 0 .5em .5em 0;
display: inline-block;
transition: border .3s;
border: 1px solid var(--board-border);
}
</style>
<div class="wrap min">
<section class="page-title">
<h2>标签云</h2>
</section>
<section class="page-content">
<@tagTag method="list">
<div class="tags-list">
<#if tags?? && tags?size gt 0>
<#list tags as tag>
<a href="${tag.fullPath!}" title="${tag.postCount!}个话题"> ${tag.name}(${tag.postCount!})</a>
</#list>
</#if>
</@tagTag>
</section>
</div>
</main>
<#include "footer.ftl">