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

Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications

Browse Source
This commit is contained in:
chaideqing
2021-12-02 15:46:40 +08:00
parent af6a88cba5 24440ff526
commit c75b9ca550
16 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/x.bug.css
+2 -1
View File
@@ -16,6 +16,7 @@ body {margin-bottom: 0px !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
module/execution/css/x.story.css
+2 -1
View File
@@ -22,6 +22,7 @@ body {margin-bottom: 0px !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
module/execution/css/x.task.css
+2 -1
View File
@@ -16,6 +16,7 @@ body {margin-bottom: 0px !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
::-webkit-scrollbar {width: 10px; height: 10px;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
module/execution/view/bug.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<?php echo $this->execution->getByID($execution->id)->name ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<span title="查看详情">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
</div>
module/execution/view/story.html.php
+1 -1
View File
@@ -143,7 +143,7 @@
<?php echo $this->execution->getByID($execution->id)->name ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<span title="查看详情">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
</div>
module/execution/view/task.html.php
+6 -6
View File
@@ -184,7 +184,7 @@ body {margin-bottom: 25px;}
<?php echo $this->execution->getByID($executionID)->name ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<span title="查看详情">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
</div>
@@ -249,7 +249,7 @@ body {margin-bottom: 25px;}
<thead>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
@@ -279,13 +279,13 @@ body {margin-bottom: 25px;}
<?php foreach($tasks as $task):?>
<tr data-id='<?php echo $task->id;?>' data-status='<?php echo $task->status?>' data-estimate='<?php echo $task->estimate?>' data-consumed='<?php echo $task->consumed?>' data-left='<?php echo $task->left?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
}?>
<?php else:?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
<?php endif;?>
</tr>
@@ -296,13 +296,13 @@ body {margin-bottom: 25px;}
<?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
<tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
$this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);
}?>
<?php else:?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?>
<?php endif;?>
</tr>