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

👽 修复了后台启用pjax之后所引发的一些问题:)

pull/1/head
RYAN0UP_ 2018-03-27 21:22:41 +08:00
parent a6d72991ff
commit 84e5362d70
28 changed files with 119 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cc/ryanc/halo/model/domain/Comment.java
View File

@ -83,4 +83,9 @@ public class Comment implements Serializable {
* 评论状态，0：正常，1：待审核，2：回收站 * 评论状态，0：正常，1：待审核，2：回收站
*/ */
private Integer commentStatus=1; private Integer commentStatus=1;
/**
* 是否是博主的评论 0:不是 1:是
*/
private Integer isAdmin;
} }

0
src/main/java/cc/ryanc/halo/repository/PostRepository.java Executable file → Normal file
View File

2
src/main/java/cc/ryanc/halo/service/AttachmentService.java
View File

@ -31,7 +31,7 @@ public interface AttachmentService {
List<Attachment> findAllAttachments(); List<Attachment> findAllAttachments();
/** /**
* 查询所有附件，分类 * 查询所有附件，分页
* *
* @param pageable pageable * @param pageable pageable
* @return page * @return page

1
src/main/java/cc/ryanc/halo/web/controller/IndexController.java
View File

@ -499,6 +499,7 @@ public class IndexController extends BaseController{
comment.setPost(post); comment.setPost(post);
comment.setCommentDate(new Date()); comment.setCommentDate(new Date());
comment.setCommentAuthorIp(HaloUtil.getIpAddr(request)); comment.setCommentAuthorIp(HaloUtil.getIpAddr(request));
comment.setIsAdmin(0);
commentService.saveByComment(comment); commentService.saveByComment(comment);
if("true".equals(HaloConst.OPTIONS.get("smtp_email_enable")) && "true".equals(HaloConst.OPTIONS.get("new_comment_notice"))){ if("true".equals(HaloConst.OPTIONS.get("smtp_email_enable")) && "true".equals(HaloConst.OPTIONS.get("new_comment_notice"))){

1
src/main/java/cc/ryanc/halo/web/controller/InstallController.java
View File

@ -141,6 +141,7 @@ public class InstallController {
comment.setCommentDate(new Date()); comment.setCommentDate(new Date());
comment.setCommentContent("欢迎，欢迎！"); comment.setCommentContent("欢迎，欢迎！");
comment.setCommentAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.162 Safari/537.36"); comment.setCommentAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.162 Safari/537.36");
comment.setIsAdmin(0);
commentService.saveByComment(comment); commentService.saveByComment(comment);
//设置默认主题 //设置默认主题

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

@ -202,6 +202,7 @@ public class CommentController extends BaseController{
comment.setCommentAgent(userAgent); comment.setCommentAgent(userAgent);
comment.setCommentParent(commentId); comment.setCommentParent(commentId);
comment.setCommentStatus(0); comment.setCommentStatus(0);
comment.setIsAdmin(1);
commentService.saveByComment(comment); commentService.saveByComment(comment);
//正则表达式判断对方的邮箱是否是正确的格式 //正则表达式判断对方的邮箱是否是正确的格式

2
src/main/resources/templates/admin/admin_attachment.ftl
View File

@ -22,7 +22,7 @@
<i class="fa fa-cloud-upload" aria-hidden="true"></i>上传 <i class="fa fa-cloud-upload" aria-hidden="true"></i>上传
</a> </a>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li class="active">附件</li> <li class="active">附件</li>
</ol> </ol>
</section> </section>

4
src/main/resources/templates/admin/admin_cate-update.ftl
View File

@ -16,8 +16,8 @@
<h1>分类目录<small></small> <h1>分类目录<small></small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li><a href="/admin/category"><i class="fa fa-dashboard"></i> 分类目录</a></li> <li><a data-pjax="true" href="/admin/category"><i class="fa fa-dashboard"></i> 分类目录</a></li>
<li class="active">修改</li> <li class="active">修改</li>
</ol> </ol>
</section> </section>

4
src/main/resources/templates/admin/admin_category.ftl
View File

@ -15,10 +15,10 @@
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"> <a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> 首页</a> <i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">文章</a></li> <li><a data-pjax="true" href="#">文章</a></li>
<li class="active">分类目录</li> <li class="active">分类目录</li>
</ol> </ol>
</section> </section>

16
src/main/resources/templates/admin/admin_comment.ftl
View File

@ -13,7 +13,7 @@
<h1>评论<small></small></h1> <h1>评论<small></small></h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li class="active">评论</li> <li class="active">评论</li>
</ol> </ol>
@ -21,13 +21,13 @@
<section class="content container-fluid"> <section class="content container-fluid">
<ul style="list-style: none;padding-left: 0"> <ul style="list-style: none;padding-left: 0">
<li class="publish"> <li class="publish">
<a href="/admin/comments">已发布<span class="count">(${publicCount?default("0")})</span></a>&nbsp;|&nbsp; <a data-pjax="true" href="/admin/comments">已发布<span class="count">(${publicCount?default("0")})</span></a>&nbsp;|&nbsp;
</li> </li>
<li class="draft"> <li class="draft">
<a href="/admin/comments?status=1">待审核<span class="count">(${checkCount?default("0")})</span></a>&nbsp;|&nbsp; <a data-pjax="true" href="/admin/comments?status=1">待审核<span class="count">(${checkCount?default("0")})</span></a>&nbsp;|&nbsp;
</li> </li>
<li class="trash"> <li class="trash">
<a href="/admin/comments?status=2">回收站<span class="count">(${trashCount?default("0")})</span></a> <a data-pjax="true" href="/admin/comments?status=2">回收站<span class="count">(${trashCount?default("0")})</span></a>
</li> </li>
</ul> </ul>
<div class="row"> <div class="row">
@ -56,16 +56,16 @@
<td> <td>
<#switch comment.commentStatus> <#switch comment.commentStatus>
<#case 0> <#case 0>
<button class="btn btn-info btn-sm btn-flat" onclick="replyShow('${comment.commentId}','${comment.post.postId}')">回复</button> <button class="btn btn-primary btn-sm btn-flat" onclick="replyShow('${comment.commentId}','${comment.post.postId}')" <#if comment.isAdmin==1>disabled</#if>>回复</button>
<button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/comments/throw?commentId=${comment.commentId}','确定移动到回收站？')">丢弃</button> <button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/comments/throw?commentId=${comment.commentId}','确定移动到回收站？')">丢弃</button>
<#break > <#break >
<#case 1> <#case 1>
<a class="btn btn-info btn-sm btn-flat" href="/admin/comments/revert?commentId=${comment.commentId}&status=1">通过</a> <a class="btn btn-primary btn-sm btn-flat" href="/admin/comments/revert?commentId=${comment.commentId}&status=1">通过</a>
<a class="btn btn-primary btn-sm btn-flat" onclick="replyShow('${comment.commentId}','${comment.post.postId}')">通过并回复</a> <a class="btn btn-info btn-sm btn-flat" onclick="replyShow('${comment.commentId}','${comment.post.postId}')">通过并回复</a>
<button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/comments/throw?commentId=${comment.commentId}','确定移动到回收站？')">丢弃</button> <button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/comments/throw?commentId=${comment.commentId}','确定移动到回收站？')">丢弃</button>
<#break > <#break >
<#case 2> <#case 2>
<a class="btn btn-info btn-sm btn-flat" href="/admin/comments/revert?commentId=${comment.commentId}&status=2">还原</a> <a class="btn btn-primary btn-sm btn-flat" href="/admin/comments/revert?commentId=${comment.commentId}&status=2">还原</a>
<button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/comments/remove?commentId=${comment.commentId}&status=2','确定要永久删除？')">删除</button> <button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/comments/remove?commentId=${comment.commentId}&status=2','确定要永久删除？')">删除</button>
<#break > <#break >
</#switch> </#switch>

2
src/main/resources/templates/admin/admin_halo.ftl
View File

@ -18,7 +18,7 @@
<h1 style="display: inline-block;">关于Halo</h1> <h1 style="display: inline-block;">关于Halo</h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li class="active">关于Halo</li> <li class="active">关于Halo</li>
</ol> </ol>

12
src/main/resources/templates/admin/admin_index.ftl
View File

@ -248,7 +248,17 @@
<a href="/article/${comment.post.getPostUrl()}">${comment.post.postTitle}</a> <a href="/article/${comment.post.getPostUrl()}">${comment.post.postTitle}</a>
</td> </td>
<td> <td>
<a href="/admin/comments">${comment.commentContent}</a> <#switch comment.commentStatus>
<#case 0>
<a href="/admin/comments">${comment.commentContent}</a>
<#break>
<#case 1>
<a href="/admin/comments?status=1">${comment.commentContent}</a>
<#break>
<#case 2>
<a href="/admin/comments?status=2">${comment.commentContent}</a>
<#break>
</#switch>
</td> </td>
<td> <td>
<#switch comment.commentStatus> <#switch comment.commentStatus>

6
src/main/resources/templates/admin/admin_link-update.ftl
View File

@ -18,9 +18,9 @@
<h1>友情链接<small></small> <h1>友情链接<small></small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li><a href="/admin/page">页面</a></li> <li><a data-pjax="true" href="/admin/page">页面</a></li>
<li><a href="/admin/page/links">友情链接</a></li> <li><a data-pjax="true" href="/admin/page/links">友情链接</a></li>
<li class="active">修改</li> <li class="active">修改</li>
</ol> </ol>
</section> </section>

4
src/main/resources/templates/admin/admin_link.ftl
View File

@ -12,8 +12,8 @@
<section class="content-header"> <section class="content-header">
<h1>友情链接<small>#</small></h1> <h1>友情链接<small>#</small></h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/admin"><i class="fa fa-dashboard"></i>首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i>首页</a></li>
<li><a href="/admin/page">页面</a></li> <li><a data-pjax="true" href="/admin/page">页面</a></li>
<li class="active">友情链接</li> <li class="active">友情链接</li>
</ol> </ol>
</section> </section>

32
src/main/resources/templates/admin/admin_md-editor.ftl
View File

@ -20,10 +20,10 @@
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="#"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="#"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li> <li>
<a href="/admin/posts">文章</a> <a data-pjax="true" href="/admin/posts">文章</a>
</li> </li>
<li class="active">新建文章</li> <li class="active">新建文章</li>
</ol> </ol>
@ -40,7 +40,7 @@
<div style="display: block;margin-bottom: 10px;"> <div style="display: block;margin-bottom: 10px;">
<span> <span>
永久链接： 永久链接：
<a href="#">https://ryanc.cc/archives/<span id="postUrl"></span>/</a> <a href="#">${options.site_url}/article/<span id="postUrl"></span>/</a>
<button class="btn btn-default btn-sm btn-flat" id="btn_input_postUrl">编辑</button> <button class="btn btn-default btn-sm btn-flat" id="btn_input_postUrl">编辑</button>
<button class="btn btn-default btn-sm btn-flat" id="btn_change_postUrl" onclick="UrlOnBlurAuto()" style="display: none;">确定</button> <button class="btn btn-default btn-sm btn-flat" id="btn_change_postUrl" onclick="UrlOnBlurAuto()" style="display: none;">确定</button>
</span> </span>
@ -130,6 +130,7 @@
</section> </section>
<script src="/static/plugins/toast/js/jquery.toast.min.js"></script> <script src="/static/plugins/toast/js/jquery.toast.min.js"></script>
<script src="/static/plugins/layer/layer.js"></script> <script src="/static/plugins/layer/layer.js"></script>
<script src="/static/plugins/editor.md/editormd.min.js"></script>
<script> <script>
function openAttach() { function openAttach() {
layer.open({ layer.open({
@ -144,27 +145,20 @@
} }
var editor; var editor;
function loadEditor() { function loadEditor() {
$.getScript("/static/plugins/editor.md/editormd.min.js",function () { editor = editormd("markdown-editor", {
editor = editormd("markdown-editor", { width: "100%",
width: "100%", height: 620,
height: 620, syncScrolling: "single",
syncScrolling: "single", path: "/static/plugins/editor.md/lib/",
path: "/static/plugins/editor.md/lib/", saveHTMLToTextarea: true,
saveHTMLToTextarea: true, toolbarIcons : function () {
toolbarIcons : function () { return editormd.toolbarModes["simple"];
return editormd.toolbarModes["simple"]; }
}
});
}); });
} }
$(document).ready(function () { $(document).ready(function () {
loadEditor(); loadEditor();
}); });
<#if options.admin_pjax?default("true") == "true">
$(document).on('pjax:complete',function () {
loadEditor();
});
</#if>
function TitleOnBlurAuto() { function TitleOnBlurAuto() {
$('#postUrl').html($('#post_title').val()); $('#postUrl').html($('#post_title').val());
} }

4
src/main/resources/templates/admin/admin_menu.ftl
View File

@ -10,9 +10,9 @@
<h1 style="display: inline-block;">菜单设置</h1> <h1 style="display: inline-block;">菜单设置</h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">外观</a></li> <li><a data-pjax="true" href="#">外观</a></li>
<li class="active">菜单设置</li> <li class="active">菜单设置</li>
</ol> </ol>
</section> </section>

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

@ -23,10 +23,10 @@
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"> <a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> 首页</a> <i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">设置</a></li> <li><a data-pjax="true" href="#">设置</a></li>
<li class="active">网站设置</li> <li class="active">网站设置</li>
</ol> </ol>
</section> </section>

4
src/main/resources/templates/admin/admin_page.ftl
View File

@ -19,9 +19,9 @@
</a> </a>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">页面</a></li> <li><a data-pjax="true" href="#">页面</a></li>
<li class="active">所有页面</li> <li class="active">所有页面</li>
</ol> </ol>
</section> </section>

22
src/main/resources/templates/admin/admin_post.ftl
View File

@ -15,15 +15,15 @@
</style> </style>
<section class="content-header"> <section class="content-header">
<h1 style="display: inline-block;">文章</h1> <h1 style="display: inline-block;">文章</h1>
<a id="btnNewPost" href="/admin/posts/new"> <a data-pjax="false" id="btnNewPost" href="/admin/posts/new">
写文章 写文章
</a> </a>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"> <a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> 首页</a> <i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">文章</a></li> <li><a data-pjax="true" href="#">文章</a></li>
<li class="active">所有文章</li> <li class="active">所有文章</li>
</ol> </ol>
</section> </section>
@ -32,13 +32,13 @@
<div class="col-xs-12"> <div class="col-xs-12">
<ul style="list-style: none;padding-left: 0"> <ul style="list-style: none;padding-left: 0">
<li class="publish"> <li class="publish">
<a href="/admin/posts">已发布<span class="count">(${publishCount})</span></a>&nbsp;|&nbsp; <a data-pjax="true" href="/admin/posts">已发布<span class="count">(${publishCount})</span></a>&nbsp;|&nbsp;
</li> </li>
<li class="draft"> <li class="draft">
<a href="/admin/posts?status=1">草稿<span class="count">(${draftCount})</span></a>&nbsp;|&nbsp; <a data-pjax="true" href="/admin/posts?status=1">草稿<span class="count">(${draftCount})</span></a>&nbsp;|&nbsp;
</li> </li>
<li class="trash"> <li class="trash">
<a href="/admin/posts?status=2">回收站<span class="count">(${trashCount})</span></a> <a data-pjax="true" href="/admin/posts?status=2">回收站<span class="count">(${trashCount})</span></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -79,17 +79,17 @@
<td> <td>
<#switch post.postStatus> <#switch post.postStatus>
<#case 0> <#case 0>
<a href="/admin/posts/view?postId=${post.postId}" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a> <a href="/admin/posts/view?postId=${post.postId}" class="btn btn-primary btn-sm btn-flat" target="_blank">预览</a>
<a href="/admin/posts/edit?postId=${post.postId}" class="btn btn-primary btn-sm btn-flat">修改</a> <a href="/admin/posts/edit?postId=${post.postId}" class="btn btn-info btn-sm btn-flat">修改</a>
<button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/posts/throw?postId=${post.postId}','确定移到回收站？')">丢弃</button> <button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/posts/throw?postId=${post.postId}','确定移到回收站？')">丢弃</button>
<#break > <#break >
<#case 1> <#case 1>
<a href="/admin/posts/view?postId=${post.postId}" class="btn btn-info btn-sm btn-flat" target="_blank">预览</a> <a href="/admin/posts/view?postId=${post.postId}" class="btn btn-primary btn-sm btn-flat" target="_blank">预览</a>
<a href="/admin/posts/edit?postId=${post.postId}" class="btn btn-primary btn-sm btn-flat">修改</a> <a href="/admin/posts/edit?postId=${post.postId}" class="btn btn-info btn-sm btn-flat">修改</a>
<button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/posts/revert?postId=${post.postId}&status=1','确定发布该文章？')">发布</button> <button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/posts/revert?postId=${post.postId}&status=1','确定发布该文章？')">发布</button>
<#break > <#break >
<#case 2> <#case 2>
<a href="/admin/posts/revert?postId=${post.postId}&status=2" class="btn btn-info btn-sm btn-flat">还原</a> <a href="/admin/posts/revert?postId=${post.postId}&status=2" class="btn btn-primary btn-sm btn-flat">还原</a>
<button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/posts/remove?postId=${post.postId}','确定永久删除？(不可逆)')">永久删除</button> <button class="btn btn-danger btn-sm btn-flat" onclick="modelShow('/admin/posts/remove?postId=${post.postId}','确定永久删除？(不可逆)')">永久删除</button>
<#break > <#break >
</#switch> </#switch>

4
src/main/resources/templates/admin/admin_profile.ftl
View File

@ -20,10 +20,10 @@
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"> <a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> 首页</a> <i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">用户</a></li> <li><a data-pjax="true" href="#">用户</a></li>
<li class="active">个人资料</li> <li class="active">个人资料</li>
</ol> </ol>
</section> </section>

4
src/main/resources/templates/admin/admin_rt-editor.ftl
View File

@ -21,10 +21,10 @@
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="#"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="#"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li> <li>
<a href="/admin/posts">文章</a> <a data-pjax="true" href="/admin/posts">文章</a>
</li> </li>
<li class="active">新建文章</li> <li class="active">新建文章</li>
</ol> </ol>

4
src/main/resources/templates/admin/admin_tag-update.ftl
View File

@ -18,8 +18,8 @@
<h1>标签<small></small> <h1>标签<small></small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li><a href="/admin/category"><i class="fa fa-dashboard"></i> 标签</a></li> <li><a data-pjax="true" href="/admin/category"><i class="fa fa-dashboard"></i> 标签</a></li>
<li class="active">修改</li> <li class="active">修改</li>
</ol> </ol>
</section> </section>

4
src/main/resources/templates/admin/admin_tag.ftl
View File

@ -16,10 +16,10 @@
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="#"> <a data-pjax="true" href="#">
<i class="fa fa-dashboard"></i> 首页</a> <i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">文章</a></li> <li><a data-pjax="true" href="#">文章</a></li>
<li class="active">标签</li> <li class="active">标签</li>
</ol> </ol>
</section> </section>

38
src/main/resources/templates/admin/admin_theme-editor.ftl
View File

@ -12,9 +12,9 @@
<h1 style="display: inline-block;">主题编辑</h1> <h1 style="display: inline-block;">主题编辑</h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li> <li>
<a href="/admin"><i class="fa fa-dashboard"></i> 首页</a> <a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a>
</li> </li>
<li><a href="#">外观</a></li> <li><a data-pjax="true" href="#">外观</a></li>
<li class="active">主题编辑</li> <li class="active">主题编辑</li>
</ol> </ol>
</section> </section>
@ -77,34 +77,28 @@
</div> </div>
</section> </section>
<script src="/static/plugins/toast/js/jquery.toast.min.js"></script> <script src="/static/plugins/toast/js/jquery.toast.min.js"></script>
<script src="/static/plugins/editor.md/editormd.min.js"></script>
<script> <script>
var editor; var editor;
function loadEditor() { function loadEditor() {
$.getScript("/static/plugins/editor.md/editormd.min.js",function () { editor = editormd("theme-editor", {
editor = editormd("theme-editor", { width: "100%",
width: "100%", height: 620,
height: 620, syncScrolling: "single",
syncScrolling: "single", path: "/static/plugins/editor.md/lib/",
path: "/static/plugins/editor.md/lib/", watch : false,
watch : false, toolbar : false,
toolbar : false, codeFold : true,
codeFold : true, searchReplace : true,
searchReplace : true, placeholder : "Enjoy coding!",
placeholder : "Enjoy coding!", value : (localStorage.mode) ? $("#"+localStorage.mode.replace("text/", "")+"-code").val() : $("#html-code").val(),
value : (localStorage.mode) ? $("#"+localStorage.mode.replace("text/", "")+"-code").val() : $("#html-code").val(), theme : (localStorage.theme) ? localStorage.theme : "default",
theme : (localStorage.theme) ? localStorage.theme : "default", mode : (localStorage.mode) ? localStorage.mode : "text/html"
mode : (localStorage.mode) ? localStorage.mode : "text/html"
});
}); });
} }
$(document).ready(function () { $(document).ready(function () {
loadEditor(); loadEditor();
}); });
<#if options.admin_pjax?default("true") == "true">
$(document).on('pjax:complete',function () {
loadEditor();
});
</#if>
function loadContent(tplName) { function loadContent(tplName) {
if (tplName && tplName != '') { if (tplName && tplName != '') {
$.ajax({ $.ajax({

6
src/main/resources/templates/admin/admin_theme.ftl
View File

@ -65,8 +65,8 @@
<i class="fa fa-cloud-upload" aria-hidden="true"></i>上传 <i class="fa fa-cloud-upload" aria-hidden="true"></i>上传
</a> </a>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li> <li><a data-pjax="true" href="/admin"><i class="fa fa-dashboard"></i> 首页</a></li>
<li><a href="#">外观</a></li> <li><a data-pjax="true" href="#">外观</a></li>
<li class="active">主题设置</li> <li class="active">主题设置</li>
</ol> </ol>
</section> </section>
@ -124,7 +124,7 @@
allowedFileExtensions: ['zip','jpg'], allowedFileExtensions: ['zip','jpg'],
maxFileCount: 1, maxFileCount: 1,
enctype: 'multipart/form-data', enctype: 'multipart/form-data',
dropZoneTitle: '拖拽文件到这里 &hellip;<br>此模式不支持多文件同时上传', dropZoneTitle: '拖拽主题压缩包到这里 &hellip;<br>不支持多个主题同时上传',
showClose: false showClose: false
}).on("fileuploaded",function (event,data,previewId,index) { }).on("fileuploaded",function (event,data,previewId,index) {
var data = data.jqXHR.responseJSON; var data = data.jqXHR.responseJSON;

2
src/main/resources/templates/admin/module/_macro.ftl
View File

@ -33,7 +33,7 @@
<script> <script>
$(document).ajaxStart(function() {Pace.restart();}); $(document).ajaxStart(function() {Pace.restart();});
<#if options.admin_pjax?default("true") == "true"> <#if options.admin_pjax?default("true") == "true">
$(document).pjax('a[target!=_blank]', '.content-wrapper', {fragment: '.content-wrapper',timeout: 8000}); $(document).pjax('a[data-pjax=true]', '.content-wrapper', {fragment: '.content-wrapper',timeout: 8000});
</#if> </#if>
$(function () { $(function () {
if($(window).width()<1024){ if($(window).width()<1024){

42
src/main/resources/templates/admin/module/_sidebar.ftl
View File

@ -21,26 +21,26 @@
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<li class="header">HEADER</li> <li class="header">HEADER</li>
<li class=""> <li class="">
<a href="/admin"> <a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>仪表盘</span> <span>仪表盘</span>
</a> </a>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#" class=""> <a data-pjax="true" href="#">
<i class="fa fa-wordpress"></i> <i class="fa fa-book"></i>
<span>文章</span> <span>文章</span>
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
</a> </a>
<ul class="treeview-menu" style=""> <ul class="treeview-menu" style="">
<li class=""><a href="/admin/posts"><i class="fa fa-circle-o"></i>所有文章</a></li> <li class=""><a data-pjax="true" href="/admin/posts"><i class="fa fa-circle-o"></i>所有文章</a></li>
<li><a href="/admin/posts/new"><i class="fa fa-circle-o"></i>写文章</a></li> <li><a data-pjax="false" href="/admin/posts/new"><i class="fa fa-circle-o"></i>写文章</a></li>
<li><a href="/admin/category"><i class="fa fa-circle-o"></i>分类目录</a></li> <li><a data-pjax="true" href="/admin/category"><i class="fa fa-circle-o"></i>分类目录</a></li>
<li><a href="/admin/tag"><i class="fa fa-circle-o"></i>标签</a></li> <li><a data-pjax="true" href="/admin/tag"><i class="fa fa-circle-o"></i>标签</a></li>
</ul> </ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a data-pjax="true" href="#">
<i class="fa fa-desktop"></i> <i class="fa fa-desktop"></i>
<span>页面</span> <span>页面</span>
<span class="pull-right-container"> <span class="pull-right-container">
@ -48,18 +48,18 @@
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="/admin/page"><i class="fa fa-circle-o"></i>所有页面</a></li> <li><a data-pjax="true" href="/admin/page"><i class="fa fa-circle-o"></i>所有页面</a></li>
<li><a href="#"><i class="fa fa-circle-o"></i>新建页面</a></li> <li><a data-pjax="false" href="#"><i class="fa fa-circle-o"></i>新建页面</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<a href="/admin/attachments"> <a data-pjax="true" href="/admin/attachments">
<i class="fa fa-camera"></i> <i class="fa fa-camera"></i>
<span>附件</span> <span>附件</span>
</a> </a>
</li> </li>
<li> <li>
<a href="/admin/comments"> <a data-pjax="true" href="/admin/comments">
<i class="fa fa-comment"></i> <i class="fa fa-comment"></i>
<span>评论</span> <span>评论</span>
<span class="pull-right-container"> <span class="pull-right-container">
@ -70,7 +70,7 @@
</a> </a>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a data-pjax="true" href="#">
<i class="fa fa-paint-brush"></i> <i class="fa fa-paint-brush"></i>
<span>外观</span> <span>外观</span>
<span class="pull-right-container"> <span class="pull-right-container">
@ -78,30 +78,30 @@
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="/admin/themes"><i class="fa fa-circle-o"></i>主题</a></li> <li><a data-pjax="true" href="/admin/themes"><i class="fa fa-circle-o"></i>主题</a></li>
<li><a href="/admin/menu"><i class="fa fa-circle-o"></i>菜单</a></li> <li><a data-pjax="true" href="/admin/menu"><i class="fa fa-circle-o"></i>菜单</a></li>
<li><a href="/admin/themes/editor"><i class="fa fa-circle-o"></i>自定义</a></li> <li><a data-pjax="false" href="/admin/themes/editor"><i class="fa fa-circle-o"></i>自定义</a></li>
</ul> </ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a data-pjax="true" href="#">
<i class="fa fa-user-o"></i> <i class="fa fa-user-o"></i>
<span>用户</span> <span>用户</span>
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="/admin/profile"><i class="fa fa-circle-o"></i>个人资料</a></li> <li><a data-pjax="true" href="/admin/profile"><i class="fa fa-circle-o"></i>个人资料</a></li>
</ul> </ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a data-pjax="true" href="#">
<i class="fa fa-cog"></i> <i class="fa fa-cog"></i>
<span>设置</span> <span>设置</span>
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="/admin/option"><i class="fa fa-circle-o"></i>网站设置</a></li> <li><a data-pjax="true" href="/admin/option"><i class="fa fa-circle-o"></i>博客设置</a></li>
<li><a href="/admin/backup"><i class="fa fa-circle-o"></i>备份恢复</a></li> <li><a data-pjax="true" href="/admin/backup"><i class="fa fa-circle-o"></i>备份恢复</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>

2
src/main/resources/templates/admin/widget/_attachment-detail.ftl
View File

@ -94,7 +94,7 @@
attachId : ${attachment.attachId} attachId : ${attachment.attachId}
}, },
success: function (data) { success: function (data) {
if(data=="success"){ if(data==true){
$.toast({ $.toast({
text: "删除成功！", text: "删除成功！",
heading: '提示', heading: '提示',