diff --git a/module/project/control.php b/module/project/control.php index 220199886a..8c4c1ce4e0 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -305,7 +305,7 @@ class project extends control $this->view->title = $this->lang->project->kanban; $this->view->kanbanGroup = $kanbanGroup; $this->view->latestExecutions = $latestExecutions; - $this->view->programPairs = $this->loadModel('program')->getPairs(true); + $this->view->programPairs = array(0 => $this->lang->project->noProgram) + $this->loadModel('program')->getPairs(true); $this->display(); } diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css index 8fa74f8f20..b07af47d53 100644 --- a/module/project/css/kanban.css +++ b/module/project/css/kanban.css @@ -3,15 +3,20 @@ .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: default; border-radius: 2px; background-color: #fff;} .board-item:hover {border-color: #ccc;} -.board-item + .board-item {margin-top: 10px;} +.board-project .board-item + .board-item {margin-top: 10px;} -.board-project {padding: 5px;} -.board-doing-project, .board-doing-execution {padding: 5px;} +.board-project {padding: 10px;} -.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;} +.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;} + +.doing .doing-project:last-child, .doing-execution:last-child {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;} .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/zh-cn.php b/module/project/lang/zh-cn.php index dad2abdc15..fe17d5b53d 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -131,16 +131,17 @@ $lang->project->moreProject = '更多项目'; $lang->project->days = '可用工作日'; $lang->project->etc = "等"; -$lang->project->kanban = new stdclass(); -$lang->project->kanban->typeList['my'] = '我负责的项目'; -$lang->project->kanban->typeList['other'] = '其他项目'; +$lang->project->typeList = array(); +$lang->project->typeList['my'] = '我负责的项目'; +$lang->project->typeList['other'] = '其他项目'; -$lang->project->kanban->waitProjects = '未开始的项目'; -$lang->project->kanban->doingProjects = '进行中的项目'; -$lang->project->kanban->doingExecutions = '进行中的执行'; -$lang->project->kanban->closedProjects = '已关闭的项目'; +$lang->project->waitProjects = '未开始的项目'; +$lang->project->doingProjects = '进行中的项目'; +$lang->project->doingExecutions = '进行中的执行'; +$lang->project->closedProjects = '已关闭的项目'; +$lang->project->noProgram = '无项目集归属项目'; -$lang->project->kanban->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761'); +$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761'); $lang->project->productNotEmpty = '请关联产品或创建产品。'; $lang->project->existProductName = '产品名称已存在。'; diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php index 771c44c2e3..1b0dcba060 100644 --- a/module/project/view/kanban.html.php +++ b/module/project/view/kanban.html.php @@ -22,71 +22,73 @@
-
project->kanban->typeList[$type];?>
+
project->typeList[$type];?>
- - + + - + - - + + $statusList):?> - + - +
project->kanban->waitProjects;?>project->waitProjects;?> project->statusList['doing'];?>project->kanban->closedProjects;?>project->closedProjects;?>
project->kanban->doingProjects;?>project->kanban->doingExecutions;?>project->doingProjects;?>project->doingExecutions;?>
-
- - -
-
-
> -
-
- name;?> -
-
-
-
-
hours->progress);?>
-
-
+
+ + +
+
> +
+
+ name;?> +
+
+
+
+
hours->progress);?>
-
- id])):?> - id];?> -
> -
-
- name;?> -
-
-
-
-
hours->progress);?>
-
-
-
-
-
- -
- -
+ + +
+ + + id])):?> + id];?> +
+
> +
+
+ name;?> +
+
+
+
+
hours->progress);?>
+
+
+
+
+
+
+ + +