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

This commit is contained in:
azhi
2013-08-30 09:40:23 +08:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -86,7 +86,7 @@
<td class="side">
<fieldset>
<legend><?php echo $lang->build->basicInfo?></legend>
<table class='table-1 a-left'>
<table class='table-1 a-left fixed'>
<tr>
<th width='25%' class='a-right'><?php echo $lang->build->product;?></th>
<td><?php echo $build->productName;?></td>
+2 -2
View File
@@ -35,8 +35,8 @@
<?php
if($task->status == 'wait' or $task->status == 'doing')
{
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', '', '', '', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', '', 'hiddenwin');
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', '', '', 'showinonlybody', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', '', 'hiddenwin', 'showinonlybody');
}
?>
</td>