diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index ad6e28023b..991296f125 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -83,7 +83,8 @@ systemMode == 'new') { - echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name, '', "title='{$project->name} ({$lang->project->{$project->model}})'"); + $projectType = $project->model == 'scrum' ? 'sprint' : $project->model; + echo html::a($this->createLink('project', 'index', 'project=' . $project->id), " " . $project->name, '', "title='{$project->name}'"); } else { diff --git a/module/project/config.php b/module/project/config.php index 3aa217d11c..ca190f5822 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -69,7 +69,7 @@ $config->project->datatable->fieldList['PM']['pri'] = '2'; $config->project->datatable->fieldList['status']['title'] = 'status'; $config->project->datatable->fieldList['status']['fixed'] = 'left'; -$config->project->datatable->fieldList['status']['width'] = '65'; +$config->project->datatable->fieldList['status']['width'] = '75'; $config->project->datatable->fieldList['status']['required'] = 'no'; $config->project->datatable->fieldList['status']['sort'] = 'yes'; $config->project->datatable->fieldList['status']['pri'] = '2'; diff --git a/module/project/model.php b/module/project/model.php index 94c8d58ae7..09ee019c4a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1978,7 +1978,7 @@ class projectModel extends model elseif($id == 'name') { $class .= ' text-left'; - $title = "title='{$project->name}" . ($this->config->vision == 'lite' ? "'" : "({$this->lang->project->{$project->model}})'"); + $title = "title='{$project->name}'"; } elseif($id == 'PM') { @@ -2022,9 +2022,10 @@ class projectModel extends model $prefix = ''; $suffix = ''; if(isset($project->delay)) $suffix = "{$this->lang->project->statusList['delay']}"; + $projectType = $project->model == 'scrum' ? 'sprint' : $project->model; if(!empty($suffix) or !empty($prefix)) echo '
'; if(!empty($prefix)) echo $prefix; - echo html::a($projectLink, $project->name, '', "class='text-ellipsis text-primary'"); + echo html::a($projectLink, " " . $project->name, '', "class='text-ellipsis text-primary'"); if(!empty($suffix)) echo $suffix; if(!empty($suffix) or !empty($prefix)) echo '
'; break; diff --git a/module/task/model.php b/module/task/model.php index 21aae6c5e2..1b20ed135b 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3756,7 +3756,8 @@ class taskModel extends model } break; case 'pri': - echo ""; + $priClass = $task->pri ? "label-pri label-pri-{$task->pri}" : ''; + echo ""; echo zget($this->lang->task->priList, $task->pri, $task->pri); echo ""; break; diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index d2635cbcdb..d749f57e41 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -116,13 +116,7 @@ children as $child):?> id;?> - - pri . "'>"; - echo $child->pri == '0' ? '' : zget($this->lang->task->priList, $child->pri, $child->pri); - echo ""; - ?> - + pri) echo "" . zget($this->lang->task->priList, $child->pri, $child->pri) . "";?> id", '', true); ?>">name;?> deadline;?> task->printAssignedHtml($child, $users);?>