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

* merge owner and pri, begin and end as one row in edit view file of testtask module.

Browse Source
This commit is contained in:
chenfeiCF
2017-03-17 15:01:26 +08:00
parent dc652650b5
commit 7f5b9a3834
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/js/edit.js
+12
View File
@@ -24,3 +24,15 @@ function loadProjectBuilds(projectID)
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);
$('#buildBox').load(link, function(){$('#build').chosen(defaultChosenOptions);});
}
$(function()
{
var adjustPriBoxWidth = function()
{
var boxWidth = $('#ownerAndPriBox').width();
var beginWidth = $("input[name='begin']").outerWidth();
var addonWidth = $('#ownerAndPriBox .input-group-addon').outerWidth();
$('#pri').css('width', boxWidth - beginWidth -addonWidth);
};
adjustPriBoxWidth();//Adjust testtask pri box width.
})
module/testtask/view/close.html.php
-4
View File
@@ -23,10 +23,6 @@
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->testtask->report;?></th>
<td><?php echo html::textarea('report', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
module/testtask/view/edit.html.php
+17 -15
View File
@@ -25,7 +25,9 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->testtask->project;?></th>
<td class='w-p25-f'><?php echo html::select('project', $projects, $task->project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?></td>
<td class='w-p35-f'>
<?php echo html::select('project', $projects, $task->project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?>
</td>
<td><?php echo html::hidden('product', $task->product)?></td>
</tr>
<tr>
@@ -34,19 +36,23 @@
</tr>
<tr>
<th><?php echo $lang->testtask->owner;?></th>
<td><?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->pri;?></th>
<td><?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control'");?></td>
<td>
<div id='ownerAndPriBox' class='input-group'>
<?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?>
<span class='input-group-addon fix-border'><?php echo $lang->testtask->pri;?></span>
<?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->testtask->begin;?></th>
<td><?php echo html::input('begin', $task->begin, "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->end;?></th>
<td><?php echo html::input('end', $task->end, "class='form-control form-date'");?></td>
<td>
<div class='input-group'>
<?php echo html::input('begin', $task->begin, "class='form-control form-date'");?>
<span class='input-group-addon fix-border'><?php echo $lang->testtask->end;?></span>
<?php echo html::input('end', $task->end, "class='form-control form-date'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->testtask->status;?></th>
@@ -60,10 +66,6 @@
<th><?php echo $lang->testtask->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->report;?></th>
<td colspan='2'><?php echo html::textarea('report', htmlspecialchars($task->report), "rows=10 class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->mailto;?></th>
<td colspan='2'>
module/testtask/view/view.html.php
-4
View File
@@ -60,10 +60,6 @@
<legend><?php echo $lang->testtask->legendDesc;?></legend>
<div class='article-content'><?php echo $task->desc;?></div>
</fieldset>
<fieldset>
<legend><?php echo $lang->testtask->legendReport;?></legend>
<div class='article-content'><?php echo $task->report;?></div>
</fieldset>
<?php include '../../common/view/action.html.php';?>
<div class='actions'><?php echo $actionLinks;?></div>
</div>