Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Remove , at the end of row in the lastest children in my.

Browse Source
This commit is contained in:
liumengyi
2023-11-13 14:27:16 +08:00
parent 6b9e60c019
commit 834d24faa1
15 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/ui/audit.html.php
+2 -2
View File
@@ -22,7 +22,7 @@ if($rawMethod == 'contribute') $linkParam = "mode=$mode&$linkParam";
featurebar
(
set::current($browseType),
set::linkParams($linkParam),
set::linkParams($linkParam)
);
if($rawMethod != 'audit') unset($config->my->audit->dtable->fieldList['actions']);
@@ -95,7 +95,7 @@ dtable
set::onRenderCell(jsRaw('window.onRenderCell')),
set::orderBy($orderBy),
set::sortLink($sortLink),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
module/my/ui/changepassword.html.php
+1 -1
View File
@@ -27,7 +27,7 @@ formPanel
div
(
setClass('panel-title text-lg'),
$lang->my->changePassword,
$lang->my->changePassword
)
),
on::change('#originalPassword,#password1,#password2', 'changePassword'),
module/my/ui/dynamic.html.php
+5 -5
View File
@@ -14,7 +14,7 @@ namespace zin;
featureBar
(
set::current($type),
set::linkParams('&type={key}'),
set::linkParams('&type={key}')
);
$content = null;
@@ -27,7 +27,7 @@ if(empty($dateGroups))
(
setClass('text-gray'),
$lang->action->noDynamic
),
)
);
}
else
@@ -46,12 +46,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')
),
@@ -65,7 +65,7 @@ else
dynamic
(
set::dynamics($actions),
set::users($users),
set::users($users)
)
)
)
module/my/ui/editprofile.html.php
+21 -21
View File
@@ -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($lang->my->editProfile),
),
),
set::text($lang->my->editProfile)
)
)
),
formRowGroup(set::title($lang->my->form->lblBasic)),
formRow
@@ -59,7 +59,7 @@ formPanel
set::width('1/2'),
set::label($lang->user->email),
set::name('email'),
set::value($user->email),
set::value($user->email)
)
),
formRow
@@ -74,7 +74,7 @@ formPanel
set::name('gender'),
set::items($lang->user->genderList),
set::value($user->gender)
),
)
),
formGroup
(
@@ -83,7 +83,7 @@ formPanel
set::control('datePicker'),
set::name('join'),
set::value($user->join)
),
)
),
formRowGroup(set::title($lang->my->form->lblAccount)),
formRow
@@ -101,8 +101,8 @@ formPanel
set::width('1/2'),
set::label($lang->user->commiter),
set::name('commiter'),
set::value($user->commiter),
),
set::value($user->commiter)
)
),
formRow
(
@@ -116,9 +116,9 @@ formPanel
(
set::id('password1'),
set::name('password1'),
set::checkStrength(true),
),
),
set::checkStrength(true)
)
)
),
formGroup
(
@@ -126,7 +126,7 @@ formPanel
set::label($lang->user->password2),
set::control('password'),
set::name('password2'),
set::value(''),
set::value('')
)
),
formRowGroup(set::title($lang->my->form->lblBasic)),
@@ -138,14 +138,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)),
@@ -158,8 +158,8 @@ formPanel
set::control('password'),
set::name('verifyPassword'),
set::value(''),
set::placeholder($lang->user->placeholder->verify),
),
set::placeholder($lang->user->placeholder->verify)
)
),
formRow
(
@@ -167,14 +167,14 @@ formPanel
formGroup
(
set::name('passwordLength'),
set::value(0),
set::value(0)
),
formGroup
(
set::name('verifyRand'),
set::value($rand),
),
),
set::value($rand)
)
)
);
render();
module/my/ui/execution.html.php
+1 -1
View File
@@ -33,7 +33,7 @@ dtable
set::footPager(usePager(array(
'recPerPage' => $pager->recPerPage,
'recTotal' => $pager->recTotal,
'linkCreator' => createLink('my', 'execution', "type={$type}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPaga={recPerPage}&page={page}"),
'linkCreator' => createLink('my', 'execution', "type={$type}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPaga={recPerPage}&page={page}")
))),
set::emptyTip($lang->execution->noExecutions)
);
module/my/ui/preference.html.php
+1 -1
View File
@@ -65,7 +65,7 @@ formPanel
set('menu', array('class' => 'menu picker-menu-list no-nested-items menu-nested flex flex-wrap content-between ursr-menu')),
set::name('URSR'),
set::items($URSRItems),
set::value($URSR),
set::value($URSR)
)
),
$this->config->systemMode == 'ALM' ? formGroup
module/my/ui/profile.html.php
+6 -6
View File
@@ -38,7 +38,7 @@ $getItems = function($datas)
(
set::width('70px'),
set::className('text-right'),
span(set::className('text-gray'), $label),
span(set::className('text-gray'), $label)
),
cell
(
@@ -75,7 +75,7 @@ div
setClass('text-base text-gray ml-1'),
'(' . zget($lang->user->roleList, $user->role) . ')'
)
),
)
),
formRowGroup(set::title($lang->my->form->lblBasic)),
div
@@ -84,7 +84,7 @@ div
$getItems(array($lang->user->realname => $user->realname, $lang->user->gender => zget($lang->user->genderList, $user->gender))),
$getItems(array($lang->user->account => $user->account, $lang->user->email => $user->email ? a(set::href("mailto:{$user->email}"), $user->email) : '')),
$getItems(array($lang->user->dept => html($deptName), $lang->user->role => zget($lang->user->roleList, $user->role, ''))),
$getItems(array($lang->user->joinAB => formatTime($user->join), $lang->user->priv => trim($groupName))),
$getItems(array($lang->user->joinAB => formatTime($user->join), $lang->user->priv => trim($groupName)))
),
formRowGroup(set::title($lang->my->form->lblContact)),
div
@@ -92,7 +92,7 @@ div
set::className('py-2'),
$getItems(array($lang->user->mobile => $user->mobile, $lang->user->weixin => $user->weixin)),
$getItems(array($lang->user->phone => $user->phone, $lang->user->qq => $user->qq)),
$getItems(array($lang->user->zipcode => $user->zipcode, $lang->user->addressAB => $user->address)),
$getItems(array($lang->user->zipcode => $user->zipcode, $lang->user->addressAB => $user->address))
),
formRowGroup(set::title($lang->my->form->lblAccount)),
div
@@ -101,7 +101,7 @@ div
$getItems(array($lang->user->commiter => $user->commiter, $lang->user->skype => $user->skype ? a(set::href("callto://{$user->skype}"), $user->skype) : '')),
$getItems(array($lang->user->visits => $user->visits, $lang->user->whatsapp => $user->whatsapp)),
$getItems(array($lang->user->last => $user->last, $lang->user->whatsapp => $user->whatsapp)),
$getItems(array($lang->user->ip => $user->ip, $lang->user->dingding => $user->dingding)),
$getItems(array($lang->user->ip => $user->ip, $lang->user->dingding => $user->dingding))
),
center
(
@@ -112,7 +112,7 @@ div
common::hasPriv('my', 'changepassword') ? array('text' => $lang->changePassword, 'data-toggle' => 'modal', 'url' => createLink('my', 'changepassword')) : null,
common::hasPriv('my', 'editprofile') ? array('text' => $lang->user->editProfile, 'data-toggle' => 'modal', 'url' => createLink('my', 'editprofile')) : null,
common::hasPriv('my', 'uploadAvatar') ? array('text' => $lang->my->uploadAvatar, 'data-on' => 'click', 'data-call' => 'uploadAvatar') : null
)),
))
)
)
);
module/my/ui/project.html.php
+1 -1
View File
@@ -15,7 +15,7 @@ jsVar('delayInfo', $lang->project->delayInfo);
featurebar
(
set::current($status),
set::linkParams("status={key}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"),
set::linkParams("status={key}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")
);
$this->loadModel('project');
module/my/ui/requirement.html.php
+1 -1
View File
@@ -62,7 +62,7 @@ $footToolbar = array('items' => array
$canBatchEdit ? array('text' => $lang->edit, 'className' => 'batch-btn', 'data-url' => helper::createLink('story', 'batchEdit', "productID=0&executionID=0&branch=0&storyType=requirement&from={$app->rawMethod}")) : null,
$canBatchReview ? array('caret' => 'up', 'text' => $lang->story->review, 'type' => 'dropdown', 'items' => $reviewItems, 'data-placement' => 'top-start') : null,
$canBatchAssignTo ? array('caret' => 'up', 'text' => $lang->story->assignedTo, 'type' => 'dropdown', 'items' => $assignedToItems, 'data-placement' => 'top-start') : null,
$canBatchClose ? array('text' => $lang->story->close, 'className' => 'batch-btn', 'data-url' => helper::createLink('story', 'batchClose', "productID=0&executionID=0&storyType=requirement&from={$app->rawMethod}")) : null,
$canBatchClose ? array('text' => $lang->story->close, 'className' => 'batch-btn', 'data-url' => helper::createLink('story', 'batchClose', "productID=0&executionID=0&storyType=requirement&from={$app->rawMethod}")) : null
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary'));
if($canBatchAction) $config->my->requirement->dtable->fieldList['id']['type'] = 'checkID';
module/my/ui/score.html.php
+4 -4
View File
@@ -15,7 +15,7 @@ jsVar('methods', $lang->score->methods);
featureBar
(
set::current('all'),
set::linkParams("date={key}&userID={$app->user->id}&status=undone"),
set::linkParams("date={key}&userID={$app->user->id}&status=undone")
);
$cols = array_values($config->my->score->dtable->fieldList);
@@ -28,7 +28,7 @@ toolbar
h::strong
(
$lang->score->current,
':',
':'
),
$user->score
),
@@ -37,7 +37,7 @@ toolbar
setClass('btn primary'),
set::url(helper::createLink('score', 'rule')),
$lang->my->scoreRule
),
)
);
dtable
@@ -46,7 +46,7 @@ dtable
set::data($data),
set::fixedLeftWidth('0.2'),
set::onRenderCell(jsRaw('window.renderCell')),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
module/my/ui/story.html.php
+1 -1
View File
@@ -64,7 +64,7 @@ $footToolbar = array('items' => array
$canBatchEdit ? array('text' => $lang->edit, 'className' => 'batch-btn', 'data-url' => helper::createLink('story', 'batchEdit', "productID=0&executionID=0&branch=0&storyType=story&from={$app->rawMethod}")) : null,
$canBatchReview ? array('caret' => 'up', 'text' => $lang->story->review, 'type' => 'dropdown', 'items' => $reviewItems, 'data-placement' => 'top-start') : null,
$canBatchAssignTo ? array('caret' => 'up', 'text' => $lang->story->assignedTo, 'type' => 'dropdown', 'items' => $assignedToItems, 'data-placement' => 'top-start') : null,
$canBatchClose ? array('text' => $lang->story->close, 'className' => 'batch-btn', 'data-url' => helper::createLink('story', 'batchClose', "productID=0&executionID=0&storyType=story&from={$app->rawMethod}")) : null,
$canBatchClose ? array('text' => $lang->story->close, 'className' => 'batch-btn', 'data-url' => helper::createLink('story', 'batchClose', "productID=0&executionID=0&storyType=story&from={$app->rawMethod}")) : null
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary'));
if($canBatchAction) $config->my->story->dtable->fieldList['id']['type'] = 'checkID';
module/my/ui/task.html.php
+1 -1
View File
@@ -26,7 +26,7 @@ $canBatchClose = common::hasPriv('task', 'batchClose') && $type != 'closedBy';
$footToolbar = array('items' => array
(
$canBatchEdit ? array('text' => $lang->edit, 'className' => 'batch-btn', 'data-url' => helper::createLink('task', 'batchEdit')) : null,
$canBatchClose ? array('text' => $lang->close, 'className' => 'batch-btn ajax-btn', 'data-url' => helper::createLink('task', 'batchClose')) : null,
$canBatchClose ? array('text' => $lang->close, 'className' => 'batch-btn ajax-btn', 'data-url' => helper::createLink('task', 'batchClose')) : null
), 'btnProps' => array('size' => 'sm', 'btnType' => 'secondary'));
if($type == 'assignedTo') unset($config->my->task->dtable->fieldList['assignedTo']);
module/my/ui/team.html.php
+1 -1
View File
@@ -32,7 +32,7 @@ dtable
set::orderBy($orderBy),
set::sortLink(inlink('team', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::fixedLeftWidth('0.2'),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
module/my/ui/testtask.html.php
+1 -1
View File
@@ -13,7 +13,7 @@ namespace zin;
featureBar
(
set::current($type),
set::linkParams("mode=testtask&type={key}&param={$param}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"),
set::linkParams("mode=testtask&type={key}&param={$param}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")
);
$tasks = initTableData($tasks, $config->my->testtask->dtable->fieldList, $this->testtask);
module/my/ui/todo.html.php
+1 -1
View File
@@ -20,7 +20,7 @@ featureBar
set::_class('w-32'),
set::value($date),
set::onChange(jsRaw("(value) => loadPage($.createLink('my', 'todo', 'date=' + (value ? zui.formatDate(value, 'yyyyMMdd') : '')), '#mainContent,#featureBar')"))
),
)
);
$canCreate = hasPriv('todo', 'create');