* adjust the display style of product's projects page and all products page.

This commit is contained in:
wangchunsheng
2012-12-15 01:14:50 +00:00
parent 1148b028c3
commit dc0a46bb3a
6 changed files with 19 additions and 15 deletions

View File

@@ -171,7 +171,7 @@ $lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story';
$lang->product->menu->project = 'Projects|product|project|status=all&productID=%s';
$lang->product->menu->order = 'Order|product|order|productID=%s';
$lang->product->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>New|product|create', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>All|product|index|locate=false', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>All|product|index|locate=no&productID=%s', 'float' => 'right');
$lang->story = new stdclass();
$lang->productplan = new stdclass();

View File

@@ -168,10 +168,10 @@ $lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s';
$lang->product->menu->doc = array('link' => '文档|product|doc|productID=%s', 'subModule' => 'doc');
$lang->product->menu->view = array('link' => '维护|product|view|productID=%s', 'alias' => 'edit');
$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story';
$lang->product->menu->project = '项目列表|product|project|status=all&productID=%s';
$lang->product->menu->project = '项目|product|project|status=all&productID=%s';
$lang->product->menu->order = '排序|product|order|productID=%s';
$lang->product->menu->create = array('link' => '<span class="icon-addProduct">&nbsp;</span>新增产品|product|create', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-allProducts">&nbsp;</span>所有产品|product|index|locate=false', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-allProducts">&nbsp;</span>所有产品|product|index|locate=no&productID=%s', 'float' => 'right');
$lang->story = new stdclass();
$lang->productplan = new stdclass();

View File

@@ -37,14 +37,18 @@ class product extends control
/**
* Index page, to browse.
*
*
* @param string $locate locate to browse page or not. If not, display all products.
* @param int $productID
* @access public
* @return void
*/
public function index($locate = 'yes')
public function index($locate = 'yes', $productID = 0)
{
if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse'));
$this->product->setMenu($this->products, $productID);
$this->app->loadLang('my');
$this->view->productStats = $this->product->getStats();
$this->display();
@@ -60,6 +64,8 @@ class product extends control
*/
public function project($status = 'all', $productID = 0)
{
$this->product->setMenu($this->products, $productID);
$this->app->loadLang('my');
$this->view->projectStats = $this->loadModel('project')->getProjectStats($status, $productID);

View File

@@ -59,12 +59,12 @@ $lang->product->RM = 'Release manager';
$lang->product->acl = 'Access limitation';
$lang->product->whitelist = 'Whitelist';
$lang->product->moduleStory = 'By module';
$lang->product->moduleStory = 'Module';
$lang->product->searchStory = 'Search';
$lang->product->assignedToMe = 'To me';
$lang->product->openedByMe = 'Opened by me';
$lang->product->reviewedByMe = 'Reviewed by me';
$lang->product->closedByMe = 'Closed by me';
$lang->product->openedByMe = 'My opened';
$lang->product->reviewedByMe = 'My reviewed';
$lang->product->closedByMe = 'My closed';
$lang->product->draftStory = 'Draft';
$lang->product->activeStory = 'Active';
$lang->product->changedStory = 'Changed';

View File

@@ -9,9 +9,8 @@
* @version $Id$
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/sparkline.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<div class='block' id='productbox'>
<?php if(empty($productStats)):?>
<table class='table-1 a-center' height='100%'>
@@ -57,4 +56,4 @@
</div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
<?php include '../../common/view/footer.html.php';?>

View File

@@ -9,9 +9,8 @@
* @version $Id: index.html.php 2343 2011-11-21 05:24:56Z wwccss $
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/sparkline.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<table class='table-1 fixed colored'>
<tr class='colhead'>
<th class='w-150px'><?php echo $lang->project->name;?></th>
@@ -41,4 +40,4 @@
</tr>
<?php endforeach;?>
</table>
<?php include '../../common/view/footer.lite.html.php';?>
<?php include '../../common/view/footer.html.php';?>