From 89328862e8b0a9fceedb7760133a8ba4fb6bc302 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Fri, 27 Aug 2021 13:23:45 +0800 Subject: [PATCH] * Finish task #41738. --- module/common/model.php | 8 ++++---- module/program/css/kanban.css | 8 ++++---- module/program/view/kanban.html.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index dcf3d0ff19..ca9eb8ab85 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2433,8 +2433,8 @@ EOD; /* If homeMenu is not exists or unset, display menu. */ if(!isset($lang->$openApp->homeMenu)) { - $lang->menu = $lang->$openApp->menu; - $lang->menuOrder = $lang->$openApp->menuOrder; + $lang->menu = isset($lang->$openApp->menu) ? $lang->$openApp->menu : array(); + $lang->menuOrder = isset($lang->$openApp->menuOrder) ? $lang->$openApp->menuOrder : array(); return; } @@ -2465,8 +2465,8 @@ EOD; } /* Default, display menu. */ - $lang->menu = $lang->$openApp->menu; - $lang->menuOrder = $lang->$openApp->menuOrder; + $lang->menu = isset($lang->$openApp->menu) ? $lang->$openApp->menu : array(); + $lang->menuOrder = isset($lang->$openApp->menuOrder) ? $lang->$openApp->menuOrder : array(); } /** diff --git a/module/program/css/kanban.css b/module/program/css/kanban.css index aa7e20443c..79fcfb66d9 100644 --- a/module/program/css/kanban.css +++ b/module/program/css/kanban.css @@ -1,7 +1,7 @@ .main-table .table {cursor: default;} .main-table .table td {background: #f5f5f5;} -.lane-name {overflow: hidden; text-overflow: ellipsis} +.lane-name {overflow: hidden; text-overflow: ellipsis; writing-mode: vertical-lr;} .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: default; border-radius: 2px; background-color: #fff;} .board-item:hover {border-color: #ccc;} @@ -9,9 +9,9 @@ #kanban {overflow-y: auto;} #kanban tbody > tr > td {line-height: 24px;} -#kanban tbody > tr > td{border-right: 3px solid #fff; border-bottom: 3px solid #fff;} -#kanban thead > tr:first-child > th:not(:first-child) {border-right: 3px solid #fff; border-bottom: 3px solid #fff;} -#kanban thead > tr:last-child > th {border: 3px solid #fff;} +#kanban tbody > tr > td{border-right: 3px solid #fff; border-bottom: 2px solid #fff;} +#kanban thead > tr:first-child > th:not(:first-child) {border-right: 2px solid #fff; border-bottom: 2px solid #fff;} +#kanban thead > tr:last-child > th {border: 2px solid #fff;} .doing-td, .wait-project, .normal-plan, .normal-release {vertical-align: top !important;} diff --git a/module/program/view/kanban.html.php b/module/program/view/kanban.html.php index 9460e5fa13..53dd3be244 100644 --- a/module/program/view/kanban.html.php +++ b/module/program/view/kanban.html.php @@ -17,7 +17,7 @@