* fixed error for ie8.

* ajusted style of 'task/recordestimate'.
 * fixed style of 'tree/browse' for ie8-11.
This commit is contained in:
Catouse
2014-05-03 08:38:33 +08:00
parent 43ff48e930
commit 73510fe9bd
7 changed files with 84 additions and 74 deletions
+1 -1
View File
@@ -171,7 +171,7 @@ if($customed)
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe text-danger', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'edit', $params, $bug, 'list');
common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
?>
+2
View File
@@ -0,0 +1,2 @@
.body-modal > .main {padding: 20px}
.body-modal > .main .table-form {border: 1px solid #ddd}
-1
View File
@@ -21,7 +21,6 @@
<small class='text-muted'><?php echo html::icon($lang->icons['edit']);?></small>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
<table class='table table-form'>
<tr>
+59 -55
View File
@@ -20,61 +20,65 @@
<small class='text-muted'> <?php echo $lang->task->logEfforts;?> <?php echo html::icon($lang->icons['recordEstimate']);?></small>
</div>
</div>
<form class='form-condensed' id="recordForm" method='post' target='hiddenwin'>
<table class='table table-form'>
<?php if(count($estimates)):?>
<thead>
<tr class='text-center'>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-100px"><?php echo $lang->task->date;?></th>
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<th><?php echo $lang->comment;?></th>
<th class="w-60px"><?php echo $lang->actions;?></th>
<div class='main'>
<form class='form-condensed' id="recordForm" method='post' target='hiddenwin'>
<table class='table table-form'>
<?php if(count($estimates)):?>
<thead>
<tr class='text-center'>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-100px"><?php echo $lang->task->date;?></th>
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<th><?php echo $lang->comment;?></th>
<th class="w-60px"><?php echo $lang->actions;?></th>
</tr>
</thead>
<?php foreach($estimates as $estimate):?>
<tr class="a-center">
<td><?php echo $estimate->id;?></td>
<td><?php echo $estimate->date;?></td>
<td><?php echo $estimate->consumed;?></td>
<td><?php echo $estimate->left;?></td>
<td class="text-left"><?php echo $estimate->work;?></td>
<td align='center'>
<?php
if($task->status == 'wait' or $task->status == 'doing')
{
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody');
}
?>
</td>
</tr>
</thead>
<?php foreach($estimates as $estimate):?>
<tr class="a-center">
<td><?php echo $estimate->id;?></td>
<td><?php echo $estimate->date;?></td>
<td><?php echo $estimate->consumed;?></td>
<td><?php echo $estimate->left;?></td>
<td class="a-left"><?php echo $estimate->work;?></td>
<td align='center'>
<?php
if($task->status == 'wait' or $task->status == 'doing')
{
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody');
}
?>
</td>
</tr>
<?php endforeach;?>
<?php endforeach;?>
<?php endif;?>
<?php if($task->status == 'wait' or $task->status == 'doing'):?>
<thead>
<tr class='text-center'>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-120px"><?php echo $lang->task->date;?></th>
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<th><?php echo $lang->comment;?></th>
<th></th>
</tr>
</thead>
<?php for($i = 1; $i <= 5; $i++):?>
<tr class="text-center">
<td><?php echo $i . html::hidden("id[$i]", $i);?></td>
<td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
<td><?php echo html::input("consumed[$i]", '', "class='form-control text-center'");?></td>
<td><?php echo html::input("left[$i]", '', "class='form-control text-center left'");?></td>
<td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' rows='1'");?></td>
<td></td>
</tr>
<?php endfor;?>
<tr>
<td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
<?php endif;?>
<?php if($task->status == 'wait' or $task->status == 'doing'):?>
<thead>
<tr class='text-center'>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-120px"><?php echo $lang->task->date;?></th>
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<th><?php echo $lang->comment;?></th><th></th>
</tr>
</thead>
<?php for($i = 1; $i <= 5; $i++):?>
<tr class="text-center">
<td><?php echo $i . html::hidden("id[$i]", $i);?></td>
<td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
<td><?php echo html::input("consumed[$i]", '', "class='form-control text-center'");?></td>
<td><?php echo html::input("left[$i]", '', "class='form-control text-center left'");?></td>
<td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' rows='1'");?></td>
</tr>
<?php endfor;?>
<tr>
<td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
<?php endif;?>
</form>
</form>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
+4 -3
View File
@@ -5,6 +5,7 @@
#sonModule {max-width: 240px}
#moduleBox span > .form-control {margin-bottom: 5px;}
#moduleBox .copy {display: table; width: 100%}
#moduleBox .copy > .form-control, #moduleBox .copy > .btn {display: table-cell; width: auto}
#moduleBox .copy > .form-control {margin-right: -1px; min-width: 100px}
.w-260px {width: 260px!important}
table.copy td {padding: 0!important}
table.copy td .form-control {border-right: 0}
+10 -10
View File
@@ -61,22 +61,22 @@
{
if($allProject)
{
echo "<div class='copy'>";
echo html::select('allProject', $allProject, '', "class='form-control' onchange=\"syncProductOrProject(this,'project')\"");
echo html::select('projectModule', $projectModules, '', "class='form-control'");
echo html::commonButton($lang->tree->syncFromProject, "id='copyModule' onclick='syncModule($currentProject, \"task\")'");
echo '</div>';
echo "<table class='copy w-p100'><tr>";
echo "<td class='w-260px'>" . html::select('allProject', $allProject, '', "class='form-control' onchange=\"syncProductOrProject(this,'project')\"") . '</td>';
echo "<td class='w-200px'>" . html::select('projectModule', $projectModules, '', "class='form-control'") . '</td>';
echo "<td class=''>" . html::commonButton($lang->tree->syncFromProject, "id='copyModule' onclick='syncModule($currentProject, \"task\")'") . '</td>';
echo '</tr></table>';
}
}
else if($viewType == 'story')
{
if($allProduct)
{
echo "<div class='copy'>";
echo html::select('allProduct', $allProduct, '', "class='form-control' onchange=\"syncProductOrProject(this,'product')\"");
echo html::select('productModule', $productModules, '', "class='form-control'");
echo html::commonButton($lang->tree->syncFromProduct, "id='copyModule' onclick='syncModule($currentProduct, \"story\")'");
echo '</div>';
echo "<table class='copy w-p100'><tr>";
echo "<td class='w-260px'>" . html::select('allProduct', $allProduct, '', "class='form-control' onchange=\"syncProductOrProject(this,'product')\"") . '</td>';
echo "<td class='w-200px'>" . html::select('productModule', $productModules, '', "class='form-control'") . '</td>';
echo "<td class=''>" . html::commonButton($lang->tree->syncFromProduct, "id='copyModule' onclick='syncModule($currentProduct, \"story\")'") . '</td>';
echo '</tr></table>';
}
}
$maxOrder = 0;
+8 -4
View File
@@ -914,10 +914,14 @@ function setModal()
if(modal.data('first')) modal.data('first', false);
}, 100);
$framebody.resize(function()
if($framebody.data('resizing'))
{
modalBody.css('height', $framebody.outerHeight());
});
$framebody.data('resizing', true).resize(function()
{
modalBody.css('height', $framebody.outerHeight());
console.log('resize'+(new Date()));
});
}
}
var iframe$ = window.frames[options.name].$;
@@ -926,7 +930,7 @@ function setModal()
iframe$.extend({'closeModal': $.closeModal});
}
}
catch(e){modal.removeClass('modal-loading');}
catch(e){modal.removeClass('modal-loading'); console.log('error');}
}
modal.modal('show');
}