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

* finish task #6161.

Browse Source
This commit is contained in:
wangyidong
2019-07-30 15:38:49 +08:00
parent cd2162d54a
commit 17b53acaa9
73 changed files with 178 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/edit.css
+3
View File
@@ -4,3 +4,6 @@
.col-side .chosen-container[id^="resolvedBuild"] {width: 172px!important}
.chosen-choices li.search-choice{word-break: break-all;}
#linkBugBox > li {margin-left:-56px}
.thWidth{width:100px !important;}
html[lang^='zh-'] .thWidth{width:80px !important;}
module/bug/css/m.browse.css
+2
View File
@@ -0,0 +1,2 @@
.confirm0 {color:gray; font-size:9px}
.confirm1 {color:green; font-size:9px}
module/bug/css/resolve.css
+3
View File
@@ -1 +1,4 @@
.chosen-container[id^="buildProject"] {max-width: 160px; border-radius: 0}
.thWidth{width:130px !important;}
html[lang^='zh-'] .thWidth{width:100px !important;}
module/bug/css/view.css
+5
View File
@@ -3,3 +3,8 @@
.table-data tr > td{word-break: break-all; word-wrap: break-word;}
.side-col .cell{padding:0px;}
.tab-pane table {border: 1px solid #ddd; border-top: none;}
#legendBasicInfo .thWidth{width:110px !important;}
#legendLife .thWidth{width:100px !important;}
html[lang^='zh-'] #legendBasicInfo .thWidth{width:70px !important;}
html[lang^='zh-'] #legendLife .thWidth{width:90px !important;}
module/bug/view/edit.html.php
+2 -4
View File
@@ -212,8 +212,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr>
<?php $colWidth = common::checkNotCN() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->openedBy;?></th>
<th class='thWidth'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
</tr>
<tr>
@@ -266,8 +265,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr class='text-top'>
<?php $colWidth = common::checkNotCN() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->linkBug;?></th>
<th class='thWidth'><?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>
<tr>
module/bug/view/resolve.html.php
+1 -2
View File
@@ -32,8 +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::checkNotCN() ? 'w-130px' : 'w-100px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->resolution;?></th>
<th class='thWidth'><?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>
</tr>
module/bug/view/view.html.php
+2 -4
View File
@@ -102,11 +102,10 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
<?php $widthClass = common::checkNotCN() ? 'w-110px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr valign='middle'>
<th class='<?php echo $widthClass;?>'><?php echo $lang->bug->product;?></th>
<th class='thWidth'><?php echo $lang->bug->product;?></th>
<td><?php if(!common::printLink('bug', 'browse', "productID=$bug->product", $productName)) echo $productName;?></td>
</tr>
<?php if($this->session->currentProductType != 'normal'):?>
@@ -271,11 +270,10 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendLife'>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-90px';?>
<table class="table table-data">
<tbody>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->bug->openedBy;?></th>
<th class='thWidth'><?php echo $lang->bug->openedBy;?></th>
<td> <?php echo zget($users, $bug->openedBy) . $lang->at . $bug->openedDate;?></td>
</tr>
<tr>