diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 995f6f1315..c74205da6d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -291,8 +291,9 @@ $lang->action->label->syncprogram = 'start'; $lang->action->label->syncproject = 'start'; $lang->action->label->syncexecution = 'start'; $lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->createmr = 'MR Linked'; -$lang->action->label->mergedmr = 'MR Merged'; +$lang->action->label->createmr = 'Merge Request Linked'; +$lang->action->label->deletemr = 'Merge Request Unlinked'; +$lang->action->label->mergedmr = 'Merge Request Merged'; $lang->action->label->reopen = 'Reopen'; $lang->action->label->approve = 'Passed'; $lang->action->label->reject = 'Rejected'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index d2b01cec78..faa68264d0 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -294,8 +294,9 @@ $lang->action->label->syncprogram = '开始了'; $lang->action->label->syncproject = '开始了'; $lang->action->label->syncexecution = '开始了'; $lang->action->label->startProgram = '(因项目开始而启动项目集)'; -$lang->action->label->createmr = 'MR关联了'; -$lang->action->label->mergedmr = 'MR合并了'; +$lang->action->label->createmr = '合并请求关联了'; +$lang->action->label->deletemr = '合并请求取消了'; +$lang->action->label->mergedmr = '合并请求合并了'; $lang->action->label->compilepass = '构建成功'; $lang->action->label->compilefail = '构建失败'; $lang->action->label->reopen = '重新打开'; diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index 5472ea90d5..24f9a91645 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -40,7 +40,7 @@ #kanbanList .kanban-card.kanban-card-span:hover, #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-card:hover {box-shadow: none;} #kanbanList .kanban-card.kanban-card-span > .title, -#kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-card > .title {white-space: normal; line-height: 1;} +#kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-card > .title {white-space: nowrap; line-height: 1;} #kanbanList .kanban-col[data-type="normalRelease"] .kanban-card > .title {display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center;} #kanbanList .kanban-col[data-type="normalRelease"] .kanban-card > .title > .text {display: block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;} diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php index 0a8c91d539..126c7d0c25 100644 --- a/module/execution/view/task.html.php +++ b/module/execution/view/task.html.php @@ -103,6 +103,7 @@ body {margin-bottom: 25px;} ?> product->searchStory;?> +
";?>
+
+