diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 508d3c2034..1a18aed718 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -42,7 +42,9 @@ #archivedCards .card-item .has-color .info > .label-pri, #archivedCards .card-item .has-color .info > .estimate, #archivedCards .card-item .has-color .info > .label-light {color: #FFFFFF;} +#archivedCards .info.execution .label-light, #archivedCards .info.productplan .label-light, #archivedCards .info.build .label-light, #archivedCards .info.release .label-light {background: #EFEFEF !important; color: #838A9D !important;} #archivedCards .card-item .has-color .info > .label-pri {border-color: #FFFFFF;} +#archivedCards .card-item .has-color .progress-box > .progress-number {color: #FFFFFF;} #archivedCards .progress-box {width: 97%;} #performable {padding: 25px 10px !important;} @@ -105,9 +107,12 @@ $app->loadLang('productplan'); begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?> end)) . $lang->kanbancard->deadlineAB;?> - begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?> + begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01' and $card->fromType == ''):?> begin)) . ' ~ ' . date("m/d", strtotime($card->end));?> + begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01' and $card->fromType != ''):?> + begin)) . ' ' . $lang->{$card->fromType}->to . ' ' . date("m-d", strtotime($card->end));?> + begin == '2030-01-01' or $card->end == '2030-01-01') echo '' . $lang->{$card->fromType}->future . '';