diff --git a/module/kanban/css/common.css b/module/kanban/css/common.css index 0196d3fe8e..5bd3a063e0 100644 --- a/module/kanban/css/common.css +++ b/module/kanban/css/common.css @@ -2,3 +2,4 @@ .color-picker-item > .icon {color: #fff; display: none} .checked > .icon {display: inline-block;} .p-10px {padding: 10px} +.c-bug, .c-hour, .c-story {width: 90px;} diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index a380406950..d9de7c1b29 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -101,10 +101,9 @@ .kanban-item .title {padding-right: 10px;} .gray .actions {display:none;} -.kanban-card .header .executionName {display: flex; width: 100%; float: left; white-space: nowrap; overflow: hidden;} -.kanban-card .header .executionName .title, .releaseTitle, .productplanTitle {padding-right: 0px; margin-right: 5px; white-space: nowrap; overflow: hidden;} +.kanban-card .header .executionName {display: flex; width: 100%; float: left;} +.kanban-card .header .executionName .title {padding-right: 0px; margin-right: 5px;} .kanban-card .header .executionName > span {flex: none;} -.execInfo, .releaseInfo, .productplanInfo {margin-top: 23px;} .label-wait {background: #EFEFEF !important; color: #838A9D;} .label-doing {background: #f8d2d2 !important; color: #e64b4c;} .label-suspended {background: #fff3d9 !important; color: #ff9800;} diff --git a/module/kanban/view/importcard.html.php b/module/kanban/view/importcard.html.php index dd6cdfbabe..c4affac8ca 100644 --- a/module/kanban/view/importcard.html.php +++ b/module/kanban/view/importcard.html.php @@ -65,7 +65,7 @@ name;?> assignedTo);?> - end;?> + end;?>'>end) ? '' : $card->end;?> diff --git a/module/kanban/view/importplan.html.php b/module/kanban/view/importplan.html.php index 8787cbc82a..50ccaa0a84 100644 --- a/module/kanban/view/importplan.html.php +++ b/module/kanban/view/importplan.html.php @@ -43,10 +43,10 @@ productplan->title;?> productplan->begin;?> productplan->end;?> - productplan->stories;?> - productplan->bugs;?> + productplan->stories;?> + productplan->bugs;?> productplan->hour;?> - productplan->desc;?> + productplan->desc;?> @@ -64,12 +64,15 @@ title;?> - begin;?> - end;?> + begin == $config->productplan->future ? $lang->productplan->future : $plan->begin;?> + end == $config->productplan->future ? $lang->productplan->future : $plan->end;?> stories;?> bugs;?> hour;?> - desc;?> + + ', '
', '
', '
'), "\n", str_replace(array("\n", "\r"), '', $plan->desc)), ''));?> +
+