Skip to content

Commit

Permalink
修复了一些问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodeLunatic
CodeLunatic committed Oct 24, 2019
1 parent b7f8859 commit 8a2aa42
Show file tree
Hide file tree
Showing 27 changed files with 262 additions and 133 deletions.
32 changes: 29 additions & 3 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion journals.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title="${user.nickname!}的日志 | ${options.blog_title!}"
keywords="${options.seo_keywords!}"
description="${options.seo_description!}">

<#--下方正文部分-->
<#--下方正文部分-->
<div class="container-fluid" style="background: #f8fafc;">
<div class="container px-md-2 px-0">
<div class="row">
Expand Down
6 changes: 3 additions & 3 deletions module/category/left.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<#--分类界面的左边ok-->
<#if posts.content?size lte 0>
<#if (posts.content)?? && posts.content?size lte 0>
<#--无结果-->
<div class="alert alert-danger mt-4" role="alert">
<i class="far fa-tired mr-2"></i>
"${category.name!}"分类下啥都没有
</div>
<#--分类描述-->
<#if category.description?? && category.description != ''>
<#if (category.description)?? && category.description != ''>
<div class="category-description mt-4 text-muted">
分类描述：${category.description!}
</div>
Expand All @@ -25,7 +25,7 @@
当前位于"${category.name!}"分类下
</div>
<#--分类描述-->
<#if category.description?? && category.description != ''>
<#if (category.description)?? && category.description != ''>
<div class="category-description mt-4 text-muted">
分类描述：${category.description!}
</div>
Expand Down
9 changes: 9 additions & 0 deletions module/categrories/left.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
<#list categories as category>
<@categoryItem category=category/>
</#list>
<#else>
<div>
<div class="d-flex flex-column align-items-center mt-2 pt-5">
<span class="text-muted"><i class="fas fa-inbox fa-7x"></i></span>
<span class="text-muted mt-4 mb-5">
还没有分类，回<a class="font-weight-bold" href="${context!}">主页</a>看看吧
</span>
</div>
</div>
</#if>
</@categoryTag>
</div>
12 changes: 6 additions & 6 deletions module/footer.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,41 @@
</div>
<div class="link-info mt-md-0 mt-4">
<#--RSS-->
<#if settings.open_rss?c == 'true'>
<#if (settings.open_rss)?? && settings.open_rss?c == 'true'>
<a class="text-dark mr-3" target="_blank" href="${context!}/feed.xml">
<i class="fas fa-rss"></i>
</a>
</#if>
<#--Github-->
<#if settings.github_url?? && settings.github_url?trim != ''>
<#if (settings.github_url)?? && settings.github_url?trim != ''>
<a class="text-dark mr-3" target="_blank"
href="${settings.github_url!}">
<i class="fab fa-github"></i>
</a>
</#if>
<#--QQ账号-->
<#if settings.qq_number?? && settings.qq_number?trim != ''>
<#if (settings.qq_number)?? && settings.qq_number?trim != ''>
<a class="text-dark mr-3" target="_blank"
href="http://wpa.qq.com/msgrd?v=3&uin=${settings.qq_number!}&site=qq&menu=yes">
<i class="fab fa-qq"></i>
</a>
</#if>
<#--新浪微博-->
<#if settings.weibo_url?? && settings.weibo_url?trim != ''>
<#if (settings.weibo_url)?? && settings.weibo_url?trim != ''>
<a class="text-dark mr-3" target="_blank"
href="${settings.weibo_url!}">
<i class="fab fa-weibo"></i>
</a>
</#if>
<#--推特账号-->
<#if settings.twitter_account?? && settings.twitter_account?trim != ''>
<#if (settings.twitter_account)?? && settings.twitter_account?trim != ''>
<a class="text-dark mr-3" target="_blank"
href="https://twitter.com/${settings.twitter_account!}">
<i class="fab fa-twitter"></i>
</a>
</#if>
<#--邮箱地址-->
<#if settings.email_address?? && settings.email_address?trim != ''>
<#if (settings.email_address)?? && settings.email_address?trim != ''>
<a class="text-dark" href="mailto:${settings.email_address!}">
<i class="fas fa-envelope"></i>
</a>
Expand Down
2 changes: 1 addition & 1 deletion module/index/list_item.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<small class="mt-4 d-block">
<#--标签-->
<#if post.tags?? && post.tags?size !=0>
<#if (post.tags)?? && post.tags?size !=0>
<span class="mr-3 font-weight-bold d-md-inline d-none">
<i class="fas fa-tags mr-1"></i>
<#list post.tags as tag>
Expand Down
4 changes: 2 additions & 2 deletions module/index/profile.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="card-header"><i class="fas fa-user mr-2"></i>个人信息</div>
<div class="card-body d-flex flex-column align-items-center">
<#--头像和个人信息-->
<div class="mt-4 mb-5 w-100 d-flex justify-content-center">
<div class="mt-4 mb-4point5 w-100 d-flex justify-content-center">
<#--头像部分-->
<div class="w-50 text-right mr-3">
<i style="display: inline-block;
Expand All @@ -16,7 +16,7 @@
<#--个人信息部分-->
<div class="w-50 text-left ml-3 d-flex flex-column justify-content-center">
<span class="h4 d-block">${user.nickname!}</span>
<#if settings.user_location?? && settings.user_location?trim != ''>
<#if (settings.user_location)?? && settings.user_location?trim != ''>
<span class="text-muted text-truncate">
<i class="fas fa-map-marker-alt mr-1"></i>
${settings.user_location!}
Expand Down
50 changes: 26 additions & 24 deletions module/index/tags.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
<#--主页的标签部分ok-->
<section id="tags" class="mt-4 mb-5 bg-white">
<div class="card">
<div class="card-header">
<i class="fas fa-tags mr-2"></i>
所有标签
</div>
<div class="card-body">
<@tagTag method="list">
<#list tags as tag>
<@tagTag method="list">
<#if tags?? && tags?size gt 0>
<section id="tags" class="mt-4 mb-5 bg-white">
<div class="card">
<div class="card-header">
<i class="fas fa-tags mr-2"></i>
所有标签
</div>
<div class="card-body">
<#list tags as tag>
<div class="tag">
<a href="/tags/${tag.slugName!}" class="text-muted">
<span class="tag-left">${tag.name!}</span>
<span class="tag-right">${tag.postCount!}</span>
</a>
</div>
</#list>
<div class="tag">
<a href="/tags/${tag.slugName!}" class="text-muted">
<span class="tag-left">${tag.name!}</span>
<span class="tag-right">${tag.postCount!}</span>
</a>
</div>
</#list>
<div class="tag">
<a href="/tags" class="text-muted">
<span class="tag-left">所有标签</span>
<span class="tag-right">
<a href="/tags" class="text-muted">
<span class="tag-left">所有标签</span>
<span class="tag-right">
<@postTag method="count">
${count!}
</@postTag>
</span>
</a>
</a>
</div>
</div>
</@tagTag>
</div>
</div>
</section>
</div>
</section>
</#if>
</@tagTag>
27 changes: 18 additions & 9 deletions module/layout.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
user-scalable=no,
shrink-to-fit=no">
<#if is_post??>
<meta name="keywords" content="<#if post.tags??><#list post.tags as tag>${tag.name}<#sep>,</#list></#if>"/>
<meta name="keywords"
content="<#if (post.tags)??><#list post.tags as tag>${tag.name}<#sep>,</#list></#if>"/>
<#else>
<meta name="keywords" content="${keywords!}"/>
</#if>
Expand Down Expand Up @@ -50,6 +51,10 @@
<link href="https://cdn.bootcss.com/fancybox/3.5.7/jquery.fancybox.min.css" rel="stylesheet">
<link rel="stylesheet" href="${static!}/source/css/journals.css">
</#if>
<#if is_sheet??>
<link rel="stylesheet" href="${static!}/source/css/sheet.css">
<link href="https://cdn.bootcss.com/social-share.js/1.0.16/css/share.min.css" rel="stylesheet">
</#if>
<#--页面公用的CSS-->
<link rel="stylesheet" href="${static!}/source/css/style.css">

