Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-09-19 10:48:36 +08:00
parent c78de38680 8bcac87dc1
commit c9db0cac7a
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/datatable.html.php
+4 -5
View File
@@ -3,7 +3,6 @@
<?php css::import($jsRoot . 'datatable/min.css'); ?>
<?php if(!empty($lang->datatable)):?>
<style>
.datatable .table>tbody>tr.active>td.col-hover, .datatable .table>tbody>tr.active.hover>td {background-color: #f3eed8 !important;}
.datatable {margin-bottom: 0;}
.datatable .table>tbody>tr>td, .datatable .table>thead>tr>th {line-height: 30px; padding-top: 3px; padding-bottom: 3px; height: 40px; vertical-align: middle; white-space: nowrap;}
.datatable .table>tbody>tr.hover {box-shadow: none!important;}
@@ -30,15 +29,15 @@
.datatable .fixed-right tbody>tr>td {padding-left: 5px!important;}
.datatable .c-actions {white-space: nowrap;}
.datatable.head-fixed {padding-top: 41px;}
.datatable .table>thead>tr>th.col-hover {background: rgba(0,0,0,.075);}
.datatable .table>thead>tr>th.col-hover {background: rgba(0,0,0,.07);}
</style>
<script>
<script>
<?php $datatableId = $this->moduleName . ucfirst($this->methodName);?>
$(document).ready(function()
{
var datatableOptions =
{
customizable : false,
customizable : false,
sortable : false,
scrollPos : 'out',
tableClass : 'tablesorter',
@@ -104,7 +103,7 @@ $(document).ready(function()
url: '<?php echo $this->createLink('datatable', 'ajaxSave')?>'
});
};
var $modal = $('#customDatatable');
var $checkList = $modal.find('.modal-body > .table > tbody');
$checkList.on('click', 'tr', function()
module/common/view/tablesorter.html.php
+1 -1
View File
@@ -12,7 +12,7 @@ table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-hea
table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner{color: #000;font-weight:bold;}
table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d7"; color: #000;}
table.tablesorter tr.tablesorter-headerRow .header.sorter-false .tablesorter-header-inner:after{content:"";}
table.tablesorter.table-borderless > thead > tr > th {border-bottom: 1px solid #ddd;}
table.tablesorter.table-borderless > thead > tr > th {border-bottom: 1px solid #e5e5e5;}
</style>
<script>
function sortTable(selector, options)