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

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

Browse Source
This commit is contained in:
wangyidong
2018-05-16 11:10:59 +08:00
parent 586b523fe9 38fb85246a
commit 43fd7a509d
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/resolve.css
+1 -1
View File
@@ -1,2 +1,2 @@
.chosen-container[id^="buildProject"] {max-width: 160px; border-radius: 0}
.chosen-container[id^="buildProject"] .chosen-drop {min-width: 400px;!important}
.chosen-container[id^="buildProject"] .chosen-drop {min-width: 300px;!important}
module/bug/view/activate.html.php
+2 -2
View File
@@ -24,7 +24,7 @@
<?php endif;?>
</h2>
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-70px'><?php echo $lang->bug->assignedTo;?></th>
@@ -32,7 +32,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->openedBuild;?></th>
<td><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></td>
<td colspan='2'><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></td>
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
module/bug/view/assignto.html.php
+1 -1
View File
@@ -28,7 +28,7 @@ js::set('page', 'assignedto');
<?php endif;?>
</h2>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->bug->assignBug;?></th>
module/bug/view/close.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<?php endif;?>
</h2>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->comment;?></th>
module/bug/view/confirmbug.html.php
+3 -3
View File
@@ -28,7 +28,7 @@ js::set('page', 'confirmbug');
<?php endif;?>
</h2>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
@@ -37,11 +37,11 @@ js::set('page', 'confirmbug');
</tr>
<tr>
<th><?php echo $lang->bug->type;?></th>
<td><?php echo html::select('type', $lang->bug->typeList, $bug->type, 'class=form-control');?></td>
<td><?php echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->pri;?></th>
<td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=form-control');?></td>
<td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, "class='form-control chosen'");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->mailto;?></th>
module/bug/view/resolve.html.php
+7 -3
View File
@@ -29,11 +29,11 @@ js::set('productID' , $bug->product);
<?php endif;?>
</h2>
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->bug->resolution;?></th>
<td class='w-p35-f'><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td>
<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>
<tr id='duplicateBugBox' class='hide'>
@@ -63,7 +63,11 @@ js::set('productID' , $bug->product);
</tr>
<tr>
<th><?php echo $lang->bug->resolvedDate;?></th>
<td><?php echo html::input('resolvedDate', helper::now(), "class='form-control form-date'");?></td>
<td>
<div class='datepicker-wrapper datepicker-date'>
<?php echo html::input('resolvedDate', helper::now(), "class='form-control form-date'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->bug->assignedTo;?></th>