Skip to content

Commit 71446e0

Browse files
committed
调整默认的主题文件
1 parent 712614d commit 71446e0

File tree

10 files changed

+273
-259
lines changed

10 files changed

+273
-259
lines changed

src/main/resources/theme/default/archive.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,29 @@
2525
<div class="archive animated fadeInDown">
2626
<h3 class="m-4">归档</h3>
2727
<ul class="list-with-title">
28-
<@u_archives>
28+
<@unaboot.archives>
2929
<#if results?? && results?size gt 0>
3030
<#list results as archive>
3131
<div class="listing-title">${archive.name}</div>
3232
<ul class="listing" style="padding-left:25px;">
33-
<@u_archive_detail name=archive.name>
33+
<@unaboot.posts type=0 name=archive.name>
3434
<#if results?? && results?size gt 0>
3535
<#list results as post>
3636
<div class="listing-item">
3737
<div class="listing-post">
38-
<a href="${una}/blog/${post.slug}" title="${post.title}">${post.title}</a>
38+
<a href="${una}/posts/${post.slug}" title="${post.title}">${post.title}</a>
3939
<div class="post-time">
4040
<span class="date">${post.createTime?string("yyyy-MM-dd")}</span>
4141
</div>
4242
</div>
4343
</div>
4444
</#list>
4545
</#if>
46-
</@u_archive_detail>
46+
</@unaboot.posts>
4747
</ul>
4848
</#list>
4949
</#if>
50-
</@u_archives>
50+
</@unaboot.archives>
5151
</ul>
5252
</div>
5353
</div>
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<link rel="icon" href="${favicon!''}" type="image/x-icon">
6+
<link rel="shortcut icon" href="${favicon!''}" type="image/x-icon">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<meta http-equiv="x-ua-compatible" content="ie=edge">
9+
<title>文章归档 - ${title!''}</title>
10+
<link rel="stylesheet" href="${una}/${theme}/css/font-awesome.css">
11+
<link rel="stylesheet" href="${una}/${theme}/css/ionicons.css">
12+
<link rel="stylesheet" href="${una}/${theme}/css/adminlte.css">
13+
<link rel="stylesheet" href="${una}/${theme}/css/unaboot.css">
14+
</head>
15+
<body>
16+
<div class="sidebar animated fadeInDown">
17+
<#include "./left.html"/>
18+
</div>
19+
<div class="main">
20+
<div class="page-top animated fadeInDown">
21+
<#include "./nav.html"/>
22+
</div>
23+
<div class="autopagerize_page_element">
24+
<div class="content">
25+
<div class="archive animated fadeInDown">
26+
<h3 class="m-4">归档</h3>
27+
<ul class="list-with-title">
28+
<@unaboot.archives>
29+
<#if results?? && results?size gt 0>
30+
<#list results as archive>
31+
<div class="listing-title">${archive.name}</div>
32+
<ul class="listing" style="padding-left:25px;">
33+
<@unaboot.posts type=0 name=archive.name>
34+
<#if results?? && results?size gt 0>
35+
<#list results as post>
36+
<div class="listing-item">
37+
<div class="listing-post">
38+
<a href="${una}/posts/${post.slug}" title="${post.title}">${post.title}</a>
39+
<div class="post-time">
40+
<span class="date">${post.createTime?string("yyyy-MM-dd")}</span>
41+
</div>
42+
</div>
43+
</div>
44+
</#list>
45+
</#if>
46+
</@unaboot.posts>
47+
</ul>
48+
</#list>
49+
</#if>
50+
</@unaboot.archives>
51+
</ul>
52+
</div>
53+
</div>
54+
</div>
55+
</div>
56+
<script src="${una}/${theme}/js/jquery/jquery.min.js"></script>
57+
<script src="${una}/${theme}/js/bootstrap/js/bootstrap.bundle.min.js"></script>
58+
<script src="${una}/${theme}/js/adminlte.min.js"></script>
59+
<script type="text/javascript">
60+
61+
</script>
62+
</body>
63+
</html>

