From 243aa368cf97299360c91a7b3ed11d65b7f064a3 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Wed, 17 Apr 2013 08:22:02 +0000 Subject: [PATCH] * finish task#1196. * finish task#1279. --- module/bug/js/common.js | 2 ++ module/bug/view/browse.html.php | 12 +++++++----- module/bug/view/view.html.php | 10 +++++----- module/my/view/bug.html.php | 10 ++++++---- module/my/view/story.html.php | 10 ++++++---- module/my/view/task.html.php | 12 +++++++----- module/my/view/testcase.html.php | 30 +++++++++++++++++++++++------ module/my/view/testtask.html.php | 7 ++++--- module/product/js/browse.js | 1 + module/product/view/browse.html.php | 9 +++++---- module/project/js/common.js | 1 + module/project/js/task.js | 1 - module/project/view/bug.html.php | 11 +++++++---- module/project/view/task.html.php | 10 ++++++---- module/story/js/view.js | 4 ++++ module/story/view/view.html.php | 8 ++++---- www/theme/default/style.css | 2 ++ 17 files changed, 91 insertions(+), 49 deletions(-) create mode 100644 module/story/js/view.js diff --git a/module/bug/js/common.js b/module/bug/js/common.js index bc7022053c..c13e8e2dda 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -1,5 +1,7 @@ $(function() { + $(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});}) + if(typeof page == 'undefined') page = ''; if(page == 'create') { diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index a189fb7d20..2ab420f207 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -103,7 +103,7 @@ js::set('customed', $customed); bug->resolvedDateAB);?> - actions;?> + actions;?> @@ -146,10 +146,12 @@ js::set('customed', $customed); id"; - common::printIcon('bug', 'resolve', $params, $bug, 'list'); - common::printIcon('bug', 'close', $params, $bug, 'list'); - common::printIcon('bug', 'edit', $params, $bug, 'list'); - common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy'); + common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true); + common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'edit', $params, $bug, 'list'); + common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy'); ?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 12608a0f2b..a19834fd37 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -23,11 +23,11 @@ if(!$bug->deleted) { ob_start(); - common::printIcon('bug', 'confirmBug', $params, $bug); - common::printIcon('bug', 'assignTo', $params); - common::printIcon('bug', 'resolve', $params, $bug); - common::printIcon('bug', 'close', $params, $bug); - common::printIcon('bug', 'activate', $params, $bug); + common::printIcon('bug', 'confirmBug', $params, $bug, 'button', '', '', 'iframe', true); + common::printIcon('bug', 'assignTo', $params, '', 'button', '', '', 'iframe', true); + common::printIcon('bug', 'resolve', $params, $bug, 'button', '', '', 'iframe', true); + common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'iframe', true); + common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'iframe', true); common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', 'toStory'); common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'createCase'); diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index b1b6c583d7..8b763de3c5 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -34,7 +34,7 @@ openedByAB);?> bug->resolvedByAB);?> bug->resolutionAB);?> - actions;?> + actions;?> @@ -51,9 +51,11 @@ id"; - common::printIcon('bug', 'resolve', $params, $bug, 'list'); - common::printIcon('bug', 'close', $params, $bug, 'list'); - common::printIcon('bug', 'edit', $params, '', 'list'); + common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true); + common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'edit', $params, '', 'list'); ?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 3643ce1928..3207c49393 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -34,7 +34,7 @@ story->estimateAB);?> statusAB);?> story->stageAB);?> - actions;?> + actions;?> @@ -52,9 +52,11 @@ story->stageList[$story->stage];?> id", $story, 'list'); - common::printIcon('story', 'review', "storyID=$story->id", $story, 'list'); - common::printIcon('story', 'close', "storyID=$story->id", $story, 'list'); + common::printIcon('story', 'change', "storyID=$story->id", $story, 'list'); + common::printIcon('story', 'review', "storyID=$story->id", $story, 'list'); + common::printIcon('story', 'close', "storyID=$story->id", $story, 'list', '', '', 'iframe', true); + common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list'); + common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'list', 'createCase'); ?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index dff5de2174..dbb0bfbbf3 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -41,7 +41,7 @@ task->deadlineAB);?> statusAB);?> openedByAB);?> - actions;?> + actions;?> @@ -62,10 +62,12 @@ openedBy];?> id", $task, 'list'); - common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list'); - common::printIcon('task', 'close', "taskID=$task->id", $task, 'list'); - common::printIcon('task', 'activate', "taskID=$task->id", $task, 'list'); + common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'edit', "taskID=$task->id", '', 'list'); ?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index b54be4cb19..f487a378fa 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -24,7 +24,10 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - + app->loadLang('testtask'); + ?> @@ -32,8 +35,11 @@ - - + + + + + @@ -44,12 +50,24 @@ - - + + + + + - +
idAB);?> testcase->title);?> typeAB);?> openedByAB);?>statusAB);?>actions;?> testtask->lastRunAccount);?> testtask->lastRunTime);?> testtask->lastRunResult);?>statusAB);?>actions;?>
createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?> testcase->typeList[$case->type];?> openedBy];?>testcase->statusList[$case->status];?>id", '', 'list');?>lastRunner];?>lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?>lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>testcase->statusList[$case->status];?> + id&version=$case->version", '', 'list', '', '', 'iframe'); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe'); + common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); + common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); + common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'list', '', 'hiddenwin'); + common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug'); + ?> +
show();?>
show();?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 5a35309c1d..0d537dea61 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -47,9 +47,10 @@ testtask->statusList[$task->status];?> id", '', 'list'); - common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); - common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'list', '', 'hiddenwin'); + common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list'); + common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); + common::printIcon('testtask', 'delete', "taskID=$task->id", '', 'list', '', 'hiddenwin'); ?> diff --git a/module/product/js/browse.js b/module/product/js/browse.js index 36c9b8e782..c37552d985 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -25,4 +25,5 @@ function changeAction(formName, actionName, actionLink) $(function() { if(browseType == 'bysearch') ajaxGetSearchForm(); + $(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});}) }) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 5a2c112cec..3e7bf3295d 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -67,7 +67,7 @@ var browseType = ''; story->estimateAB);?> statusAB);?> story->stageAB);?> - actions;?> + actions;?> @@ -93,9 +93,10 @@ var browseType = ''; id}"; - common::printIcon('story', 'change', $vars, $story, 'list'); - common::printIcon('story', 'review', $vars, $story, 'list'); - common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list'); + common::printIcon('story', 'change', $vars, $story, 'list'); + common::printIcon('story', 'review', $vars, $story, 'list'); + common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); + common::printIcon('story', 'edit', $vars, $story, 'list'); common::printIcon('story', 'createCase', "productID=$story->product&module=0&from=¶m=0&$vars", $story, 'list', 'createCase'); ?> diff --git a/module/project/js/common.js b/module/project/js/common.js index bc1f69b344..96a947b987 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -95,6 +95,7 @@ function computeEndDate(delta) /* Auto compute the work days. */ $(function() { + $('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}}); $(".date").bind('dateSelected', function() { computeWorkDays(); diff --git a/module/project/js/task.js b/module/project/js/task.js index 6adf2fbdb9..685d4577ce 100644 --- a/module/project/js/task.js +++ b/module/project/js/task.js @@ -2,7 +2,6 @@ $(function() { setOuterBox(); if(browseType == 'bysearch') ajaxGetSearchForm(); - $('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}}); }); function showProject() diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 90ae269abf..cfaf761b7d 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -33,7 +33,7 @@ assignedToAB);?> bug->resolvedBy);?> bug->resolutionAB);?> - actions;?> + actions;?> @@ -50,9 +50,12 @@ id"; - common::printIcon('bug', 'resolve', $params, $bug, 'list'); - common::printIcon('bug', 'close', $params, $bug, 'list'); - common::printIcon('bug', 'edit', $params, $bug, 'list'); + common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true); + common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); + common::printIcon('bug', 'edit', $params, $bug, 'list'); + common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy'); ?> diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 0faf33e3d5..7679fbe1cf 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -72,7 +72,7 @@ var browseType = ''; task->consumedAB);?> task->leftAB);?> type == 'sprint') print '' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '';?> - actions;?> + actions;?> @@ -125,15 +125,17 @@ var browseType = ''; ?> project&taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); if($browseType == 'needconfirm') { $lang->task->confirmStoryChange = $lang->confirm; common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin'); } - common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list'); - common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list'); - common::printIcon('task', 'close', "taskID=$task->id", $task, 'list'); + common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); common::printIcon('task', 'edit',"taskID=$task->id", '', 'list'); ?> diff --git a/module/story/js/view.js b/module/story/js/view.js new file mode 100644 index 0000000000..c9d99a16e9 --- /dev/null +++ b/module/story/js/view.js @@ -0,0 +1,4 @@ +$(function() +{ + $(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});}) +}); diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index b4094cf0f6..49067a15be 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -22,10 +22,10 @@ { ob_start(); - common::printIcon('story', 'change', "storyID=$story->id", $story); - common::printIcon('story', 'review', "storyID=$story->id", $story); - common::printIcon('story', 'close', "storyID=$story->id", $story); - common::printIcon('story', 'activate', "storyID=$story->id", $story); + common::printIcon('story', 'change', "storyID=$story->id", $story); + common::printIcon('story', 'review', "storyID=$story->id", $story); + common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe', true); + common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe', true); common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'button', 'createCase'); common::printDivider(); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index a6b5ecf385..41b24b5ed2 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -226,6 +226,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} +.w-160px {width:160px} .w-200px {width:200px} .w-id {width:55px;} @@ -506,6 +507,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table .icon-green-bug-confirmStoryChange {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -282px;} .icon-green-bug-confirmBug {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -282px;} +.icon-gray-bug-confirmBug {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -302px;} .icon-green-bug-assignTo {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -242px;}