diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 3d3a1e0468..c9c004c408 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -29,7 +29,7 @@ $lang->todo->menuOrder = $lang->my->menuOrder; /* product menu order. */ $lang->product->menuOrder[5] = 'index'; -$lang->product->menuOrder[10] = 'story'; +$lang->product->menuOrder[10] = 'story'; $lang->product->menuOrder[15] = 'dynamic'; $lang->product->menuOrder[20] = 'plan'; $lang->product->menuOrder[25] = 'release'; @@ -47,6 +47,7 @@ $lang->release->menuOrder = $lang->product->menuOrder; $lang->branch->menuOrder = $lang->product->menuOrder; /* project menu order. */ +$lang->project->menuOrder[1] = 'index'; $lang->project->menuOrder[5] = 'task'; $lang->project->menuOrder[10] = 'story'; $lang->project->menuOrder[15] = 'bug'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d93bea3a7e..2cb20a4c94 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -202,6 +202,7 @@ $lang->project = new stdclass(); $lang->project->menu = new stdclass(); $lang->project->menu->list = '%s'; +$lang->project->menu->index = '首页|project|index|locate=no&prjectID=%s'; $lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug,kanban,printkanban'); $lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory'); $lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; @@ -213,7 +214,7 @@ $lang->project->menu->doc = array('link' => '文档|project|doc|porjectID= $lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; $lang->project->menu->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); -$lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|index|locate=no&status=undone&projectID=%s", 'float' => 'right'); +$lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); $lang->task = new stdclass(); $lang->build = new stdclass(); diff --git a/module/product/css/index.css b/module/product/css/all.css similarity index 100% rename from module/product/css/index.css rename to module/product/css/all.css diff --git a/module/product/js/index.js b/module/product/js/all.js similarity index 100% rename from module/product/js/index.js rename to module/product/js/all.js diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index a35691c1a4..5080750370 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -88,7 +88,7 @@
- product->batchEdit, '', '');?> + product->batchEdit);?> recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->product->updateOrder, '' , "class='btn'");?>
diff --git a/module/project/control.php b/module/project/control.php index d32b700f10..69db284b42 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -37,30 +37,14 @@ class project extends control * @access public * @return void */ - public function index($locate = 'yes', $status = 'undone', $projectID = 0, $orderBy = 'order_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) + public function index($locate = 'yes', $projectID = 0) { if($locate == 'yes') $this->locate($this->createLink('project', 'task')); if($this->projects) $this->commonAction($projectID); - $this->session->set('projectList', $this->app->getURI(true)); - /* Load pager and get tasks. */ - $this->app->loadClass('pager', $static = true); - $pager = new pager($recTotal, $recPerPage, $pageID); - - $this->app->loadLang('my'); - $this->view->title = $this->lang->project->allProject; - $this->view->position[] = $this->lang->project->allProject; - $this->view->projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager); - $this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getPairs(); - $this->view->productID = $productID; - $this->view->projectID = $projectID; - $this->view->pager = $pager; - $this->view->recTotal = $pager->recTotal; - $this->view->recPerPage = $pager->recPerPage; - $this->view->orderBy = $orderBy; - $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->status = $status; + $this->view->title = $this->lang->project->index; + $this->view->position[] = $this->lang->project->index; $this->display(); } @@ -1927,4 +1911,28 @@ class project extends control $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($order)->where('id')->eq($newID)->exec(); } } + + public function all($status = 'undone', $projectID = 0, $orderBy = 'order_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) + { + if($this->projects) $this->commonAction($projectID); + $this->session->set('projectList', $this->app->getURI(true)); + + /* Load pager and get tasks. */ + $this->app->loadClass('pager', $static = true); + $pager = new pager($recTotal, $recPerPage, $pageID); + + $this->app->loadLang('my'); + $this->view->title = $this->lang->project->allProject; + $this->view->position[] = $this->lang->project->allProject; + $this->view->projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, $pager); + $this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getPairs(); + $this->view->productID = $productID; + $this->view->projectID = $projectID; + $this->view->pager = $pager; + $this->view->orderBy = $orderBy; + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->status = $status; + + $this->display(); + } } diff --git a/module/project/css/index.css b/module/project/css/all.css similarity index 100% rename from module/project/css/index.css rename to module/project/css/all.css diff --git a/module/project/js/index.js b/module/project/js/all.js similarity index 73% rename from module/project/js/index.js rename to module/project/js/all.js index 32b6716999..e0c2f1c978 100644 --- a/module/project/js/index.js +++ b/module/project/js/all.js @@ -11,5 +11,5 @@ $(function() function byProduct(productID, projectID) { - location.href = createLink('project', 'index', "locate=no&status=byproduct&project=" + projectID + "&orderBy=" + orderBy + '&productID=' + productID); + location.href = createLink('project', 'all', "status=byproduct&project=" + projectID + "&orderBy=" + orderBy + '&productID=' + productID); } diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php new file mode 100644 index 0000000000..8cdebaac36 --- /dev/null +++ b/module/project/view/all.html.php @@ -0,0 +1,102 @@ + + * @package project + * @version $Id: index.html.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $ + */ +?> + + + +
+
+ " . $lang->project->create, '', "class='btn'")?> +
+ +
+ +
'> + + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + delay)):?> + + + + + + + + + + + + + + + + + + + + +
idAB);?>project->name);?>project->code);?>project->PM);?>project->end);?>project->status);?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progess;?>project->burn;?>project->updateOrder);?>
+ + + + createLink('project', 'view', 'project=' . $project->id), sprintf('%03d', $project->id));?> + createLink('project', 'view', 'project=' . $project->id), $project->name);?>code;?>PM];?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> + + hours->progress;?>% + burns);?>'>
+
+ + + project->batchEdit);?> + + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?> +
+
show();?>
+
+
+ + + diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index ded11b04fe..b2d9b3ed94 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -10,93 +10,4 @@ */ ?> - - -
-
- " . $lang->project->create, '', "class='btn'")?> -
- -
- -
'> - - recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - delay)):?> - - - - - - - - - - - - - - - - - - - - -
idAB);?>project->name);?>project->code);?>project->PM);?>project->end);?>project->status);?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progess;?>project->burn;?>project->updateOrder);?>
- - - - createLink('project', 'view', 'project=' . $project->id), sprintf('%03d', $project->id));?> - createLink('project', 'view', 'project=' . $project->id), $project->name);?>code;?>PM];?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> - - hours->progress;?>% - burns);?>'>
-
- - - project->batchEdit);?> - - recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?> -
-
show();?>
-
-
- -