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 into sprint/241_tianshujie_bug

Browse Source
This commit is contained in:
tianshujie
2022-09-26 08:12:31 +08:00
parent e553730c29 d3911c77e6
commit e82f1f6d6a
35 changed files with 4114 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/css/browse.css
+2 -1
View File
@@ -14,7 +14,8 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
.has-suffix > a {padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
.is-nest-child span.table-nest-icon {visibility: hidden; width: 0;}
tr[data-type="project"] span.table-nest-icon {visibility: hidden; width: 0;}
tr[data-type="project"].no-nest .c-name {padding-left: 12px;}
div.checkbox-primary + span.table-nest-icon {margin-left: 0px !important;}
#checkAll + label.hover:after {border-width: 0px;}
module/program/view/browsebylist.html.php
+4 -4
View File
@@ -48,7 +48,7 @@
$originOrders[] = $program->order;
?>
<tr <?php echo $trAttrs;?>>
<tr <?php echo $trAttrs;?> data-type="<?php echo $program->type;?>">
<td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?> has-prefix has-suffix' title='<?php echo $program->name?>'>
<?php
$icon = '';
@@ -58,6 +58,7 @@
?>
<span class="table-nest-icon icon <?php echo $class . $icon;?>"></span>
<?php if($program->type == 'program'):?>
&nbsp;<span class="icon icon-cards-view" style="color: #888fa1;"></span>
<?php echo ($app->user->admin or strpos(",{$app->user->view->programs},", ",$program->id,") !== false) ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?>
<?php else:?>
<?php echo html::a($this->createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?>
@@ -117,9 +118,8 @@
#programTableList .icon-scrum:before {content: '\e9a2';}
#programTableList .icon-waterfall:before {content: '\e9a4';}
#programTableList .icon-kanban:before {content: '\e983';}
#programTableList .is-top-level {font-weight: bold;}
#programTableList .has-nest-child > .c-name > a {color: #0b0f18!important;}
/* #programTableList .is-nest-child > .c-name > a {color: #2463C7!important;} */
/* #programTableList .has-nest-child > .c-name > a {color: #0b0f18!important;}
#programTableList .is-nest-child > .c-name > a {color: #2463c7!important;} */
#programTableList .c-name .label-danger {position: absolute; right: 10px; padding: 2px 4px;}
</style>
<?php js::set('originOrders', $originOrders);?>
module/program/view/edit.html.php
+1 -1
View File
@@ -144,7 +144,7 @@
<h4 class="modal-title"><?php echo $lang->program->changePRJUnit;?></h4>
</div>
<div class="modal-body">
<form method='post'>
<form method='post' class='not-watch'>
<table class='table table-form'>
<tr>
<td colspan='3'><div class='alert alert-info no-margin'><?php echo $lang->program->confirmChangePRJUint;?></div></td>