diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css index b07af47d53..364ea8ea22 100644 --- a/module/project/css/kanban.css +++ b/module/project/css/kanban.css @@ -7,16 +7,17 @@ .board-project {padding: 10px;} -.doing .doing-project:not(:last-child) {padding: 10px; border-bottom: 2px solid #fff;} -.doing .doing-executioni:not(:last-child) {padding: 10px; border-bottom: 2px solid #fff;} +.board-doing {padding: 0px !important; vertical-align: top !important;} +.board-doing div:not(:last-child) .board-doing-project, +.board-doing div:not(:last-child) .board-doing-execution {padding: 10px; border-bottom: 2px solid #fff;} -.doing .doing-project:last-child, .doing-execution:last-child {padding: 10px;} +.board-doing div:last-child .board-doing-project, +.board-doing div:last-child .board-doing-execution {padding: 10px;} -.doing-project .table-row .table-col:last-child, .c-progress {width: 30px;} -.doing-execution .table-row .table-col:last-child, .c-progress {width: 30px;} +.board-doing-project .table-row .table-col:last-child, .c-progress {width: 30px;} +.board-doing-execution .table-row .table-col:last-child, .c-progress {width: 30px;} .table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} table th, td {border: 2px solid #fff !important;} -td.doing {padding: 0px !important;} #kanban {padding-bottom: 10px} diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 8e5471b467..a5c106d505 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -131,6 +131,19 @@ $lang->project->moreProject = 'More Project'; $lang->project->days = 'Available Days'; $lang->project->etc = " , etc"; +/* Project Kanban. */ +$lang->project->typeList = array(); +$lang->project->typeList['my'] = 'Projects Ownedbyme'; +$lang->project->typeList['other'] = 'Other Projects'; + +$lang->project->waitProjects = 'Waiting Projects'; +$lang->project->doingProjects = 'Ongoing Projects'; +$lang->project->doingExecutions = 'Ongoing Executions'; +$lang->project->closedProjects = 'Closed Projects'; +$lang->project->noProgram = 'Independent Projects'; + +$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761'); + $lang->project->productNotEmpty = 'Please link products or create products.'; $lang->project->existProductName = 'Product name already exists.'; $lang->project->changeProgram = '%s > Change project'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 089a475e47..0804183012 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -134,6 +134,7 @@ $lang->project->moreProject = '更多项目'; $lang->project->days = '可用工作日'; $lang->project->etc = "等"; +/* Project Kanban. */ $lang->project->typeList = array(); $lang->project->typeList['my'] = '我负责的项目'; $lang->project->typeList['other'] = '其他项目'; diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php index 1b0dcba060..aa10f40a70 100644 --- a/module/project/view/kanban.html.php +++ b/module/project/view/kanban.html.php @@ -27,7 +27,7 @@
| + | project->waitProjects;?> | project->statusList['doing'];?> | project->closedProjects;?> | @@ -43,50 +43,64 @@- | + |
-
- delay) ? 'red' : "#0BD986") . "'";?>>
-
-
- name;?>
-
-
-
-
- hours->progress);?>
+
+
-
-
-
+
- delay) ? 'red' : "#0BD986") . "'";?>>
+
+
+ createLink('project', 'index', "projectID=$project->id"), $project->name, '', "title='{$project->name}'");
+ }
+ else
+ {
+ echo "{$project->name}";
+ }
+ ?>
+
+
+
+
+
hours->progress);?>
+ |
-
-
-
- id])):?>
- id];?>
-
- delay) ? 'red' : "#0BD986") . "'";?>>
-
-
- name;?>
-
-
-
-
-
-
hours->progress);?>
+
+ id])):?>
+ id];?>
+
delay) ? 'red' : "#0BD986") . "'";?>>
+
+
+
+ createLink('execution', 'task', "executionID=$execution->id"), $execution->name, '', "title='{$execution->name}'");
+ }
+ else
+ {
+ echo "{$execution->name}";
+ }
+ ?>
+
+
+
+
+
hours->progress);?>
+ |
|||
|---|---|---|---|---|---|---|---|---|---|---|