From c1982f97cd4cc41de57c085dbdf9d8642f6aa91b Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 13 Nov 2023 15:50:39 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in user. --- module/user/ui/batchcreate.html.php | 62 +++++++++++++------------- module/user/ui/batchedit.html.php | 6 +-- module/user/ui/bug.html.php | 2 +- module/user/ui/create.html.php | 4 +- module/user/ui/cropavatar.html.php | 2 +- module/user/ui/delete.html.php | 4 +- module/user/ui/deny.html.php | 6 +-- module/user/ui/dynamic.html.php | 8 ++-- module/user/ui/edit.html.php | 60 ++++++++++++------------- module/user/ui/execution.html.php | 2 +- module/user/ui/featurebar.html.php | 4 +- module/user/ui/forgetpassword.html.php | 16 +++---- module/user/ui/login.html.php | 30 ++++++------- module/user/ui/profile.html.php | 36 +++++++-------- module/user/ui/reset.html.php | 34 +++++++------- module/user/ui/resetpassword.html.php | 24 +++++----- module/user/ui/story.html.php | 2 +- module/user/ui/task.html.php | 2 +- module/user/ui/testcase.html.php | 2 +- module/user/ui/testtask.html.php | 2 +- module/user/ui/todo.html.php | 2 +- 21 files changed, 155 insertions(+), 155 deletions(-) diff --git a/module/user/ui/batchcreate.html.php b/module/user/ui/batchcreate.html.php index da4c8d7040..39aba1e9d1 100644 --- a/module/user/ui/batchcreate.html.php +++ b/module/user/ui/batchcreate.html.php @@ -42,7 +42,7 @@ formBatchPanel set::name('type'), set::value('inside'), set::inline(true), - set::items($lang->user->typeList), + set::items($lang->user->typeList) ) ) ), @@ -62,7 +62,7 @@ formBatchPanel set::items($depts), set::value($deptID), set::ditto(true), - set::hidden(zget($visibleFields, 'dept', true, false)), + set::hidden(zget($visibleFields, 'dept', true, false)) ), formBatchItem ( @@ -78,13 +78,13 @@ formBatchPanel ( set::name('company'), set::items($companies), - set::value(''), + set::value('') ), input ( set::name('newCompany'), set::value(''), - setClass('hidden'), + setClass('hidden') ), checkbox ( @@ -93,9 +93,9 @@ formBatchPanel set::value(0), set::text($lang->company->create), set::rootClass('btn'), - width('96px'), - ), - ), + width('96px') + ) + ) ), formBatchItem ( @@ -133,7 +133,7 @@ formBatchPanel set::width('200px'), set::items($lang->user->roleList), set::value(''), - set::ditto(true), + set::ditto(true) ), formBatchItem ( @@ -143,7 +143,7 @@ formBatchPanel set::items($groupList), set::width('200px'), set::value(''), - set::ditto(true), + set::ditto(true) ), formBatchItem ( @@ -151,7 +151,7 @@ formBatchPanel set::label($lang->user->email), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'email', true, false)), + set::hidden(zget($visibleFields, 'email', true, false)) ), formBatchItem ( @@ -161,7 +161,7 @@ formBatchPanel set::items($lang->user->genderList), set::value('m'), set::width('160px'), - set::hidden(zget($visibleFields, 'gender', true, false)), + set::hidden(zget($visibleFields, 'gender', true, false)) ), formBatchItem ( @@ -174,12 +174,12 @@ formBatchPanel ( set::name('password'), set::value(''), - set::placeholder(zget($lang->user->placeholder->passwordStrength, $config->safe->mode, '')), + set::placeholder(zget($lang->user->placeholder->passwordStrength, $config->safe->mode, '')) ), span ( - setClass('input-group-addon passwordStrength hidden'), - ), + setClass('input-group-addon passwordStrength hidden') + ) ), set::width('200px'), set::required(true) @@ -190,14 +190,14 @@ formBatchPanel set::label($lang->user->commiter), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'commiter', true, false)), + set::hidden(zget($visibleFields, 'commiter', true, false)) ), formBatchItem ( set::name('join'), set::label($lang->user->join), set::control('date'), - set::width('160px'), + set::width('160px') ), formBatchItem ( @@ -205,7 +205,7 @@ formBatchPanel set::label($lang->user->skype), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'skype', true, false)), + set::hidden(zget($visibleFields, 'skype', true, false)) ), formBatchItem ( @@ -213,7 +213,7 @@ formBatchPanel set::label($lang->user->qq), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'qq', true, false)), + set::hidden(zget($visibleFields, 'qq', true, false)) ), formBatchItem ( @@ -221,7 +221,7 @@ formBatchPanel set::label($lang->user->dingding), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'dingding', true, false)), + set::hidden(zget($visibleFields, 'dingding', true, false)) ), formBatchItem ( @@ -229,7 +229,7 @@ formBatchPanel set::label($lang->user->weixin), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'weixin', true, false)), + set::hidden(zget($visibleFields, 'weixin', true, false)) ), formBatchItem ( @@ -237,7 +237,7 @@ formBatchPanel set::label($lang->user->mobile), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'mobile', true, false)), + set::hidden(zget($visibleFields, 'mobile', true, false)) ), formBatchItem ( @@ -245,7 +245,7 @@ formBatchPanel set::label($lang->user->slack), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'slack', true, false)), + set::hidden(zget($visibleFields, 'slack', true, false)) ), formBatchItem ( @@ -253,7 +253,7 @@ formBatchPanel set::label($lang->user->whatsapp), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'whatsapp', true, false)), + set::hidden(zget($visibleFields, 'whatsapp', true, false)) ), formBatchItem ( @@ -261,7 +261,7 @@ formBatchPanel set::label($lang->user->phone), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'phone', true, false)), + set::hidden(zget($visibleFields, 'phone', true, false)) ), formBatchItem ( @@ -269,7 +269,7 @@ formBatchPanel set::label($lang->user->address), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'address', true, false)), + set::hidden(zget($visibleFields, 'address', true, false)) ), formBatchItem ( @@ -277,7 +277,7 @@ formBatchPanel set::label($lang->user->zipcode), set::control('input'), set::width('160px'), - set::hidden(zget($visibleFields, 'zipcode', true, false)), + set::hidden(zget($visibleFields, 'zipcode', true, false)) ), div ( @@ -291,21 +291,21 @@ formBatchPanel set::control('password'), set::name('verifyPassword'), set::value(''), - set::required(true), - ), + set::required(true) + ) ), formGroup ( setClass('hidden'), set::name('verifyRand'), - set::value($rand), + set::value($rand) ), formGroup ( setClass('hidden'), set::name('userType'), - set::value('inside'), - ), + set::value('inside') + ) ); render(); diff --git a/module/user/ui/batchedit.html.php b/module/user/ui/batchedit.html.php index f4e09a5692..79f4485247 100644 --- a/module/user/ui/batchedit.html.php +++ b/module/user/ui/batchedit.html.php @@ -35,9 +35,9 @@ formBatchPanel set::control('password'), set::name('verifyPassword'), set::value(''), - set::required(true), - ), - ), + set::required(true) + ) + ) ); formHidden('verifyRand', $rand); diff --git a/module/user/ui/bug.html.php b/module/user/ui/bug.html.php index 1340c03b3d..0614b0b31c 100644 --- a/module/user/ui/bug.html.php +++ b/module/user/ui/bug.html.php @@ -48,7 +48,7 @@ div set::data(array_values($bugs)), set::orderBy($orderBy), set::sortLink(inlink('bug', "userID={$user->id}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), - set::footPager(usePager()), + set::footPager(usePager()) ) ); diff --git a/module/user/ui/create.html.php b/module/user/ui/create.html.php index ce2afb3068..ac730f471e 100644 --- a/module/user/ui/create.html.php +++ b/module/user/ui/create.html.php @@ -25,7 +25,7 @@ foreach($visionList as $key => $label) set::name('visions[]'), set::text($label), set::value($key), - set::checked($key == 'rnd'), + set::checked($key == 'rnd') ); } @@ -79,7 +79,7 @@ formPanel set::id('addCompany'), set::name('new[]'), set::value('0'), - set::text($lang->company->create), + set::text($lang->company->create) ) ) ) diff --git a/module/user/ui/cropavatar.html.php b/module/user/ui/cropavatar.html.php index bff9370a46..dccdce9a19 100644 --- a/module/user/ui/cropavatar.html.php +++ b/module/user/ui/cropavatar.html.php @@ -21,7 +21,7 @@ formPanel set::tipText($lang->user->cropAvatarTip), set::src($image->webPath), set::handleBtnClick(jsRaw('saveAvatar')), - setStyle('max-width', '540px'), + setStyle('max-width', '540px') ) ); diff --git a/module/user/ui/delete.html.php b/module/user/ui/delete.html.php index 3490067173..209c68169e 100644 --- a/module/user/ui/delete.html.php +++ b/module/user/ui/delete.html.php @@ -14,7 +14,7 @@ modalHeader ( set::title(''), set::entityID(''), - set::entityText(sprintf($lang->user->noticeDelete, $user->realname)), + set::entityText(sprintf($lang->user->noticeDelete, $user->realname)) ); formPanel @@ -33,7 +33,7 @@ formPanel setClass('hidden'), set::name('verifyRand'), set::value($rand) - ), + ) ); render(); diff --git a/module/user/ui/deny.html.php b/module/user/ui/deny.html.php index cbd3f727ee..a26d67e04c 100644 --- a/module/user/ui/deny.html.php +++ b/module/user/ui/deny.html.php @@ -46,15 +46,15 @@ panel set::footerActions (array( $refererBeforeDeny ? array('url' => helper::safe64Decode($refererBeforeDeny), 'text' => $lang->user->goback) : array('back' => 'APP', 'text' => $lang->user->goback), - array('data-url' => createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), 'class' => 'primary', 'text' => $lang->user->relogin, 'onclick' => 'locateLogin(this)'), + array('data-url' => createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), 'class' => 'primary', 'text' => $lang->user->relogin, 'onclick' => 'locateLogin(this)') )), set::footerClass('justify-center'), div ( setClass('alert'), icon(setClass('icon-3x alert-icon'), set::style(array('opacity' => '0.6')), 'exclamation-sign'), - div(html($denyContent)), - ), + div(html($denyContent)) + ) ); render(); diff --git a/module/user/ui/dynamic.html.php b/module/user/ui/dynamic.html.php index 3c64b62225..0ee517336b 100644 --- a/module/user/ui/dynamic.html.php +++ b/module/user/ui/dynamic.html.php @@ -30,7 +30,7 @@ if(empty($dateGroups)) ( setClass('text-gray'), $lang->action->noDynamic - ), + ) ); } else @@ -49,12 +49,12 @@ else setClass('cursor-pointer leading-5'), span ( - icon('angle-down text-primary border-2 rounded-full z-10 bg-canvas align-middle'), + icon('angle-down text-primary border-2 rounded-full z-10 bg-canvas align-middle') ), span ( setClass('ml-2'), - $isToday ? $lang->today : $date, + $isToday ? $lang->today : $date ), on::click('toggleCollapse') ), @@ -68,7 +68,7 @@ else dynamic ( set::dynamics($actions), - set::users($users), + set::users($users) ) ) ) diff --git a/module/user/ui/edit.html.php b/module/user/ui/edit.html.php index 94eb92eeca..277783cc78 100644 --- a/module/user/ui/edit.html.php +++ b/module/user/ui/edit.html.php @@ -22,7 +22,7 @@ if(!empty($config->user->contactField)) set::width('1/2'), set::label($lang->user->{$field}), set::name($field), - set::value($user->{$field}), + set::value($user->{$field}) ); if($i % 2 == 1) $contacts[] = formRow($contactGroup); @@ -40,9 +40,9 @@ formPanel entityLabel ( set::level(1), - set::text($user->realname), - ), - ), + set::text($user->realname) + ) + ) ), set::formClass('border-0'), on::click('button[type="submit"]', 'computePassword'), @@ -63,7 +63,7 @@ formPanel set::control('picker'), set::name('role'), set::items($lang->user->roleList), - set::value($user->role), + set::value($user->role) ) ), formRow @@ -85,7 +85,7 @@ formPanel set::control('date'), set::name('join'), set::value($user->join) - ), + ) ), formRow ( @@ -98,8 +98,8 @@ formPanel set::name('group[]'), set::items($groups), set::value($userGroups), - set::multiple(true), - ), + set::multiple(true) + ) ), formGroup ( @@ -118,7 +118,7 @@ formPanel ( set::name('newCompany'), set::value(''), - setClass('hidden'), + setClass('hidden') ), checkbox ( @@ -128,10 +128,10 @@ formPanel set::value(0), set::text($lang->company->create), set::rootClass('btn'), - width('96px'), - ), - ), - ), + width('96px') + ) + ) + ) ), formRow ( @@ -146,7 +146,7 @@ formPanel set::name('type'), set::items($lang->user->typeList), set::value($user->type) - ), + ) ), formGroup ( @@ -158,8 +158,8 @@ formPanel set::name('gender'), set::items($lang->user->genderList), set::value($user->gender) - ), - ), + ) + ) ), formRowGroup(set::title($lang->user->accountInfo)), formRow @@ -177,7 +177,7 @@ formPanel set::width('1/2'), set::label($lang->user->email), set::name('email'), - set::value($user->email), + set::value($user->email) ) ), formRow @@ -187,7 +187,7 @@ formPanel on::change('password1Change'), set::width('1/2'), set::label($lang->user->password), - password(set::checkStrength(true)), + password(set::checkStrength(true)) ), formGroup ( @@ -196,7 +196,7 @@ formPanel set::label($lang->user->password2), set::control('password'), set::name('password2'), - set::value(''), + set::value('') ) ), formRow @@ -207,7 +207,7 @@ formPanel set::width('1/2'), set::label($lang->user->commiter), set::name('commiter'), - set::value($user->commiter), + set::value($user->commiter) ), formGroup ( @@ -219,8 +219,8 @@ formPanel set::name('visions[]'), set::items($visionList), set::value($user->visions), - set::inline(true), - ), + set::inline(true) + ) ) ), formRowGroup(set::title($lang->user->contactInfo)), @@ -232,14 +232,14 @@ formPanel set::width('1/2'), set::label($lang->user->address), set::name('address'), - set::value($user->address), + set::value($user->address) ), formGroup ( set::width('1/2'), set::label($lang->user->zipcode), set::name('zipcode'), - set::value($user->zipcode), + set::value($user->zipcode) ) ), formRowGroup(set::title($lang->user->verify)), @@ -252,8 +252,8 @@ formPanel set::control('password'), set::name('verifyPassword'), set::value(''), - set::placeholder($lang->user->placeholder->verify), - ), + set::placeholder($lang->user->placeholder->verify) + ) ), formRow ( @@ -261,14 +261,14 @@ formPanel formGroup ( set::name('passwordLength'), - set::value(0), + set::value(0) ), formGroup ( set::name('verifyRand'), - set::value($rand), - ), - ), + set::value($rand) + ) + ) ); render(); diff --git a/module/user/ui/execution.html.php b/module/user/ui/execution.html.php index 94d853661d..5cf1b55ae6 100644 --- a/module/user/ui/execution.html.php +++ b/module/user/ui/execution.html.php @@ -45,7 +45,7 @@ panel set::orderBy($orderBy), set::sortLink(inlink('execution', "userID={$user->id}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::onRenderCell(jsRaw('window.renderCell')), - set::footPager(usePager()), + set::footPager(usePager()) ) ); diff --git a/module/user/ui/featurebar.html.php b/module/user/ui/featurebar.html.php index 4f7d942581..30b425251b 100755 --- a/module/user/ui/featurebar.html.php +++ b/module/user/ui/featurebar.html.php @@ -15,8 +15,8 @@ featureBar set::items($userList), set::value($user->id), set::required(true), - set::onChange(jsRaw("(value) => switchAccount(value)")), + set::onChange(jsRaw("(value) => switchAccount(value)")) ) ), - set::items($this->user->getFeatureBarMenus($user)), + set::items($this->user->getFeatureBarMenus($user)) ); diff --git a/module/user/ui/forgetpassword.html.php b/module/user/ui/forgetpassword.html.php index 982ba8e6b7..a8271c1634 100644 --- a/module/user/ui/forgetpassword.html.php +++ b/module/user/ui/forgetpassword.html.php @@ -24,8 +24,8 @@ div a ( set::href(inlink('reset')), - $lang->user->resetTitle, - ), + $lang->user->resetTitle + ) ), set::title($lang->admin->resetPWDByMail), setClass('forget-password'), @@ -40,7 +40,7 @@ div set::value(''), set::required(true), set::placeholder($lang->user->placeholder->loginAccount) - ), + ) ), formRow ( @@ -59,11 +59,11 @@ div toolbar ( btn(set(array('text' => $lang->user->submit, 'btnType' => 'submit', 'type' => 'primary', 'class' => 'mx-4'))), - btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))), - ), - ), - ), - ), + btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))) + ) + ) + ) + ) ); render('pagebase'); diff --git a/module/user/ui/login.html.php b/module/user/ui/login.html.php index 6f28901848..08499c9df2 100644 --- a/module/user/ui/login.html.php +++ b/module/user/ui/login.html.php @@ -89,7 +89,7 @@ div set::items($langItems), set::menuClass('langsDropMenu'), set::staticMenu(true), - set::trigger('hover'), + set::trigger('hover') ) ), div @@ -99,7 +99,7 @@ div ( set::width('1/3'), setID('logo-box'), - h::img(set::src($config->webRoot . 'theme/default/images/main/' . $this->lang->logoImg)), + h::img(set::src($config->webRoot . 'theme/default/images/main/' . $this->lang->logoImg)) ), cell ( @@ -112,13 +112,13 @@ div ( set::label($lang->user->account), set::strong(true), - set::control(array('type' => 'text', 'name' => 'account')), + set::control(array('type' => 'text', 'name' => 'account')) ), formGroup ( set::label($lang->user->password), set::strong(true), - set::control(array('type' => 'password', 'name' => 'password')), + set::control(array('type' => 'password', 'name' => 'password')) ), !empty($this->config->safe->loginCaptcha) ? formGroup ( @@ -129,23 +129,23 @@ div inputGroup ( input(set::name('captcha')), - span(setClass('input-group-addon'), h::img(set::src($this->createLink('misc', 'captcha', "sessionVar=captcha")), on::click('refreshCaptcha(e.target)'))), + span(setClass('input-group-addon'), h::img(set::src($this->createLink('misc', 'captcha', "sessionVar=captcha")), on::click('refreshCaptcha(e.target)'))) ) ) ) : null, formGroup ( set::label(''), - set::control(array('type' => 'checkList', 'items' => $lang->user->keepLogin, 'name' => 'keepLogin', 'value' => $keepLogin)), + set::control(array('type' => 'checkList', 'items' => $lang->user->keepLogin, 'name' => 'keepLogin', 'value' => $keepLogin)) ), formHidden('referer', $referer), set::actions(array ( array('text' => $lang->login, 'id' => 'submit', 'class' => 'primary'), - array('text' => $lang->user->resetPassword, 'class' => 'resetPassword', 'url' => $resetLink), - )), - ), - ), + array('text' => $lang->user->resetPassword, 'class' => 'resetPassword', 'url' => $resetLink) + )) + ) + ) ), (count($plugins['expired']) > 0 || count($plugins['expiring']) > 0) ? div ( @@ -154,15 +154,15 @@ div ( setID('notice'), setClass('alert secondary'), - div(setClass('content'), icon(setClass('text-secondary'), 'exclamation-sign'), $expiredCountTips), + div(setClass('content'), icon(setClass('text-secondary'), 'exclamation-sign'), $expiredCountTips) ) ) : null, empty($demoUsers) ? null : div ( setClass('footer'), span($lang->user->loginWithDemoUser), - $demoUserItems, - ), + $demoUserItems + ) ), div ( @@ -170,8 +170,8 @@ div div ( setID('poweredby'), - ($unsafeSites && !empty($unsafeSites[$zentaoDirName])) ? div(a(setClass('showNotice'), set::href('###'), on::click('showNotice'), $lang->user->notice4Safe)) : null, - ), + ($unsafeSites && !empty($unsafeSites[$zentaoDirName])) ? div(a(setClass('showNotice'), set::href('###'), on::click('showNotice'), $lang->user->notice4Safe)) : null + ) ) ) ); diff --git a/module/user/ui/profile.html.php b/module/user/ui/profile.html.php index 5e10233ca4..df79936d61 100644 --- a/module/user/ui/profile.html.php +++ b/module/user/ui/profile.html.php @@ -35,7 +35,7 @@ div ( set::width('50%'), setClass('text-right pr-3'), - userAvatar(set::user($user)), + userAvatar(set::user($user)) ), cell ( @@ -45,8 +45,8 @@ div ( setClass('user-role text-gray'), zget($lang->user->roleList, $user->role) - ), - ), + ) + ) ), h::table ( @@ -55,29 +55,29 @@ div h::th($lang->user->realname), h::td($user->realname), h::th($lang->user->gender), - h::td(zget($lang->user->genderList, $user->gender)), + h::td(zget($lang->user->genderList, $user->gender)) ), h::tr ( h::th($lang->user->account), h::td($user->account), h::th($lang->user->email), - h::td(set::title($user->email), $user->email ? a(set::href("mailto:{$user->email}"), $user->email) : null), + h::td(set::title($user->email), $user->email ? a(set::href("mailto:{$user->email}"), $user->email) : null) ), h::tr ( h::th($lang->user->dept), h::td(html($deptName)), h::th($lang->user->role), - h::td(zget($lang->user->roleList, $user->role, '')), + h::td(zget($lang->user->roleList, $user->role, '')) ), h::tr ( h::th($lang->user->joinAB), h::td(formatTime($user->join)), h::th($lang->user->priv), - h::td(trim($groupName)), - ), + h::td(trim($groupName)) + ) ), h::hr(), h::table @@ -87,22 +87,22 @@ div h::th($lang->user->mobile), h::td($user->mobile), h::th($lang->user->weixin), - h::td($user->weixin), + h::td($user->weixin) ), h::tr ( h::th($lang->user->phone), h::td($user->phone), h::th($lang->user->qq), - h::td($user->qq), + h::td($user->qq) ), h::tr ( h::th($lang->user->zipcode), h::td($user->zipcode), h::th($lang->user->addressAB), - h::td(set::title($user->address), $user->address), - ), + h::td(set::title($user->address), $user->address) + ) ), isInModal() ? null : h::hr(), isInModal() ? null : h::table @@ -112,30 +112,30 @@ div h::th($lang->user->commiter), h::td($user->commiter), h::th($lang->user->skype), - h::td($user->skype ? a(set::href("callto://{$user->skype}"), $user->skype) : null), + h::td($user->skype ? a(set::href("callto://{$user->skype}"), $user->skype) : null) ), h::tr ( h::th($lang->user->visits), h::td($user->visits), h::th($lang->user->whatsapp), - h::td($user->whatsapp), + h::td($user->whatsapp) ), h::tr ( h::th($lang->user->last), h::td($user->last), h::th($lang->user->slack), - h::td($user->slack), + h::td($user->slack) ), h::tr ( h::th($lang->user->ip), h::td($user->ip), h::th($lang->user->dingding), - h::td($user->dingding), - ), - ), + h::td($user->dingding) + ) + ) ); render(); diff --git a/module/user/ui/reset.html.php b/module/user/ui/reset.html.php index e4d68e9be3..dd5756a72b 100644 --- a/module/user/ui/reset.html.php +++ b/module/user/ui/reset.html.php @@ -20,7 +20,7 @@ $content = $needCreateFile ? div cell ( setClass('alert-info p-4 mb-6'), - html(sprintf($lang->user->noticeResetFile, $resetFileName)), + html(sprintf($lang->user->noticeResetFile, $resetFileName)) ), cell ( @@ -30,16 +30,16 @@ $content = $needCreateFile ? div setClass('px-8 mx-4'), set::type('primary'), set::url(inlink('reset')), - $lang->refresh, + $lang->refresh ), backBtn ( setClass('px-8 mx-4'), set::back('GLOBAL'), $lang->goback - ), - ), - ), + ) + ) + ) ) : div ( setClass('reset-password cell flex justify-center mt-24'), @@ -54,8 +54,8 @@ $content = $needCreateFile ? div set::label($lang->user->account), set::name('account'), set::value(''), - set::required(true), - ), + set::required(true) + ) ), formRow ( @@ -63,8 +63,8 @@ $content = $needCreateFile ? div ( set::label($lang->user->password), password(set::checkStrength(true)), - set::required(true), - ), + set::required(true) + ) ), formRow ( @@ -74,7 +74,7 @@ $content = $needCreateFile ? div set::control('password'), set::name('password2'), set::value(''), - set::required(true), + set::required(true) ) ), formRow @@ -83,15 +83,15 @@ $content = $needCreateFile ? div formGroup ( set::name('passwordLength'), - set::value(0), + set::value(0) ), formGroup ( set::name('verifyRand'), - set::value($rand), - ), - ), - ), + set::value($rand) + ) + ) + ) ); set::zui(true); @@ -101,8 +101,8 @@ div div ( set::id('mainContent'), - $content, - ), + $content + ) ); render('pagebase'); diff --git a/module/user/ui/resetpassword.html.php b/module/user/ui/resetpassword.html.php index 11e15c7930..ac5e970789 100644 --- a/module/user/ui/resetpassword.html.php +++ b/module/user/ui/resetpassword.html.php @@ -15,7 +15,7 @@ $content = $expired ? div ( setClass('alert-danger p-4 mb-6'), $lang->user->linkExpired, - html(sprintf($lang->user->jumping, inlink('login'))), + html(sprintf($lang->user->jumping, inlink('login'))) ) : formPanel ( setClass('reset-password w-full'), @@ -30,8 +30,8 @@ $content = $expired ? div password ( set::checkStrength(true) - ), - ), + ) + ) ), formRow ( @@ -41,7 +41,7 @@ $content = $expired ? div set::required(true), set::control('password'), set::name('password2'), - set::value(''), + set::value('') ) ), formRow @@ -50,13 +50,13 @@ $content = $expired ? div formGroup ( set::name('passwordLength'), - set::value(0), + set::value(0) ), formGroup ( set::name('verifyRand'), - set::value($rand), - ), + set::value($rand) + ) ), formRow ( @@ -64,9 +64,9 @@ $content = $expired ? div toolbar ( btn(set(array('text' => $lang->user->submit, 'btnType' => 'submit', 'type' => 'primary', 'class' => 'mx-4'))), - btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))), - ), - ), + btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))) + ) + ) ); set::zui(true); @@ -76,8 +76,8 @@ div div ( set::id('mainContent'), - $content, - ), + $content + ) ); render('pagebase'); diff --git a/module/user/ui/story.html.php b/module/user/ui/story.html.php index 2871235233..bef3c67a93 100644 --- a/module/user/ui/story.html.php +++ b/module/user/ui/story.html.php @@ -57,7 +57,7 @@ div set::data(array_values($stories)), set::orderBy($orderBy), set::sortLink(inlink('story', "userID={$user->id}&storyType={$storyType}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), - set::footPager(usePager()), + set::footPager(usePager()) ) ); diff --git a/module/user/ui/task.html.php b/module/user/ui/task.html.php index 910f48f763..821858fb13 100644 --- a/module/user/ui/task.html.php +++ b/module/user/ui/task.html.php @@ -65,7 +65,7 @@ div set::orderBy($orderBy), set::sortLink(inlink('task', "userID={$user->id}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::onRenderCell(jsRaw('window.renderCell')), - set::footPager(usePager()), + set::footPager(usePager()) ) ); diff --git a/module/user/ui/testcase.html.php b/module/user/ui/testcase.html.php index 5ea3840d75..0c24df1b26 100644 --- a/module/user/ui/testcase.html.php +++ b/module/user/ui/testcase.html.php @@ -58,7 +58,7 @@ div set::orderBy($orderBy), set::sortLink(inlink('testcase', "userID={$user->id}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::onRenderCell(jsRaw('window.renderCell')), - set::footPager(usePager()), + set::footPager(usePager()) ) ); diff --git a/module/user/ui/testtask.html.php b/module/user/ui/testtask.html.php index 23e80056fc..72cd464d64 100644 --- a/module/user/ui/testtask.html.php +++ b/module/user/ui/testtask.html.php @@ -59,7 +59,7 @@ div set::sortLink(inlink('testtask', "userID={$user->id}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footPager(usePager()), set::onRenderCell(jsRaw('window.renderCell')), - set::footer(array(array('html' => $summary, 'className' => "text-dark"), 'flex', 'pager')), + set::footer(array(array('html' => $summary, 'className' => "text-dark"), 'flex', 'pager')) ) ); diff --git a/module/user/ui/todo.html.php b/module/user/ui/todo.html.php index 23595b0a17..a630ded1e2 100644 --- a/module/user/ui/todo.html.php +++ b/module/user/ui/todo.html.php @@ -59,7 +59,7 @@ div set::orderBy($orderBy), set::sortLink(inlink('todo', "userID={$user->id}&type={$type}&status={$status}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footer(array(array('html' => $summary, 'className' => "text-dark"), 'flex', 'pager')), - set::footPager(usePager()), + set::footPager(usePager()) ) );