diff --git a/module/block/css/teamachievementblock.ui.css b/module/block/css/teamachievementblock.ui.css index 6980606654..23a971d630 100644 --- a/module/block/css/teamachievementblock.ui.css +++ b/module/block/css/teamachievementblock.ui.css @@ -1,5 +1,5 @@ .teamachievement-block .item-row {min-height: 88px;} -.teamachievement-block .item-row .item-icon {background-size: 100%; position: relative; top: 10px; left: -50px;} +.teamachievement-block .item-row .item-icon {background-size: 100%; position: relative; top: 10px; left: -38px;} .teamachievement-block .item-row .item-task .item-icon {background: url(static/svg/block-task.svg) center no-repeat;} .teamachievement-block .item-row .item-bug .item-icon {background: url(static/svg/block-bug.svg) center no-repeat;} .teamachievement-block .item-row .item-hour .item-icon {background: url(static/svg/block-hour.svg) center no-repeat;} diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 3e1a0fe750..1fb07690f3 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -648,13 +648,13 @@ $lang->block->releasestatistic->monthly = 'Monthly releases trend chart'; $lang->block->releasestatistic->annual = "Annual release list (%s year)"; $lang->block->teamachievement = new stdclass(); -$lang->block->teamachievement->finishedTasks = 'Finished Tasks'; -$lang->block->teamachievement->createdStories = 'New Stories'; -$lang->block->teamachievement->closedBugs = 'Closed Bugs'; -$lang->block->teamachievement->runCases = 'Run Cases'; -$lang->block->teamachievement->consumedHours = 'Consumed Hours'; -$lang->block->teamachievement->totalWorkload = 'Total Workload'; -$lang->block->teamachievement->comparedYesterday = 'Compared'; +$lang->block->teamachievement->finishedTasks = 'Finished Tasks'; +$lang->block->teamachievement->createdStories = 'New Stories'; +$lang->block->teamachievement->closedBugs = 'Closed Bugs'; +$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->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 236a4ce089..12acd0ce4c 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -648,13 +648,13 @@ $lang->block->releasestatistic->monthly = 'Monthly releases trend chart'; $lang->block->releasestatistic->annual = "Annual release list (%s year)"; $lang->block->teamachievement = new stdclass(); -$lang->block->teamachievement->finishedTasks = 'Finished Tasks'; -$lang->block->teamachievement->createdStories = 'New Stories'; -$lang->block->teamachievement->closedBugs = 'Closed Bugs'; -$lang->block->teamachievement->runCases = 'Run Cases'; -$lang->block->teamachievement->consumedHours = 'Consumed Hours'; -$lang->block->teamachievement->totalWorkload = 'Total Workload'; -$lang->block->teamachievement->comparedYesterday = 'Compared'; +$lang->block->teamachievement->finishedTasks = 'Finished Tasks'; +$lang->block->teamachievement->createdStories = 'New Stories'; +$lang->block->teamachievement->closedBugs = 'Closed Bugs'; +$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->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index df1e21b612..654f1f3bb2 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -648,13 +648,13 @@ $lang->block->releasestatistic->monthly = 'Monthly releases trend chart'; $lang->block->releasestatistic->annual = "Annual release list (%s year)"; $lang->block->teamachievement = new stdclass(); -$lang->block->teamachievement->finishedTasks = 'Finished Tasks'; -$lang->block->teamachievement->createdStories = 'New Stories'; -$lang->block->teamachievement->closedBugs = 'Closed Bugs'; -$lang->block->teamachievement->runCases = 'Run Cases'; -$lang->block->teamachievement->consumedHours = 'Consumed Hours'; -$lang->block->teamachievement->totalWorkload = 'Total Workload'; -$lang->block->teamachievement->comparedYesterday = 'Compared'; +$lang->block->teamachievement->finishedTasks = 'Finished Tasks'; +$lang->block->teamachievement->createdStories = 'New Stories'; +$lang->block->teamachievement->closedBugs = 'Closed Bugs'; +$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->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 4bc802e12f..acf553a85a 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -669,13 +669,13 @@ $lang->block->releasestatistic->monthly = '月度发布次数趋势图'; $lang->block->releasestatistic->annual = "年度发布榜(%s年)"; $lang->block->teamachievement = new stdclass(); -$lang->block->teamachievement->finishedTasks = '完成任务数量'; -$lang->block->teamachievement->createdStories = '创建需求数量'; -$lang->block->teamachievement->closedBugs = '关闭的Bug数'; -$lang->block->teamachievement->runCases = '执行的用例数'; -$lang->block->teamachievement->consumedHours = '消耗工时'; -$lang->block->teamachievement->totalWorkload = '累计工作量'; -$lang->block->teamachievement->comparedYesterday = '较昨日'; +$lang->block->teamachievement->finishedTasks = '完成任务数量'; +$lang->block->teamachievement->createdStories = '创建需求数量'; +$lang->block->teamachievement->closedBugs = '关闭的Bug数'; +$lang->block->teamachievement->runCases = '执行的用例数'; +$lang->block->teamachievement->consumedHours = '消耗工时'; +$lang->block->teamachievement->totalWorkload = '累计工作量'; +$lang->block->teamachievement->vs = '较昨日'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; diff --git a/module/block/ui/teamachievementblock.html.php b/module/block/ui/teamachievementblock.html.php index 2ae5e38435..7b5be2e109 100644 --- a/module/block/ui/teamachievementblock.html.php +++ b/module/block/ui/teamachievementblock.html.php @@ -14,7 +14,7 @@ namespace zin; panel ( setClass('teamachievement-block'), - set::bodyClass('p-0 px-8'), + set::bodyClass('p-0 px-6'), set::title($block->title), div ( @@ -29,7 +29,7 @@ panel cell ( set::width('50%'), - setClass('border-r item-task pl-4 pr-2'), + setClass('border-r item-task px-1'), div ( setClass('h-0 w-0'), @@ -52,26 +52,27 @@ panel setClass('items-center'), span ( - setClass('text-gray'), + setClass('text-gray text-sm'), $lang->today, ), span ( - setClass('ml-1 font-bold text-lg'), + setClass('ml-0.5 text-lg'), $finishedTasks, ), ), $comparedTasks > 0 ? row ( width('1/2'), + setClass('items-center'), span ( - setClass('text-gray'), - $lang->block->teamachievement->comparedYesterday, + setClass('text-gray text-sm'), + $lang->block->teamachievement->vs, ), span ( - setClass('ml-0.5 font-bold text-warning'), + setClass('text-warning font-sm'), '+' . $comparedTasks, ), ) : null, @@ -80,7 +81,7 @@ panel cell ( set::width('50%'), - setClass('pl-4 pr-2'), + setClass('pl-4'), div ( setClass('text-gray'), @@ -95,26 +96,27 @@ panel setClass('items-center'), span ( - setClass('text-gray'), + setClass('text-gray text-sm'), $lang->today, ), span ( - setClass('ml-1 font-bold text-lg'), + setClass('ml-0.5 text-lg'), $createdStories, ), ), $comparedStories > 0 ? row ( width('1/2'), + setClass('items-center'), span ( - setClass('text-gray'), - $lang->block->teamachievement->comparedYesterday, + setClass('text-gray text-sm'), + $lang->block->teamachievement->vs, ), span ( - setClass('ml-0.5 font-bold text-warning'), + setClass('text-warning font-sm'), '+' . $comparedStories, ), ) : null, @@ -132,7 +134,7 @@ panel cell ( set::width('50%'), - setClass('border-r item-bug pl-4 pr-2'), + setClass('border-r item-bug px-1'), div ( setClass('h-0 w-0'), @@ -155,26 +157,27 @@ panel setClass('items-center'), span ( - setClass('text-gray'), + setClass('text-gray text-sm'), $lang->today, ), span ( - setClass('ml-1 font-bold text-lg'), + setClass('ml-0.5 text-lg'), $closedBugs, ), ), $comparedBugs > 0 ? row ( width('1/2'), + setClass('items-center'), span ( - setClass('text-gray'), - $lang->block->teamachievement->comparedYesterday, + setClass('text-gray text-sm'), + $lang->block->teamachievement->vs, ), span ( - setClass('ml-0.5 font-bold text-warning'), + setClass('text-warning font-sm'), '+' . $comparedBugs, ), ) : null, @@ -183,7 +186,7 @@ panel cell ( set::width('50%'), - setClass('pl-4 pr-2'), + setClass('pl-4'), div ( setClass('text-gray'), @@ -198,26 +201,27 @@ panel setClass('items-center'), span ( - setClass('text-gray'), + setClass('text-gray text-sm'), $lang->today, ), span ( - setClass('ml-1 font-bold text-lg'), + setClass('ml-0.5 text-lg'), $runCases, ), ), $comparedCases > 0 ? row ( width('1/2'), + setClass('items-center'), span ( - setClass('text-gray'), - $lang->block->teamachievement->comparedYesterday, + setClass('text-gray text-sm'), + $lang->block->teamachievement->vs, ), span ( - setClass('ml-0.5 font-bold text-warning'), + setClass('text-warning font-sm'), '+' . $comparedCases, ), ) : null, @@ -235,7 +239,7 @@ panel cell ( set::width('50%'), - setClass('border-r item-hour pl-4 pr-2'), + setClass('border-r item-hour px-1'), div ( setClass('h-0 w-0'), @@ -247,7 +251,7 @@ panel div ( setClass('text-gray'), - $lang->block->teamachievement->consumedHours, + $lang->block->teamachievement->consumedHours . ' / ' . $lang->block->projectstatistic->hour, ), div ( @@ -258,28 +262,28 @@ panel setClass('items-center'), span ( - setClass('text-gray'), + setClass('text-gray text-sm'), $lang->today, ), span ( - setClass('ml-1 font-bold text-lg'), + setClass('ml-0.5 text-lg'), $consumedHours, ), - $lang->block->projectstatistic->hour, ), $comparedHours > 0 ? row ( width('1/2'), + setClass('items-center'), span ( - setClass('text-gray'), - $lang->block->teamachievement->comparedYesterday, + setClass('text-gray text-sm'), + $lang->block->teamachievement->vs, ), span ( - setClass('ml-0.5 font-bold text-warning'), - '+' . $comparedHours . $lang->block->projectstatistic->hour, + setClass('text-warning font-sm'), + '+' . $comparedHours, ), ) : null, ) @@ -287,11 +291,11 @@ panel cell ( set::width('50%'), - setClass('pl-4 pr-2'), + setClass('pl-4'), div ( setClass('text-gray'), - $lang->block->teamachievement->totalWorkload, + $lang->block->teamachievement->totalWorkload . ' / ' . $lang->block->projectstatistic->personDay, ), div ( @@ -302,23 +306,23 @@ panel setClass('items-center'), span ( - setClass('ml-1 font-bold text-lg'), + setClass('ml-0.5 text-lg'), $totalWorkload, ), - $lang->block->projectstatistic->personDay ), $todayWorkload > 0 ? row ( width('1/2'), + setClass('items-center'), span ( - setClass('text-gray'), + setClass('text-gray text-sm'), $lang->today, ), span ( - setClass('ml-0.5 font-bold text-warning'), - '+' . $todayWorkload . $lang->block->projectstatistic->personDay, + setClass('text-warning font-sm'), + '+' . $todayWorkload, ), ) : null, )