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

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

Browse Source
This commit is contained in:
liugang
2018-05-14 11:08:30 +08:00
parent 5f1823691c 14f54e7f37
commit 78be34984f
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/view/create.html.php
+31 -8
View File
@@ -28,8 +28,8 @@
<table class='table table-form'>
<tbody>
<tr>
<th class='w-80px'><?php echo $lang->testcase->product;?></th>
<td class='w-p45-f'>
<th><?php echo $lang->testcase->product;?></th>
<td>
<div class='input-group'>
<?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen'");?>
<?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
@@ -104,13 +104,36 @@
<?php if(strpos(",$showFields,", ',pri,') !== false):?>
<tr>
<th><?php echo $lang->testcase->pri;?></th>
<td><?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px chosen'");?></td>
<td colspan="2">
<?php
$hasCustomPri = false;
foreach($lang->testcase->priList as $priKey => $priValue)
{
if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
}
}
$priList = $lang->testcase->priList;
if(end($priList))
{
unset($priList[0]);
$priList[0] = '';
}
?>
<?php if($hasCustomPri):?>
<?php echo html::select('pri', (array)$priList, $pri, "class='form-control chosen'");?>
<?php else: ?>
<?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector'");?>
<?php endif; ?>
</td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->testcase->precondition;?></th>
<td colspan='2'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->testcase->steps;?></th>
<td colspan='2'>
@@ -171,18 +194,18 @@
<?php endforeach; ?>
</tbody>
</table>
</td>
</td>
</tr>
<?php if(strpos(",$showFields,", ',keywords,') !== false):?>
<tr>
<th><?php echo $lang->testcase->keywords;?></th>
<td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control' autocomplete='off'");?></td>
</tr>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->testcase->files;?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
</tr>
</tbody>
<tfoot>
<tr>
@@ -190,7 +213,7 @@
<?php
echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
echo ' &nbsp; ';
echo html::backButton($lang->goback, '', 'btn btn-wide btn-gray');
echo html::backButton($lang->goback, '', 'btn btn-wide');
?>
</td>
</tr>
module/user/view/login.html.php
+2 -3
View File
@@ -46,10 +46,9 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
<td id="keeplogin"><?php echo html::checkBox('keepLogin', $lang->user->keepLogin, $keepLogin);?></td>
</tr>
<tr>
<th></th>
<td class="form-actions">
<td class="form-actions" colspan='2'>
<?php
echo html::submitButton($lang->login);
echo html::submitButton($lang->login, '', 'btn btn-primary btn-wide');
if($app->company->guest) echo html::linkButton($lang->user->asGuest, $this->createLink($config->default->module));
echo html::hidden('referer', $referer);
echo html::a(inlink('reset'), $lang->user->resetPassword);