From c61e4fc501340d4a320d5e3ce0e3223e8cb4efcf Mon Sep 17 00:00:00 2001 From: wangxuepeng Date: Thu, 16 Nov 2023 17:03:36 +0800 Subject: [PATCH] * Change to new writing method. --- module/task/ui/batchcreate.html.php | 34 +++++++++++++++++++---------- module/task/ui/create.html.php | 4 ++-- module/task/ui/edit.html.php | 22 +++++++++---------- module/task/ui/pause.html.php | 4 ++-- module/task/ui/report.html.php | 8 +++---- module/task/ui/view.html.php | 25 +++++++++++++++------ 6 files changed, 59 insertions(+), 38 deletions(-) diff --git a/module/task/ui/batchcreate.html.php b/module/task/ui/batchcreate.html.php index 326dec4b6c..6f197812da 100644 --- a/module/task/ui/batchcreate.html.php +++ b/module/task/ui/batchcreate.html.php @@ -39,13 +39,18 @@ if(!$hideStory) set::control('hidden'), btn ( - set('type', 'btn'), - set('icon', 'eye'), - set('class', 'ghost'), - set('hint', $lang->preview), - set('data-url', '#'), - set('data-toggle', 'modal'), - set('disabled', true) + set( + array + ( + 'type' => 'btn', + 'icon' => 'eye', + 'class' => 'ghost', + 'hint' => $lang->preview, + 'data-url' => '#', + 'data-toggle' => 'modal', + 'disabled' => true + ) + ) ) ); @@ -57,10 +62,15 @@ if(!$hideStory) set::control('hidden'), btn ( - set('type', 'btn'), - set('icon', 'arrow-right'), - set('class', 'ghost'), - set('hint', $lang->task->copyStoryTitle) + set( + array + ( + 'type' => 'btn', + 'icon' => 'copy', + 'class' => 'ghost', + 'hint' => $lang->task->copyStoryTitle + ) + ) ) ); @@ -222,7 +232,7 @@ formBatchPanel ( checkbox ( - set::id('zeroTaskStory'), + setID('zeroTaskStory'), set::text($lang->story->zeroTask), on::change('toggleZeroTaskStory') ) diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php index 6f73350ba6..0b06b42a34 100644 --- a/module/task/ui/create.html.php +++ b/module/task/ui/create.html.php @@ -221,11 +221,11 @@ formPanel $from == 'task' ? set::customFields(true) : null, modal ( - set::id('modalTeam'), + setID('modalTeam'), set::title($lang->task->teamMember), h::table ( - set::id('teamTable'), + setID('teamTable'), h::tr ( h::td diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php index bebf1e0093..c7008f432e 100644 --- a/module/task/ui/edit.html.php +++ b/module/task/ui/edit.html.php @@ -181,8 +181,8 @@ detailBody ( setClass('flex'), checkbox( - set::rootClass('items-center ml-3'), setID('showAllModule'), + set::rootClass('items-center ml-3'), set::name('showAllModule'), set::text($lang->all), set::value(1), @@ -309,31 +309,31 @@ detailBody ), span ( - set('id', 'contactBox'), - set('class', 'input-group-addon'), + setID('contactBox'), + setClass('input-group-addon'), $contactListMenuOptions ? setStyle(array('width' => '100px', 'padding' => '0')) : null, $contactListMenuOptions ? picker ( - set::className('width', 'w-20'), + setClass('w-20'), set::name('contactListMenuOptionsMenu'), set::items($contactListMenuOptions), set::placeholder($lang->contact->common) ) : span ( - set('class', 'input-group-addon'), + setClass('input-group-addon'), a ( - set('class', 'mr-2'), set('href', createLink('my', 'managecontacts', 'listID=0&mode=new')), set('title', $lang->user->contacts->manage), - set('data-toggle', 'modal'), + setClass('mr-2'), + setData(array('toggle' => 'modal')), icon('cog'), ), a ( - set('id', 'refreshMailto'), - set('class', 'text-black'), + setID('refreshMailto'), + setClass('text-black'), set('href', 'javascript:void(0)'), icon('refresh') ) @@ -346,7 +346,7 @@ detailBody ( modal ( - set::id('modalTeam'), + setID('modalTeam'), set::title($lang->task->teamMember), h::table ( @@ -415,7 +415,7 @@ detailBody span ( setClass('span-text'), - set::id('consumedSpan'), + setID('consumedSpan'), $task->consumed . $lang->task->suffixHour ), btn diff --git a/module/task/ui/pause.html.php b/module/task/ui/pause.html.php index f8b5dc533c..37836716a0 100644 --- a/module/task/ui/pause.html.php +++ b/module/task/ui/pause.html.php @@ -17,7 +17,7 @@ namespace zin; modalHeader(); formPanel ( - set::id('taskPauseForm'), + setID('taskPauseForm'), formGroup ( set::label($lang->comment), @@ -27,7 +27,7 @@ formPanel set::rows('5') ), input( - set::className('hidden'), + setClass('hidden'), set::name('status'), set::value('pause') ) diff --git a/module/task/ui/report.html.php b/module/task/ui/report.html.php index 810d37f32f..2abbf50832 100644 --- a/module/task/ui/report.html.php +++ b/module/task/ui/report.html.php @@ -66,8 +66,8 @@ foreach($lang->report->typeList as $type => $typeName) to::prefix(icon($type == 'default' ? 'list-alt' : "chart-{$type}")), div ( - set::className('pb-4'), - span(set::className('text-gray'), + setClass('pb-4'), + span(setClass('text-gray'), html(str_replace('%tab%', $lang->task->waitTask . $lang->testcase->common, $lang->report->notice->help))) ), div($echarts) @@ -83,7 +83,7 @@ div formPanel ( setClass('chart-form'), - set::id('chartForm'), + setID('chartForm'), set::title($lang->task->report->select), set::actionsClass('justify-start'), set::actions @@ -119,7 +119,7 @@ div ( setID('chartContainer'), set::flex('1'), - set::className('ml-5 bg-white px-4 py-2'), + setClass('ml-5 bg-white px-4 py-2'), tabs ( on::click('.font-medium', 'changeTab'), diff --git a/module/task/ui/view.html.php b/module/task/ui/view.html.php index 6bb32b7a7a..bdfef66598 100644 --- a/module/task/ui/view.html.php +++ b/module/task/ui/view.html.php @@ -149,7 +149,7 @@ foreach($linkMRTitles as $MRID => $linkMRTitle) ( set::href(createLink('mr', 'view', "MRID=$MRID")), "#$MRID $linkMRTitle", - set('data-ap', $app->tab) + setData(array('ap' => $app->tab)) ) : div("#$MRID $linkMRTitle"); } @@ -162,7 +162,7 @@ foreach($linkCommits as $commit) ( set::href(createLink('repo', 'revision', "repoID={$commit->repo}&objectID={$task->execution}&revision={$commit->revision}")), "#$MRID $linkMRTitle", - set('data-ap', $app->tab) + setData(array('ap' => $app->tab)) ) : div($revision . ' ' . $commit->comment); } @@ -273,8 +273,13 @@ detailBody set::name($lang->task->story), a ( - set('data-toggle', 'modal'), - set('data-size', 'lg'), + setData( + array + ( + 'toggle' => 'modal', + 'size' => 'lg' + ) + ), set::href(createLink('story', 'view', "id={$task->story}")), set::title($task->storyTitle), $task->storyTitle @@ -285,8 +290,14 @@ detailBody set::name($lang->task->fromBug), !empty($fromBug) ? a ( - set('data-toggle', 'modal'), - set('data-size', 'lg'), + setData + ( + array + ( + 'toggle' => 'modal', + 'size' => 'lg' + ) + ), set::href(createLink('bug', 'view', "id={$task->fromBug}")), set::title($fromBug->title), $fromBug->title @@ -364,7 +375,7 @@ detailBody h::table ( setClass('table table-data'), - set::id('team'), + setID('team'), h::thead ( h::tr