Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task#1196.

Browse Source 
* finish task#1279.
This commit is contained in:
chencongzhi520@gmail.com
2013-04-17 08:22:02 +00:00
parent c31a78e23b
commit 243aa368cf
17 changed files with 91 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/common.js
+2
View File
@@ -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')
{
module/bug/view/browse.html.php
+7 -5
View File
@@ -103,7 +103,7 @@ js::set('customed', $customed);
<th class='w-date'><?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
<?php endif;?>
<th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
<?php endif;?>
</tr>
</thead>
@@ -146,10 +146,12 @@ js::set('customed', $customed);
<td class='a-right'>
<?php
$params = "bugID=$bug->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');
?>
</td>
<?php endif;?>
module/bug/view/view.html.php
+5 -5
View File
@@ -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');
module/my/view/bug.html.php
+6 -4
View File
@@ -34,7 +34,7 @@
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-80px'><?php echo $lang->actions;?></th>
<th class='w-140px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -51,9 +51,11 @@
<td class='a-right'>
<?php
$params = "bugID=$bug->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');
?>
</td>
</tr>
module/my/view/story.html.php
+6 -4
View File
@@ -34,7 +34,7 @@
<th class='w-hour'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-100px'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='w-80px'><?php echo $lang->actions;?></th>
<th class='w-140px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -52,9 +52,11 @@
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='a-right'>
<?php
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');
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=&param=0&storyID=$story->id", '', 'list', 'createCase');
?>
</td>
</tr>
module/my/view/task.html.php
+7 -5
View File
@@ -41,7 +41,7 @@
<th class='w-date'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-100px'> <?php echo $lang->actions;?></th>
<th class='w-140px'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -62,10 +62,12 @@
<td><?php echo $users[$task->openedBy];?></td>
<td class='a-right'>
<?php
common::printIcon('task', 'start', "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', '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');
?>
</td>
</tr>
module/my/view/testcase.html.php
+24 -6
View File
@@ -24,7 +24,10 @@
<?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<table class='table-1 fixed tablesorter'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<?php
$vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
$this->app->loadLang('testtask');
?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
@@ -32,8 +35,11 @@
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-40px'><?php echo $lang->actions;?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th class='w-120px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-140px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -44,12 +50,24 @@
<td class='a-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo $lang->testcase->statusList[$case->status];?></td>
<td><?php common::printIcon('testcase', 'edit', "caseID=$case->id", '', 'list');?></td>
<td><?php echo $users[$case->lastRunner];?></td>
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='<?php echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
<td>
<?php
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->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&param=$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');
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot><tr><td colspan='7'><?php $pager->show();?></td></tr></tfoot>
<tfoot><tr><td colspan='10'><?php $pager->show();?></td></tr></tfoot>
</table>
<script language="Javascript">$("#<?php echo $type;?>Tab").addClass('active'); </script>
<?php include '../../common/view/footer.html.php';?>
module/my/view/testtask.html.php
+4 -3
View File
@@ -47,9 +47,10 @@
<td><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='a-right'>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->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');
?>
</td>
</tr>
module/product/js/browse.js
+1
View File
@@ -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;}});})
})
module/product/view/browse.html.php
+5 -4
View File
@@ -67,7 +67,7 @@ var browseType = '<?php echo $browseType;?>';
<th class='w-hour'><?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -93,9 +93,10 @@ var browseType = '<?php echo $browseType;?>';
<td class='a-right'>
<?php
$vars = "story={$story->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=&param=0&$vars", $story, 'list', 'createCase');
?>
</td>
module/project/js/common.js
+1
View File
@@ -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();
module/project/js/task.js
-1
View File
@@ -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()
module/project/view/bug.html.php
+7 -4
View File
@@ -33,7 +33,7 @@
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -50,9 +50,12 @@
<td class='a-right'>
<?php
$params = "bugID=$bug->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');
?>
</td>
</tr>
module/project/view/task.html.php
+6 -4
View File
@@ -72,7 +72,7 @@ var browseType = '<?php echo $browseType;?>';
<th class='w-40px'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='w-40px'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<?php if($project->type == 'sprint') print '<th>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
<th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -125,15 +125,17 @@ var browseType = '<?php echo $browseType;?>';
?>
<td class='a-right'>
<?php
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);
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');
?>
</td>
module/story/js/view.js
+4
View File
@@ -0,0 +1,4 @@
$(function()
{
$(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});})
});
module/story/view/view.html.php
+4 -4
View File
@@ -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=&param=0&storyID=$story->id", '', 'button', 'createCase');
common::printDivider();
www/theme/default/style.css
+2
View File
@@ -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;}