From e33c9b2f0e27dc57a349903c124ba33c8a93f2f3 Mon Sep 17 00:00:00 2001 From: liuruogu Date: Fri, 5 May 2023 19:24:47 +0800 Subject: [PATCH] * Finish task #92563. --- module/block/ui/contributeblock.html.php | 44 +++++++++++++ .../block/ui/executionoverviewblock.html.php | 64 ------------------- module/block/zen.php | 1 + 3 files changed, 45 insertions(+), 64 deletions(-) create mode 100644 module/block/ui/contributeblock.html.php delete mode 100644 module/block/ui/executionoverviewblock.html.php diff --git a/module/block/ui/contributeblock.html.php b/module/block/ui/contributeblock.html.php new file mode 100644 index 0000000000..1a713bd6ca --- /dev/null +++ b/module/block/ui/contributeblock.html.php @@ -0,0 +1,44 @@ + +* @package block +* @link https://www.zentao.net +*/ + +namespace zin; + +$blocks = array(); + +foreach($data as $code => $value) +{ + $blocks[] = cell + ( + set('flex', '0 0 33.33%'), + col + ( + set('justify', 'around'), + set('class', 'text-center'), + span(zget($lang->block, $code)), + a + ( + set('class', 'font-bold text-2xl text-darker leading-loose'), // TODO:zu1 + $value + ) + ) + ); +} + +panel +( + div + ( + set('class', 'flex flex-wrap gap-y-2'), + $blocks + ) +); + +render(); diff --git a/module/block/ui/executionoverviewblock.html.php b/module/block/ui/executionoverviewblock.html.php deleted file mode 100644 index 783076c640..0000000000 --- a/module/block/ui/executionoverviewblock.html.php +++ /dev/null @@ -1,64 +0,0 @@ - -* @package block -* @link https://www.zentao.net -*/ - -namespace zin; - -panel -( - div - ( - set('class', 'flex'), - cell - ( - set('class', 'border-right'), - set('style', ['width' => '25%']), - col - ( - set('class', 'text-center'), - span - ( - set('class', 'text-2xl font-bold leading-10 text-primary'), - 132 - ), - span - ( - set('class', 'text-light'), - '执行总量' - ) - ) - ), - cell - ( - set('class', 'border-right'), - set('style', ['width' => '25%']), - col - ( - set('class', 'text-center'), - span - ( - set('class', 'text-2xl font-bold leading-10'), - 12 - ), - span - ( - set('class', 'text-light'), - '今年完成' - ) - ) - ), - cell - ( - - ) - ) -); - -render(); diff --git a/module/block/zen.php b/module/block/zen.php index 5dc0e341a2..1313e15e08 100644 --- a/module/block/zen.php +++ b/module/block/zen.php @@ -368,6 +368,7 @@ class blockZen extends block */ public function printContributeBlock() { + /* TODO:zu1*/ $this->view->data = $this->loadModel('user')->getPersonalData(); }