Expand Down Expand Up @@ -82,14 +87,7 @@
<script type="text/javascript" src="${static!}/source/js/search.js"></script>
</#if>
<#-- 额外配置功能-->
<#if is_post??>
<script src="https://cdn.bootcss.com/clipboard.js/2.0.4/clipboard.min.js"></script>
<#--代码高亮库-->
<script src="https://cdn.bootcss.com/highlight.js/9.15.10/highlight.min.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
<script src="https://cdn.bootcss.com/fancybox/3.5.7/jquery.fancybox.min.js"></script>
<script src="https://cdn.bootcss.com/social-share.js/1.0.16/js/social-share.min.js"></script>
<#--Todo 这段代码加入用户设置显示行号后生效-->
<#if is_post?? || is_sheet??>
<script>
var displayReadProgress = <#if (settings.open_read_progress)??>${settings.open_read_progress?c}<#else>true</#if>;
var displayLineNumber = <#if (settings.line_number)??>${settings.line_number?c}<#else>true</#if>;
Expand All @@ -103,12 +101,23 @@
var blogTitle = `${options.blog_title!}`;
var blogUrl = `${context!}`;
</script>
<script src="https://cdn.bootcss.com/social-share.js/1.0.16/js/social-share.min.js"></script>
</#if>
<#if is_post??>
<script src="https://cdn.bootcss.com/clipboard.js/2.0.4/clipboard.min.js"></script>
<#--代码高亮库-->
<script src="https://cdn.bootcss.com/highlight.js/9.15.10/highlight.min.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
<script src="https://cdn.bootcss.com/fancybox/3.5.7/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="${static!}/source/js/post.js"></script>
</#if>
<#if is_journal??>
<script src="https://cdn.bootcss.com/fancybox/3.5.7/jquery.fancybox.min.js"></script>
<script type="text/javascript" src="${static!}/source/js/journals.js"></script>
</#if>
<#if is_sheet??>
<script type="text/javascript" src="${static!}/source/js/sheet.js"></script>
</#if>
<div id="backTop" class="back-top">
<span><i class="fas fa-caret-up"></i></span>
</div>
Expand Down
15 changes: 1 addition & 14 deletions module/links/left.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@
<div class="card-header">
<i class="fas fa-link mr-2"></i>链接分类
</div>
<ul id="linkCategoryList" class="list-group list-group-flush">
<@linkTag method="listTeams">
<#if teams?? && teams?size gt 0>
<#list teams as team>
<li class="list-group-item">
<a id="${team.team!}" class="category-button <#if team?index == 0>text-danger</#if>"
href="javascript: void(0)">
<i class="fas fa-caret-right mr-3"></i>${team.team!}
</a>
</li>
</#list>
</#if>
</@linkTag>
</ul>
<ul id="linkCategoryList" class="list-group list-group-flush"></ul>

This comment has been minimized.

Sign in to view

Copy link
@JohnNiang

JohnNiang Oct 25, 2019

这里将内部的代码删除之后，似乎造成无法显示链接的问题。

This comment has been minimized.

Sign in to view

Copy link
@CodeLunatic

CodeLunatic Oct 25, 2019

Author Owner

这个问题的话无缓存刷新一下就好了，可能是之前的JS还在缓存着
</div>
</section>
Loading

0 comments on commit 8a2aa42

Please sign in to comment.