From cf3a65aa9e58b08e822fcb09ebb8750698a3901e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Sun, 7 Apr 2024 10:44:58 +0800 Subject: [PATCH] * Adjust layout for story#53176. --- module/block/lang/de.php | 1 + module/block/lang/en.php | 1 + module/block/lang/fr.php | 1 + module/block/lang/zh-cn.php | 1 + module/block/ui/teamachievementblock.html.php | 113 ++++++++---------- 5 files changed, 54 insertions(+), 63 deletions(-) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index e61b6d673f..23a9e3c37c 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -691,6 +691,7 @@ $lang->block->teamachievement->runCases = 'Run Cases'; $lang->block->teamachievement->consumedHours = 'Consumed Hours'; $lang->block->teamachievement->totalWorkload = 'Total Workload'; $lang->block->teamachievement->vs = 'VS'; +$lang->block->teamachievement->accrued = 'Accrued'; $lang->block->estimate = new stdclass(); $lang->block->estimate->costs = 'Costs'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index c61da980db..5f132576eb 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -691,6 +691,7 @@ $lang->block->teamachievement->runCases = 'Run Cases'; $lang->block->teamachievement->consumedHours = 'Consumed Hours'; $lang->block->teamachievement->totalWorkload = 'Total Workload'; $lang->block->teamachievement->vs = 'VS'; +$lang->block->teamachievement->accrued = 'Accrued'; $lang->block->estimate = new stdclass(); $lang->block->estimate->costs = 'Costs'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 70a8e0d4f4..ffc2beba33 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -691,6 +691,7 @@ $lang->block->teamachievement->runCases = 'Run Cases'; $lang->block->teamachievement->consumedHours = 'Consumed Hours'; $lang->block->teamachievement->totalWorkload = 'Total Workload'; $lang->block->teamachievement->vs = 'VS'; +$lang->block->teamachievement->accrued = 'Accrued'; $lang->block->estimate = new stdclass(); $lang->block->estimate->costs = 'Costs'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 8486c0184f..72d60e86ac 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -691,6 +691,7 @@ $lang->block->teamachievement->runCases = '执行的用例数'; $lang->block->teamachievement->consumedHours = '消耗工时'; $lang->block->teamachievement->totalWorkload = '累计工作量'; $lang->block->teamachievement->vs = '较昨日'; +$lang->block->teamachievement->accrued = '累计'; $lang->block->estimate = new stdclass(); $lang->block->estimate->costs = '人工'; diff --git a/module/block/ui/teamachievementblock.html.php b/module/block/ui/teamachievementblock.html.php index 50a44e2707..dcb8e32e4c 100644 --- a/module/block/ui/teamachievementblock.html.php +++ b/module/block/ui/teamachievementblock.html.php @@ -17,10 +17,10 @@ blockPanel set::bodyClass('ml-6'), div ( - setClass('flex flex-wrap gap-y-3 py-0.5'), + setClass('flex flex-wrap gap-y-3'), div ( - setClass('flex p-4 w-full item-row'), + setClass('flex mt-1 px-4 w-full item-row'), cell ( set::width('100%'), @@ -41,35 +41,32 @@ blockPanel ), div ( - setClass('mt-2 flex flex-wrap items-center pl-1'), - row + setClass('mt-2 items-center pl-1'), + div ( - $comparedTasks > 0 ? width('1/3') : width('full'), setClass('items-center'), span ( - setClass('text-gray text-sm'), + setClass('text-gray text-base'), $lang->today ), span ( - setClass('ml-0.5 text-lg'), + setClass('ml-0.5 text-md'), $finishedTasks ) ), - $comparedTasks > 0 ? row + $comparedTasks > 0 ? div ( - width('2/3'), setClass('items-center'), - div(setClass('divider mx-2 my-auto h-4')), span ( - setClass('text-sm text-success'), + setClass('text-base text-success'), $lang->block->teamachievement->vs ), span ( - setClass('text-success font-sm pl-1'), + setClass('text-success text-md pl-1'), '+' . $comparedTasks ) ) : null @@ -91,35 +88,32 @@ blockPanel ), div ( - setClass('mt-2 flex flex-wrap items-center pl-1'), - row + setClass('mt-2 items-center pl-1'), + div ( - $comparedStories > 0 ? width('1/3') : width('full'), setClass('items-center'), span ( - setClass('text-gray text-sm'), + setClass('text-gray text-base'), $lang->today ), span ( - setClass('ml-0.5 text-lg'), + setClass('ml-0.5 text-md'), $createdStories ) ), - $comparedStories > 0 ? row + $comparedStories > 0 ? div ( - width('2/3'), setClass('items-center'), - div(setClass('divider mx-2 my-auto h-4')), span ( - setClass('text-sm text-success'), + setClass('text-base text-success'), $lang->block->teamachievement->vs ), span ( - setClass('text-success font-sm pl-1'), + setClass('text-success text-md pl-1'), '+' . $comparedStories ) ) : null @@ -129,7 +123,7 @@ blockPanel ), div ( - setClass('flex p-4 w-full item-row'), + setClass('flex px-4 w-full item-row'), cell ( set::width('100%'), @@ -150,35 +144,32 @@ blockPanel ), div ( - setClass('mt-2 flex flex-wrap items-center pl-1'), - row + setClass('mt-2 items-center pl-1'), + div ( - $comparedBugs > 0 ? width('1/3') : width('full'), setClass('items-center'), span ( - setClass('text-gray text-sm'), + setClass('text-gray text-base'), $lang->today ), span ( - setClass('ml-0.5 text-lg'), + setClass('ml-0.5 text-md'), $closedBugs ) ), - $comparedBugs > 0 ? row + $comparedBugs > 0 ? div ( - width('2/3'), setClass('items-center'), - div(setClass('divider mx-2 my-auto h-4')), span ( - setClass('text-sm text-success'), + setClass('text-base text-success'), $lang->block->teamachievement->vs ), span ( - setClass('text-success font-sm pl-1'), + setClass('text-success text-md pl-1'), '+' . $comparedBugs ) ) : null @@ -200,35 +191,32 @@ blockPanel ), div ( - setClass('mt-2 flex flex-wrap items-center pl-1'), - row + setClass('mt-2 items-center pl-1'), + div ( - $comparedCases > 0 ? width('1/3') : width('full'), setClass('items-center'), span ( - setClass('text-gray text-sm'), + setClass('text-gray text-base'), $lang->today ), span ( - setClass('ml-0.5 text-lg'), + setClass('ml-0.5 text-md'), $runCases ) ), - $comparedCases > 0 ? row + $comparedCases > 0 ? div ( - width('2/3'), setClass('items-center'), - div(setClass('divider mx-2 my-auto h-4')), span ( - setClass('text-sm text-success'), + setClass('text-base text-success'), $lang->block->teamachievement->vs ), span ( - setClass('text-success font-sm pl-1'), + setClass('text-success text-md pl-1'), '+' . $comparedCases ) ) : null @@ -238,7 +226,7 @@ blockPanel ), div ( - setClass('flex p-4 w-full item-row'), + setClass('flex px-4 w-full item-row'), cell ( set::width('100%'), @@ -259,35 +247,32 @@ blockPanel ), div ( - setClass('mt-2 flex flex-wrap items-center pl-1'), - row + setClass('mt-2 items-center pl-1'), + div ( - $comparedHours > 0 ? width('1/3') : width('full'), setClass('items-center'), span ( - setClass('text-gray text-sm'), + setClass('text-gray text-base'), $lang->today ), span ( - setClass('ml-0.5 text-lg'), + setClass('ml-0.5 text-md'), $consumedHours ) ), - $comparedHours > 0 ? row + $comparedHours > 0 ? div ( - width('2/3'), setClass('items-center'), - div(setClass('divider mx-2 my-auto h-4')), span ( - setClass('text-sm text-success'), + setClass('text-base text-success'), $lang->block->teamachievement->vs ), span ( - setClass('text-success font-sm pl-1'), + setClass('text-success text-md pl-1'), '+' . $comparedHours ), ) : null @@ -309,30 +294,32 @@ blockPanel ), div ( - setClass('mt-2 flex flex-wrap items-center'), - row + setClass('mt-2 items-center pl-1'), + div ( - $todayWorkload > 0 ? width('1/3') : width('full'), setClass('items-center'), span ( - setClass('ml-0.5 text-lg'), + setClass('text-gray text-base'), + $lang->block->teamachievement->accrued + ), + span + ( + setClass('ml-0.5 text-md'), $totalWorkload ) ), - $todayWorkload > 0 ? row + $todayWorkload > 0 ? div ( - width('2/3'), setClass('items-center'), - div(setClass('divider mx-2 my-auto h-4')), span ( - setClass('text-success text-sm'), + setClass('text-success text-base'), $lang->today ), span ( - setClass('text-success font-sm pl-1'), + setClass('text-success text-md pl-1'), '+' . $todayWorkload ) ) : null