🔖 页面优化

上级 46d56965
......@@ -5001,4 +5001,8 @@ ul, menu, dir {
#spider-message p {
margin: 0 0 2px;
}
.control-label .required {
color: #dc3545;
}
\ No newline at end of file
......@@ -245,7 +245,11 @@ function clearText($this, type, info){
}
$this.val(thisValue);
} else {
$this.val(thisValue);
if(type != 'password') {
$this.val(thisValue);
} else {
$this.val('');
}
}
} else {
if (type === 'radio' || type === 'checkbox') {
......
......@@ -158,13 +158,13 @@
<script>
articleId = '${id}';
$(function () {
if(!articleId) {
/*if(!articleId) {
$.alert.confirm("当前已支持markdown编辑器,去试试?", function () {
window.location.href="/article/publishMd";
}, function () {
});
}
}*/
zhyd.initWangEditor({
id: "editor",
contentId: "content",
......
......@@ -43,13 +43,13 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">名称: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">名称 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="name" id="name" required="required" placeholder="请输入标签名称"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="description">标签描述: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="description">标签描述 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" id="description" name="description" placeholder="请输入标签描述"/>
</div>
......
......@@ -43,25 +43,25 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">名称: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">名称 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="name" id="name" required="required" placeholder="请输入分类名称"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="type">父级: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="type">父级 </label>
<div class="col-md-6 col-sm-6 col-xs-6">
<select id="pid" name="pid" class="form-control col-md-5 col-xs-5" target="combox" data-url="/type/listParent" data-method="post"></select>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="description">描述: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="description">描述 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" id="description" name="description" placeholder="请输入分类描述"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="sort">排序:</label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="sort">排序 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="sort" id="sort" placeholder="请输入排序"/>
</div>
......@@ -88,7 +88,7 @@
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="icon">图标:</label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="icon">图标 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="icon" id="icon" placeholder="请输入图标,比如:fa fa-qq"/>
</div>
......
......@@ -96,7 +96,7 @@
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="password">旧密码 <span class="required">*</span></label>
<div class="col-md-8 col-sm-8 col-xs-8">
<input class="form-control col-md-7 col-xs-12" id="password" name="password" required="required" type="password" minlength="6" maxlength="15">
<input class="form-control col-md-7 col-xs-12" id="oldPassword" name="password" required="required" type="password" minlength="6" maxlength="15">
</div>
</div>
<div class="item form-group">
......
......@@ -41,31 +41,31 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="url">URL: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="url">URL <span class="required">*</span></label>
<div class="col-md-7 col-sm-7 col-xs-7">
<input type="text" class="form-control" name="url" id="url" required="required" placeholder="请输入URL"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="name">名称: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="name">名称 <span class="required">*</span></label>
<div class="col-md-7 col-sm-7 col-xs-7">
<input type="text" class="form-control" name="name" id="name" required="required" placeholder="请输入名称"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="description">描述: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="description">描述 </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<input type="text" class="form-control" id="description" name="description" placeholder="请输入描述"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="favicon">Logo: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="favicon">Logo </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<input type="text" class="form-control" id="favicon" name="favicon" placeholder="请输入Logo"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="status">状态: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="status">状态 </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<ul class="list-unstyled list-inline">
<li><input type="radio" class="square" name="status" value="1"> 启用</li>
......@@ -74,7 +74,7 @@
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="homePageDisplay">首页显示: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="homePageDisplay">首页显示 </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<ul class="list-unstyled list-inline">
<li><input type="radio" class="square" name="homePageDisplay" value="1"> 是</li>
......@@ -83,19 +83,19 @@
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="email">e-mail: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="email">e-mail </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<input type="text" class="form-control" id="email" name="email" placeholder="请输入email"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="qq">qq: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="qq">qq </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<input type="text" class="form-control" id="qq" name="qq" placeholder="请输入qq"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="remark">备注: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-3" for="remark">备注 </label>
<div class="col-md-7 col-sm-7 col-xs-7">
<textarea class="form-control" id="remark" name="remark"></textarea>
</div>
......
......@@ -41,20 +41,20 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="title">标题: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="title">标题 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="title" id="title" required="required"
placeholder="请输入标题"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="content">内容: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="content">内容 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<textarea class="form-control col-md-7 col-xs-12" id="content" name="content" required="required"></textarea>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="status">状态: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="status">状态 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<ul class="list-unstyled list-inline">
<li>
......
......@@ -37,7 +37,7 @@
<a href="#multiple" id="multiple-tab" role="tab" data-toggle="tab" aria-expanded="true">抓取列表</a>
</li>
<li role="presentation">
<a href="#single" id="single-tab" role="tab" data-toggle="tab" aria-expanded="true"><i class="fa fa-fire fa-fw red"></i>抓取单个文章</a>
<a href="#single" id="single-tab" role="tab" data-toggle="tab" aria-expanded="true"><i class="fa fa-free-code-camp fa-fw red"></i>抓取单个文章</a>
</li>
</ul>
<div id="myTabContent" class="tab-content">
......
......@@ -41,13 +41,13 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">资源名称: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">资源名称 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="name" id="name" required="required" placeholder="请输入资源名称"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="type">资源类型: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="type">资源类型 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<select name="type" id="type" required="required" class="form-control col-md-7 col-xs-12">
<option value="">请选择</option>
......@@ -57,7 +57,7 @@
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="type">父级资源: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="type">父级资源 </label>
<div class="col-md-6 col-sm-6 col-xs-6">
<select id="parentId" name="parentId" class="form-control col-md-5 col-xs-5">
<option value="">请选择</option>
......@@ -79,25 +79,25 @@
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="url">资源链接: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="url">资源链接 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="url" id="url" placeholder="请输入资源链接"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="permission">资源权限: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="permission">资源权限 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="permission" id="permission" placeholder="请输入资源权限"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="sort">资源排序: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="sort">资源排序 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="sort" id="sort" placeholder="请输入资源排序"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="icon">资源图标: </label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="icon">资源图标 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="icon" id="icon" placeholder="请输入资源图标"/>
</div>
......
......@@ -63,19 +63,19 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">角色名称: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="name">角色名称 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="name" id="name" required="required" placeholder="请输入角色名称"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="description">角色描述: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="description">角色描述 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="description" id="description" required="required" placeholder="请输入角色描述"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="available">是否可用: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="available">是否可用 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<select name="available" id="available" required="required" class="form-control col-md-7 col-xs-12">
<option value="">请选择</option>
......
......@@ -63,37 +63,37 @@
<form id="addOrUpdateForm" class="form-horizontal form-label-left" novalidate>
<input type="hidden" name="id">
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="username">用户名: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="username">用户名 <span class="required">*</span></label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="username" id="username" required="required" placeholder="请输入用户名"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="password">密码: <span class="required">*</span></label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="password">密码 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="password" class="form-control col-md-7 col-xs-12" id="password" name="password" required="required" placeholder="请输入密码 6位以上"/>
<input type="password" class="form-control col-md-7 col-xs-12" id="password" name="password" placeholder="请输入密码 6位以上"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="nickname">昵称:</label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="nickname">昵称 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="text" class="form-control col-md-7 col-xs-12" name="nickname" id="nickname" placeholder="请输入昵称"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="mobile">手机:</label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="mobile">手机 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="tel" class="form-control col-md-7 col-xs-12" name="mobile" id="mobile" data-validate-length-range="6,20" placeholder="请输入手机号"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="email">邮箱:</label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="email">邮箱 </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="email" class="form-control col-md-7 col-xs-12" name="email" id="email" placeholder="请输入邮箱"/>
</div>
</div>
<div class="item form-group">
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="qq">QQ:</label>
<label class="control-label col-md-3 col-sm-3 col-xs-12" for="qq">QQ </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<input type="number" class="form-control col-md-7 col-xs-12" name="qq" id="qq" placeholder="请输入QQ"/>
</div>
......
......@@ -181,7 +181,7 @@ public class RenderController {
* @return
*/
@GetMapping("/article/{articleId}")
@BussinessLog(value = "进入文章[{1}]详情页", platform = PlatformEnum.WEB)
@BussinessLog(value = "进入文章[{2}]详情页", platform = PlatformEnum.WEB)
public ModelAndView article(Model model, @PathVariable("articleId") Long articleId) {
Article article = bizArticleService.getByPrimaryKey(articleId);
if (article == null || ArticleStatusEnum.UNPUBLISHED.getCode() == article.getStatusEnum().getCode()) {
......
......@@ -54,7 +54,8 @@ em {
}*/
.commentList {
margin-top: 0px;
margin-top: 0;
padding-top: 10px;
}
.cancel-reply {
......@@ -100,7 +101,7 @@ em {
.comment .comment-body .cheader {
display: block;
height: 43px;
height: 50px;
}
.comment .comment-body .cheader .user-img {
......@@ -141,7 +142,7 @@ em {
}
.comment .comment-body .cheader .user-info .timer i {
margin-left: 0px;
margin-left: 0;
}
.comment-quote {
......@@ -155,30 +156,29 @@ em {
list-style-type: none;
-webkit-margin-before: 1em;
-webkit-margin-after: 1em;
-webkit-margin-start: 0px;
-webkit-margin-end: 0px;
-webkit-padding-start: 0px;
-webkit-margin-start: 0;
-webkit-margin-end: 0;
-webkit-padding-start: 0;
}
.cheader {
border-bottom: 1px dotted #ddd;
/*border-bottom: 1px dotted #ddd;*/
}
.content {
padding: 10px;
border-bottom: 1px dotted #ddd;
/*border-bottom: 1px dotted #ddd;*/
font-size: 12px;
}
.content p {
margin: 0px;
margin: 0;
}
.sign {
overflow: visible !important;
line-height: 2;
padding-left: 5px;
padding-right: 5px;
padding: 5px;
background-color: rgba(255, 255, 255, .7);
color: #999aaa;
font-size: 12px;
......@@ -194,15 +194,14 @@ em {
.sepa {
font-style: normal;
margin-right: -5px;
margin-left: 0px;
margin-right: 10px;
}
.sepa:before {
/*.sepa:before {
content: "|";
margin-left: 3px;
margin-right: 3px;
}
}*/
.reply {
margin-left: 20px
......@@ -219,11 +218,9 @@ em {
}
.userImage {
width: 35px;
height: 35px;
width: 40px;
height: 40px;
border-radius: 50%;
margin-bottom: 4px;
margin-right: 3px;
}
.userImage:hover {
......
......@@ -74,13 +74,13 @@ $.extend({
}, options);
var commentBox = '<div id="comment-place">'
+ '<div class="comment-post" id="comment-post" style="position: relative">'
+ '<h4 class="bottom-line"><i class="fa fa-commenting-o fa-fw icon"></i><strong>评论</strong></h4>'
+ '<h5 class="custom-title"><i class="fa fa-commenting-o fa-fw icon"></i><strong>评论</strong><small></small></h5>'
+ '<form class="form-horizontal" role="form" id="comment-form">'
+ '<div class="cancel-reply" id="cancel-reply" style="display: none;"><a href="javascript:void(0);" onclick="$.comment.cancelReply(this)" rel="external nofollow"><i class="fa fa-share"></i>取消回复</a></div>'
+ '<input type="hidden" name="pid" id="comment-pid" value="0" size="22" tabindex="1">'
+ '<textarea id="comment_content" class="form-control col-md-7 col-xs-12 valid" style="display: none"></textarea>'
+ '<textarea name="content" style="display: none"></textarea>'
+ '<div style="position: absolute;right: 10px;bottom: 70px;font-size: 14px;font-weight: 700;color: #ececec;z-index: 1;">' + op.wmName + '<br>' + op.wmUrl + '<br>' + op.wmDesc + '</div>'
+ '<div style="position: absolute;right: 10px;bottom: 70px;font-size: 14px;color: #dbdada;z-index: 1;">' + op.wmName + '<br>' + op.wmUrl + '<br>' + op.wmDesc + '</div>'
+ '<a id="comment-form-btn" type="button" data-loading-text="正在提交评论..." class="btn btn-default btn-block">提交评论</a>'
+ '</form></div></div>';
$box.html(commentBox);
......@@ -126,7 +126,7 @@ $.extend({
var commentListBox = '';
if(!commentList){
commentListBox = '<div class="commentList">'
+ '<h4 class="bottom-line"><i class="fa fa-comments-o fa-fw icon"></i><strong><em>0</em> 条评论</strong></h4>'
+ '<h5 class="custom-title"><i class="fa fa-comments-o fa-fw icon"></i><strong>0 评论</strong><small></small></h5>'
+ '<ul class="comment">';
commentListBox += '<li><div class="list-comment-empty-w fade-in">'
+'<div class="empty-prompt-w">'
......@@ -140,7 +140,7 @@ $.extend({
// 首次加载-刷新页面后第一次加载,此时没有点击加载更多进行分页
if(!pageNumber) {
commentListBox = '<div class="commentList">'
+ '<h4 class="bottom-line"><i class="fa fa-comments-o fa-fw icon"></i><strong><em>' + json.data.total + '</em> 条评论</strong></h4>'
+ '<h5 class="custom-title"><i class="fa fa-comments-o fa-fw icon"></i><strong>' + json.data.total + ' 评论</strong><small></small></h5>'
+ '<ul class="comment">';
}
for(var i = 0, len = commentList.length; i < len ; i ++){
......
<#include "include/macros.ftl">
<@compress single_line=true>
<@header title="关于 | ${config.siteName}"
keywords="${config.siteName},关于博客"
description="一个程序员的个人博客,关于我的个人原创博客 - ${config.siteName}"
canonical="/about">
</@header>
<@header title="关于 | ${config.siteName}" keywords="${config.siteName},关于博客" description="一个程序员的个人博客,关于我的个人原创博客 - ${config.siteName}" canonical="/about"></@header>
<div class="container custome-container">
<nav class="breadcrumb">
......@@ -15,27 +11,23 @@
<@blogHeader title="关于本站"></@blogHeader>
<div class="col-sm-12 blog-main">
<div class="blog-body expansion">
<h5 class="legend-title">博主简介</h5>
<h5 class="custom-title"><i class="fa fa-user-secret fa-fw"></i><strong>博主简介</strong><small></small></h5>
<div class="info">
<p>
码农一枚
</p>
</div>
<h5 class="legend-title">关于博客</h5>
<h5 class="custom-title"><i class="fa fa-coffee fa-fw"></i><strong>关于博客</strong><small></small></h5>
<div class="info">
本站为非商业化站点,无盈利性质,为博主个人博客。本站二次开发于 <a href="https://gitee.com/yadong.zhang/DBlog" title="" data-toggle="tooltip" data-placement="right" target="_blank" data-original-title="DBlog是一款简洁美观、自适应的Java博客系统..."><strong>DBlog</strong></a>。<br>
</div>
<h5 class="legend-title">关于版权</h5>
<h5 class="custom-title"><i class="fa fa-copyright fa-fw"></i><strong>关于版权</strong><small></small></h5>
<div class="info">
本站所有标注为原创的文章,转载请标明出处。<br>
本站所有转载的文章,一般都会在文章中注明原文出处。<br>
所有转载的文章皆来源于互联网,若因此对原作者造成侵权,烦请原作者<a target="_blank" href="mailto:yadong.zhang0415@gmail.com" title="点击给我发邮件" data-toggle="tooltip" data-placement="bottom" rel="external nofollow"><strong>告知</strong></a>,我会立刻删除相关内容。
</div>
<h5 class="legend-title">赞助</h5>
<div class="alert alert-warning alert-dismissible simple-alert fade-in" role="alert">
<strong>注!</strong> 如果您觉得我的网站能够帮助到您,请您多多支持。我的支付宝账号:<span class="label label-success">1602008388#qq.com</span>(#==@)!
扫码点击:<a class="btn btn-danger btn-sm reward" onclick="PaymentUtils.show();">打赏</a>
</div>
<@praise></@praise>
</div>
</div>
<#--<div class="col-sm-12 blog-main">
......
<#include "include/macros.ftl">
<@compress single_line=true>
<@header title="归档目录 | ${config.siteName}"
keywords="归档目录"
description="归档目录"
canonical="/archives">
<style type="text/css">
.bottom-line{
text-align: center;
}
.archives-meta{
margin: 10px;
}
/* 文章归档盒子 */
.archives-box {
margin: 30px 10px;
}
.archives-box .month {
color: #000;
line-height: 30px;
margin: 5px 0 5px 10px;
}
.archives-box .month-li {
line-height: 25px;
text-indent: 2em;
}
.archives-box .num {
color: #999;
font-size: 14px;
font-weight: 100;
}
.archives-box .article-item {
text-indent: 4em;
}
</style>
</@header>
<@header title="归档目录 | ${config.siteName}" keywords="归档目录" description="归档目录" canonical="/archives"></@header>
<div class="container custome-container">
<nav class="breadcrumb">
<a class="crumbs" title="返回首页" href="${config.siteUrl}" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-home"></i>首页</a> <i
class="fa fa-angle-right"></i>归档目录
</nav>
<div class="row">
<div class="row archives">
<div class="col-sm-8 blog-main">
<div class="blog-body overflow-initial fade-in">
<div class="blog-info overflow-initial">
<div class="bottom-line">
<h1 class="blog-info-title">
<h1 class="archives-title">
<strong>文章归档目录</strong>
</h1>
<@zhydTag method="siteInfo">
......@@ -58,7 +20,7 @@
</@zhydTag>
<p class="blog-description hitokoto"></p>
</div>
<div class="blog-info-body">
<div class="archives-body">
<div class="archives-box overflow-initial">
<#list archives['years'] as year>
<h3 class="year pointer">${year}年 </h3>
......
<#include "include/macros.ftl">
<@header title="${article.title} | ${config.siteName}"
keywords="${article.keywords?if_exists},${config.siteName}"
description="${article.description?if_exists}"
canonical="/article/${article.id}">
<link href="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
<link href="https://cdn.bootcss.com/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
<link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
<style>
.CodeMirror {
padding: 0px;
}
.CodeMirror, .CodeMirror-scroll {
min-height: 130px;
max-height: 200px;
}
.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word) {
background: none;
}
.editor-statusbar {
display: none;
}
.editor-preview {
overflow-y: initial!important;
}
ul {
list-style: none;
margin-left: 0;
padding-left: 0;
}
</style>
</@header>
<@header title="${article.title} | ${config.siteName}" keywords="${article.keywords?if_exists},${config.siteName}" description="${article.description?if_exists}" canonical="/article/${article.id}" hasEditor=true></@header>
<#if article.coverImage?exists>
<img src="${config.qiniuBasePath}${article.coverImage?if_exists}" onerror="this.src='${config.staticWebSite}/img/default_article_cover.jpg'" style="display: none;" id="cover-img">
</#if>
......@@ -41,7 +10,7 @@
<a href="${config.siteUrl}/type/${article.typeId}" title="点击查看该分类文章" data-toggle="tooltip" data-placement="bottom">${article.type.name}</a>
<i class="fa fa-angle-right"></i>正文
</nav>
<div class="row">
<div class="row article-body">
<div class="col-sm-8 blog-main">
<div class="blog-body overflow-initial fade-in">
<div class="article-flag">
......@@ -58,18 +27,16 @@
</#if>
<div class="blog-info-meta pull-right">
<ul class="list-unstyled list-inline">
<li><i class="fa fa-clock-o fa-fw"></i>发表于 ${article.createTime?string('yyyy年MM月dd日')}</li>
<li><i class="fa fa-clock-o fa-fw"></i>${article.createTime?string('yyyy-MM-dd')}</li>
<li><i class="fa fa-eye fa-fw"></i><a class="pointer" data-original-title="${article.lookCount!(0)}人浏览了该文章" data-toggle="tooltip" data-placement="bottom">浏览 (<num>${article.lookCount!(0)}</num>)</a></li>
<li><a href="#comment-box" data-original-title="${article.commentCount!(0)}人评论了该文章" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-comments-o fa-fw"></i>评论 (${article.commentCount!(0)})</a></li>
</ul>
</div>
</div>
<div class="blog-info overflow-initial">
<div class="bottom-line">
<h1 class="blog-info-title">
<strong>${article.title}</strong>
</h1>
</div>
<h1 class="blog-info-title">
<strong>${article.title}</strong>
</h1>
<div class="blog-info-body ${article.isMarkdown?string('markdown-body editor-preview-active-side', '')}">
${article.content}
</div>
......@@ -160,7 +127,7 @@
</div>
<#-- 热门推荐 -->
<div class="blog-body clear overflow-initial">
<h4 class="bottom-line"><i class="fa fa-fire icon"></i><strong>热门推荐</strong></h4>
<h5 class="custom-title"><i class="fa fa-fire fa-fw icon"></i><strong>热门推荐</strong><small></small></h5>
<ul class="list-unstyled">
<@articleTag method="hotList" pageSize="10">
<#if hotList?exists && (hotList?size > 0)>
......@@ -201,7 +168,7 @@
</div>
<#-- 相关文章 -->
<div class="blog-body clear overflow-initial">
<h4 class="bottom-line"><i class="fa fa-google-wallet icon"></i><strong>相关文章</strong></h4>
<h5 class="custom-title"><i class="fa fa-google-wallet fa-fw icon"></i><strong>相关文章</strong><small></small></h5>
<ul class="list-unstyled">
<#list relatedList as item>
<li class="line-li">
......
<#include "include/macros.ftl">
<@compress single_line=true>
<@header title="免责声明 | ${config.siteName}"
keywords="免责声明"
description="免责声明"
canonical="/disclaimer">
<style type="text/css">
.bottom-line{
text-align: center;
}
.disclaimer-box {
margin: 30px 10px;
}
.disclaimer-box li {
color: #000;
line-height: 30px;
margin: 5px 0 5px 10px;
}
</style>
</@header>
<@header title="免责声明 | ${config.siteName}" keywords="免责声明" description="免责声明" canonical="/disclaimer"></@header>
<div class="container custome-container">
<nav class="breadcrumb">
<a class="crumbs" title="返回首页" href="${config.siteUrl}" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-home"></i>首页</a> <i
class="fa fa-angle-right"></i>免责声明
</nav>
<div class="row">
<div class="row disclaimer">
<div class="col-sm-8 blog-main">
<div class="blog-body overflow-initial fade-in">
<div class="blog-info overflow-initial">
<div class="bottom-line">
<h1 class="blog-info-title">
<h1 class="disclaimer-title">
<strong>免责声明</strong>
</h1>
<p>作者:<a href="${config.siteUrl}" title="网站作者">${config.authorName}</a>&nbsp;&nbsp;&nbsp;&nbsp; 发布时间:2018年3月16日</p>
</div>
<div class="blog-info-body">
<div class="disclaimer-body">
<ul class="list-unstyled disclaimer-box">
<li>1、本网站属于个人非赢利性质的网站,所有转载的文章都以遵循原作者的版权声明注明了文章来源。</li>
<li>2、如果原文没有版权声明,按照目前互联网开放的原则,本网站将在不通知作者的情况下转载文章。</li>
......
......@@ -3,33 +3,7 @@
<@header title="留言板 | ${config.siteName}"
keywords="${config.siteName},留言板,原创博客留言,个人原创网站,个人技术博客"
description="我的留言板,欢迎给我的个人原创博客留言 - ${config.siteName}"
canonical="/guestbook">
<link href="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
<link href="https://cdn.bootcss.com/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
<link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
<style>
.CodeMirror {
padding: 0px;
}
.CodeMirror, .CodeMirror-scroll {
min-height: 130px;
max-height: 200px;
}
.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word) {
background: none;
}
.editor-statusbar {
display: none;
}
.editor-preview {
overflow-y: initial!important;
}
ul {
list-style: none;
margin-left: 0;
padding-left: 0;
}
</style>
canonical="/guestbook" hasEditor=true>
</@header>
<div class="container custome-container">
......@@ -37,7 +11,7 @@
<a class="crumbs" title="返回首页" href="${config.siteUrl}" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-home"></i>首页</a>
<i class="fa fa-angle-right"></i>留言板
</nav>
<div class="row">
<div class="row guestbook-body">
<@blogHeader title="留言板"></@blogHeader>
<div class="col-sm-12 blog-main">
<div class="blog-body expansion">
......
<#-- 公共顶部 -->
<#macro header title="DBlog开源博客" keywords="" description="" canonical="">
<#macro header title="DBlog开源博客" keywords="" description="" canonical="" hasEditor=false>
<#include "/common/annotation.ftl">
<!DOCTYPE HTML>
<html lang="zh-CN">
......@@ -23,6 +23,11 @@
-o-filter: grayscale(100%);
filter: url("data:image/svg+xml;utf8,<svg xmlns="\'http://www.w3.org/2000/svg\'"><filter id="\'grayscale\'"><feColorMatrix type="\'matrix\'" values="\'0.3333" 0.3333="" 0="" 1="" 0\'=""></fecolormatrix></filter></svg>#grayscale");filter:progid:DXImageTransform.Microsoft.BasicImage(grayscale=1);-webkit-filter:grayscale(1);}
</style>-->
<#if hasEditor>
<link href="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
<link href="https://cdn.bootcss.com/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
<link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
</#if>
<#nested>
</head>
<body>
......@@ -57,7 +62,7 @@
<#macro blogHeader title="Header" weiboName="@我的微博">
<div class="col-sm-12 blog-main">
<div class="blog-header">
<h1 class="blog-title">${title}</h1>
<h4>${title}</h4>
<p class="blog-description" id="hitokoto"></p>
<div class="info">
<a href="javascript:void(0);" target="_blank" title="点击QQ联系我"onclick="window.open('tencent://message/?uin=${config.qq}&amp;Site=www.${config.domain}&amp;Menu=yes')" rel="external nofollow"><i class="fa fa fa-qq fa-fw"></i>QQ联系</a>
......@@ -79,4 +84,23 @@
系统预计将在<strong>${config.maintenanceDate?string('yyyy年MM月dd日 HH点mm分')}</strong>进行更新,届时网站将无法使用,更新时间大约 5-10分钟,敬请悉知。
</div>
</#if>
</#macro>
<#-- 赞赏 -->
<#macro praise>
<#if config.wxPraiseCode?if_exists || config.zfbPraiseCode?if_exists>
<h5 class="custom-title"><i class="fa fa-dollar fa-fw"></i><strong>鼓励一下</strong><small></small></h5>
<div class="col-sm-12 col-md-12">
<#if config.zfbPraiseCode?if_exists>
<a href="${config.qiniuBasePath}${config.zfbPraiseCode}" class="showImage" title="支付宝收钱码" rel="external nofollow">
<img src="${config.qiniuBasePath}${config.zfbPraiseCode}" alt="支付宝收钱码" class="img-rounded" style="width: 250px;height: auto;">
</a>
</#if>
<#if config.wxPraiseCode?if_exists>
<a href="${config.qiniuBasePath}${config.wxPraiseCode}" class="showImage" title="微信收钱码" rel="external nofollow">
<img src="${config.qiniuBasePath}${config.wxPraiseCode}" alt="微信收钱码" class="img-rounded" style="width: 250px;height: auto;">
</a>
</#if>
</div>
</#if>
</#macro>
\ No newline at end of file
......@@ -32,13 +32,11 @@
<#if recommendedList?exists && (recommendedList?size > 0)>
<div class="blog-body expansion" style="padding: 0;">
<div id="myCarousel" class="carousel slide" style="height:300px;">
<!-- 轮播(Carousel)指标 -->
<ol class="carousel-indicators">
<#list recommendedList as item>
<li data-target="#myCarousel" data-slide-to="${item_index}" class="${(item_index == 0)?string('active','')}"></li>
</#list>
</ol>
<!-- 轮播(Carousel)项目 -->
<div class="carousel-inner">
<#list recommendedList as item>
<div class="item ${(item_index == 0)?string('active','')}">
......@@ -49,7 +47,6 @@
</div>
</#list>
</div>
<!-- 轮播(Carousel)导航 -->
<a class="left carousel-control hide" href="#myCarousel" role="button" data-slide="prev">
<span class="fa fa-angle-left fa-fw fa-3x" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
......@@ -86,7 +83,7 @@
</div>
<span class="title-l"></span>
<span class="entry-meta">
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-calendar-o fa-fw"></i>${item.createTime?string('yyyy-MM-dd')}</span>
<span class="date" title="文章发表日期" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-clock-o fa-fw"></i>${item.createTime?string('yyyy-MM-dd')}</span>
<span class="views" title="文章阅读次数" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-eye fa-fw"></i>浏览(${item.lookCount!(0)})</span>
<span class="comment" title="文章评论次数" data-toggle="tooltip" data-placement="bottom">
<a href="${config.siteUrl}/article/${item.id?c}#comment-box" rel="external nofollow">
......
......@@ -27,8 +27,8 @@
<a class="navbar-brand logo" href="#"></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<div class="pull-left site-desc" style="line-height: 0.9;">
<h1 style="font-size: 20px;font-weight: 700;" class="auto-shake"><a href="${config.siteUrl}" data-original-title="${config.siteDesc}" data-toggle="tooltip" data-placement="bottom">${config.siteName}</a></h1>
<div class="pull-left site-desc">
<h1 class="auto-shake"><a href="${config.siteUrl}" data-original-title="${config.siteDesc}" data-toggle="tooltip" data-placement="bottom">${config.siteName}</a></h1>
<p class="site-description">${config.siteDesc}</p>
</div>
<ul class="nav navbar-nav ">
......
<div class="col-sm-3 blog-sidebar">
<#if articleDetail?exists>
<div class="sidebar-module">
<h5 class="sidebar-title"><i class="fa fa-hand-peace-o icon"></i><strong>说给你听</strong></h5>
<h5 class="custom-title"><i class="fa fa-hand-peace-o fa-fw icon"></i><strong>说给你听</strong><small></small></h5>
<div class="div-quote">
<i class="fa fa-quote-left fa-fw"></i><p id="hitokoto" style="margin-left: 15px;"></p>
</div>
......@@ -9,7 +9,7 @@
<#else>
<div class="sidebar-module" style="position: relative;">
<a href='https://gitee.com/yadong.zhang/DBlog' target="_blank" rel="external nofollow"><img src='https://gitee.com/yadong.zhang/DBlog/widgets/widget_1.svg?color=07b83f' alt='Fork me on Gitee' style="position: absolute;right: 0;"/></a>
<h5 class="sidebar-title"><i class="fa fa-home icon"></i><strong>关于我</strong></h5>
<h5 class="custom-title"><i class="fa fa-home fa-fw icon"></i><strong>关于我</strong><small></small></h5>
<div class="widget">
<div id="feed_widget">
<div class="feed-about">
......@@ -48,14 +48,13 @@
</div>
</#if>
<div class="sidebar-module article-module hide" style="top: 0;">
<h5 class="sidebar-title"><i class="fa fa-book icon"></i><strong>本文目录</strong> <i class="fa fa-close pull-right close-article-menu hide pointer"></i></h5>
<h5 class="custom-title"><i class="fa fa-book fa-fw icon"></i><strong>本文目录</strong><i class="fa fa-close pull-right close-article-menu hide pointer"></i><small></small></h5>
<div id="article-menu">
<ul class="list-unstyled">
</ul>
<ul class="list-unstyled"></ul>
</div>
</div>
<div class="sidebar-module">
<h5 class="sidebar-title"><i class="fa fa-tags icon"></i><strong>标签云</strong></h5>
<h5 class="custom-title"><i class="fa fa-tags fa-fw icon"></i><strong>标签云</strong><small></small></h5>
<@zhydTag method="tagsList" pageSize="10">
<#if tagsList?exists && (tagsList?size > 0)>
<#list tagsList as item>
......@@ -69,7 +68,7 @@
<@zhydTag method="recentComments" pageSize="10">
<#if recentComments?? && recentComments?size gt 0>
<div class="sidebar-module">
<h5 class="sidebar-title"><i class="fa fa-comments icon"></i><strong>近期评论</strong></h5>
<h5 class="custom-title"><i class="fa fa-comments fa-fw icon"></i><strong>近期评论</strong><small></small></h5>
<ul class="list-unstyled list-inline comments">
<#list recentComments as item>
<li>
......@@ -96,12 +95,15 @@
<#if recentArticles?exists && (recentArticles?size > 0)>
<#list recentArticles as item>
<li>
<span class="li-icon li-icon-${item_index + 1}">${item_index + 1}</span>
<a href="${config.siteUrl}/article/${item.id?c}" title="${item.title}" data-toggle="tooltip" data-placement="bottom">
${item.title}
<i class="fa fa-book fa-fw"></i> ${item.title}
</a>
</li>
</#list>
<#else>
<li class="empty-list">
<i class="fa fa-bookmark-o fa-fw"></i> 暂无相关文章
</li>
</#if>
</@articleTag>
</ol>
......@@ -112,12 +114,15 @@
<#if recommendedList?exists && (recommendedList?size > 0)>
<#list recommendedList as item>
<li>
<span class="li-icon li-icon-${item_index + 1}">${item_index + 1}</span>
<a href="${config.siteUrl}/article/${item.id?c}" title="${item.title}" data-toggle="tooltip" data-placement="bottom">
${item.title}
<i class="fa fa-book fa-fw"></i> ${item.title}
</a>
</li>
</#list>
<#else>
<li class="empty-list">
<i class="fa fa-bookmark-o fa-fw"></i> 暂无相关文章
</li>
</#if>
</@articleTag>
</ol>
......@@ -128,12 +133,15 @@
<#if randomList?exists && (randomList?size > 0)>
<#list randomList as item>
<li>
<span class="li-icon li-icon-${item_index + 1}">${item_index + 1}</span>
<a href="${config.siteUrl}/article/${item.id?c}" title="${item.title}" data-toggle="tooltip" data-placement="bottom">
${item.title}
<i class="fa fa-book fa-fw"></i> ${item.title}
</a>
</li>
</#list>
<#else>
<li class="empty-list">
<i class="fa fa-bookmark-o fa-fw"></i> 暂无相关文章
</li>
</#if>
</@articleTag>
</ol>
......@@ -142,7 +150,7 @@
</div>
<div class="clear"></div>
<div class="sidebar-module">
<h5 class="sidebar-title"><i class="fa fa-info icon"></i><strong>网站信息</strong></h5>
<h5 class="custom-title"><i class="fa fa-info fa-fw icon"></i><strong>网站信息</strong><small></small></h5>
<ul class="ul-default">
<@zhydTag method="siteInfo">
<li> <i class="fa fa-file fa-fw"></i> 文章总数:${siteInfo.articleCount!(0)} 篇</li>
......
......@@ -15,8 +15,7 @@
<@blogHeader title="友情链接"></@blogHeader>
<div class="col-sm-12 blog-main">
<div class="blog-body expansion">
<#--<h5 class="legend-title">简单的要求<small> - 简单点,说话的方式简单点</small></h5>-->
<h4 class="bottom-line"><i class="fa fa-coffee fa-fw"></i><strong>简单的要求</strong><small> - 简单点,说话的方式简单点</small></h4>
<h4 class="custom-title"><i class="fa fa-coffee fa-fw"></i><strong>简单的要求</strong><small> - 简单点,说话的方式简单点</small></h4>
<div class="link-info">
<ul class="list-unstyled">
<li>本站定位:个人技术类博客</li>
......
......@@ -17,7 +17,7 @@
<div class="col">
<form>
<div class="form-group">
<label for="comment">聊天框:</label> <textarea class="form-control" rows="5" id="text"></textarea>
<label for="comment">聊天框 </label> <textarea class="form-control" rows="5" id="text"></textarea>
</div>
<div class="form-group">
<button onclick="$.websocket.send($('#text').val())" type="button" class="btn btn-primary">发送</button>
......
......@@ -12,19 +12,18 @@
<i class="fa fa-angle-right"></i>网站更新记录
</nav>
<div class="row">
<div class="col-sm-8">
<div class="col-sm-8 blog-main">
<#if list?exists && (list?size > 0)>
<article class="fade-in update-logs">
<ul class="list-unstyled">
<#list list as item>
<div class="blog-body fade-in update-logs updatelog-body">
<#list list as item>
<h3 class="update-title pointer">${item.recordeTime?string('yyyy年MM月dd日 HH时')} | Version: ${item.version}</h3>
<ul class="list-box list-unstyled" style="display: none;">
<li>
更新版本:${item.version}
<div>更新内容:${item.description}</div>
<span>${item.recordeTime?string('yyyy/MM/dd')}</span>
</li>
</#list>
</ul>
</article>
</ul>
</#list>
</div>
<#else >
<article class="fade-in">
<div class="h3 text-center">亲,啥也没找到啊~~<img src="http://img.t.sinajs.cn/t35/style/images/common/face/ext/normal/15/j_thumb.gif" alt="[囧]"></div>
......@@ -35,5 +34,22 @@
<#include "layout/sidebar.ftl"/>
</div>
</div>
<@footer></@footer>
<@footer>
<script>
$(document).ready(function() {
(function() {
var listBox = $('.updatelog-body ul.list-box'),
listBoxFirst = $('.updatelog-body ul:first, .updatelog-body ul:first .list-box');
listBox.hide(1, function() {
listBoxFirst.show();
});
$(".update-title").click(function () {
var $this = $(this);
$this.next(".list-box:first").slideToggle(400);
return false;
});
})();
});
</script>
</@footer>
</@compress>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册