src/main/resources/theme/default/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
</div>
2323
<div class="autopagerize_page_element">
2424
<div class="content">
25-
<@u_post_page_detail type=0 offset=offset size=15>
25+
<@unaboot.pages type=0 offset=offset size=15 style=0>
2626
<#if results?? && results.content?size gt 0>
2727
<#list results.content as post>
2828
<div class="post animated fadeInDown">
2929
<div class="post-title mb-2">
3030
<h3>
31-
<a href="${una}/blog/${post.slug}">${post.title}</a>
31+
<a href="${una}/posts/${post.slug}">${post.title}</a>
3232
</h3>
3333
</div>
3434
<div class="post-content">
@@ -40,7 +40,7 @@ <h3>
4040
<div class="meta">
4141
<div class="info">
4242
<i class="fa fa-sun-o"></i>
43-
<span class="date">${u_timeAgo(post.createTime)}</span>
43+
<span class="date">${unaboot.timeAgo(post.createTime)}</span>
4444
<i class="fa fa-user-circle-o"></i>
4545
<a href="#">${post.author}</a>
4646
<i class="fa fa-eye"> ${post.visits!'0'}</i>
@@ -49,7 +49,7 @@ <h3>
4949
<i class="fa fa-tags"></i>
5050
<#if post.tags?? && post.tags?size gt 0>
5151
<#list post.tags as tag>
52-
<a href="${una}/tag/${tag.name}" class="tag"> ${tag.name}</a>
52+
<a href="${una}/tags/${tag.slug}" class="tag"> ${tag.name}</a>
5353
</#list>
5454
</#if>
5555
</div>
@@ -58,9 +58,9 @@ <h3>
5858
</div>
5959
</#list>
6060
</#if>
61-
</@u_post_page_detail>
61+
</@unaboot.pages>
6262
<div class="pagination">
63-
${u_postPage(una+"/index" 0 offset 5 15)}
63+
${unaboot.pageUrl(una+"/index" 0 offset 5 15 0)}
6464
</div>
6565
</div>
6666
</div>

src/main/resources/theme/default/left.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ <h3 class="mt-2">${title!'Una | 尤娜'}</h3>
1616
</div>
1717
<ul class="social-links">
1818
<li>
19-
<a href="https://github.com/ramostear/UnaBoot-Pro" target="_blank">
19+
<a href="https://github.com/ramostear/UnaBoot" target="_blank">
2020
<i class="fa fa-github fa-2x"></i>
2121
</a>
2222
</li>
2323
<li>
24-
<a href="https://gitee.com/ramostear/UnaBoot-Pro" target="_blank">
24+
<a href="https://gitee.com/ramostear/UnaBoot" target="_blank">
2525
<i class="fa fa-git fa-2x"></i>
2626
</a>
2727
</li>

src/main/resources/theme/default/links.html

