diff --git a/application/admin/command/Crud/stubs/javascript.stub b/application/admin/command/Crud/stubs/javascript.stub
index 038a503e..1019d591 100644
--- a/application/admin/command/Crud/stubs/javascript.stub
+++ b/application/admin/command/Crud/stubs/javascript.stub
@@ -25,7 +25,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: '{%order%}',
exportTypes: ['csv', 'excel'],
exportOptions: {
- fileName: '{%controllerUrl%}_' + date.getFullYear() + '-' + date.getMonth() + '-' + date.getDate(),
+ fileName: '{%controllerUrl%}_' + [date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-'),
ignoreColumn: [0, 'operate'], //默认不导出第一列(checkbox)与操作(operate)列
},
columns: [
diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index 6f9a394a..94cea353 100644
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -3,7 +3,7 @@
{include file="common/meta" /}
-
+
diff --git a/public/assets/css/backend.css b/public/assets/css/backend.css
index 77cef5e4..55fe99df 100644
--- a/public/assets/css/backend.css
+++ b/public/assets/css/backend.css
@@ -1,6 +1,6 @@
@import url("../css/bootstrap.min.css");
@import url("../css/fastadmin.min.css");
-@import url("../css/skins/skin-green.css");
+@import url("../css/skins/skin-blue.css");
@import url("../css/iconfont.css");
@import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/toastr.min.css");
@@ -56,7 +56,7 @@ html.ios-fix body {
-webkit-overflow-scrolling: touch;
}
.content {
- min-height: 500px;
+ min-height: 200px;
}
#header {
background: #fff;
@@ -132,7 +132,7 @@ table.table-template {
}
.sp_container .msg-box {
position: absolute;
- right: 0;
+ left: 0;
top: 0;
}
.toast-top-right-index {
diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js
index bf31df10..7c1602b4 100644
--- a/public/assets/js/fast.js
+++ b/public/assets/js/fast.js
@@ -6,7 +6,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
"closeButton": true,
"debug": false,
"newestOnTop": false,
- "progressBar": false,
+ "progressBar": true,
"positionClass": "toast-top-center",
"preventDuplicates": false,
"onclick": null,
@@ -114,10 +114,10 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
},
//打开一个弹出窗口
open: function (url, title, options) {
- title = title ? title : "";
+ title = options.title ? options.title : (title ? title : "");
url = Fast.api.fixurl(url);
url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1";
- var area = [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%'];
+ var area = [$(window).width() > 1000 ? '1000px' : '95%', $(window).height() > 750 ? '750px' : '95%'];
options = $.extend({
type: 2,
title: title,
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 0ad33b96..cab6cc20 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -12,8 +12,9 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
validClass: 'has-success',
invalidClass: 'has-error',
bindClassTo: '.form-group',
- formClass: 'n-default n-bootstrap',
- msgClass: 'n-right',
+ formClass: 'n-yellow n-bootstrap',
+ msgClass: 'n-top',
+ theme: 'yellow_top',
stopOnError: true,
display: function (elem) {
return $(elem).closest('.form-group').find(".control-label").text().replace(/\:/, '');
diff --git a/public/assets/less/backend.less b/public/assets/less/backend.less
index 7df760be..20b2528d 100644
--- a/public/assets/less/backend.less
+++ b/public/assets/less/backend.less
@@ -6,7 +6,7 @@
@import url("../css/bootstrap.min.css");
@import url("../css/fastadmin.min.css");
-@import url("../css/skins/skin-green.css");
+@import url("../css/skins/skin-blue.css");
@import url("../css/iconfont.css");
@import url("../libs/font-awesome/css/font-awesome.min.css");
@import url("../libs/toastr/toastr.min.css");