From e4a9dcd7e188af2654aa303db2cc2002c02064f5 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Tue, 30 Mar 2021 13:37:52 +0800 Subject: [PATCH] * Use modal for links in my module. --- module/my/view/bug.html.php | 4 ++-- module/my/view/story.html.php | 4 ++-- module/my/view/task.html.php | 4 ++-- module/my/view/testcase.html.php | 8 ++++---- module/my/view/testtask.html.php | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index f8fff37170..0a2a9d6fe1 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -124,8 +124,8 @@ common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'ok', '', 'iframe', true, '', '', $bug->project); common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $bug->project); common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true, '', '', $bug->project); - common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', '', '', '', '', $bug->project); - common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', '', '', '', '', $bug->project); + common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', 'iframe', true, "data-width='95%'", '', $bug->project); + common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', 'iframe', true, "data-width='95%'", '', $bug->project); } ?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 73c5bca88a..0bb1addef3 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -99,8 +99,8 @@ common::printIcon('story', 'change', $vars, $story, 'list', 'alter'); common::printIcon('story', 'review', $vars, $story, 'list', 'search'); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); - common::printIcon('story', 'edit', $vars, $story, 'list'); - common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); + common::printIcon('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'"); + common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', 'iframe', true, "data-width='95%'"); } ?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index a11fed49d9..d70b1d56d0 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -123,8 +123,8 @@ common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project); common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->project); - common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', '', '', 'data-group="execution"', '', $task->project); - common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', '', '', 'data-group="project"', $this->lang->task->children, $task->project); + common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'", '', $task->project); + common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', 'iframe', true, "data-width='95%'", $this->lang->task->children, $task->project); } } ?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 5de913da90..c6549e4e15 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -100,10 +100,10 @@ if($canBeChanged) { common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', "data-app='qa'"); - common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from={$app->rawMethod}¶m=$caseID", $case, 'list', 'copy', '', '', '', "data-app='qa'"); - common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%' data-app='qa'", '', $case->project); - common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%' data-app='qa'", '', $case->project); - common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit', '', 'iframe', "data-app='qa'", '', '', $case->project); + common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from={$app->rawMethod}¶m=$caseID", $case, 'list', 'copy', '', 'iframe', true, "data-width='95%'"); + common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project); + common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project); + common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit', '', 'iframe', true, "data-width='95%'", '', $case->project); } ?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 5f2053f694..0c1c36fec9 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -55,11 +55,11 @@ processStatus('testtask', $task);?> id", $task, 'list', 'sitemap'); - common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px'); + common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', "data-app='qa'"); + common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, "data-width='90%'"); common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag'); - common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list', '', '', '', true); + common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='90%'"); if(common::hasPriv('testtask', 'delete', $task)) { $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");