Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2019-08-14 09:00:49 +08:00
55 changed files with 106 additions and 77 deletions
+1 -1
View File
@@ -210,7 +210,7 @@
<th><?php echo $lang->testcase->status;?></th>
<td><?php echo html::hidden('status', 'normal');?></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<th><?php echo $lang->testcase->files;?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
+2 -2
View File
@@ -114,7 +114,7 @@
</table>
</div>
</div>
<?php $this->printExtendFields($case, 'div', 'position=left&divCell=false');?>
<?php $this->printExtendFields($case, 'div', 'position=left');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
<div class='detail-content'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
@@ -248,7 +248,7 @@
<?php endif;?>
</table>
</div>
<?php $this->printExtendFields($case, 'div', 'position=right&divCell=false');?>
<?php $this->printExtendFields($case, 'div', 'position=right');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendOpenAndEdit;?></div>
<table class='table table-form'>
+1 -1
View File
@@ -36,7 +36,7 @@
<th><?php echo $lang->testcase->status;?></th>
<td><?php echo html::hidden('status', $case->status);?></td>
</tr>
<?php $this->printExtendFields($case, 'table', 'columns=1');?>
<?php $this->printExtendFields($case, 'table');?>
<tr>
<th><?php echo $lang->testcase->reviewedByAB;?></th>
<td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control chosen' multiple");?></td>
+2 -2
View File
@@ -96,7 +96,7 @@
</div>
<?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
</div>
<?php $this->printExtendFields($case, 'div', "position=left&divCell=true");?>
<?php $this->printExtendFields($case, 'div', "position=left&inForm=0&inCell=1");?>
<div class='cell'><?php include '../../common/view/action.html.php';?></div>
<div class='main-actions'>
<div class="btn-toolbar">
@@ -327,7 +327,7 @@
</div>
</details>
</div>
<?php $this->printExtendFields($case, 'div', "position=right&divCell=true");?>
<?php $this->printExtendFields($case, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
<div id="mainActions" class='main-actions'>