Lines changed: 19 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2,95 +2,42 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<link rel="icon" href="./img/logo.png" type="image/x-icon">
6-
<link rel="shortcut icon" href="./img/logo.png" type="image/x-icon">
5+
<link rel="icon" href="${favicon}" type="image/x-icon">
6+
<link rel="shortcut icon" href="${favicon}" type="image/x-icon">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="x-ua-compatible" content="ie=edge">
9-
<title>友情连接 - 尤娜博客</title>
10-
<link rel="stylesheet" href="css/font-awesome.css">
11-
<link rel="stylesheet" href="css/ionicons.css">
12-
<link rel="stylesheet" href="css/adminlte.css">
13-
<link rel="stylesheet" href="css/unaboot.css">
9+
<title>友情链接 - ${title}</title>
10+
<link rel="stylesheet" href="${una}/${theme}/css/font-awesome.css">
11+
<link rel="stylesheet" href="${una}/${theme}/css/ionicons.css">
12+
<link rel="stylesheet" href="${una}/${theme}/css/adminlte.css">
13+
<link rel="stylesheet" href="${una}/${theme}/css/unaboot.css">
1414
</head>
1515
<body>
1616
<div class="sidebar animated fadeInDown">
17-
<div class="ribbon-wrapper ribbon-lg">
18-
<div class="ribbon bg-gray-dark" style="text-transform: none;">
19-
<a href="https://github.com/ramostear">
20-
<i class="fa fa-github"></i> Fork me
21-
</a>
22-
</div>
23-
</div>
24-
<div class="logo-title">
25-
<img src="img/logo.png" style="width: 127px;">
26-
<h3 class="mt-2">UnaBoot V1.2.0</h3>
27-
<div class="description">
28-
<p>UnaBoot Default Theme</p>
29-
</div>
30-
</div>
31-
<ul class="social-links">
32-
<li>
33-
<a href="https://github.com/ramostear" target="_blank">
34-
<i class="fa fa-github fa-2x"></i>
35-
</a>
36-
</li>
37-
<li>
38-
<a href="https://gitee.com/ramostear" target="_blank">
39-
<i class="fa fa-git fa-2x"></i>
40-
</a>
41-
</li>
42-
<li>
43-
<a href="https://weibo.com/ramostear" target="_blank">
44-
<i class="fa fa-weibo fa-2x"></i>
45-
</a>
46-
</li>
47-
</ul>
48-
<div class="footer pt-2">
49-
<a href="#" target="_blank">
50-
<span>Powered By Ramostear</span>
51-
</a>
52-
<div class="by_farbox">
53-
<a href="#" target="">&copy;2020-ramostear</a>
54-
<a href="#" target="_blank">ICP备:2011201508号</a>
55-
</div>
56-
</div>
17+
<#include "./left.html"/>
5718
</div>
5819
<div class="main">
5920
<div class="page-top animated fadeInDown">
60-
<div class="nav">
61-
<li>
62-
<a href="index.html" target="_blank" class="">Home</a>
63-
</li>
64-
<li>
65-
<a href="archive.html" target="_blank" class="">Archive</a>
66-
</li>
67-
<li>
68-
<a href="category.html" target="_blank" class="">Category</a>
69-
</li>
70-
<li>
71-
<a href="tags.html" target="_blank" class="">Tags</a>
72-
</li>
73-
<li>
74-
<a href="links.html" target="_blank" class="current">Links</a>
75-
</li>
76-
<li>
77-
<a href="about.html" target="_blank" class="">About</a>
78-
</li>
79-
</div>
21+
<#include "./nav.html"/>
8022
</div>
8123
<div class="autopagerize_page_element">
8224
<div class="content">
8325
<div class="links animated fadeInDown">
8426
<h3>友情连接</h3>
85-
<a href="#" class="btn btn-outline-primary m-2">许进沉思录</a>
86-
<a href="#" class="btn btn-outline-primary m-2">树下魅狐</a>
27+
<@unaboot.links>
28+
<#if results?? && results?size gt 0>
29+
<#list results as link>
30+
<a href="${link.url}" class="btn btn-outline-primary m-2">${link.name}</a>
31+
</#list>
32+
</#if>
33+
</@unaboot.links>
8734
</div>
8835
</div>
8936
</div>
9037
</div>
91-
<script src="js/jquery/jquery.min.js"></script>
92-
<script src="js/bootstrap/js/bootstrap.bundle.min.js"></script>
93-
<script src="js/adminlte.min.js"></script>
38+
<script src="${una}/${theme}/js/jquery/jquery.min.js"></script>
39+
<script src="${una}/${theme}/js/bootstrap/js/bootstrap.bundle.min.js"></script>
40+
<script src="${una}/${theme}/js/adminlte.min.js"></script>
9441
<script type="text/javascript">
9542

9643
</script>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<div class="nav">
2-
<@u_navigation>
2+
<@unaboot.navMenus>
33
<#if results?? && results?size gt 0>
44
<#list results as nav>
55
<li>
66
<a href="${una}/category/${nav.slug}">${nav.name}</a>
77
</li>
88
</#list>
99
</#if>
10-
</@u_navigation>
10+
</@unaboot.navMenus>
1111
</div>

