diff --git a/module/bug/ui/view.html.php b/module/bug/ui/view.html.php
index b402a8cee4..1045b1ec5a 100644
--- a/module/bug/ui/view.html.php
+++ b/module/bug/ui/view.html.php
@@ -85,8 +85,14 @@ if(!empty($legendBasic['mailto']['text']))
$duplicateLink = $bug->duplicateBug && $canViewBug ? a
(
set('href', $this->createLink('bug', 'view', "bugID={$bug->duplicateBug}")),
- set('data-toggle', 'modal'),
- set('data-size', 'lg'),
+ setData
+ (
+ array
+ (
+ 'toggle' => 'modal',
+ 'size' => 'lg',
+ )
+ ),
$bug->duplicateBugTitle
) : '';
$duplicateBug = $bug->duplicateBug ? span("#{$bug->duplicateBug}:", $duplicateLink) : '';
@@ -97,9 +103,15 @@ foreach($legendMisc['relatedBug']['text'] as $relatedBugID => $relatedBugTitle)
$relatedBugs[] = div(a
(
set('href', $this->createLink('bug', 'view', "bugID={$relatedBugID}")),
- set('data-toggle', 'modal'),
- set('data-size', 'lg'),
- span(label(set::className('dark-outline rounded-full mr-2'), $relatedBugID), $relatedBugTitle)
+ setData
+ (
+ array
+ (
+ 'toggle' => 'modal',
+ 'size' => 'lg',
+ )
+ ),
+ span(label(setClass('dark-outline rounded-full mr-2'), $relatedBugID), $relatedBugTitle)
));
}
@@ -109,8 +121,8 @@ foreach($legendMisc['linkMR']['text'] as $MRID => $linkMRTitle)
$linkMR[] = div(a
(
$canViewMR ? set('href', $this->createLink('mr', 'view', "MRID={$MRID}")) : null,
- set('data-app', 'devops'),
- span(label(set::className('dark-outline rounded-full mr-2'), $MRID), $linkMRTitle)
+ setData(array('data-app' => 'devops')),
+ span(label(setClass('dark-outline rounded-full mr-2'), $MRID), $linkMRTitle)
));
}
@@ -119,7 +131,7 @@ foreach($legendMisc['linkCommit']['text'] as $commit)
{
$linkCommits[] = div(a
(
- set('data-app', 'devops'),
+ setData(array('app' => 'devops')),
$canViewRepo ? set('href', $this->createLink('repo', 'revision', "repoID={$commit->repo}&objectID=0&revision={$commit->revision}")) : null,
"{$commit->comment}"
));
@@ -151,7 +163,7 @@ $legendMain['story']['text'] = $bug->story ? div
')'
) : ''
) : '';
-$legendMain['task']['text'] = $bug->task ? div(label(set('class', 'dark-outline rounded-full size-sm mr-2'), $bug->task), span($bug->taskName)) : '';;
+$legendMain['task']['text'] = $bug->task ? div(label(setClass('dark-outline rounded-full size-sm mr-2'), $bug->task), span($bug->taskName)) : '';;
$legendMisc['relatedBug']['text'] = $relatedBugs;
$legendMisc['linkCommit']['text'] = $linkCommits;
$legendMisc['linkMR']['text'] = $linkMR;
@@ -237,7 +249,7 @@ detailBody
floatToolbar
(
set::object($bug),
- isAjaxRequest('modal') ? null : to::prefix(backBtn(set::icon('back'), set::className('ghost text-white'), $lang->goback)),
+ isAjaxRequest('modal') ? null : to::prefix(backBtn(set::icon('back'), setClass('ghost text-white'), $lang->goback)),
set::main($actions['mainActions']),
set::suffix($actions['suffixActions'])
),
@@ -295,15 +307,15 @@ detailBody
modal
(
- set::id('toTask'),
+ setID('toTask'),
set::modalProps(array('title' => $lang->bug->selectProjects)),
to::footer
(
div
(
- set::className('toolbar gap-4 w-full justify-center'),
- btn($lang->bug->nextStep, set::id('toTaskButton'), setClass('primary')),
- btn($lang->cancel, set::id('cancelButton'), set('data-dismiss', 'modal'))
+ setClass('toolbar gap-4 w-full justify-center'),
+ btn($lang->bug->nextStep, setID('toTaskButton'), setClass('primary')),
+ btn($lang->cancel, setID('cancelButton'), setData(array('dismiss' => 'modal')))
)
),
formPanel
@@ -329,7 +341,7 @@ modal
set::required(true),
inputGroup
(
- set('id', 'executionBox'),
+ setID('executionBox'),
picker
(
set::name('execution'),
diff --git a/module/task/ui/activate.html.php b/module/task/ui/activate.html.php
index 1762f180c7..4e2f5da569 100644
--- a/module/task/ui/activate.html.php
+++ b/module/task/ui/activate.html.php
@@ -60,11 +60,11 @@ if($isMultiple)
set::label($lang->task->mode),
inputGroup
(
- set::className('no-background'),
+ setClass('no-background'),
zget($lang->task->modeList, $task->mode),
input
(
- set::className('hidden'),
+ setClass('hidden'),
set::name('mode'),
set::value($task->mode)
)
@@ -80,7 +80,7 @@ if($isMultiple)
setClass('items-center'),
checkbox
(
- set::id('multiple'),
+ setID('multiple'),
set::name('multiple'),
set::text($lang->task->manageTeam),
set::rootClass('ml-4'),
@@ -109,9 +109,9 @@ if($isMultiple)
{
$modalTeamBtn = btn(
set::text($lang->task->team),
- set::className('team-group hidden'),
+ setClass('team-group hidden'),
set::url('#modalTeam'),
- set('data-toggle', 'modal')
+ setData(array('toggle' => 'modal'))
);
}
@@ -129,9 +129,15 @@ foreach($task->team as $member)
$teamForm[] = h::tr
(
setClass("member member-{$member->status}"),
- set('data-estimate', (float)$member->estimate),
- set('data-consumed', (float)$member->consumed),
- set('data-left', (float)$member->left),
+ set
+ (
+ array
+ (
+ 'estimate' => (float)$member->estimate,
+ 'consumed' => (float)$member->consumed,
+ 'left' => (float)$member->left
+ )
+ ),
h::td
(
setClass('team-index'),
@@ -354,25 +360,25 @@ formPanel
(
modal
(
- set::id('modalTeam'),
+ setID('modalTeam'),
+ setData(array('backdrop' => false)),
set::title($lang->task->team),
set::footerClass('flex-center'),
- set('data-backdrop', false),
to::footer
(
div(setClass('multi-append')),
btn
(
+ setID('confirmButton'),
setClass('primary btn-wide'),
- set::id('confirmButton'),
set::text($lang->confirm),
on::click('checkTeam')
)
),
h::table
(
+ setID('teamTable'),
setClass('table table-form'),
- set::id('teamTable'),
$teamForm
)
)
diff --git a/module/zanode/ui/create.html.php b/module/zanode/ui/create.html.php
index b12dd5ab78..26c406890c 100644
--- a/module/zanode/ui/create.html.php
+++ b/module/zanode/ui/create.html.php
@@ -22,11 +22,17 @@ formPanel
icon
(
'help',
- set('data-toggle', 'tooltip'),
- set('data-placement', 'right'),
- set('data-title', $lang->zanode->tips),
- set('data-type', 'white'),
- set('data-class-name', 'text-gray border border-light'),
+ setData
+ (
+ array
+ (
+ 'toggle' => 'tooltip',
+ 'placement' => 'right',
+ 'title' => $lang->zanode->tips,
+ 'type' => 'white',
+ 'class-name' => 'text-gray border border-light'
+ )
+ ),
setClass('text-gray')
)
)),
@@ -59,7 +65,7 @@ formPanel
(
set::href(createLink('zahost', 'create')),
$lang->zahost->create,
- set('data-toggle', 'modal'),
+ setData(array('data-toggle' => 'modal')),
setClass('leading-8 ml-2')
)
),
@@ -147,11 +153,11 @@ formPanel
),
formRow
(
- set::id('osNamePhysicsContainer'),
+ setID('osNamePhysicsContainer'),
setClass('hidden'),
formGroup
(
- set::id('osNamePhysicsPre'),
+ setID('osNamePhysicsPre'),
set::label($lang->zanode->osName),
set::items($config->zanode->osType),
set::value('linux'),
diff --git a/module/zanode/ui/createimage.html.php b/module/zanode/ui/createimage.html.php
index 36e9b83f06..c7c5a8e518 100644
--- a/module/zanode/ui/createimage.html.php
+++ b/module/zanode/ui/createimage.html.php
@@ -24,7 +24,7 @@ if($task) modalHeader(set::title($lang->zanode->createImage));
!$task ? formPanel
(
in_array($node->status, array('shutdown', 'shutoff')) ? null : set::ajax(array('beforeSubmit' => jsRaw("() => zui.Modal.confirm('{$lang->zanode->createImageNotice}')"))),
- set::id('createImageForm'),
+ setID('createImageForm'),
set::title($lang->zanode->createImage),
formGroup
(
diff --git a/module/zanode/ui/view.html.php b/module/zanode/ui/view.html.php
index 4db6143b10..262d229b1a 100644
--- a/module/zanode/ui/view.html.php
+++ b/module/zanode/ui/view.html.php
@@ -87,7 +87,7 @@ if($zanode->hostType == 'physics')
h::textarea
(
setClass('hidden'),
- set::id('ssh-copy'),
+ setID('ssh-copy'),
$ssh
)
)
@@ -191,7 +191,7 @@ else
h::textarea
(
setClass('hidden'),
- set::id('ssh-copy'),
+ setID('ssh-copy'),
$ssh
)
)
@@ -279,7 +279,7 @@ else
setClass('ml-2'),
span
(
- set::id('pwd-text'),
+ setID('pwd-text'),
str_repeat('*', strlen($config->zanode->defaultPwd))
),
h::button
@@ -306,7 +306,7 @@ else
),
h::textarea
(
- set::id('pwd-copy'),
+ setID('pwd-copy'),
setClass('hidden'),
$config->zanode->defaultPwd
)
@@ -409,7 +409,7 @@ detailBody
),
div
(
- set::id('statusContainer')
+ setID('statusContainer')
),
div
(
@@ -425,7 +425,7 @@ detailBody
html($lang->zanode->init->initFailNoticeOnPhysics),
textarea
(
- set::id('initBash'),
+ setID('initBash'),
setClass('hidden'),
$initBash
),
@@ -464,7 +464,7 @@ detailBody
$lang->zanode->createSnapshot,
set::url(createLink('zanode', 'createSnapshot', "zanodeID={$zanode->id}")),
set::icon('plus'),
- set('data-toggle', 'modal'),
+ setData(array('toggle' => 'modal')),
set::disabled($zanode->status != 'running' ? true : false)
)
)