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

* finish task #6166,#6149,6139

Browse Source
This commit is contained in:
jinianlan
2019-07-29 15:54:08 +08:00
parent d187bc8515
commit c90aac3512
68 changed files with 106 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
+4 -4
View File
@@ -116,7 +116,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
?>
</ul>
</div>
<?php if(!common::checkEnLang()):?>
<?php if(!common::checkNotCN()):?>
<?php
common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", "<i class='icon icon-plus'></i>" . $lang->bug->batchCreate, '', "class='btn btn-secondary'");
if(commonModel::isTutorialMode())
@@ -208,9 +208,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
{
if($value->show)
{
if(common::checkEnLang() and $value->id == 'severity') $value->name = $lang->bug->severity;
if(common::checkEnLang() and $value->id == 'pri') $value->name = $lang->bug->pri;
if(common::checkEnLang() and $value->id == 'confirmed') $value->name = $lang->bug->confirmed;
if(common::checkNotCN() and $value->id == 'severity') $value->name = $lang->bug->severity;
if(common::checkNotCN() and $value->id == 'pri') $value->name = $lang->bug->pri;
if(common::checkNotCN() and $value->id == 'confirmed') $value->name = $lang->bug->confirmed;
$this->datatable->printHead($value, $orderBy, $vars);
$columns ++;
}
module/bug/view/edit.html.php
+2 -2
View File
@@ -212,7 +212,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
</tr>
@@ -266,7 +266,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr class='text-top'>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->linkBug;?></th>
<td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
</tr>
module/bug/view/resolve.html.php
+1 -1
View File
@@ -32,7 +32,7 @@ js::set('productID' , $bug->product);
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
<?php $colWidth = common::checkNotCN() ? 'w-130px' : 'w-100px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->resolution;?></th>
<td class='w-p35-f'><?php echo html::select('resolution', $lang->bug->resolutionList, '', "class='form-control chosen' onchange=setDuplicate(this.value)");?></td>
<td></td>
module/bug/view/view.html.php
+2 -2
View File
@@ -102,7 +102,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
<?php $widthClass = common::checkEnLang() ? 'w-110px' : 'w-70px';?>
<?php $widthClass = common::checkNotCN() ? 'w-110px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr valign='middle'>
@@ -271,7 +271,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendLife'>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-90px';?>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-90px';?>
<table class="table table-data">
<tbody>
<tr>