diff --git a/blog-admin/src/main/resources/static/assets/js/gentelella.core.js b/blog-admin/src/main/resources/static/assets/js/gentelella.core.js index e29db0520b271e8a172d8299a6dc4858df0a9c9d..5f0ca5f41728baacdd7e8aa8d73432dc8d8e4ce3 100644 --- a/blog-admin/src/main/resources/static/assets/js/gentelella.core.js +++ b/blog-admin/src/main/resources/static/assets/js/gentelella.core.js @@ -51,12 +51,6 @@ var gentelella = window.gentelella || { return validator.checkAll($(this)) || (b = !1), b && this.submit(), !1 })); }, - initHelloMsg: function () { - var $helloMsg = $("#hello_msg"); - var now = new Date(); - var nowHours = now.getHours(); - $helloMsg.html((nowHours >= 0 && nowHours <= 5) ? "凌晨好" : (nowHours > 5 && nowHours <= 9) ? "早上好" : ((nowHours > 9 && nowHours <= 12) ? "上午好" : ((nowHours > 12 && nowHours <= 13) ? "中午好" : ((nowHours > 13 && nowHours <= 18) ? "下午好" : "晚上好")))); - }, initSwitchery: function (delay) { setTimeout(function () { var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch')); @@ -166,5 +160,4 @@ $(document).ready(function () { gentelella.initSidebar(); gentelella.initDaterangepicker(); gentelella.initValidator(); - gentelella.initHelloMsg(); }); \ No newline at end of file diff --git a/blog-admin/src/main/resources/static/assets/js/zhyd.table.js b/blog-admin/src/main/resources/static/assets/js/zhyd.table.js index 1ceee2588fd074e5951655a6d49d385758e49686..f2570a3aeb7d27ac23b228e61e0eb92187dcbfda 100644 --- a/blog-admin/src/main/resources/static/assets/js/zhyd.table.js +++ b/blog-admin/src/main/resources/static/assets/js/zhyd.table.js @@ -126,7 +126,7 @@ Table.prototype = { type: "post", url: options.getInfoUrl.replace("{id}", userId), success: function (json) { - if(json.status != 200) { + if (json.status != 200) { $.alert.error(json.message); return; } @@ -155,7 +155,7 @@ Table.prototype = { /* 删除 */ function remove(ids) { var len = 1; - if(typeof ids == "object") { + if (typeof ids == "object") { len = ids.length; } $.alert.confirm("确定删除已选中的" + len + "条 [ " + options.modalName + " ] 信息?", function () { @@ -191,11 +191,11 @@ Table.prototype = { remove(userId); }); }, - bindEvent: function(eventName, selector, callback){ + bindEvent: function (eventName, selector, callback) { var options = this.options; $(options.tableBox).on(eventName, selector, callback); }, - bindClickEvent: function(selector, callback) { + bindClickEvent: function (selector, callback) { this.bindEvent("click", selector, callback); }, queryParams: function (params) { @@ -205,6 +205,10 @@ Table.prototype = { }, refresh: function () { var options = this.options; + if (options.reloadAll) { + window.location.reload(); + return; + } $(options.tableBox).bootstrapTable('refresh', {url: options.url}); }, getSelectedIds: function () { @@ -239,7 +243,7 @@ Table.prototype = { url: url, success: function (json) { $.alert.ajaxSuccess(json); - if(json.status == 200) { + if (json.status == 200) { $modal.modal('hide'); } $table.refresh(); @@ -253,7 +257,7 @@ Table.prototype = { data: $form.serialize(), success: function (json) { $.alert.ajaxSuccess(json); - if(json.status == 200) { + if (json.status == 200) { $modal.modal('hide'); } $table.refresh(); @@ -272,7 +276,7 @@ Table.prototype = { }); }, clearText: function ($this, type, info) { - if($this.hasClass("final") || $this.data("final")) { + if ($this.hasClass("final") || $this.data("final")) { return; } var $div = $this.parents(".item"); @@ -315,9 +319,9 @@ Table.prototype = { } $this.val(thisValue); } else { - if(type == 'file') { + if (type == 'file') { var previewContainer = $this.data("preview-container"); - if(previewContainer) { + if (previewContainer) { $(previewContainer).html('') } } else if (type == 'password') { diff --git a/blog-admin/src/main/resources/static/assets/js/zhyd.treetable.js b/blog-admin/src/main/resources/static/assets/js/zhyd.treetable.js index d3982ed56aa6d2eeae15394020b6ae37b8db7d36..fe9a11b9c0caf340fa3823c2a4670fb6ff1018e4 100644 --- a/blog-admin/src/main/resources/static/assets/js/zhyd.treetable.js +++ b/blog-admin/src/main/resources/static/assets/js/zhyd.treetable.js @@ -18,7 +18,7 @@ $.extend({ toobarTemplate: '
', oprater: { title: '操作', - width: '100px', + width: '120px', align: "center", formatter: function (value, row, index) { var curId = row.id; @@ -56,6 +56,12 @@ $.extend({ */ refresh: function (tableOptions) { var initOptions = $.extend({}, this._default_config, tableOptions); + + if (initOptions.reloadAll) { + window.location.reload(); + return; + } + // $(initOptions.containerBox).data('bootstrap.tree.table').load(); $(initOptions.containerBox).bootstrapTreeTable('refresh'); }, @@ -90,7 +96,7 @@ $.extend({ success: function (json) { $.alert.ajaxSuccess(json); $("#addOrUpdateModal").modal('hide'); - $.table.refresh(); + $.table.refresh(initOptions); }, error: $.alert.ajaxError }); @@ -140,7 +146,7 @@ $.extend({ data: {'ids': ids}, success: function (json) { $.alert.ajaxSuccess(json); - $.table.refresh(); + $.table.refresh(initOptions); }, error: $.alert.ajaxError }, function () { diff --git a/blog-admin/src/main/resources/templates/article/tags.ftl b/blog-admin/src/main/resources/templates/article/tags.ftl index dd075e05ea3c8733a072586a411146fe3f749aa5..c8221382886aeee2e5892d68e5d55114074cc103 100644 --- a/blog-admin/src/main/resources/templates/article/tags.ftl +++ b/blog-admin/src/main/resources/templates/article/tags.ftl @@ -33,7 +33,7 @@ -<@addOrUpdateMOdal defaultTitle="添加标签"> +<@addOrUpdateModal defaultTitle="添加标签">
@@ -47,7 +47,7 @@
- + <@footer> - \ No newline at end of file diff --git a/blog-web/src/main/resources/templates/archives.ftl b/blog-web/src/main/resources/templates/archives.ftl index ca3863c56a57bf34141117fc398a8b94bd84f46c..a767a662db22b5234c5a033c706ff944f72dcc72 100644 --- a/blog-web/src/main/resources/templates/archives.ftl +++ b/blog-web/src/main/resources/templates/archives.ftl @@ -79,6 +79,5 @@ })(); }); - \ No newline at end of file diff --git a/blog-web/src/main/resources/templates/article.ftl b/blog-web/src/main/resources/templates/article.ftl index 67805048d309356beec802e5024caf59fd644041..653ec405072be3b80d9e9abf58ff5994cb4666ac 100644 --- a/blog-web/src/main/resources/templates/article.ftl +++ b/blog-web/src/main/resources/templates/article.ftl @@ -216,7 +216,6 @@ var coverImg = $("#cover-img").attr("src") || "${config.staticWebSite}/img/default_article_cover.jpg"; window._bd_share_config={"common":{"bdSnsKey":{},"bdText":bdText,"bdMini":"2","bdMiniList":["mshare","qzone","tsina","bdysc","weixin","renren","tqq","kaixin001","tqf","tieba","douban","bdhome","sqq","youdao","sdo","qingbiji","mail","isohu","ty","fbook","twi","linkedin","h163","evernotecn","copy","print"],"bdPic":coverImg,"bdStyle":"1","bdSize":"24"},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)]; - diff --git a/blog-web/src/main/resources/templates/disclaimer.ftl b/blog-web/src/main/resources/templates/disclaimer.ftl index b413a2cdbe46e519e240f63349a5e66028cc4370..77abaac63139ac467234833de5155936bd304b3e 100644 --- a/blog-web/src/main/resources/templates/disclaimer.ftl +++ b/blog-web/src/main/resources/templates/disclaimer.ftl @@ -39,7 +39,4 @@ <#include "layout/sidebar.ftl"/> -<@footer> - - \ No newline at end of file diff --git a/blog-web/src/main/resources/templates/guestbook.ftl b/blog-web/src/main/resources/templates/guestbook.ftl index 02837fbd21547329870b823e08ea39833f181b9e..6f931b66de7f596893deaea4f067f97a5f088e22 100644 --- a/blog-web/src/main/resources/templates/guestbook.ftl +++ b/blog-web/src/main/resources/templates/guestbook.ftl @@ -36,8 +36,6 @@ <@footer> - - diff --git a/blog-web/src/main/resources/templates/index.ftl b/blog-web/src/main/resources/templates/index.ftl index 482c1b3cb281f2630e256d9c0bf7b4b0dbb4751a..d7e8e3a0379ad1c2273965f7f37dde55d417ff15 100644 --- a/blog-web/src/main/resources/templates/index.ftl +++ b/blog-web/src/main/resources/templates/index.ftl @@ -9,22 +9,6 @@
<@prompt>
@@ -101,17 +85,16 @@
-
亲,啥也没找到啊~~[囧]
-
换个姿势,再来一次~~
+
暂无相关文章
- 惩罚我 +
- + diff --git a/blog-web/src/main/resources/templates/layout/sidebar.ftl b/blog-web/src/main/resources/templates/layout/sidebar.ftl index 72130e87d44b2f73b5e78a20fefb9e732759cfe0..fcc44832c2ffe6c79a2097f868ee14a726f22696 100644 --- a/blog-web/src/main/resources/templates/layout/sidebar.ftl +++ b/blog-web/src/main/resources/templates/layout/sidebar.ftl @@ -1,11 +1,5 @@
<#if articleDetail??> - <#else>