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-09-01 13:49:04 +08:00
parent b7651ed530 4415f0c6e4
commit 4cda4bc9db
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/css/browse.css
+4 -3
View File
@@ -11,6 +11,7 @@ td.c-actions {overflow: visible;}
.icon-list {padding-left: 7px;}
.panel-actions {position: relative; padding: 0 0;}
td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
td.flex a.text-ellipsis {min-width: 30px;}
#projectTableList .project-name {position: relative; display: flex; align-items: center;}
#projectTableList .project-name > span,
#projectTableList .project-name > span {flex: none;}
#projectTableList .project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 100px); flex: auto; padding: 0 5px;}
module/project/js/kanban.js
+1 -1
View File
@@ -6,7 +6,7 @@ $(function()
{
var boardWaitCount = $(this).find('.board-wait .board-item').length;
var boardClosedCount = $(this).find('.board-closed .board-item').length;
var boardDoingCount = $(this).find('.board-doing .board-item').length;
var boardDoingCount = $(this).find('.board-doing-project .board-item').length;
if((boardWaitCount > 5 || boardClosedCount > 5) && (boardWaitCount > boardDoingCount || boardClosedCount > boardDoingCount))
{
module/project/model.php
+3 -1
View File
@@ -1387,7 +1387,7 @@ class projectModel extends model
if($id == 'name')
{
$class .= ' text-left flex';
$class .= ' text-left';
$title = "title='{$project->name}'";
}
@@ -1425,6 +1425,7 @@ class projectModel extends model
}
break;
case 'name':
echo '<div class="project-name">';
if(isset($this->config->maxVersion))
{
if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
@@ -1432,6 +1433,7 @@ class projectModel extends model
}
echo html::a($projectLink, $project->name, '', "class='text-ellipsis'");
if(isset($project->delay)) echo "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
echo '</div>';
break;
case 'PM':
$user = $this->loadModel('user')->getByID($project->PM, 'account');