From 2f212964c92cd04284e43e0e936585dc7cde3e16 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Tue, 17 Jul 2012 09:01:04 +0000 Subject: [PATCH] * Adjust the icons. --- module/common/control.php | 2 +- module/testcase/model.php | 2 +- module/testtask/view/cases.html.php | 9 +++++---- www/theme/default/style.css | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/module/common/control.php b/module/common/control.php index 2ee2da102d..e74d4b6647 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -268,7 +268,7 @@ class common extends control } /* Set module and method, then create link to it. */ - if(strtolower($module) == 'testcase' and strtolower($method) == 'createbug') ($module = 'bug') and ($method = 'create'); + if(strtolower($module) == 'testcase' and strtolower($method) == 'createbug') ($module = 'bug') and ($method = 'create'); if(strtolower($module) == 'story' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create'); if(strtolower($module) == 'bug' and strtolower($method) == 'tostory') ($module = 'story') and ($method = 'create'); if(strtolower($module) == 'bug' and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create'); diff --git a/module/testcase/model.php b/module/testcase/model.php index 41dd1ad256..afb92c2652 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -311,7 +311,7 @@ class testcaseModel extends model { $action = strtolower($action); - if($action == 'tobug') return $case->lastRunResult == 'fail'; + if($action == 'createbug') return $case->lastRunResult == 'fail'; return true; } diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 67632db90a..f8196dbc21 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -27,9 +27,10 @@ var moduleID = '';
id", $lang->testtask->linkCase); - common::printIcon('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=$task->id", '', 'big'); - common::printRPN($this->session->testtaskLisk, ''); + common::printIcon('testtask', 'linkCase', "taskID=$task->id"); + common::printIcon('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=$task->id"); + common::printDivider(); + common::printRPN($this->session->testtaskList, ''); ?>
@@ -77,7 +78,7 @@ var moduleID = ''; common::printLink('testtask', 'runcase', "id=$run->id", $lang->testtask->runCase, '', 'class="iframe"'); common::printLink('testtask', 'results', "id=$run->id", $lang->testtask->results, '', 'class="iframe"'); common::printLink('testtask', 'unlinkcase', "id=$run->id", $lang->testtask->unlinkCase, 'hiddenwin'); - common::printIcon('testcase', 'toBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'small', 'createBug'); + common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'list', 'createBug'); ?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index ba3b45fe09..e20c78138f 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -421,6 +421,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table .icon-arrow { padding-left:10px; background:url(images/main/ui-gray.png) -32px 0px;} /* Common icons. */ +#featurebar .f-right .icon-goback {padding:0px 10px} .pri1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px -141px;} .pri2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px -141px;} .pri3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px -141px;}