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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-07-16 13:20:05 +08:00
parent 382f829564 7bb10b58db
commit 2c8a1ef5ef
27 changed files with 97 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/css/all.css
+2 -1
View File
@@ -35,7 +35,8 @@
#sidebar>.cell {width: 100%;}
.main-table thead>tr:first-of-type>th {border-left: 1px solid #ddd;}
th.table-nest-title .table-nest-toggle {margin-top: 8px; margin-left: 35px;}
th.table-nest-title .nest-has-checkbox {margin-top: 8px; margin-left: 35px;}
th.table-nest-title .nest-none-checkbox {margin-top: 8px; margin-left: 5px;}
th.table-nest-title .header {margin-left: 5px;}
th.table-nest-title .sort-up {padding-left: 5px;}
th.table-nest-title .sort-down {padding-left: 5px;}
module/product/view/all.html.php
+1 -1
View File
@@ -41,7 +41,7 @@
<tr class="text-center">
<th class='table-nest-title text-left' rowspan="2">
<?php if($canBatchEdit) echo "<div class='checkbox-primary check-all' title='{$this->lang->selectAll}'><label></label></div>";?>
<a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse; ?>'></a>
<a class='table-nest-toggle table-nest-toggle-global <?php echo $canBatchEdit ? 'nest-has-checkbox' : 'nest-none-checkbox';?>' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse; ?>'></a>
<?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?>
</th>
<?php if($this->config->URAndSR):?>