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

* finish the task #869

Browse Source
This commit is contained in:
areyou123456
2012-08-16 07:31:48 +00:00
parent 447ca49c50
commit f232fbbde9
23 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -344,7 +344,7 @@ class bug extends control
$productName = $this->products[$productID];
/* Header and positon. */
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->view;
$this->view->header->title = "BUG #$bug->id $bug->title/" . $this->products[$productID];
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName);
$this->view->position[] = $this->lang->bug->view;
module/bug/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='titlebar'>
<div id='main' <?php if($bug->deleted) echo "class='deleted'";?>>BUG #<?php echo $bug->id . $lang->colon . $bug->title;?></div>
<div id='main' <?php if($bug->deleted) echo "class='deleted'";?>>BUG #<?php echo $bug->id . ' ' . $bug->title;?></div>
<div>
<?php
$browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
module/build/control.php
+2 -2
View File
@@ -123,9 +123,9 @@ class build extends control
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
$this->loadModel('project')->setMenu($this->project->getPairs(), $build->project);
$projects = $this->project->getPairs();
/* Assign. */
$this->view->header->title = $this->lang->build->view;
$this->view->header->title = "BUILD #$build->id $build->name/" . $projects[$build->project];
$this->view->position[] = $this->lang->build->view;
$this->view->products = $this->project->getProducts($build->project);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/build/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<table class='cont-rt5'>
<caption><?php echo $lang->build->view;?></caption>
<caption>BUILD #<?php echo $build->id . ' ' . $build->name;?></caption>
<tr valign='top'>
<td>
<fieldset>
module/common/view/kindeditor.html.php
+1 -1
View File
@@ -6,7 +6,7 @@ if(!isset($config->$module->editor->$method)) return;
$editor = $config->$module->editor->$method;
$editor['id'] = explode(',', $editor['id']);
?>
<script src='<?php echo $jsRoot;?>jquery/kindeditor/kindeditor.<?php echo $app->getClientLang();?>.js' type='text/javascript'></script>
<script src='<?php echo $jsRoot;?>jquery/kindeditor/kindeditor.js' type='text/javascript'></script>
<script language='javascript'>
var editor = <?php echo json_encode($editor);?>;
module/doc/control.php
+1 -1
View File
@@ -387,7 +387,7 @@ class doc extends control
/* Set menu. */
$this->doc->setMenu($this->libs, $doc->lib);
$this->view->header->title = $this->libs[$doc->lib] . $this->lang->colon . $this->lang->doc->view;
$this->view->header->title = "DOC #$doc->id $doc->title/" . $this->libs[$doc->lib];
$this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$doc->lib"), $this->libs[$doc->lib]);
$this->view->position[] = $this->lang->doc->view;
module/doc/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<table class='table-1'>
<caption><?php echo $doc->title . $lang->colon . $lang->doc->view;?></caption>
<caption>DOC #<?php echo $doc->id . ' ' . $doc->title?></caption>
<tr>
<th class='rowhead'><?php echo $lang->doc->title;?></th>
<td <?php if($doc->deleted) echo "class='deleted'";?>><?php echo $doc->title;?></td>
module/product/control.php
+5 -5
View File
@@ -102,7 +102,7 @@ class product extends control
setcookie('productStoryOrder', $orderBy, $this->config->cookieLife, $this->config->webRoot);
/* Set header and position. */
$this->view->header->title = $this->lang->product->index . $this->lang->colon . $this->products[$productID];
$this->view->header->title = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse;
$this->view->position[] = $this->products[$productID];
/* Load pager. */
@@ -223,7 +223,7 @@ class product extends control
$product->desc = $this->loadModel('file')->setImgSize($product->desc);
if(!$product) die(js::error($this->lang->notFound) . js::locate('back'));
$this->view->header->title = $this->lang->product->view . $this->lang->colon . $product->name;
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->product->view;
$this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
$this->view->position[] = $this->lang->product->view;
$this->view->product = $product;
@@ -269,7 +269,7 @@ class product extends control
$this->session->set('docList', $this->app->getURI(true));
$product = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
$this->view->header->title = $this->lang->product->doc;
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->product->doc;
$this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
$this->view->position[] = $this->lang->product->doc;
$this->view->product = $product;
@@ -293,7 +293,7 @@ class product extends control
$this->session->set('productPlanList', $this->app->getURI(true));
$product = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch();
$this->view->header->title = $this->lang->product->roadmap;
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->product->roadmap;
$this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
$this->view->position[] = $this->lang->product->roadmap;
$this->view->product = $product;
@@ -341,7 +341,7 @@ class product extends control
$period = $type == 'account' ? 'all' : $type;
/* The header and position. */
$this->view->header->title = $this->lang->product->dynamic;
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->product->dynamic;
$this->view->position[] = $this->lang->product->dynamic;
/* Assign. */
module/product/view/view.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<table class='cont-rt5'>
<caption>
<?php echo $lang->product->view;?>
<?php echo $product->name . $this->lang->colon . $lang->product->view;?>
<div class='f-right f-16px strong'>
<?php
$browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
module/productplan/control.php
+5 -5
View File
@@ -111,7 +111,8 @@ class productplan extends control
{
$this->session->set('productPlanList', $this->app->getURI(true));
$this->commonAction($product);
$this->view->header->title = $this->lang->productplan->browse;
$products = $this->product->getPairs();
$this->view->header->title = $products[$product] . $this->lang->colon . $this->lang->productplan->browse;
$this->view->position[] = $this->lang->productplan->browse;
$this->view->plans = $this->productplan->getList($product);
$this->display();
@@ -130,13 +131,12 @@ class productplan extends control
$plan = $this->productplan->getByID($planID, true);
if(!$plan) die(js::error($this->lang->notFound) . js::locate('back'));
$this->commonAction($plan->product);
$this->view->header->title = $this->lang->productplan->view;
$products = $this->product->getPairs();
$this->view->header->title = "PLAN #$plan->id $plan->title/" . $products[$plan->product];
$this->view->position[] = $this->lang->productplan->view;
$this->view->planStories= $this->loadModel('story')->getPlanStories($planID);
$this->view->products = $this->product->getPairs();
$this->view->products = $products;
$this->view->plan = $plan;
$this->view->actions = $this->loadModel('action')->getList('productplan', $planID);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/productplan/view/view.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<table class='cont-rt5'>
<caption><?php echo $plan->title . $lang->colon . $lang->productplan->view;?></caption>
<caption>PLAN #<?php echo $plan->id . ' ' . $plan->title;?></caption>
<tr valign='top'>
<td>
<fieldset>
module/release/control.php
+5 -3
View File
@@ -36,8 +36,9 @@ class release extends control
public function browse($productID)
{
$this->commonAction($productID);
$products = $this->product->getPairs();
$this->session->set('releaseList', $this->app->getURI(true));
$this->view->header->title = $this->lang->release->browse;
$this->view->header->title = $products[$productID] . $this->lang->colon . $this->lang->release->browse;
$this->view->position[] = $this->lang->release->browse;
$this->view->releases = $this->release->getList($productID);
$this->display();
@@ -138,10 +139,11 @@ class release extends control
$bugs = $this->dao->select('*')->from(TABLE_BUG)->where('id')->in($release->bugs)->fetchAll();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
$this->commonAction($release->product);
$this->view->header->title = $this->lang->release->view;
$products = $this->product->getPairs();
$this->view->header->title = "RELEASE #$release->id $release->name/" . $products[$release->product];
$this->view->position[] = $this->lang->release->view;
$this->view->release = $release;
$this->view->stories = $stories;
module/release/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<table class='cont-rt5'>
<caption><?php echo $lang->release->view;?></caption>
<caption>RELEASE #<?php echo $release->id . ' ' . $release->name;?></caption>
<tr valign='top'>
<td>
<fieldset>
module/story/control.php
+1 -1
View File
@@ -368,7 +368,7 @@ class story extends control
/* Set the menu. */
$this->product->setMenu($this->product->getPairs(), $product->id);
$header['title'] = $product->name . $this->lang->colon . $this->lang->story->view . $this->lang->colon . $story->title;
$header['title'] = "STORY #$story->id $story->title/$product->name";
$position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name);
$position[] = $this->lang->story->view;
module/story/view/view.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='titlebar'>
<div id='main' <?php if($story->deleted) echo "class='deleted'";?>>STORY #<?php echo $story->id . $lang->colon . $story->title;?></div>
<div id='main' <?php if($story->deleted) echo "class='deleted'";?>>STORY #<?php echo $story->id . ' ' . $story->title;?></div>
<div>
<?php
$browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&moduleID=$story->module");
module/testcase/control.php
+1 -1
View File
@@ -317,7 +317,7 @@ class testcase extends control
$productID = $case->product;
$this->testcase->setMenu($this->products, $productID);
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->view;
$this->view->header['title'] = "CASE #$case->id $case->title/" . $this->products[$productID];
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testcase->view;
module/testcase/view/view.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<div id='titlebar' <?php if($case->deleted) echo "class='deleted'";?>>
<div id='main'>CASE #<?php echo $case->id . $lang->colon . $case->title;?></div>
<div id='main'>CASE #<?php echo $case->id . ' ' . $case->title;?></div>
<div>
<?php
$browseLink = $app->session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");
module/testtask/control.php
+1 -1
View File
@@ -174,7 +174,7 @@ class testtask extends control
$productID = $task->product;
$this->testtask->setMenu($this->products, $productID);
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->view;
$this->view->header['title'] = "TASK #$task->id $task->name/" . $this->products[$productID];
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testtask->view;
module/testtask/view/view.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<table class='table-1'>
<caption><?php echo $lang->testtask->view;?></caption>
<caption>TASK #<?php echo $task->id . ' ' . $task->name;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->testtask->name;?></th>
<td class='<?php if($task->deleted) echo 'deleted';?>'><?php echo $task->name;?>
module/todo/control.php
+1 -1
View File
@@ -147,7 +147,7 @@ class todo extends control
$this->loadModel('user')->setMenu($this->user->getPairs(), $todo->account);
$this->lang->set('menugroup.todo', $from);
$this->view->header->title = $this->lang->todo->view;
$this->view->header->title = "TODO #$todo->id $todo->name";
$this->view->position[] = $this->lang->todo->view;
$this->view->todo = $todo;
$this->view->times = $this->todo->buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
module/todo/view/view.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
<table class='table-1 a-left'>
<caption><?php echo $lang->todo->view;?></caption>
<caption>TODO #<?php echo $todo->id . ' ' . $todo->name;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->todo->account;?></th>
<td><?php echo $todo->account;?></td>
module/tree/control.php
+5 -5
View File
@@ -71,7 +71,7 @@ class tree extends control
$this->view->currentProduct = $currentProduct;
$this->view->productModules = $this->tree->getOptionMenu($currentProduct, 'story');
$header['title'] = $this->lang->tree->manageProduct . $this->lang->colon . $product->name;
$header['title'] = $product->name . $this->lang->colon . $this->lang->tree->manageProduct;
$position[] = html::a($this->createLink('product', 'browse', "product=$rootID"), $product->name);
$position[] = $this->lang->tree->manageProduct;
}
@@ -90,7 +90,7 @@ class tree extends control
$this->view->currentProject = $currentProject;
$this->view->projectModules = $this->tree->getOptionMenu($currentProject, 'task');
$header['title'] = $this->lang->tree->manageProject . $this->lang->colon . $project->name;
$header['title'] = $project->name . $this->lang->colon . $this->lang->tree->manageProject;
$position[] = html::a($this->createLink('project', 'task', "projectID=$rootID"), $project->name);
$position[] = $this->lang->tree->manageProject;
}
@@ -101,7 +101,7 @@ class tree extends control
$this->lang->tree->menuOrder = $this->lang->bug->menuOrder;
$this->lang->set('menugroup.tree', 'qa');
$header['title'] = $this->lang->tree->manageBug . $this->lang->colon . $product->name;
$header['title'] = $product->name . $this->lang->colon . $this->lang->tree->manageBug;
$position[] = html::a($this->createLink('bug', 'browse', "product=$rootID"), $product->name);
$position[] = $this->lang->tree->manageBug;
}
@@ -112,7 +112,7 @@ class tree extends control
$this->lang->tree->menuOrder = $this->lang->testcase->menuOrder;
$this->lang->set('menugroup.tree', 'qa');
$header['title'] = $this->lang->tree->manageCase . $this->lang->colon . $product->name;
$header['title'] = $product->name . $this->lang->colon . $this->lang->tree->manageCase;
$position[] = html::a($this->createLink('testcase', 'browse', "product=$rootID"), $product->name);
$position[] = $this->lang->tree->manageCase;
}
@@ -123,7 +123,7 @@ class tree extends control
$this->lang->tree->menuOrder = $this->lang->doc->menuOrder;
$this->lang->set('menugroup.tree', 'doc');
$header['title'] = $this->lang->tree->manageCustomDoc . $this->lang->colon . $lib->name;
$header['title'] = $lib->name . $this->lang->colon . $this->lang->tree->manageCustomDoc;
$position[] = html::a($this->createLink('doc', 'browse', "libID=$rootID"), $lib->name);
$position[] = $this->lang->tree->manageCustomDoc;
}
module/user/control.php
+2 -2
View File
@@ -198,7 +198,6 @@ class user extends control
*/
public function profile($account)
{
$header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->profile;
$position[] = $this->lang->user->profile;
/* Set menu. */
@@ -206,7 +205,8 @@ class user extends control
$user = $this->user->getById($account);
$deptPath = $this->dept->getParents($user->dept);
$header['title'] = "USER #$user->id $user->account/" . $this->lang->user->profile;
$this->view->header = $header;
$this->view->position = $position;
$this->view->user = $user;