* finish task#1535.

This commit is contained in:
chencongzhi520@gmail.com
2013-07-10 01:57:06 +00:00
parent 24b3f2f2d5
commit 9929b9fa21
3 changed files with 49 additions and 24 deletions
+17 -5
View File
@@ -8,19 +8,27 @@
<div id='defaultMenu' class='f-left'>
<ul>
<?php
$i = 0;
$iCharges = 0;
$others = 0;
$closeds = 0;
foreach($products as $product)
{
if($product->status == 'normal' and $product->PO == $this->app->user->account) $iCharges++;
if($product->status == 'normal' and !($product->PO == $this->app->user->account)) $others++;
if($product->status == 'closed') $closeds++;
}
if($iCharges and $others) echo "<span class='black'>{$lang->product->mine}</span>";
foreach($products as $product)
{
if($product->status == 'normal' and $product->PO == $this->app->user->account)
{
if(!$i) echo "<span class='black'>{$lang->product->mine}</span>";
echo "<li>" . html::a(sprintf($link, $product->id), $product->name, '', "class='mine'"). "</li>";
$i++;
}
}
if($i) echo "<span class='black'>{$lang->product->other}</span>";
$class = $i ? "class='other'" : '';
if($iCharges and $others) echo "<span class='black'>{$lang->product->other}</span>";
$class = ($iCharges and $others) ? "class='other'" : '';
foreach($products as $product)
{
if($product->status == 'normal' and !($product->PO == $this->app->user->account))
@@ -30,7 +38,11 @@
}
?>
</ul>
<?php if($closeds):?>
<div class='a-right'><a class='gray' id='more' onClick='switchMore()'><?php echo $lang->product->closed;?></a></div>
<?php endif;?>
</div>
<div id='moreMenu' class='hidden f-left'>
+31 -19
View File
@@ -8,29 +8,41 @@
<div id='defaultMenu' class='f-left'>
<ul>
<?php
$i = 0;
foreach($projects as $project)
{
if($project->status != 'done' and $project->PM == $this->app->user->account)
{
if(!$i) echo "<span class='black'>{$lang->project->mine}</span>";
echo "<li>" . html::a(sprintf($link, $project->id), $project->name). "</li>";
$i++;
}
}
$iCharges = 0;
$others = 0;
$dones = 0;
foreach($projects as $project)
{
if($project->status != 'done' and $project->PM == $this->app->user->account) $iCharges++;
if($project->status != 'done' and !($project->PM == $this->app->user->account)) $others++;
if($project->status == 'done') $dones++;
}
if($i) echo "<span class='black'>{$lang->project->other}</span>";
$class = $i ? "class='other'" : '';
foreach($projects as $project)
{
if($project->status != 'done' and !($project->PM == $this->app->user->account))
{
echo "<li>" . html::a(sprintf($link, $project->id), $project->name, '', "$class"). "</li>";
}
}
if($iCharges and $others) echo "<span class='black'>{$lang->project->mine}</span>";
foreach($projects as $project)
{
if($project->status != 'done' and $project->PM == $this->app->user->account)
{
echo "<li>" . html::a(sprintf($link, $project->id), $project->name). "</li>";
}
}
if($iCharges and $others) echo "<span class='black'>{$lang->project->other}</span>";
$class = ($iCharges and $others) ? "class='other'" : '';
foreach($projects as $project)
{
if($project->status != 'done' and !($project->PM == $this->app->user->account))
{
echo "<li>" . html::a(sprintf($link, $project->id), $project->name, '', "$class"). "</li>";
}
}
?>
</ul>
<?php if($dones):?>
<div class='a-right'><a id='more' onClick='switchMore()'><?php echo $lang->project->doneProjects . '&raquo;';?></a></div>
<?php endif;?>
</div>
<div id='moreMenu' class='hidden f-left'>
+1
View File
@@ -318,6 +318,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#dropMenu { border:solid 1px #ccc; position:absolute; display:none; font-size:12px; z-index:9999}
#dropMenu #defaultMenu, #dropMenu ul, #dropMenu li {padding:0px}
#dropMenu #defaultMenu {margin-bottom:20px}
#dropMenu #search {border:1px solid #ccc; height:25px; margin:10px 20px 5px; padding-left:5px}
#dropMenu #search, #dropMenu #defaultMenu {min-width:250px;}
#dropMenu #searchResult {margin:5px 20px 10px;}