diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/openapi/JobApiController.java similarity index 98% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/openapi/JobApiController.java index ad3f186d..1be49828 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/openapi/JobApiController.java @@ -1,4 +1,4 @@ -package com.xxl.job.admin.controller.biz; +package com.xxl.job.admin.controller.openapi; import com.xxl.job.admin.scheduler.conf.XxlJobAdminConfig; import com.xxl.job.core.biz.AdminBiz; diff --git a/xxl-job-admin/src/main/resources/static/js/common.1.js b/xxl-job-admin/src/main/resources/static/js/common.1.js index 675ff874..a601bbfd 100644 --- a/xxl-job-admin/src/main/resources/static/js/common.1.js +++ b/xxl-job-admin/src/main/resources/static/js/common.1.js @@ -1,5 +1,8 @@ $(function(){ + + // ---------------------- logout ---------------------- + // logout $("#logoutBtn").click(function(){ layer.confirm( I18n.logout_confirm , { @@ -28,6 +31,9 @@ $(function(){ }); + + // ---------------------- update pwd ---------------------- + // update pwd $('#updatePwd').on('click', function(){ $('#updatePwdModal').modal({backdrop: false, keyboard: false}).modal('show'); @@ -99,6 +105,9 @@ $(function(){ $("#updatePwdModal .form .form-group").removeClass("has-error"); }); + + // ---------------------- slideToTop ---------------------- + // slideToTop var slideToTop = $("
"); slideToTop.html(''); @@ -142,9 +151,27 @@ $(function(){ }); + // ---------------------- body fixed ---------------------- + + // init body fixed + $('body').addClass('fixed'); + + + // ---------------------- menu, sidebar-toggle ---------------------- + + // init menu speed + $('.sidebar-menu').attr('data-animation-speed', 1); // default 300ms + + // init menu status + if ( 'close' === $.cookie('sidebar_status') ) { + $('body').addClass('sidebar-collapse'); + } else { + $('body').removeClass('sidebar-collapse'); + } + // change menu status $('.sidebar-toggle').click(function(){ - if ( 'close' == $.cookie('sidebar_status') ) { + if ( 'close' === $.cookie('sidebar_status') ) { $.cookie('sidebar_status', 'open', { expires: 7 }); } else { $.cookie('sidebar_status', 'close', { expires: 7 }); //$.cookie('the_cookie', '', { expires: -1 }); diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js index 0e5b2356..e9b16e41 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js @@ -140,8 +140,8 @@ $(function() { var html = ''; if (row.registryList) { for (var index in row.registryList) { - html += ''; - html += ''; + html += ''; + html += ''; } } html += '
' + (parseInt(index)+1) + '' + row.registryList[index] + '
' + (parseInt(index)+1) + '' + row.registryList[index] + '
'; diff --git a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl index 1e792944..2f2d1266 100644 --- a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl +++ b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl @@ -61,17 +61,6 @@ diff --git a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl index 25f44c6a..2141abb1 100644 --- a/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl @@ -87,7 +87,7 @@