🍎 后台优化

2018-07-12 11:03:21 +08:00 · 2018-07-12 11:03:21 +08:00 · e31b6d9d24
parent 08a915850b
commit e31b6d9d24
11 changed files with 101 additions and 103 deletions
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@ -98,4 +98,16 @@
 }
 .layout-boxed {
    background: url('../images/boxed-bg.jpg') repeat fixed;
+}
+
+::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    background-color: transparent;
+}
+::-webkit-scrollbar-thumb {
+    background-color: transparent;
+}
+::-webkit-scrollbar-track {
+    background-color: transparent;
 }
--- a/src/main/resources/static/js/app.js
+++ b/src/main/resources/static/js/app.js
@ -1,10 +1,23 @@
 $(document).ready(function () {
+    if($(window).width()<1024){
+        if($('body').hasClass('layout-boxed')){
+            $('body').removeClass('layout-boxed');
+        }
+        if($('body').hasClass('sidebar-collapse')){
+            $('body').removeClass('sidebar-collapse');
+        }
+    }
    initMenu();
 });

+$(document).on('pjax:clicked', function() {
+    $('.content-wrapper').html("");
+});
+
 $(document).on('pjax:complete',function () {
    initMenu();
 });
+
 /**
 * https://github.com/JpressProjects/jpress/blob/master/jpress-web/src/main/resources/static/admin/js/jpressadmin.js
 */
--- a/src/main/resources/templates/admin/admin_attachment.ftl
+++ b/src/main/resources/templates/admin/admin_attachment.ftl
@ -8,7 +8,6 @@
    <!-- 菜单栏模块 -->
    <#include "module/_sidebar.ftl">
    <div class="content-wrapper">
-        <link rel="stylesheet" href="/static/plugins/fileinput/fileinput.min.css">
        <style type="text/css" rel="stylesheet">
            #showForm{margin-left:4px;padding:3px 6px;position:relative;top:-4px;border:1px solid #ccc;border-radius:2px;background:#fff;text-shadow:none;font-weight:600;font-size:12px;line-height:normal;color:#3c8dbc;cursor:pointer;transition:all .2s ease-in-out}
            #showForm:hover{background:#3c8dbc;color:#fff}
@ -56,7 +55,6 @@
                </div>
            </div>
        </section>
