orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改BUG：更新DataTimePicker组件相关UI

This commit is contained in:
Argo-MacBookPro 2018-08-04 01:31:52 +08:00
parent 7b2198e67c
commit 7507937345
8 changed files with 1954 additions and 1848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Bootstrap.Admin/Views/Admin/Exceptions.cshtml
View File

@ -21,20 +21,28 @@
<div class="card-body"> <div class="card-body">
<form class="form-inline"> <form class="form-inline">
<div class="form-row"> <div class="form-row">
<div class="form-group col-lg-5"> <div class="form-group col-sm-6 col-lg-5">
<label class="control-label" for="txt_operate_start">起始时间</label> <label class="control-label" for="txt_operate_start">起始时间</label>
<div class="input-group date form_date"> <div class="input-group date form_date">
<input id="txt_operate_start" class="form-control" size="16" type="text" value="" readonly> <input id="txt_operate_start" class="form-control" size="16" type="text" value="" readonly>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <div class="input-group-append input-group-addon">
<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span> <div class="input-group-text"><span class="fa fa-times"></span></div>
</div>
<div class="input-group-append input-group-addon">
<div class="input-group-text"><span class="fa fa-calendar"></span></div>
</div>
</div> </div>
</div> </div>
<div class="form-group col-lg-5"> <div class="form-group col-sm-6 col-lg-5">
<label class="control-label" for="txt_operate_end">终止时间</label> <label class="control-label" for="txt_operate_end">终止时间</label>
<div class="input-group date form_date"> <div class="input-group date form_date">
<input id="txt_operate_end" class="form-control" size="16" type="text" value="" readonly> <input id="txt_operate_end" class="form-control" size="16" type="text" value="" readonly>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <div class="input-group-append input-group-addon">
<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span> <div class="input-group-text"><span class="fa fa-times"></span></div>
</div>
<div class="input-group-append input-group-addon">
<div class="input-group-text"><span class="fa fa-calendar"></span></div>
</div>
</div> </div>
</div> </div>
<div class="form-group col-lg-2"> <div class="form-group col-lg-2">

46
Bootstrap.Admin/Views/Admin/Logs.cshtml
View File

@ -4,15 +4,28 @@
Layout = "~/Views/Shared/_Admin.cshtml"; Layout = "~/Views/Shared/_Admin.cshtml";
} }
@section css { @section css {
<link href="~/css/bootstrap-table.css" rel="stylesheet" /> <environment include="Development">
<link href="~/css/bootstrap-datetimepicker.css" rel="stylesheet" /> <link href="~/css/bootstrap-table.css" rel="stylesheet" />
<link href="~/css/bootstrap-datetimepicker.css" rel="stylesheet" />
</environment>
<environment exclude="Development">
<link href="~/css/bootstrap-table.min.css" rel="stylesheet" />
<link href="~/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />
</environment>
} }
@section Javascript { @section Javascript {
<script src="~/js/bootstrap-table.js"></script> <environment include="Development">
<script src="~/js/bootstrap-table-zh-CN.js"></script> <script src="~/js/bootstrap-table.js"></script>
<script src="~/js/longbow.dataentity.js"></script> <script src="~/js/bootstrap-table-zh-CN.js"></script>
<script src="~/js/bootstrap-datetimepicker.js"></script> <script src="~/js/bootstrap-datetimepicker.js"></script>
</environment>
<environment exclude="Development">
<script src="~/js/bootstrap-table.min.js"></script>
<script src="~/js/bootstrap-table-zh-CN.min.js"></script>
<script src="~/js/bootstrap-datetimepicker.min.js"></script>
</environment>
<script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script> <script src="~/js/bootstrap-datetimepicker.zh-CN.js"></script>
<script src="~/js/longbow.dataentity.js"></script>
<script src="~/js/Logs.js"></script> <script src="~/js/Logs.js"></script>
} }
<div class="card"> <div class="card">
@ -20,30 +33,35 @@
<div class="card-body"> <div class="card-body">
<form class="form-inline"> <form class="form-inline">
<div class="form-row"> <div class="form-row">
<div class="form-group col-xs-12"> <div class="form-group col-12">
<label class="control-label" for="txt_operate_type">操作类型</label> <label class="control-label" for="txt_operate_type">操作类型</label>
<input type="text" class="form-control" id="txt_operate_type" /> <input type="text" class="form-control" id="txt_operate_type" />
</div> </div>
</div>
<div class="form-row">
<div class="form-group col-sm-6 col-lg-5"> <div class="form-group col-sm-6 col-lg-5">
<label class="control-label" for="txt_operate_start">起始时间</label> <label class="control-label" for="txt_operate_start">起始时间</label>
<div class="input-group date form_date"> <div class="input-group date form_date">
<input id="txt_operate_start" class="form-control" size="16" type="text" value="" readonly> <input id="txt_operate_start" class="form-control" size="16" type="text" value="" readonly>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <div class="input-group-append input-group-addon">
<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span> <div class="input-group-text"><span class="fa fa-times"></span></div>
</div>
<div class="input-group-append input-group-addon">
<div class="input-group-text"><span class="fa fa-calendar"></span></div>
</div>
</div> </div>
</div> </div>
<div class="form-group col-sm-6 col-lg-5"> <div class="form-group col-sm-6 col-lg-5">
<label class="control-label" for="txt_operate_end">终止时间</label> <label class="control-label" for="txt_operate_end">终止时间</label>
<div class="input-group date form_date"> <div class="input-group date form_date">
<input id="txt_operate_end" class="form-control" size="16" type="text" value="" readonly> <input id="txt_operate_end" class="form-control" size="16" type="text" value="" readonly>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <div class="input-group-append input-group-addon">
<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span> <div class="input-group-text"><span class="fa fa-times"></span></div>
</div>
<div class="input-group-append input-group-addon">
<div class="input-group-text"><span class="fa fa-calendar"></span></div>
</div>
</div> </div>
</div> </div>
<div class="form-group col-lg-2"> <div class="form-group col-lg-2">
<label class="sr-only"></label>
<button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button> <button type="button" id="btn_query" class="btn btn-primary form-control"><i class="fa fa-search" aria-hidden="true"></i><span>查询</span></button>
</div> </div>
</div> </div>

