github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

🎨 改变部分代码结构，统一Favicon设置

pull/33/merge
ruibaby 2018-08-16 10:36:06 +08:00
parent 32779b6e0d
commit c3bd63311a
16 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
View File

@ -231,7 +231,7 @@ public class BackupController {
content.put("fileName", file.getName());
content.put("createAt", HaloUtils.getCreateTime(srcPath));
content.put("size", HaloUtils.parseSize(file.length()));
mailService.sendAttachMail(user.getUserEmail(), "有新的备份！", content, "common/mail/mail_attach.ftl", srcPath);
mailService.sendAttachMail(user.getUserEmail(), "有新的备份！", content, "common/mail_template/mail_attach.ftl", srcPath);
} catch (Exception e) {
log.error("邮件服务器未配置：{}", e.getMessage());
}

4
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
View File

@ -235,7 +235,7 @@ public class CommentController extends BaseController {
map.put("replyContent", commentContent);
map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
mailService.sendTemplateMail(
lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl");
lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论有了新回复", map, "common/mail_template/mail_reply.ftl");
}
}
}
@ -276,7 +276,7 @@ public class CommentController extends BaseController {
map.put("author", user.getUserDisplayName());
mailService.sendTemplateMail(
comment.getCommentAuthorEmail(),
"您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail/mail_passed.ftl");
"您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail_template/mail_passed.ftl");
}
} catch (Exception e) {
log.error("邮件服务器未配置：{}", e.getMessage());

4
src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
View File

@ -46,7 +46,7 @@ public class CommonController implements ErrorController {
*/
@GetMapping(value = "/404")
public String fourZeroFour() {
return "common/404";
return "common/error/404";
}
/**
@ -57,7 +57,7 @@ public class CommonController implements ErrorController {
*/
@GetMapping(value = "/500")
public String fiveZeroZero() {
return "common/500";
return "common/error/500";
}
/**

4
src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
View File

@ -175,7 +175,7 @@ public class FrontCommentController {
}
map.put("visitor", comment.getCommentAuthor());
map.put("commentContent", comment.getCommentContent());
mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail/mail_admin.ftl");
mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail_template/mail_admin.ftl");
} catch (Exception e) {
log.error("邮件服务器未配置：{}", e.getMessage());
}
@ -216,7 +216,7 @@ public class FrontCommentController {
map.put("replyContent", comment.getCommentContent());
map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
mailService.sendTemplateMail(
lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl");
lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()) + "的评论有了新回复", map, "common/mail_template/mail_reply.ftl");
}
}
}

11
src/main/resources/templates/admin/admin_option.ftl
View File

@ -88,6 +88,17 @@
</div>
</div>
</div>
<div class="form-group">
<label for="blogFavicon" class="col-lg-2 col-sm-4 control-label">Favicon：</label>
<div class="col-lg-4 col-sm-8">
<div class="input-group">
<input type="text" class="form-control selectData" id="blogFavicon" name="blog_favicon" value="${options.blog_favicon?if_exists}">
<span class="input-group-btn">
<button class="btn btn-default " type="button" onclick="openAttach('blogFavicon')">选择</button>
</span>
</div>
</div>
</div>
<div class="form-group">
<label for="blogFooterInfo" class="col-lg-2 col-sm-4 control-label">页脚信息：
<span data-toggle="tooltip" data-placement="top" title="支持HTML" style="cursor: pointer">

0
src/main/resources/templates/common/404.ftl → src/main/resources/templates/common/error/404.ftl
View File

0
src/main/resources/templates/common/500.ftl → src/main/resources/templates/common/error/500.ftl
View File

16
src/main/resources/templates/common/macro/common_macro.ftl Normal file
View File

@ -0,0 +1,16 @@
<!-- 统计代码 -->
<#macro statistics>
${options.statistics_code?if_exists}
</#macro>
<!-- 页脚信息 -->
<#macro footer_info>
${options.blog_footer_info?if_exists}
</#macro>
<!-- favicon -->
<#macro favicon>
<#if options.blog_favicon??>
<link rel="shortcut icon" type="images/x-icon" href="${options.blog_favicon}">
</#if>
</#macro>

0
src/main/resources/templates/common/mail/mail_admin.ftl → src/main/resources/templates/common/mail_template/mail_admin.ftl
View File

0
src/main/resources/templates/common/mail/mail_attach.ftl → src/main/resources/templates/common/mail_template/mail_attach.ftl
View File

0
src/main/resources/templates/common/mail/mail_passed.ftl → src/main/resources/templates/common/mail_template/mail_passed.ftl
View File

0
src/main/resources/templates/common/mail/mail_reply.ftl → src/main/resources/templates/common/mail_template/mail_reply.ftl
View File

5
src/main/resources/templates/themes/anatole/gallery.ftl
View File

@ -1,3 +1,4 @@
<#include "../../common/macro/common_macro.ftl">
<!DOCTYPE HTML>
<html>
<head>
@ -41,6 +42,6 @@
<script src="anatole/source/plugins/gallery/js/jquery.min.js"></script>
<script src="anatole/source/plugins/gallery/js/skel.min.js"></script>
<script src="anatole/source/plugins/gallery/js/main.js"></script>
${options.statistics_code?if_exists}
<@statistics></@statistics>
</body>
</html>
</html>

5
src/main/resources/templates/themes/anatole/module/macro.ftl
View File

@ -1,3 +1,4 @@
<#include "../../../common/macro/common_macro.ftl">
<#macro head title="" keywords="" description="">
<!DOCTYPE html>
<html>
@ -13,7 +14,7 @@
<meta name="author" content="${user.userDisplayName?if_exists}" />
<meta name="keywords" content="${keywords?default("Anatole")}"/>
<meta name="description" content="${description?default("Anatole")}" />
<link rel="shortcut icon" href="${options.anatole_style_favicon?default("/anatole/source/images/favicon.png")}" type="image/x-icon" />
<@favicon></@favicon>
<link href="/anatole/source/css/font-awesome.min.css" type="text/css" rel="stylesheet"/>
<link rel="stylesheet" href="/anatole/source/css/blog_basic.min.css?version=88107691fe">
<link href="/anatole/source/css/style.min.css" type="text/css" rel="stylesheet" />
@ -75,7 +76,7 @@
xhr.send();
</#if>
</script>
${options.statistics_code?if_exists}
<@statistics></@statistics>
</body>
</html>
</#macro>

11
src/main/resources/templates/themes/anatole/module/options.ftl
View File

@ -116,17 +116,6 @@
<div class="tab-pane" id="style">
<form method="post" class="form-horizontal" id="anatoleStyleOptions">
<div class="box-body">
<div class="form-group">
<label for="anatoleStyleFavicon" class="col-sm-4 control-label">Favicon：</label>
<div class="col-sm-8">
<div class="input-group">
<input type="text" class="form-control" id="anatoleStyleFavicon" name="anatole_style_favicon" value="${options.anatole_style_favicon?default("/anatole/source/images/favicon.png")}" >
<span class="input-group-btn">
<button class="btn btn-default btn-flat" type="button" onclick="openAttach('anatoleStyleFavicon')">选择</button>
</span>
</div>
</div>
</div>
<div class="form-group">
<label for="anatoleStyleRightIcon" class="col-sm-4 control-label">右上角图标：</label>
<div class="col-sm-8">

4
src/main/resources/templates/themes/anatole/module/sidebar.ftl
View File

@ -23,8 +23,8 @@
<a href="https://github.com/ruibaby/halo" target="_blank">Proudly published with Halo&#65281;</a>
</div>
<div class="footer_text">
${options.blog_footer_info?if_exists}
<@footer_info></@footer_info>
</div>
</a>
</div>
</div>
</div>