-        <script src="/static/plugins/layer/layer.js"></script>
        <script type="application/javascript">
            function openDetail(id) {
                layer.open({
@ -71,39 +69,35 @@
                });
            }
            function loadFileInput() {
-                $.getScript("/static/plugins/fileinput/fileinput.min.js",function () {
-                    $.getScript("/static/plugins/fileinput/zh.min.js",function () {
-                        $('#uploadImg').fileinput({
-                            language: 'zh',
-                            uploadUrl: '/admin/attachments/upload',
-                            uploadAsync: true,
-                            allowedFileExtensions: ['jpg','gif','png','jpeg','svg','psd'],
-                            maxFileCount: 100,
-                            enctype : 'multipart/form-data',
-                            showClose: false
-                        }).on("fileuploaded",function (event,data,previewId,index) {
-                            var data = data.jqXHR.responseJSON;
-                            if(data.success=="1"){
-                                $("#uploadForm").hide(400);
-                                $.toast({
-                                    text: "上传成功！",
-                                    heading: '提示',
-                                    icon: 'success',
-                                    showHideTransition: 'fade',
-                                    allowToastClose: true,
-                                    hideAfter: 1000,
-                                    stack: 1,
-                                    position: 'top-center',
-                                    textAlign: 'left',
-                                    loader: true,
-                                    loaderBg: '#ffffff',
-                                    afterHidden: function () {
-                                        window.location.reload();
-                                    }
-                                });
+                $('#uploadImg').fileinput({
+                    language: 'zh',
+                    uploadUrl: '/admin/attachments/upload',
+                    uploadAsync: true,
+                    allowedFileExtensions: ['jpg','gif','png','jpeg','svg','psd'],
+                    maxFileCount: 100,
+                    enctype : 'multipart/form-data',
+                    showClose: false
+                }).on("fileuploaded",function (event,data,previewId,index) {
+                    var data = data.jqXHR.responseJSON;
+                    if(data.success=="1"){
+                        $("#uploadForm").hide(400);
+                        $.toast({
+                            text: "上传成功！",
+                            heading: '提示',
+                            icon: 'success',
+                            showHideTransition: 'fade',
+                            allowToastClose: true,
+                            hideAfter: 1000,
+                            stack: 1,
+                            position: 'top-center',
+                            textAlign: 'left',
+                            loader: true,
+                            loaderBg: '#ffffff',
+                            afterHidden: function () {
+                                window.location.reload();
                            }
                        });
-                    });
+                    }
                });
            }
            $(document).ready(function () {
--- a/src/main/resources/templates/admin/admin_index.ftl
+++ b/src/main/resources/templates/admin/admin_index.ftl
@ -358,8 +358,6 @@
                </div>
            </div>
        </div>
-        <script src="/static/plugins/layer/layer.js"></script>
-        <script src="/static/js/app.js"></script>
        <script type="application/javascript">
            $(document).ready(function () {
                var dateBegin = new Date("${options.blog_start?default('0000-00-00')}");
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@ -615,8 +615,6 @@
                </div>
            </div>
        </section>
-        <script src="/static/plugins/layer/layer.js"></script>
-        <script src="/static/js/app.js"></script>
        <@compress single_line=true>
        <script>
            $(function () {
--- a/src/main/resources/templates/admin/admin_page_gallery.ftl
+++ b/src/main/resources/templates/admin/admin_page_gallery.ftl
@ -109,7 +109,6 @@
                </div>
            </div>
        </section>
-        <script src="/static/plugins/layer/layer.js"></script>
        <script type="application/javascript">
            $('#btnNewPicture').click(function () {
                $('#newPicturePanel').slideToggle(400);
--- a/src/main/resources/templates/admin/admin_page_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl
@ -114,7 +114,6 @@
                </div>
            </div>
        </section>
-        <script src="/static/plugins/layer/layer.js"></script>
        <script src="/static/plugins/editor.md/editormd.min.js"></script>
        <script>

@ -272,7 +271,7 @@
                });
            }

-            setInterval("autoPush()","30000");
+            setInterval("autoPush()","60000");
            /**
             * 自动保存文章
             */
--- a/src/main/resources/templates/admin/admin_post_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl
@ -165,7 +165,6 @@
                </div>
            </div>
        </section>
-        <script src="/static/plugins/layer/layer.js"></script>
        <script src="/static/plugins/editor.md/editormd.min.js"></script>
        <script src="/static/plugins/jquery-tageditor/jquery.tag-editor.min.js"></script>
        <script src="/static/plugins/jquery-tageditor/jquery.caret.min.js"></script>
@ -366,7 +365,7 @@
                    }
                });
            }
-            setInterval("autoPush()","30000");
+            setInterval("autoPush()","60000");
            /**
             * 自动保存文章
             */
--- a/src/main/resources/templates/admin/admin_profile.ftl
+++ b/src/main/resources/templates/admin/admin_profile.ftl
@ -131,7 +131,6 @@
                </div>
            </div>
        </section>
-        <script src="/static/plugins/layer/layer.js"></script>
        <@compress single_line=true>
        <script>
            $(function () {
--- a/src/main/resources/templates/admin/admin_theme.ftl
+++ b/src/main/resources/templates/admin/admin_theme.ftl
@ -7,7 +7,6 @@
    <!-- 菜单栏模块 -->
    <#include "module/_sidebar.ftl">
    <div class="content-wrapper">
-        <link rel="stylesheet" href="/static/plugins/fileinput/fileinput.min.css">
        <style type="text/css" rel="stylesheet">
            .theme-thumbnail{
                width:100%;
@ -133,56 +132,51 @@
                </div>
            </div>
        </div>
-        <script src="/static/plugins/layer/layer.js"></script>
        <script type="application/javascript">
            function loadFileInput() {
-                $.getScript("/static/plugins/fileinput/fileinput.min.js",function () {
-                    $.getScript("/static/plugins/fileinput/zh.min.js",function () {
-                        $('#uploadTheme').fileinput({
-                            language: 'zh',
-                            uploadUrl: '/admin/themes/upload',
-                            allowedFileExtensions: ['zip','jpg'],
-                            maxFileCount: 1,
-                            enctype: 'multipart/form-data',
-                            dropZoneTitle: '拖拽主题压缩包到这里 &hellip;<br>不支持多个主题同时上传',
-                            showClose: false
-                        }).on("fileuploaded",function (event,data,previewId,index) {
-                            var data = data.jqXHR.responseJSON;
-                            if(data.code==1){
-                                $("#uploadForm").hide(400);
-                                $.toast({
-                                    text: data.msg,
-                                    heading: '提示',
-                                    icon: 'success',
-                                    showHideTransition: 'fade',
-                                    allowToastClose: true,
-                                    hideAfter: 1000,
-                                    stack: 1,
-                                    position: 'top-center',
-                                    textAlign: 'left',
-                                    loader: true,
-                                    loaderBg: '#ffffff',
-                                    afterHidden: function () {
-                                        window.location.reload();
-                                    }
-                                });
-                            }else{
-                                $.toast({
-                                    text: data.msg,
-                                    heading: '提示',
-                                    icon: 'error',
-                                    showHideTransition: 'fade',
-                                    allowToastClose: true,
-                                    hideAfter: 1000,
-                                    stack: 1,
-                                    position: 'top-center',
-                                    textAlign: 'left',
-                                    loader: true,
-                                    loaderBg: '#ffffff'
-                                });
+                $('#uploadTheme').fileinput({
+                    language: 'zh',
+                    uploadUrl: '/admin/themes/upload',
+                    allowedFileExtensions: ['zip','jpg'],
+                    maxFileCount: 1,
+                    enctype: 'multipart/form-data',
+                    dropZoneTitle: '拖拽主题压缩包到这里 &hellip;<br>不支持多个主题同时上传',
+                    showClose: false
+                }).on("fileuploaded",function (event,data,previewId,index) {
+                    var data = data.jqXHR.responseJSON;
+                    if(data.code==1){
+                        $("#uploadForm").hide(400);
+                        $.toast({
+                            text: data.msg,
+                            heading: '提示',
+                            icon: 'success',
+                            showHideTransition: 'fade',
+                            allowToastClose: true,
+                            hideAfter: 1000,
+                            stack: 1,
+                            position: 'top-center',
+                            textAlign: 'left',
+                            loader: true,
+                            loaderBg: '#ffffff',
+                            afterHidden: function () {
+                                window.location.reload();
                            }
                        });
-                    });
+                    }else{
+                        $.toast({
+                            text: data.msg,
+                            heading: '提示',
+                            icon: 'error',
+                            showHideTransition: 'fade',
+                            allowToastClose: true,
+                            hideAfter: 1000,
+                            stack: 1,
+                            position: 'top-center',
+                            textAlign: 'left',
+                            loader: true,
+                            loaderBg: '#ffffff'
+                        });
+                    }
                });
            }
            $(document).ready(function () {
--- a/src/main/resources/templates/admin/module/_macro.ftl
+++ b/src/main/resources/templates/admin/module/_macro.ftl
@ -14,13 +14,13 @@
    <link rel="stylesheet" href="/static/css/style.css">
    <link rel="stylesheet" href="/static/css/loader.css">
    <link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css">
+    <link rel="stylesheet" href="/static/plugins/fileinput/fileinput.min.css">
    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <script src="//oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="//oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
    <script src="/static/plugins/jquery/jquery.min.js"></script>
    <script src="/static/plugins/bootstrap/js/bootstrap.min.js"></script>
-
 </head>
 <body class="hold-transition sidebar-mini ${options.admin_theme?default('skin-blue')} ${options.admin_layout?default('')} ${options.sidebar_style?default('')}">
 <#if options.admin_loading?default("false") == "true">
@ -45,6 +45,9 @@
 <script src="/static/plugins/pace/pace.min.js"></script>
 <script src="/static/js/adminlte.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/fileinput/fileinput.min.js"></script>
+<script src="/static/plugins/fileinput/zh.min.js"></script>
 <script src="/static/js/app.js"></script>
 <@compress single_line=true>
 <script>
@ -63,16 +66,6 @@
            },500);
        });
    </#if>
-    $(function () {
-        if($(window).width()<1024){
-            if($('body').hasClass('layout-boxed')){
-                $('body').removeClass('layout-boxed');
-            }
-            if($('body').hasClass('sidebar-collapse')){
-                $('body').removeClass('sidebar-collapse');
-            }
-        }
-    });
 </script>
 </@compress>
 </body>