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

* finish task #6288.

Browse Source
This commit is contained in:
wangyidong
2019-08-30 15:02:15 +08:00
parent b0d08b4a89
commit bc919217ad
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/productstatisticblock.html.php
+6 -6
View File
@@ -155,11 +155,11 @@ $(function()
<table class='status-count'>
<tr>
<td class='text-right'><?php echo $lang->productplan->all;?> :</td>
<td class='text-left'><?php echo $totalPlan;?></td>
<td class='text-left'><?php echo empty($totalPlan) ? 0 : html::a($this->createLink('productplan', 'browse', "productID={$product->id}&branch=0&browseType=all"), $totalPlan);?></td>
</tr>
<tr>
<td class='text-right'><?php echo $lang->productplan->featureBar['browse']['unexpired'];?> :</td>
<td class='text-left'><?php echo $unexpiredPlan;?></td>
<td class='text-left'><?php echo empty($unexpiredPlan) ? 0 : html::a($this->createLink('productplan', 'browse', "productID={$product->id}&branch=0&browseType=unexpired"), $unexpiredPlan);?></td>
</tr>
</table>
</div>
@@ -189,11 +189,11 @@ $(function()
<table class='status-count'>
<tr>
<td class='text-right'><?php echo $lang->project->allProjects;?> :</td>
<td class='text-left'><?php echo $totalProject;?></td>
<td class='text-left'><?php echo empty($totalProject) ? 0 : html::a($this->createLink('product', 'project', "type=all&product={$product->id}"), $totalProject);?></td>
</tr>
<tr>
<td class='text-right'><?php echo $lang->project->statusList['doing'];?> :</td>
<td class='text-left'><?php echo $doingProject;?></td>
<td class='text-left'><?php echo empty($doingProject) ? 0 : html::a($this->createLink('product', 'project', "type=undone&product={$product->id}"), $doingProject);?></td>
</tr>
</table>
</div>
@@ -222,11 +222,11 @@ $(function()
<table class='status-count'>
<tr>
<td class='text-right'><?php echo $lang->product->allRelease;?> :</td>
<td class='text-left'><?php echo $totalRelease;?></td>
<td class='text-left'><?php echo empty($totalRelease) ? 0 : html::a($this->createLink('release', 'browse', "productID={$product->id}&branch=0&type=all"), $totalRelease);?></td>
</tr>
<tr>
<td class='text-right'><?php echo $lang->product->maintain;?> :</td>
<td class='text-left'><?php echo $normalRelease;?></td>
<td class='text-left'><?php echo empty($normalRelease) ? 0 : html::a($this->createLink('release', 'browse', "productID={$product->id}&branch=0&type=normal"), $normalRelease);?></td>
</tr>
</table>
</div>
module/block/view/welcome.html.php
+5 -5
View File
@@ -48,7 +48,7 @@
<div class="row tiles">
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myTask?></div>
<div class="tile-amount"><?php echo html::a($this->createLink('my', 'task', 'type=assignedTo'), (int)$tasks);?></div>
<div class="tile-amount"><?php echo empty($tasks) ? 0 : html::a($this->createLink('my', 'task', 'type=assignedTo'), (int)$tasks);?></div>
<?php if(!empty($delay['task'])):?>
<div class="tile-info">
<span class="label label-danger label-outline"><?php echo $lang->block->delayed . ' ' . $delay['task']?></span>
@@ -57,7 +57,7 @@
</div>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myBug?></div>
<div class="tile-amount"><?php echo html::a($this->createLink('my', 'bug', 'type=assignedTo'), (int)$bugs);?></div>
<div class="tile-amount"><?php echo empty($bugs) ? 0 : html::a($this->createLink('my', 'bug', 'type=assignedTo'), (int)$bugs);?></div>
<?php if(!empty($delay['bug'])):?>
<div class="tile-info">
<span class="label label-danger label-outline"><?php echo $lang->block->delayed . ' ' . $delay['bug']?></span>
@@ -66,11 +66,11 @@
</div>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myStory?></div>
<div class="tile-amount"><?php echo html::a($this->createLink('my', 'story', 'type=assignedTo'), (int)$stories);?></div>
<div class="tile-amount"><?php echo empty($stories) ? 0 : html::a($this->createLink('my', 'story', 'type=assignedTo'), (int)$stories);?></div>
</div>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myProject?></div>
<div class="tile-amount"><?php echo html::a($this->createLink('project', 'all', 'type=undone'), (int)$projects);?></div>
<div class="tile-amount"><?php echo empty($projects) ? 0 : html::a($this->createLink('project', 'all', 'type=undone'), (int)$projects);?></div>
<?php if(!empty($delay['project'])):?>
<div class="tile-info">
<span class="label label-danger label-outline"><?php echo $lang->block->delayed . ' ' . $delay['project']?></span>
@@ -79,7 +79,7 @@
</div>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myProduct?></div>
<div class="tile-amount"><?php echo html::a($this->createLink('product', 'all', 'product=0&line=0&status=noclosed'), (int)$products);?></div>
<div class="tile-amount"><?php echo empty($products) ? 0 : html::a($this->createLink('product', 'all', 'product=0&line=0&status=noclosed'), (int)$products);?></div>
</div>
</div>
</div>
module/product/control.php
+1
View File
@@ -83,6 +83,7 @@ class product extends control
$this->view->position[] = $this->products[$productID];
$this->view->position[] = $this->lang->product->project;
$this->view->productID = $productID;
$this->view->status = $status;
$this->display();
}
module/product/view/project.html.php
+3 -1
View File
@@ -12,7 +12,9 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->product->project;?></span></span>
<?php foreach($lang->project->featureBar['all'] as $key => $label):?>
<?php echo html::a(inlink("project", "status=$key&productID=$productID"), "<span class='text'>{$label}</span>", '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?>
<?php endforeach;?>
<span class="label label-info"><?php echo $lang->product->projectInfo;?></span>
</div>
</div>