6
Bootstrap.Admin/wwwroot/css/bootstrap-datetimepicker.css vendored
View File

@ -192,7 +192,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a); background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
background-image: -o-linear-gradient(top, #fdd49a, #fdf59a); background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
background-image: linear-gradient(top, #fdd49a, #fdf59a); background-image: linear-gradient(to bottom, #fdd49a, #fdf59a);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
border-color: #fdf59a #fdf59a #fbed50; border-color: #fdf59a #fdf59a #fbed50;
@ -244,7 +244,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
background-image: -o-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc);
background-image: linear-gradient(top, #0088cc, #0044cc); background-image: linear-gradient(to bottom, #0088cc, #0044cc);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
border-color: #0044cc #0044cc #002a80; border-color: #0044cc #0044cc #002a80;
@ -343,7 +343,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
background-image: -o-linear-gradient(top, #0088cc, #0044cc); background-image: -o-linear-gradient(top, #0088cc, #0044cc);
background-image: linear-gradient(top, #0088cc, #0044cc); background-image: linear-gradient(to bottom, #0088cc, #0044cc);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
border-color: #0044cc #0044cc #002a80; border-color: #0044cc #0044cc #002a80;

2
Bootstrap.Admin/wwwroot/css/bootstrap-datetimepicker.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
Bootstrap.Admin/wwwroot/js/Exceptions.js
View File

@ -35,7 +35,8 @@
minView: 2, minView: 2,
forceParse: 0, forceParse: 0,
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
pickerPosition: 'bottom-left' pickerPosition: 'bottom-left',
fontAwesome: true
}); });
$('#btn_view').on('click', function (row) { $('#btn_view').on('click', function (row) {

3
Bootstrap.Admin/wwwroot/js/Logs.js
View File

@ -29,6 +29,7 @@
minView: 2, minView: 2,
forceParse: 0, forceParse: 0,
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
pickerPosition: 'bottom-left' pickerPosition: 'bottom-left',
fontAwesome: true
}); });
}); });

3720
Bootstrap.Admin/wwwroot/js/bootstrap-datetimepicker.js vendored
View File

File diff suppressed because it is too large Load Diff

2
Bootstrap.Admin/wwwroot/js/bootstrap-datetimepicker.min.js vendored
View File

File diff suppressed because one or more lines are too long