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

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

Browse Source
This commit is contained in:
王怡栋
2021-09-15 10:05:04 +08:00
parent d2ef694ea6 77cab3ad10
commit 310b23c8fa
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/kanban.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
#kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item:hover {box-shadow: none;}
#kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item > .title {white-space: normal;}
#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title {display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center; height: 38px;}
#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;}
#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: block; white-space: nowrap; text-overflow: clip; overflow: hidden;}
#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title.has-icon > .text {margin-right: 5px; max-width: calc(100% - 20px);}
#kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title {display: block; height: 38px;}
#kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: inline-block;}
module/install/lang/en.php
+1 -1
View File
@@ -58,7 +58,7 @@ $lang->install->introductionContent = <<<EOT
<p>Project is used to organize the manpower for development, track and manage the project process, and complete the project in a faster, better, and less costly way.</p>
</div>
<div class='block-details block-right'>
<p class='block-title'><i class='icon icon-product'></i><strong>Execution</strong></p>
<p class='block-title'><i class='icon icon-run'></i><strong>Execution</strong></p>
<p>Execution is used to decompose, assign, and track tasks to ensure that project goals can be implemented by manpower.<p>
</div>
</div>
module/install/lang/zh-cn.php
+1 -1
View File
@@ -58,7 +58,7 @@ $lang->install->introductionContent = <<<EOT
<p>项目用来组织相应的人力进行研发，做好项目过程的跟踪管理，多快好省地完成项目。</p>
</div>
<div class='block-details block-right'>
<p class='block-title'><i class='icon icon-product'></i><strong>执行</strong></p>
<p class='block-title'><i class='icon icon-run'></i><strong>执行</strong></p>
<p>执行用来做任务的分解、指派和跟踪，保证项目目标可以落实到人来执行。<p>
</div>
</div>
module/product/control.php
+4
View File
@@ -1156,6 +1156,10 @@ class product extends control
*/
public function kanban()
{
$this->session->set('projectList', $this->app->getURI(true), 'project');
$this->session->set('productPlanList', $this->app->getURI(true), 'product');
$this->session->set('releaseList', $this->app->getURI(true), 'product');
$kanbanGroup = $this->product->getStats4Kanban();
extract($kanbanGroup);
module/tutorial/js/index.js
+1 -1
View File
@@ -194,7 +194,7 @@ $(function()
}
else
{
$e.parent().addClass('tooltip-tutorial').after("<div id='typeLabel' class='text-danger help-text'>" + options.title + "</div>");
$e.parent().addClass('tooltip-tutorial').append("<div id='typeLabel' class='text-danger help-text'>" + options.title + "</div>");
}
};