src/main/resources/theme/default/post.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="shortcut icon" href="${favicon!''}" type="image/x-icon">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="x-ua-compatible" content="ie=edge">
9-
<title>${blog.title} - ${title!''}</title>
9+
<title>${post.title} - ${title!''}</title>
1010
<link rel="stylesheet" href="${una}/${theme}/css/font-awesome.css">
1111
<link rel="stylesheet" href="${una}/${theme}/css/ionicons.css">
1212
<link rel="stylesheet" href="${una}/${theme}/css/adminlte.css">
@@ -27,56 +27,56 @@
2727
<div class="post-page">
2828
<div class="post animated fadeInDown">
2929
<div class="post-title mb-4">
30-
<h3><a>${blog.title}</a></h3>
30+
<h3><a>${post.title}</a></h3>
3131
</div>
3232
<div class="post-meta">
3333
<div class="meta">
3434
<div class="info">
3535
<i class="fa fa-calendar-o"></i>
36-
<span class="date">${blog.createTime?string("yyyy-MM-dd HH:mm")}</span>
36+
<span class="date">${post.createTime?string("yyyy-MM-dd HH:mm")}</span>
3737
<i class="fa fa-user-circle-o"></i>
38-
<a href="#">${blog.author}</a>
38+
<a href="#">${post.author}</a>
3939
<i class="fa fa-tags"></i>
40-
<@u_post_tags id=blog.id>
40+
<@unaboot.tags id=post.id>
4141
<#if results?? && results?size gt 0>
4242
<#list results as tag>
43-
<a href="${una}/tag/${tag.name}" class="tag"> ${tag.name}</a>
43+
<a href="${una}/tags/${tag.slug}" class="tag"> ${tag.name}</a>
4444
</#list>
4545
</#if>
46-
</@u_post_tags>
47-
<i class="fa fa-info-circle"> 本文共${u_wordNumber(blog.html)}个字,预计阅读需要${u_readTime(blog.html)}分钟。</i>
46+
</@unaboot.tags>
47+
<i class="fa fa-info-circle"> 本文共${unaboot.words(post.content)}个字,预计阅读需要${unaboot.readTime(post.content)}分钟。</i>
4848
</div>
4949
</div>
5050
</div>
5151
<div class="post-content typo editormd-html-preview editormd-preview-theme-dark">
52-
${blog.html!''}
52+
${post.content!''}
5353
</div>
5454
</div>
5555
<div class="pre-next">
5656
<div class="row">
5757
<div class="col-12">
58-
<@u_pre_or_next current=blog.id category=blog.category type="previous">
59-
<#if (result.slug??)>
60-
<a href="${una}/blog/${result.slug}" class="pull-left">
58+
<@unaboot.postInfo id=post.id type=1 category=post.category style=0>
59+
<#if result.slug??>
60+
<a href="${una}/posts/${result.slug}" class="pull-left">
6161
<i class="fa fa-angle-double-left"></i>上一篇 : ${result.title}
6262
</a>
6363
<#else>
6464
<a href="javascript:void(0);" class="pull-left">
6565
<i class="fa fa-angle-double-left"></i>上一篇 : 没有了
6666
</a>
6767
</#if>
68-
</@u_pre_or_next>
69-
<@u_pre_or_next current=blog.id category=blog.category type="next">
70-
<#if (result.slug??)>
71-
<a href="${una}/blog/${result.slug}" class="pull-right">
68+
</@unaboot.postInfo>
69+
<@unaboot.postInfo id=post.id type=2 category=post.category style=0>
70+
<#if result.slug??>
71+
<a href="${una}/posts/${result.slug}" class="pull-right">
7272
${result.title} :下一篇<i class="fa fa-angle-double-right"></i>
7373
</a>
7474
<#else>
7575
<a href="javascript:void(0);" class="pull-right">
7676
没有了 :下一篇<i class="fa fa-angle-double-right"></i>
7777
</a>
7878
</#if>
79-
</@u_pre_or_next>
79+
</@unaboot.postInfo>
8080
</div>
8181
</div>
8282
</div>
@@ -95,10 +95,10 @@ <h3>评论</h3>
9595
<script src="https://cdn.bootcss.com/gitalk/1.5.0/gitalk.js"></script>
9696
<script type="text/javascript">
9797
hljs.initHighlightingOnLoad();
98-
${u_gitalkScript(blog.id "gitalk-container")}
9998
$(".post-content img").each(function(){
10099
$(this).addClass("img-fluid");
101100
});
102101
</script>
102+
${unaboot.gitalk(0 post.id "gitalk-container")}
103103
</body>
104104
</html>

0 commit comments

Comments
 (0)