diff --git a/module/user/ui/bug.html.php b/module/user/ui/bug.html.php index 179aee2624..1340c03b3d 100644 --- a/module/user/ui/bug.html.php +++ b/module/user/ui/bug.html.php @@ -12,10 +12,10 @@ namespace zin; include './featurebar.html.php'; $that = zget($lang->user->thirdPerson, $user->gender); -$bugNavs['assignedTo'] = array('text' => sprintf($lang->user->assignedTo, $that), 'url' => inlink('bug', "userID={$user->id}&type=assignedTo&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$bugNavs['openedBy'] = array('text' => sprintf($lang->user->openedBy, $that), 'url' => inlink('bug', "userID={$user->id}&type=openedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$bugNavs['resolvedBy'] = array('text' => sprintf($lang->user->resolvedBy, $that), 'url' => inlink('bug', "userID={$user->id}&type=resolvedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$bugNavs['closedBy'] = array('text' => sprintf($lang->user->closedBy, $that), 'url' => inlink('bug', "userID={$user->id}&type=closedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); +$bugNavs['assignedTo'] = array('text' => sprintf($lang->user->assignedTo, $that), 'url' => inlink('bug', "userID={$user->id}&type=assignedTo&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$bugNavs['openedBy'] = array('text' => sprintf($lang->user->openedBy, $that), 'url' => inlink('bug', "userID={$user->id}&type=openedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$bugNavs['resolvedBy'] = array('text' => sprintf($lang->user->resolvedBy, $that), 'url' => inlink('bug', "userID={$user->id}&type=resolvedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$bugNavs['closedBy'] = array('text' => sprintf($lang->user->closedBy, $that), 'url' => inlink('bug', "userID={$user->id}&type=closedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); if(isset($bugNavs[$type])) $bugNavs[$type]['active'] = true; $cols = array(); @@ -30,13 +30,18 @@ $cols = array_map(function($col) return $col; }, $cols); -panel +div ( - setClass('list'), - set::title(null), - set::headingActions(array(nav(set::items($bugNavs)))), + setClass('shadow-sm rounded canvas'), + nav + ( + setClass('dtable-sub-nav py-1'), + set::items($bugNavs) + ), dtable ( + set::_className('shadow-none'), + set::extraHeight('+.dtable-sub-nav'), set::userMap($users), set::bordered(true), set::cols($cols), diff --git a/module/user/ui/story.html.php b/module/user/ui/story.html.php index d0eee3c2fa..2871235233 100644 --- a/module/user/ui/story.html.php +++ b/module/user/ui/story.html.php @@ -12,10 +12,10 @@ namespace zin; include './featurebar.html.php'; $that = zget($lang->user->thirdPerson, $user->gender); -$storyNavs['assignedTo'] = array('text' => sprintf($lang->user->assignedTo, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=assignedTo&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$storyNavs['openedBy'] = array('text' => sprintf($lang->user->openedBy, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=openedBy&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$storyNavs['reviewedBy'] = array('text' => sprintf($lang->user->reviewedBy, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=reviewedBy&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$storyNavs['closedBy'] = array('text' => sprintf($lang->user->closedBy, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=closedBy&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); +$storyNavs['assignedTo'] = array('text' => sprintf($lang->user->assignedTo, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=assignedTo&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$storyNavs['openedBy'] = array('text' => sprintf($lang->user->openedBy, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=openedBy&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$storyNavs['reviewedBy'] = array('text' => sprintf($lang->user->reviewedBy, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=reviewedBy&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$storyNavs['closedBy'] = array('text' => sprintf($lang->user->closedBy, $that), 'url' => inlink('story', "userID={$user->id}&storyType={$storyType}&type=closedBy&orderType={$orderType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); if(isset($storyNavs[$type])) $storyNavs[$type]['active'] = true; $this->loadModel('my'); @@ -39,13 +39,18 @@ $cols = array_map(function($col) foreach($stories as $story) $story->estimate .= $config->hourUnit; -panel +div ( - setClass('list'), - set::title(null), - set::headingActions(array(nav(set::items($storyNavs)))), + setClass('shadow-sm rounded canvas'), + nav + ( + setClass('dtable-sub-nav py-1'), + set::items($storyNavs) + ), dtable ( + set::_className('shadow-none'), + set::extraHeight('+.dtable-sub-nav'), set::userMap($users), set::bordered(true), set::cols($cols), diff --git a/module/user/ui/task.html.php b/module/user/ui/task.html.php index 55cced8e2b..910f48f763 100644 --- a/module/user/ui/task.html.php +++ b/module/user/ui/task.html.php @@ -17,11 +17,11 @@ jsVar('childrenAB', $lang->task->childrenAB); jsVar('multipleAB', $lang->task->multipleAB); $that = zget($lang->user->thirdPerson, $user->gender); -$taskNavs['assignedTo'] = array('text' => sprintf($lang->user->assignedTo, $that), 'url' => inlink('task', "userID={$user->id}&type=assignedTo&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$taskNavs['openedBy'] = array('text' => sprintf($lang->user->openedBy, $that), 'url' => inlink('task', "userID={$user->id}&type=openedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$taskNavs['finishedBy'] = array('text' => sprintf($lang->user->finishedBy, $that), 'url' => inlink('task', "userID={$user->id}&type=finishedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$taskNavs['closedBy'] = array('text' => sprintf($lang->user->closedBy, $that), 'url' => inlink('task', "userID={$user->id}&type=closedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$taskNavs['canceledBy'] = array('text' => sprintf($lang->user->canceledBy, $that), 'url' => inlink('task', "userID={$user->id}&type=canceledBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); +$taskNavs['assignedTo'] = array('text' => sprintf($lang->user->assignedTo, $that), 'url' => inlink('task', "userID={$user->id}&type=assignedTo&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$taskNavs['openedBy'] = array('text' => sprintf($lang->user->openedBy, $that), 'url' => inlink('task', "userID={$user->id}&type=openedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$taskNavs['finishedBy'] = array('text' => sprintf($lang->user->finishedBy, $that), 'url' => inlink('task', "userID={$user->id}&type=finishedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$taskNavs['closedBy'] = array('text' => sprintf($lang->user->closedBy, $that), 'url' => inlink('task', "userID={$user->id}&type=closedBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$taskNavs['canceledBy'] = array('text' => sprintf($lang->user->canceledBy, $that), 'url' => inlink('task', "userID={$user->id}&type=canceledBy&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); if(isset($taskNavs[$type])) $taskNavs[$type]['active'] = true; $this->loadModel('my'); @@ -46,13 +46,18 @@ foreach($tasks as $task) $task->leftLabel = $task->left . $lang->execution->workHourUnit; } -panel +div ( - setClass('list'), - set::title(null), - set::headingActions(array(nav(set::items($taskNavs)))), + setClass('shadow-sm rounded canvas'), + nav + ( + setClass('dtable-sub-nav py-1'), + set::items($taskNavs) + ), dtable ( + set::_className('shadow-none'), + set::extraHeight('+.dtable-sub-nav'), set::userMap($users), set::bordered(true), set::cols($cols), diff --git a/module/user/ui/testcase.html.php b/module/user/ui/testcase.html.php index ef4c927446..5ea3840d75 100644 --- a/module/user/ui/testcase.html.php +++ b/module/user/ui/testcase.html.php @@ -13,8 +13,8 @@ include './featurebar.html.php'; $that = zget($lang->user->thirdPerson, $user->gender); -$testcaseNavs['case2Him'] = array('text' => sprintf($lang->user->case2Him, $that), 'url' => inlink('testcase', "userID={$user->id}&type=case2Him&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); -$testcaseNavs['caseByHim'] = array('text' => sprintf($lang->user->caseByHim, $that), 'url' => inlink('testcase', "userID={$user->id}&type=caseByHim&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")); +$testcaseNavs['case2Him'] = array('text' => sprintf($lang->user->case2Him, $that), 'url' => inlink('testcase', "userID={$user->id}&type=case2Him&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); +$testcaseNavs['caseByHim'] = array('text' => sprintf($lang->user->caseByHim, $that), 'url' => inlink('testcase', "userID={$user->id}&type=caseByHim&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table'); if(isset($testcaseNavs[$type])) $testcaseNavs[$type]['active'] = true; $cols = array(); @@ -39,13 +39,18 @@ foreach($cases as $case) if((isset($case->fromCaseVersion) && $case->fromCaseVersion > $case->version) || $case->needconfirm) $case->status = 'changed'; } -panel +div ( - setClass('list'), - set::title(null), - set::headingActions(array(nav(set::items($testcaseNavs)))), + setClass('shadow-sm rounded canvas'), + nav + ( + setClass('dtable-sub-nav'), + set::items($testcaseNavs) + ), dtable ( + set::_className('shadow-none'), + set::extraHeight('+.dtable-sub-nav'), set::userMap($users), set::bordered(true), set::cols($cols), diff --git a/module/user/ui/testtask.html.php b/module/user/ui/testtask.html.php index d963076093..23e80056fc 100644 --- a/module/user/ui/testtask.html.php +++ b/module/user/ui/testtask.html.php @@ -14,7 +14,7 @@ include './featurebar.html.php'; jsVar('trunkLang', $lang->trunk); $that = zget($lang->user->thirdPerson, $user->gender); -$testtaskNavs['assignedTo'] = array('text' => sprintf($lang->user->testTask2Him, $that), 'url' => inlink('testtask', "userID={$user->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'active' => true); +$testtaskNavs['assignedTo'] = array('text' => sprintf($lang->user->testTask2Him, $that), 'url' => inlink('testtask', "userID={$user->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table', 'active' => true); $cols = array(); foreach($config->user->defaultFields['testtask'] as $field) $cols[$field] = $config->testtask->dtable->fieldList[$field]; @@ -39,13 +39,18 @@ foreach($tasks as $task) } $summary = sprintf($lang->testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount, $doneCount); -panel +div ( - setClass('list'), - set::title(null), - set::headingActions(array(nav(set::items($testtaskNavs)))), + setClass('shadow-sm rounded canvas'), + nav + ( + setClass('dtable-sub-nav py-1'), + set::items($testtaskNavs) + ), dtable ( + set::_className('shadown-none'), + set::extraHeight('+.dtable-sub-nav'), set::userMap($users), set::bordered(true), set::cols($cols),