diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php index 6a8817d6aa..396326fd38 100644 --- a/module/bug/ui/resolve.html.php +++ b/module/bug/ui/resolve.html.php @@ -20,11 +20,11 @@ if(common::hasPriv('build', 'create')) { $createBuild = formGroup ( - set::id('createBuildBox'), + setID('createBuildBox'), set::width('1/3'), checkbox ( - set::id('createBuild'), + setID('createBuild'), set::name('createBuild'), set::rootClass('ml-4 items-center'), set::text($lang->bug->createBuild) @@ -49,7 +49,7 @@ formPanel formRow ( setClass('hidden'), - set::id('duplicateBugBox'), + setID('duplicateBugBox'), formGroup ( set::width('1/3'), @@ -66,7 +66,7 @@ formPanel formGroup ( set::width('1/3'), - set::id('newBuildExecutionBox'), + setID('newBuildExecutionBox'), setClass('hidden'), set::label(!empty($execution) && $execution->type == 'kanban' ? $lang->bug->kanban : $lang->build->execution), set::required(true), @@ -80,7 +80,7 @@ formPanel formGroup ( set::width('1/3'), - set::id('resolvedBuildBox'), + setID('resolvedBuildBox'), set::label($lang->bug->resolvedBuild), set::name('resolvedBuild'), set::value(''), @@ -90,7 +90,7 @@ formPanel ( set::width('1/3'), setClass('hidden'), - set::id('newBuildBox'), + setID('newBuildBox'), set::required(true), inputGroup ( diff --git a/module/testcase/ui/edit.html.php b/module/testcase/ui/edit.html.php index 69895dd20f..f8eaea5d3f 100644 --- a/module/testcase/ui/edit.html.php +++ b/module/testcase/ui/edit.html.php @@ -104,7 +104,7 @@ detailBody set::title($lang->testcase->scene), formGroup ( - set::id('sceneIdBox'), + setID('sceneIdBox'), picker ( set::name('scene'), @@ -184,7 +184,7 @@ detailBody ), picker ( - set::className(!isset($product->type) || $product->type == 'normal' ? 'hidden' : ''), + setClass(!isset($product->type) || $product->type == 'normal' ? 'hidden' : ''), setID('branch'), set::name('branch'), set::items($branchTagOption), @@ -199,7 +199,7 @@ detailBody ( inputGroup ( - set::id('moduleIdBox'), + setID('moduleIdBox'), picker ( setID('module'), @@ -234,7 +234,7 @@ detailBody set::name($lang->testcase->story), formGroup ( - set::id('storyIdBox'), + setID('storyIdBox'), picker ( setID('story'), @@ -259,7 +259,7 @@ detailBody ), span ( - set::className('input-group-addon'), + setClass('input-group-addon'), control ( set::type('checkbox'), diff --git a/module/testcase/ui/groupcase.html.php b/module/testcase/ui/groupcase.html.php index 3758733040..3c238ba5ec 100644 --- a/module/testcase/ui/groupcase.html.php +++ b/module/testcase/ui/groupcase.html.php @@ -30,7 +30,7 @@ $cases = initTableData(array_values($cases), $cols); dtable ( - set::id('groupCaseTable'), + setID('groupCaseTable'), set::cols($cols), set::data($cases), set::userMap($users), diff --git a/module/testcase/ui/view.html.php b/module/testcase/ui/view.html.php index a34771e542..9c8f7b875c 100644 --- a/module/testcase/ui/view.html.php +++ b/module/testcase/ui/view.html.php @@ -74,7 +74,7 @@ if($isLibCase) $linkCaseTitles[] = a ( set::href($this->createLink('testcase', 'view', "caseID={$linkCaseID}", '', true)), - set('data-toggle', 'modal'), + setData(array('toggle' => 'modal')), "#{$linkCaseID} {$linkCaseTitle}" ); } @@ -188,8 +188,7 @@ else $storyItem = item ( set::name($lang->testcase->story), - isset($case->storyTitle) && hasPriv('story', 'view') ? a(set::href($this->createLink('story', 'view', "storyID={$case->story}{$param}")), set('data-toggle', 'modal'), "#{$case->story}:{$case->storyTitle}") : (isset($case->storyTitle) ? "#{$case->story}:{$case->storyTitle}" : ''), - set::labelProps(array('data-toggle' => 'modal', 'data-size' => 'lg')), + isset($case->storyTitle) && hasPriv('story', 'view') ? a(set::href($this->createLink('story', 'view', "storyID={$case->story}{$param}")), setData(array('toggle' => 'modal')), "#{$case->story}:{$case->storyTitle}") : (isset($case->storyTitle) ? "#{$case->story}:{$case->storyTitle}" : ''), set::labelProps(array('data-toggle' => 'modal', 'data-size' => 'lg')), $confirmStatusChange ); @@ -392,7 +391,7 @@ detailBody ( $stepsType == 'table' ? div ( - set::id('stepsTable'), + setID('stepsTable'), div ( setClass('steps-header'), @@ -416,7 +415,7 @@ detailBody ) ) : div ( - set::id('stepsView'), + setID('stepsView'), mindmap ( set::data($case->mindMapSteps), @@ -448,7 +447,7 @@ detailBody floatToolbar ( set::object($case), - $isInModal ? null : to::prefix(backBtn(set::icon('back'), set::className('ghost text-white'), $lang->goback)), + $isInModal ? null : to::prefix(backBtn(set::icon('back'), setClass('ghost text-white'), $lang->goback)), set::main($actions['mainActions']), set::suffix($actions['suffixActions']) ), diff --git a/module/tutorial/ui/start.html.php b/module/tutorial/ui/start.html.php index 79ba1b2dad..1b000ab67b 100644 --- a/module/tutorial/ui/start.html.php +++ b/module/tutorial/ui/start.html.php @@ -12,18 +12,18 @@ namespace zin; div ( - set::id('start'), - set::className('bg-primary'), + setID('start'), + setClass('bg-primary'), div ( - set::className('start-icon'), + setClass('start-icon'), icon('certificate icon-certificate-empty icon1 spin'), icon('flag icon2') ), h1($lang->tutorial->common), p($lang->tutorial->desc), a( - set::className('btn btn-default btn-start-now btn-lg btn-info'), + setClass('btn btn-default btn-start-now btn-lg btn-info'), set::href($this->inlink('index')), set::target('_top'), span($lang->tutorial->start)