From cd78af7526f20b32f115dca3b7dfa94251c99bc3 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 30 Jun 2023 10:58:35 +0800 Subject: [PATCH] * Adjust modal style. --- .../block/ui/productstatisticblock.html.php | 4 +- module/bug/ui/view.html.php | 2 + module/bug/zen.php | 10 ++-- module/my/config/table.php | 56 +++++++++++-------- module/task/control.php | 2 +- module/testcase/config/action.php | 32 ++++++----- module/testtask/config/action.php | 10 ++-- module/testtask/ui/linkcase.html.php | 2 +- 8 files changed, 69 insertions(+), 49 deletions(-) diff --git a/module/block/ui/productstatisticblock.html.php b/module/block/ui/productstatisticblock.html.php index 2727b96f5e..bd5c7d0d07 100644 --- a/module/block/ui/productstatisticblock.html.php +++ b/module/block/ui/productstatisticblock.html.php @@ -260,13 +260,13 @@ function getProductInfo(array $products, string $blockNavID, bool $longBlock): a ( 'type' => 'line', 'name' => $lang->block->productstatistic->opened, - 'data' => array(1, 2, 3, 4, 5, 6) + 'data' => array(23, 25, 27, 22, 24, 30) ), array ( 'type' => 'line', 'name' => $lang->block->productstatistic->done, - 'data' => array(6, 5, 4, 3, 2, 1) + 'data' => array(20, 21, 24, 20, 21, 22) ) ) ) diff --git a/module/bug/ui/view.html.php b/module/bug/ui/view.html.php index e1178a571b..eea7a6bcdc 100644 --- a/module/bug/ui/view.html.php +++ b/module/bug/ui/view.html.php @@ -57,6 +57,7 @@ $duplicateLink = $bug->duplicateBug && $canViewBug ? a ( set('href', $this->createLink('bug', 'view', "bugID={$bug->duplicateBug}")), set('data-toggle', 'modal'), + set('data-size', 'lg'), $bug->duplicateBugTitle ) : ''; $duplicateBug = $bug->duplicateBug ? "#{$bug->duplicateBug}:{$duplicateLink}" : ''; @@ -68,6 +69,7 @@ foreach($legendMisc['relatedBug']['text'] as $relatedBugID => $relatedBugTitle) ( set('href', $this->createLink('bug', 'view', "bugID={$relatedBugID}")), set('data-toggle', 'modal'), + set('data-size', 'lg'), span(label(set::class('dark-outline rounded-full mr-2'), $relatedBugID), $relatedBugTitle) )); } diff --git a/module/bug/zen.php b/module/bug/zen.php index ef88c7da59..3dad6fb664 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -632,7 +632,7 @@ class bugZen extends bug if($product->type != 'normal') $legendBasic['branch'] = array('name' => $branchTitle, 'text' => $branchName, 'href' => $branchLink); $legendBasic['module'] = array('name' => $this->lang->bug->module, 'text' => $moduleTitle); if(empty($product->shadow) || !empty($project->multiple)) $legendBasic['productplan'] = array('name' => $this->lang->bug->plan, 'text' => $bug->planName, 'href' => $planLink); - $legendBasic['fromCase'] = array('name' => $this->lang->bug->fromCase, 'text' => $fromCaseName, 'href' => $fromCaseLink, 'attr' => array('data-toggle' => 'modal')); + $legendBasic['fromCase'] = array('name' => $this->lang->bug->fromCase, 'text' => $fromCaseName, 'href' => $fromCaseLink, 'attr' => array('data-toggle' => 'modal', 'data-size' => 'lg')); $legendBasic['type'] = array('name' => $this->lang->bug->type, 'text' => zget($this->lang->bug->typeList, $bug->type)); $legendBasic['severity'] = array('name' => $this->lang->bug->severity, 'text' => zget($this->lang->bug->severityList, $bug->severity)); $legendBasic['pri'] = array('name' => $this->lang->bug->pri, 'text' => zget($this->lang->bug->priList, $bug->pri)); @@ -702,8 +702,8 @@ class bugZen extends bug $legendExecStoryTask = array(); $legendExecStoryTask['project'] = array('name' => $this->lang->bug->project, 'text' => zget($bug, 'projectName', ''), 'href' => $projectLink); $legendExecStoryTask['execution'] = array('name' => $executionTitle, 'text' => $bug->executionName, 'href' => $executionLink); - $legendExecStoryTask['story'] = array('name' => $this->lang->bug->story, 'text' => $bug->storyTitle, 'href' => $storyLink, 'attr' => array('data-toggle' => 'modal')); - $legendExecStoryTask['task'] = array('name' => $this->lang->bug->task, 'text' => $bug->taskName, 'href' => $taskLink, 'attr' => array('data-toggle' => 'modal')); + $legendExecStoryTask['story'] = array('name' => $this->lang->bug->story, 'text' => $bug->storyTitle, 'href' => $storyLink, 'attr' => array('data-toggle' => 'modal', 'data-size' => 'lg')); + $legendExecStoryTask['task'] = array('name' => $this->lang->bug->task, 'text' => $bug->taskName, 'href' => $taskLink, 'attr' => array('data-toggle' => 'modal', 'data-size' => 'lg')); return $legendExecStoryTask; } @@ -731,8 +731,8 @@ class bugZen extends bug $legendMisc = array(); $legendMisc['relatedBug'] = array('name' => $lang->bug->relatedBug, 'text' => isset($bug->linkBugTitles) ? $bug->linkBugTitles : array()); $legendMisc['toCase'] = array('name' => $lang->bug->toCase, 'text' => $bug->toCases); - $legendMisc['toStory'] = array('name' => $lang->bug->toStory, 'text' => $toStoryName, 'href' => $toStoryLink, 'attr' => array('data-toggle' => 'modal')); - $legendMisc['toTask'] = array('name' => $lang->bug->toTask, 'text' => $toTaskName, 'href' => $toTaskLink, 'attr' => array('data-toggle' => 'modal')); + $legendMisc['toStory'] = array('name' => $lang->bug->toStory, 'text' => $toStoryName, 'href' => $toStoryLink, 'attr' => array('data-toggle' => 'modal', 'data-size' => 'lg')); + $legendMisc['toTask'] = array('name' => $lang->bug->toTask, 'text' => $toTaskName, 'href' => $toTaskLink, 'attr' => array('data-toggle' => 'modal', 'data-size' => 'lg')); $legendMisc['linkMR'] = array('name' => $lang->bug->linkMR, 'text' => $bug->linkMRTitles); $legendMisc['linkCommit'] = array('name' => $lang->bug->linkCommit, 'text' => $linkCommits); diff --git a/module/my/config/table.php b/module/my/config/table.php index ac7929eeef..6cea394079 100644 --- a/module/my/config/table.php +++ b/module/my/config/table.php @@ -148,10 +148,11 @@ $config->my->score->dtable->fieldList['desc']['type'] = 'desc'; $config->my->task = new stdclass(); $config->my->task->actionList = array(); -$config->my->task->actionList['confirmStoryChange']['icon'] = 'search'; -$config->my->task->actionList['confirmStoryChange']['text'] = $lang->task->confirmStoryChange; -$config->my->task->actionList['confirmStoryChange']['hint'] = $lang->task->confirmStoryChange; -$config->my->task->actionList['confirmStoryChange']['url'] = array('module' => 'task', 'method' => 'confirmStoryChange', 'params' => 'taskID={id}'); +$config->my->task->actionList['confirmStoryChange']['icon'] = 'search'; +$config->my->task->actionList['confirmStoryChange']['text'] = $lang->task->confirmStoryChange; +$config->my->task->actionList['confirmStoryChange']['hint'] = $lang->task->confirmStoryChange; +$config->my->task->actionList['confirmStoryChange']['url'] = array('module' => 'task', 'method' => 'confirmStoryChange', 'params' => 'taskID={id}'); +$config->my->task->actionList['confirmStoryChange']['className'] = 'ajax-submit'; $config->my->task->actionList['start']['icon'] = 'play'; $config->my->task->actionList['start']['text'] = $lang->task->start; @@ -183,17 +184,21 @@ $config->my->task->actionList['record']['hint'] = $lang->task->logEfforts $config->my->task->actionList['record']['url'] = array('module' => 'task', 'method' => 'recordEstimate', 'params' => 'taskID={id}'); $config->my->task->actionList['record']['data-toggle'] = 'modal'; -$config->my->task->actionList['edit']['icon'] = 'edit'; -$config->my->task->actionList['edit']['text'] = $lang->task->edit; -$config->my->task->actionList['edit']['hint'] = $lang->task->edit; -$config->my->task->actionList['edit']['url'] = array('module' => 'task', 'method' => 'edit', 'params' => 'taskID={id}'); -$config->my->task->actionList['edit']['data-toggle'] = 'modal'; +$config->my->task->actionList['edit']['icon'] = 'edit'; +$config->my->task->actionList['edit']['text'] = $lang->task->edit; +$config->my->task->actionList['edit']['hint'] = $lang->task->edit; +$config->my->task->actionList['edit']['url'] = array('module' => 'task', 'method' => 'edit', 'params' => 'taskID={id}'); +$config->my->task->actionList['edit']['data-toggle'] = 'modal'; +$config->my->task->actionList['edit']['data-size'] = 'lg'; +$config->my->task->actionList['edit']['data-position'] = 'center'; -$config->my->task->actionList['batchCreate']['icon'] = 'split'; -$config->my->task->actionList['batchCreate']['text'] = $lang->task->batchCreate; -$config->my->task->actionList['batchCreate']['hint'] = $lang->task->batchCreate; -$config->my->task->actionList['batchCreate']['url'] = array('module' => 'task', 'method' => 'batchCreate', 'params' => 'executionID={execution}&storyID={story}&moduleID={module}&taskID={id}iframe=true'); -$config->my->task->actionList['batchCreate']['data-toggle'] = 'modal'; +$config->my->task->actionList['batchCreate']['icon'] = 'split'; +$config->my->task->actionList['batchCreate']['text'] = $lang->task->batchCreate; +$config->my->task->actionList['batchCreate']['hint'] = $lang->task->batchCreate; +$config->my->task->actionList['batchCreate']['url'] = array('module' => 'task', 'method' => 'batchCreate', 'params' => 'executionID={execution}&storyID={story}&moduleID={module}&taskID={id}iframe=true'); +$config->my->task->actionList['batchCreate']['data-toggle'] = 'modal'; +$config->my->task->actionList['batchCreate']['data-size'] = 'lg'; +$config->my->task->actionList['batchCreate']['data-position'] = 'center'; $config->my->task->dtable = new stdclass(); $config->my->task->dtable->fieldList['id']['name'] = 'id'; @@ -304,10 +309,11 @@ $config->my->requirement->actionList['edit']['hint'] = $lang->story->edit $config->my->requirement->actionList['edit']['url'] = array('module' => 'story', 'method' => 'edit', 'params' => 'storyID={id}&from=default&storyType=requirement'); $config->my->requirement->actionList['edit']['data-toggle'] = 'modal'; -$config->my->requirement->actionList['close']['icon'] = 'off'; -$config->my->requirement->actionList['close']['text'] = $lang->story->close; -$config->my->requirement->actionList['close']['hint'] = $lang->story->close; -$config->my->requirement->actionList['close']['url'] = array('module' => 'story', 'method' => 'close', 'params' => 'storyID={id}&from=&storyType=requirement'); +$config->my->requirement->actionList['close']['icon'] = 'off'; +$config->my->requirement->actionList['close']['text'] = $lang->story->close; +$config->my->requirement->actionList['close']['hint'] = $lang->story->close; +$config->my->requirement->actionList['close']['url'] = array('module' => 'story', 'method' => 'close', 'params' => 'storyID={id}&from=&storyType=requirement'); +$config->my->requirement->actionList['close']['data-toggle'] = 'modal'; $config->my->requirement->dtable = new stdclass(); $config->my->requirement->dtable->fieldList['id']['name'] = 'id'; @@ -397,10 +403,11 @@ $config->my->story->actionList['create']['hint'] = $lang->testcase->creat $config->my->story->actionList['create']['url'] = array('module' => 'testcase', 'method' => 'create', 'params' => 'productID={product}&branch={branch}&module=0&from=¶m=0&storyID={id}'); $config->my->story->actionList['create']['data-toggle'] = 'modal'; -$config->my->story->actionList['close']['icon'] = 'off'; -$config->my->story->actionList['close']['text'] = $lang->story->close; -$config->my->story->actionList['close']['hint'] = $lang->story->close; -$config->my->story->actionList['close']['url'] = array('module' => 'story', 'method' => 'close', 'params' => 'storyID={id}'); +$config->my->story->actionList['close']['icon'] = 'off'; +$config->my->story->actionList['close']['text'] = $lang->story->close; +$config->my->story->actionList['close']['hint'] = $lang->story->close; +$config->my->story->actionList['close']['url'] = array('module' => 'story', 'method' => 'close', 'params' => 'storyID={id}'); +$config->my->story->actionList['close']['data-toggle'] = 'modal'; $config->my->story->dtable = new stdclass(); $config->my->story->dtable->fieldList['id']['name'] = 'id'; @@ -504,6 +511,9 @@ $config->my->testtask->dtable->fieldList['actions']['sortType'] = false; $config->my->testtask->dtable->fieldList['actions']['list'] = $config->testtask->actionList; $config->my->testtask->dtable->fieldList['actions']['menu'] = array('cases', 'linkCase', 'report', 'view', 'edit', 'delete'); +$config->my->testtask->dtable->fieldList['actions']['list']['edit']['data-toggle'] = 'modal'; +$config->my->testtask->dtable->fieldList['actions']['list']['edit']['data-size'] = 'lg'; + $config->my->testcase = new stdclass(); $config->my->testcase->dtable = new stdclass(); $config->my->testcase->dtable->fieldList['id']['name'] = 'id'; @@ -532,6 +542,8 @@ $config->my->testcase->dtable->fieldList['lastRunDate'] = $config->testcase->d $config->my->testcase->dtable->fieldList['lastRunResult'] = $config->testcase->dtable->fieldList['lastRunResult']; $config->my->testcase->dtable->fieldList['actions'] = $config->testcase->dtable->fieldList['actions']; +$config->my->testcase->dtable->fieldList['actions']['list']['edit']['data-toggle'] = 'modal'; +$config->my->testcase->dtable->fieldList['actions']['list']['edit']['data-size'] = 'lg'; $config->my->testcase->dtable->fieldList['actions']['menu'] = array('runCase', 'runResult', 'edit', 'createBug', 'create'); $config->my->audit->dtable = new stdclass(); diff --git a/module/task/control.php b/module/task/control.php index 397bf86f0a..6cf4fcf1f9 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -386,7 +386,7 @@ class task extends control $this->executeHooks($taskID); - echo js::reload('parent'); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true)); } /** diff --git a/module/testcase/config/action.php b/module/testcase/config/action.php index 3dd11a48d5..dd3648d389 100644 --- a/module/testcase/config/action.php +++ b/module/testcase/config/action.php @@ -9,17 +9,19 @@ $config->testcase->actionList['confirmStoryChange']['text'] = $lang->confirm; $config->testcase->actionList['confirmStoryChange']['hint'] = $lang->confirm; $config->testcase->actionList['confirmStoryChange']['url'] = array('module' => 'testcase', 'method' => 'confirmStoryChange', 'params' => 'caseID={id}'); -$config->testcase->actionList['runCase']['icon'] = 'play'; -$config->testcase->actionList['runCase']['text'] = $lang->testtask->runCase; -$config->testcase->actionList['runCase']['hint'] = $lang->testtask->runCase; -$config->testcase->actionList['runCase']['url'] = array('module' => 'testtask', 'method' => 'runCase', 'params' => 'runID=0&caseID={id}&version={version}'); -$config->testcase->actionList['runCase']['data-width'] = 0.95; +$config->testcase->actionList['runCase']['icon'] = 'play'; +$config->testcase->actionList['runCase']['text'] = $lang->testtask->runCase; +$config->testcase->actionList['runCase']['hint'] = $lang->testtask->runCase; +$config->testcase->actionList['runCase']['url'] = array('module' => 'testtask', 'method' => 'runCase', 'params' => 'runID=0&caseID={id}&version={version}'); +$config->testcase->actionList['runCase']['data-toggle'] = 'modal'; +$config->testcase->actionList['runCase']['data-size'] = 'lg'; -$config->testcase->actionList['runResult']['icon'] = 'list-alt'; -$config->testcase->actionList['runResult']['text'] = $lang->testtask->results; -$config->testcase->actionList['runResult']['hint'] = $lang->testtask->results; -$config->testcase->actionList['runResult']['url'] = array('module' => 'testtask', 'method' => 'results', 'params' => 'runID=0&caseID={id}'); -$config->testcase->actionList['runResult']['data-width'] = 0.95; +$config->testcase->actionList['runResult']['icon'] = 'list-alt'; +$config->testcase->actionList['runResult']['text'] = $lang->testtask->results; +$config->testcase->actionList['runResult']['hint'] = $lang->testtask->results; +$config->testcase->actionList['runResult']['url'] = array('module' => 'testtask', 'method' => 'results', 'params' => 'runID=0&caseID={id}'); +$config->testcase->actionList['runResult']['data-toggle'] = 'modal'; +$config->testcase->actionList['runResult']['data-size'] = 'lg'; $config->testcase->actionList['edit']['icon'] = 'edit'; $config->testcase->actionList['edit']['text'] = $lang->testcase->edit; @@ -32,10 +34,12 @@ $config->testcase->actionList['review']['hint'] = $lang->testcase->review $config->testcase->actionList['review']['url'] = array('module' => 'testcase', 'method' => 'review', 'params' => 'caseID={id}'); $config->testcase->actionList['review']['data-toggle'] = 'modal'; -$config->testcase->actionList['createBug']['icon'] = 'bug'; -$config->testcase->actionList['createBug']['text'] = $lang->testcase->createBug; -$config->testcase->actionList['createBug']['hint'] = $lang->testcase->createBug; -$config->testcase->actionList['createBug']['url'] = array('module' => 'testcase', 'method' => 'createBug', 'params' => 'product={product}&branch={branch}&extra=caseID={id},version={version},runID='); +$config->testcase->actionList['createBug']['icon'] = 'bug'; +$config->testcase->actionList['createBug']['text'] = $lang->testcase->createBug; +$config->testcase->actionList['createBug']['hint'] = $lang->testcase->createBug; +$config->testcase->actionList['createBug']['url'] = array('module' => 'testcase', 'method' => 'createBug', 'params' => 'product={product}&branch={branch}&extra=caseID={id},version={version},runID='); +$config->testcase->actionList['createBug']['data-toggle'] = 'modal'; +$config->testcase->actionList['createBug']['data-size'] = 'lg'; $config->testcase->actionList['create']['icon'] = 'copy'; $config->testcase->actionList['create']['text'] = $lang->testcase->copy; diff --git a/module/testtask/config/action.php b/module/testtask/config/action.php index 05e9c8a3dc..1ea7e56d71 100644 --- a/module/testtask/config/action.php +++ b/module/testtask/config/action.php @@ -59,10 +59,12 @@ $config->testtask->actionList['edit']['text'] = $lang->testtask->edit; $config->testtask->actionList['edit']['hint'] = $lang->testtask->edit; $config->testtask->actionList['edit']['url'] = array('module' => 'testtask', 'method' => 'edit', 'params' => 'taskID={id}'); -$config->testtask->actionList['delete']['icon'] = 'trash'; -$config->testtask->actionList['delete']['text'] = $lang->testtask->delete; -$config->testtask->actionList['delete']['hint'] = $lang->testtask->delete; -$config->testtask->actionList['delete']['url'] = array('module' => 'testtask', 'method' => 'delete', 'params' => 'taskID={id}'); +$config->testtask->actionList['delete']['icon'] = 'trash'; +$config->testtask->actionList['delete']['text'] = $lang->testtask->delete; +$config->testtask->actionList['delete']['hint'] = $lang->testtask->delete; +$config->testtask->actionList['delete']['url'] = array('module' => 'testtask', 'method' => 'delete', 'params' => 'taskID={id}'); +$config->testtask->actionList['delete']['className'] = 'ajax-submit'; +$config->testtask->actionList['delete']['data-confirm'] = $lang->testtask->confirmDelete; if(!isset($config->testtask->cases)) $config->testtask->cases = new stdclass(); $config->testtask->cases->actionList['confirmChange']['icon'] = 'search'; diff --git a/module/testtask/ui/linkcase.html.php b/module/testtask/ui/linkcase.html.php index 2aa56b58ea..2278a7c8b8 100644 --- a/module/testtask/ui/linkcase.html.php +++ b/module/testtask/ui/linkcase.html.php @@ -67,7 +67,7 @@ featureBar set::items($items), set::current($type), set::linkParams("taskID=$taskID&type={key}"), - to::before(a(set::href(createLink('testtask', 'browse', "product={$task->product}")), set::class('btn secondary'), icon('back'), $lang->goback)), + to::before(backBtn(set::icon('back'), set::class('btn secondary'), $lang->goback)), li(searchToggle()) );