diff --git a/src/main/resources/static/css/comment.css b/src/main/resources/static/css/comment.css
index fbddac99b..f6fc3546c 100644
--- a/src/main/resources/static/css/comment.css
+++ b/src/main/resources/static/css/comment.css
@@ -1,7 +1,7 @@
.native-list-one-head a, .native-list-one-content a{
/* color: #424242; */
color: #7575d0;
- opacity: 1;!important;
+ opacity: 1!important;
-webkit-transition: all .15s linear;
-moz-transition: all .15s linear;
-o-transition: all .15s linear;
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index d1513b0de..678f85109 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -1,101 +1,102 @@
/**
皮肤颜色附加
*/
-.skin-blue .box.box-primary{
+.skin-blue .box.box-primary {
border-top-color: #fff;
}
-.skin-blue .nav-tabs-custom > .nav-tabs > li.active{
+.skin-blue .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-blue-light .box.box-primary{
+.skin-blue-light .box.box-primary {
border-top-color: #fff;
}
-.skin-blue-light .nav-tabs-custom > .nav-tabs > li.active{
+.skin-blue-light .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-black .box.box-primary{
+.skin-black .box.box-primary {
border-top-color: #fff;
}
-.skin-black .nav-tabs-custom > .nav-tabs > li.active{
+.skin-black .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-black-light .box.box-primary{
+.skin-black-light .box.box-primary {
border-top-color: #fff;
}
-.skin-black-light .nav-tabs-custom > .nav-tabs > li.active{
+.skin-black-light .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-green .box.box-primary{
+.skin-green .box.box-primary {
border-top-color: #fff;
}
-.skin-green .nav-tabs-custom > .nav-tabs > li.active{
+.skin-green .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-green-light .box.box-primary{
+.skin-green-light .box.box-primary {
border-top-color: #fff;
}
-.skin-green-light .nav-tabs-custom > .nav-tabs > li.active{
+.skin-green-light .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-purple .box.box-primary{
+.skin-purple .box.box-primary {
border-top-color: #fff;
}
-.skin-purple .nav-tabs-custom > .nav-tabs > li.active{
+.skin-purple .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-purple-light .box.box-primary{
+.skin-purple-light .box.box-primary {
border-top-color: #fff;
}
-.skin-purple-light .nav-tabs-custom > .nav-tabs > li.active{
+.skin-purple-light .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-red .box.box-primary{
+.skin-red .box.box-primary {
border-top-color: #fff;
}
-.skin-red .nav-tabs-custom > .nav-tabs > li.active{
+.skin-red .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-red-light .box.box-primary{
+.skin-red-light .box.box-primary {
border-top-color: #fff;
}
-.skin-red-light .nav-tabs-custom > .nav-tabs > li.active{
+.skin-red-light .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-yellow .box.box-primary{
+.skin-yellow .box.box-primary {
border-top-color: #fff;
}
-.skin-yellow .nav-tabs-custom > .nav-tabs > li.active{
+.skin-yellow .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
-.skin-yellow-light .box.box-primary{
+.skin-yellow-light .box.box-primary {
border-top-color: #fff;
}
-.skin-yellow-light .nav-tabs-custom > .nav-tabs > li.active{
+.skin-yellow-light .nav-tabs-custom > .nav-tabs > li.active {
border-top-color: #fff;
}
+
.layout-boxed {
background: url('../images/boxed-bg.jpg') repeat fixed;
}
@@ -105,9 +106,11 @@
height: 2px;
background-color: #eee;
}
+
::-webkit-scrollbar-thumb {
background-color: #d0afaf;
}
+
::-webkit-scrollbar-track {
background-color: #eee;
}
@@ -129,16 +132,19 @@
transition: all .2s ease-in-out
}
-.btn-header:hover{
- background:#3c8dbc;color:#fff
+.btn-header:hover {
+ background: #3c8dbc;
+ color: #fff
}
-.table-responsive{
- border: none!important;
+.table-responsive {
+ border: none !important;
}
-.table-bordered{
- border: none!important;
+
+.table-bordered {
+ border: none !important;
}
-.box{
- border-top: none!important;
+
+.box {
+ border-top: none !important;
}
diff --git a/src/main/resources/static/js/app.js b/src/main/resources/static/js/app.js
index 528726ac4..0e4f3a3fa 100755
--- a/src/main/resources/static/js/app.js
+++ b/src/main/resources/static/js/app.js
@@ -185,6 +185,38 @@ $.halo.prototype.showMsgAndRedirect = function (text, icon, hideAfter, url) {
});
};
+/**
+ * 格式化字符串
+ *
+ * @param a a
+ * @returns {*} a
+ */
+$.halo.prototype.formatContent = function (a) {
+ a = a.replace(/\r\n/g, '
');
+ a = a.replace(/\n/g, '
');
+ a = a.replace(/\s/g, ' ');
+ return a;
+};
+
+/**
+ * layer弹出框
+ *
+ * @param url 地址
+ * @param title 标题
+ */
+$.halo.prototype.layerModal = function (url, title) {
+ layer.open({
+ type: 2,
+ title: title,
+ shadeClose: true,
+ shade: 0.5,
+ maxmin: true,
+ area: ['90%', '90%'],
+ content: url,
+ scrollbar: false
+ });
+};
+
/**
* 保存设置选项
*/
diff --git a/src/main/resources/static/js/comment.js b/src/main/resources/static/js/comment.js
index 5b8b09e50..e8c113b6a 100644
--- a/src/main/resources/static/js/comment.js
+++ b/src/main/resources/static/js/comment.js
@@ -5,7 +5,7 @@ var s = new OwO({
position: 'down',
width: '100%',
maxHeight: '210px',
- api:"/static/plugins/OwO/OwO.min.json"
+ api: "/static/plugins/OwO/OwO.min.json"
});
$(document).ready(function () {
$(".comment-list-one-head").each(function (i) {
@@ -27,10 +27,10 @@ $('#comment-submit').click(function () {
$(".comment-message").fadeIn(1000);
setTimeout(function () {
$(".comment-message").fadeOut(1000);
- },1500);
+ }, 1500);
return;
}
- $(this).attr("disabled","disabled");
+ $(this).attr("disabled", "disabled");
$(this).html("提交中...");
$.ajax({
type: 'POST',
@@ -49,11 +49,11 @@ $('#comment-submit').click(function () {
localStorage.setItem('author', author.val());
localStorage.setItem('email', email.val());
localStorage.setItem('url', url.val());
- if(data.code==1){
+ if (data.code == 1) {
$('.comment-input-content').val("");
- $(".comment-message").html(""+data.msg+"");
- }else{
- $(".comment-message").html(""+data.msg+"");
+ $(".comment-message").html("" + data.msg + "");
+ } else {
+ $(".comment-message").html("" + data.msg + "");
}
$(".comment-message").fadeIn(1000);
setTimeout(function () {
@@ -61,21 +61,21 @@ $('#comment-submit').click(function () {
$("#comment-submit").removeAttr("disabled");
$("#comment-submit").html("提交");
window.location.reload();
- },1500);
+ }, 1500);
}
});
});
$('.comment-list-one-footer-reback').click(function () {
var at = $(this).attr("at");
- var commentParentAuthor = $('#comment-id-'+at).find(".comment-list-one-head-name").html();
+ var commentParentAuthor = $('#comment-id-' + at).find(".comment-list-one-head-name").html();
$('#commentParent').val(at);
- $('#commentContent').attr("placeholder","@"+commentParentAuthor);
+ $('#commentContent').attr("placeholder", "@" + commentParentAuthor);
$(".comment-cancel-reply").show();
$('#commentContent').focus();
});
$('.comment-cancel-reply').click(function () {
$('#commentParent').val(0);
- $('#commentContent').attr("placeholder","");
+ $('#commentContent').attr("placeholder", "");
$(".comment-cancel-reply").hide();
});
@@ -83,9 +83,9 @@ $('.comment-cancel-reply').click(function () {
* 加载头像
*/
function loadAvatar() {
- $(".comment-author-avatar").attr("src","//gravatar.loli.net/avatar/"+md5(localStorage.getItem("email"))+"?s=256&d="+avatarType);
- if($('input[name=commentAuthorEmail]').val()!='' && $('input[name=commentAuthorEmail]').val()!=null){
- $(".comment-author-avatar").attr("src","//gravatar.loli.net/avatar/"+md5($('input[name=commentAuthorEmail]').val())+"?s=256&d="+avatarType);
+ $(".comment-author-avatar").attr("src", "//gravatar.loli.net/avatar/" + md5(localStorage.getItem("email")) + "?s=256&d=" + avatarType);
+ if ($('input[name=commentAuthorEmail]').val() != '' && $('input[name=commentAuthorEmail]').val() != null) {
+ $(".comment-author-avatar").attr("src", "//gravatar.loli.net/avatar/" + md5($('input[name=commentAuthorEmail]').val()) + "?s=256&d=" + avatarType);
}
}
@@ -95,15 +95,16 @@ function loadAvatar() {
* @returns {string}
*/
var parser = new UAParser();
-function show_ua(string){
+
+function show_ua(string) {
parser.setUA(string);
var uua = parser.getResult();
- if(uua.os.version=='x86_64') {
+ if (uua.os.version == 'x86_64') {
uua.os.version = 'x64';
}
- var browser = uua.browser.name+' '+uua.browser.version;
+ var browser = uua.browser.name + ' ' + uua.browser.version;
var os = uua.os.name + ' ' + uua.os.version;
- return ''+browser+''+os+'';
+ return '' + browser + '' + os + '';
}
/**
diff --git a/src/main/resources/static/js/login.js b/src/main/resources/static/js/login.js
index db24b7f6f..b412965ba 100644
--- a/src/main/resources/static/js/login.js
+++ b/src/main/resources/static/js/login.js
@@ -2,27 +2,28 @@ var halo = new $.halo();
$(document).ready(function () {
$("#login-name").val(localStorage.getItem("loginName"));
});
+
function btn_login() {
$('#btn-login').button('loading');
var name = $("#login-name").val();
var pwd = $("#login-pwd").val();
- if(name==""||pwd==""){
- halo.showMsg("请输入完整信息!",'info',2000);
+ if (name == "" || pwd == "") {
+ halo.showMsg("请输入完整信息!", 'info', 2000);
$('#btn-login').button('reset');
- }else{
+ } else {
$.ajax({
type: 'POST',
url: '/admin/getLogin',
async: false,
- data:{
+ data: {
'loginName': name,
'loginPwd': pwd
},
success: function (data) {
localStorage.setItem('loginName', $("#login-name").val());
- if(data.code==1){
- halo.showMsgAndRedirect(data.msg,'success',1000,'/admin');
- }else{
+ if (data.code == 1) {
+ halo.showMsgAndRedirect(data.msg, 'success', 1000, '/admin');
+ } else {
$('.login-body').addClass('animate shake');
$.toast({
text: data.msg,
@@ -46,8 +47,9 @@ function btn_login() {
});
}
}
+
$(document).keydown(function (event) {
- if(event.keyCode == 13){
+ if (event.keyCode == 13) {
btn_login();
}
});
diff --git a/src/main/resources/templates/admin/admin_attachment.ftl b/src/main/resources/templates/admin/admin_attachment.ftl
index b5ae1a723..e4dada499 100755
--- a/src/main/resources/templates/admin/admin_attachment.ftl
+++ b/src/main/resources/templates/admin/admin_attachment.ftl
@@ -33,7 +33,7 @@