diff --git a/module/release/ui/browse.html.php b/module/release/ui/browse.html.php index e45f8c9adf..e65b8f961b 100644 --- a/module/release/ui/browse.html.php +++ b/module/release/ui/browse.html.php @@ -25,7 +25,7 @@ $canCreateRelease = hasPriv('release', 'create') && common::canModify('product', if($canCreateRelease) $createItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->release->create, 'url' => $this->createLink('release', 'create', "productID={$product->id}&branch={$branch}")); toolbar ( - !empty($createItem) ? item(set($createItem)) : null, + !empty($createItem) ? item(set($createItem)) : null ); jsVar('markerTitle', $lang->release->marker); @@ -46,12 +46,12 @@ dtable set::footPager( usePager ( - array('linkCreator' => helper::createLink('release', 'browse', "productID={$product->id}&branch={$branch}&type={$type}&orderBy={$orderBy}¶m=$param&recTotal={recTotal}&recPerPage={recPerPage}&pageID={page}"), 'recTotal' => $pager->recTotal, 'recPerPage' => $pager->recPerPage), - ), + array('linkCreator' => helper::createLink('release', 'browse', "productID={$product->id}&branch={$branch}&type={$type}&orderBy={$orderBy}¶m=$param&recTotal={recTotal}&recPerPage={recPerPage}&pageID={page}"), 'recTotal' => $pager->recTotal, 'recPerPage' => $pager->recPerPage) + ) ), set::emptyTip($lang->release->noRelease), set::createTip($lang->release->create), - set::createLink($canCreateRelease ? createLink('release', 'create', "productID={$product->id}&branch={$branch}") : ''), + set::createLink($canCreateRelease ? createLink('release', 'create', "productID={$product->id}&branch={$branch}") : '') ); /* ====== Render page ====== */ diff --git a/module/release/ui/create.html.php b/module/release/ui/create.html.php index 45e6c43b89..0395ce94ee 100644 --- a/module/release/ui/create.html.php +++ b/module/release/ui/create.html.php @@ -25,8 +25,8 @@ if(!empty($projectID)) set::name('product'), set::label($lang->release->product), set::items($products), - set::value($product->id), - ), + set::value($product->id) + ) ); } @@ -39,7 +39,7 @@ formPanel ( set::width('1/2'), set::name('name'), - set::label($lang->release->name), + set::label($lang->release->name) ), $app->tab != 'project' || empty($product->shadow) ? formGroup ( @@ -49,10 +49,10 @@ formPanel set::name('marker'), set::rootClass('ml-4'), set::value(1), - set::text($lang->release->marker), + set::text($lang->release->marker) ), $lastRelease ? '(' . $lang->release->last . ': ' . $lastRelease->name . ')' : '' - ) : '', + ) : '' ), $productRow, formRow @@ -66,8 +66,8 @@ formPanel set::name('build[]'), set::placeholder($lang->build->placeholder->multipleSelect), set::items($builds), - set::multiple(true), - ), + set::multiple(true) + ) ), formGroup ( @@ -78,9 +78,9 @@ formPanel set::rootClass('ml-4'), set::checked(1), set::value(1), - set::text($lang->release->syncFromBuilds), - ), - ), + set::text($lang->release->syncFromBuilds) + ) + ) ), formRow ( @@ -91,7 +91,7 @@ formPanel set::label($lang->release->date), set::value(helper::today()), set::control('date') - ), + ) ), formGroup ( @@ -99,7 +99,7 @@ formPanel editor ( set::name('desc'), - set::rows('10'), + set::rows('10') ) ), formGroup @@ -109,14 +109,14 @@ formPanel ( set::name('mailto[]'), set::items($users), - set::multiple(true), + set::multiple(true) ) ), formGroup ( set::label($lang->release->files), upload() - ), + ) ); /* ====== Render page ====== */ diff --git a/module/release/ui/edit.html.php b/module/release/ui/edit.html.php index 55069e9bc1..67a10f2d35 100644 --- a/module/release/ui/edit.html.php +++ b/module/release/ui/edit.html.php @@ -20,7 +20,7 @@ formPanel set::width('1/2'), set::name('name'), set::label($lang->release->name), - set::value($release->name), + set::value($release->name) ), $app->tab != 'project' || empty($product->shadow) ? formGroup ( @@ -31,9 +31,9 @@ formPanel set::rootClass('ml-4'), set::value(1), set::checked(!empty($release->marker)), - set::text($lang->release->marker), - ), - ) : '', + set::text($lang->release->marker) + ) + ) : '' ), formRow ( @@ -47,9 +47,9 @@ formPanel set::placeholder($lang->build->placeholder->multipleSelect), set::items($builds), set::value($release->build), - set::multiple(true), - ), - ), + set::multiple(true) + ) + ) ), formRow ( @@ -60,7 +60,7 @@ formPanel set::label($lang->release->date), set::value($release->date), set::control('date') - ), + ) ), formRow ( @@ -70,8 +70,8 @@ formPanel set::name('status'), set::label($lang->release->status), set::value($release->status), - set::items($lang->release->statusList), - ), + set::items($lang->release->statusList) + ) ), formGroup ( @@ -80,7 +80,7 @@ formPanel ( set::name('desc'), html($release->desc), - set::rows('10'), + set::rows('10') ) ), formGroup @@ -91,7 +91,7 @@ formPanel set::name('mailto[]'), set::value($release->mailto), set::items($users), - set::multiple(true), + set::multiple(true) ) ), formGroup @@ -99,7 +99,7 @@ formPanel set::label($lang->release->files), upload() ), - formHidden('product', $release->product), + formHidden('product', $release->product) ); /* ====== Render page ====== */ diff --git a/module/release/ui/export.html.php b/module/release/ui/export.html.php index a2ad760b8c..5506644b5c 100644 --- a/module/release/ui/export.html.php +++ b/module/release/ui/export.html.php @@ -26,7 +26,7 @@ formPanel set::name('type'), set::value('all'), set::items($lang->release->exportTypeList), - set::required(true), + set::required(true) ), set::submitBtnText($lang->export), set::formClass('border-0') diff --git a/module/release/ui/notify.html.php b/module/release/ui/notify.html.php index eff4712db6..f9b37eb0f8 100644 --- a/module/release/ui/notify.html.php +++ b/module/release/ui/notify.html.php @@ -22,7 +22,7 @@ formPanel formGroup ( setclass('user-title'), - $lang->release->notifyUsers, + $lang->release->notifyUsers ) ), formRow @@ -35,7 +35,7 @@ formPanel set::name('notify[]'), set::value('FB'), set::items($lang->release->notifyList), - set::inline(true), + set::inline(true) ) ) ) diff --git a/module/release/ui/view.html.php b/module/release/ui/view.html.php index e1d168e5cc..e456afa53a 100644 --- a/module/release/ui/view.html.php +++ b/module/release/ui/view.html.php @@ -83,7 +83,7 @@ if(common::hasPriv($releaseModule, 'export') && ($summary || count($bugs) || cou 'url' => createLink($releaseModule, 'export', "releaseID={$release->id}"), 'class' => 'ghost', 'data-size' => 'sm', - 'data-toggle' => 'modal', + 'data-toggle' => 'modal' ))); } @@ -99,7 +99,7 @@ if($canBeChanged) 'data-url' => createLink($releaseModule, 'linkStory', "releaseID={$release->id}" . ($link == 'true' && $type == 'story' ? $decodeParam : '&browseType=story')), 'class' => 'link', 'type' => 'primary', - 'onclick' => 'showLink(this)', + 'onclick' => 'showLink(this)' ))); } @@ -111,7 +111,7 @@ if($canBeChanged) 'data-url' => createLink($releaseModule, 'linkBug', "releaseID={$release->id}" . ($link == 'true' && $type == 'bug' ? $decodeParam : '&browseType=bug')), 'class' => 'link', 'type' => 'primary', - 'onclick' => 'showLink(this)', + 'onclick' => 'showLink(this)' ))); $linkLeftBtn = btn(set(array( @@ -120,7 +120,7 @@ if($canBeChanged) 'data-url' => createLink($releaseModule, 'linkBug', "releaseID={$release->id}". ($link == 'true' && $type == 'leftBug' ? $decodeParam . '&type=leftBug' : '&browseType=leftBug¶m=0&type=leftBug')), 'class' => 'link', 'type' => 'primary', - 'onclick' => 'showLink(this)', + 'onclick' => 'showLink(this)' ))); } } @@ -144,7 +144,7 @@ detailBody ( setClass('tabnActions'), $exportBtn, - $linkStoryBtn, + $linkStoryBtn ), dtable ( @@ -171,7 +171,7 @@ detailBody ( setClass('tabnActions'), $exportBtn, - $linkBugBtn, + $linkBugBtn ), dtable ( @@ -197,7 +197,7 @@ detailBody ( setClass('tabnActions'), $exportBtn, - $linkLeftBtn, + $linkLeftBtn ), dtable ( @@ -221,7 +221,7 @@ detailBody div ( setClass('tabnActions'), - $exportBtn, + $exportBtn ), div( section( @@ -262,12 +262,12 @@ detailBody ( set::name($lang->release->desc), html($release->desc) - ), + ) ) ), fileList ( - set::files($release->files), + set::files($release->files) ), h::hr(set::className('mt-6')), history()