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

* finish task 71896

Browse Source
This commit is contained in:
wangzemei
2022-10-09 09:42:29 +08:00
parent 8f02d62c13
commit ca3a61f605
8 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/task.js
+1 -1
View File
@@ -13,7 +13,7 @@ $(function()
adjustTableFooter();
$('body').on('click', '#toggleFold', adjustTableFooter);
$('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter);
$('body').on('click', '.icon.icon-angle-right', adjustTableFooter);
/* The display of the adjusting sidebarHeader is synchronized with the sidebar. */
$(".sidebar-toggle").click(function()
module/execution/model.php
+1 -1
View File
@@ -4882,7 +4882,7 @@ class executionModel extends model
if(isset($execution->delay)) echo "<span class='label label-danger label-badge'>{$this->lang->execution->delayed}</span> ";
if(!empty($execution->children))
{
echo "<a class='plan-toggle' data-id='$execution->id'><i class='icon icon-angle-double-right'></i></a>";
echo "<a class='plan-toggle' data-id='$execution->id'><i class='icon icon-angle-right'></i></a>";
}
break;
case 'code':
module/my/view/story.html.php
+1 -1
View File
@@ -96,7 +96,7 @@
<td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='c-name nobr <?php if(!empty($story->children)) echo "has-child" ?>' title='<?php echo $story->title;?>'>
<?php echo common::hasPriv('story', 'view') ? html::a($storyLink, $story->title, null, "style='color: $story->color' data-group='product'") : $story->title;?>
<?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';;?>
<?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';;?>
</td>
<td class='c-product' title='<?php echo $story->productTitle;?>'><?php echo $story->productTitle;?></td>
<td class='c-plan'><?php echo $story->planTitle;?></td>
module/my/view/task.html.php
+1 -1
View File
@@ -120,7 +120,7 @@
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'");
}
?>
<?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
<?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-right"></i></a>';?>
</td>
<?php if($config->systemMode == 'new'):?>
<?php $projectName = isset($projects[$task->execution]->name) ? $projects[$task->execution]->name : '';?>
module/productplan/view/browsebylist.html.php
+1 -1
View File
@@ -138,7 +138,7 @@
if($plan->parent > 0) echo "<span class='label label-badge label-light' title='{$this->lang->productplan->children}'>{$this->lang->productplan->childrenAB}</span>";
echo html::a(inlink('view', "id=$plan->id"), $plan->title);
if(!empty($expired)) echo $expired;
if(isset($plan->children)) echo '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
if(isset($plan->children)) echo '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-right"></i></a>';
echo '</div>';
?>
</td>
module/project/css/execution.css
+3 -5
View File
@@ -1,4 +1,4 @@
#executionList > thead > tr > th .table-nest-toggle-global {top: 0;}
#executionList > thead > tr > th .table-nest-toggle-global {top: 4px;}
#executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
#executionsSummary {padding-left: 10px;}
#mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
@@ -8,8 +8,6 @@ th.table-nest-title-edit {padding-left: 50px !important;}
th.table-nest-title-edit .table-nest-toggle {left: 28px;}
th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;}
.c-date {text-align: center;}
#executionTableList > tr.has-nest-child .table-nest-toggle {vertical-align: middle;}
#executionTableList > tr:not(.has-nest-child) .table-nest-toggle {display: none;}
#executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
#executionTableList .table-nest-toggle:before,
#executionTableList .table-nest-toggle:after {top: 9px;}
#executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;}
module/story/model.php
+1 -1
View File
@@ -4805,7 +4805,7 @@ class storyModel extends model
if($story->module and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";
if($story->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->story->children . '">' . $this->lang->story->childrenAB . '</span> ';
echo $canView ? html::a($storyLink, $story->title, '', "title='$story->title' style='color: $story->color' data-app='$tab'") : "<span style='color: $story->color'>{$story->title}</span>";
if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';
if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';
break;
case 'plan':
echo isset($story->planTitle) ? $story->planTitle : '';
www/theme/default/style.css
+6 -1
View File
@@ -136,7 +136,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
#executionTableList .c-name .label-danger,
.flex-between {display: flex;align-items: center;justify-content: space-between;}
#toggleFold > .icon {display: inline-block; transition: transform .2s; transform: rotate(-90deg);}
#toggleFold > .icon {display: inline-block; color: #838a9d; font-size: 16px; transition: transform .2s; transform: rotate(-90deg);}
#toggleFold.collapsed > .icon {transform: rotate(90deg);}
#programTableList .c-name .label-danger {position: absolute; right: 4px; padding: 2px 4px;}
@@ -144,3 +144,8 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
#projectForm .c-name,
#executionTableList .c-name,
#programTableList .c-name {padding-right: 64px;}
.table .table-children,
.table .is-nest-child {background: #F8F8F8;}
.table tbody td.has-child .icon-angle-right {color: #838a9d;}