" . $lang->project->create, '', "class='btn btn-primary'")?>
-
+
+
+
createLink('productplan', 'create', 'productID=' . $productID), ''. $lang->productplan->create, '', 'class="btn btn-mini" id="createPlan"');?>
+
+
$mapBranches):?>
diff --git a/module/budget/lang/en.php b/module/budget/lang/en.php
new file mode 100644
index 0000000000..7638876af6
--- /dev/null
+++ b/module/budget/lang/en.php
@@ -0,0 +1,28 @@
+budget->create = 'Create Budget';
+$lang->budget->edit = 'Edit Budget';
+$lang->budget->total = 'Total Budget';
+$lang->budget->summary = 'Summary';
+$lang->budget->browse = 'Browse Dudget';
+$lang->budget->list = 'Budget List';
+$lang->budget->view = 'Budget Detail';
+$lang->budget->delete = 'Delete';
+$lang->budget->batchCreate = 'Batch Create';
+$lang->budget->common = 'Cost Estimate';
+$lang->budget->id = 'ID';
+$lang->budget->stage = 'Stage';
+$lang->budget->subject = 'Subject';
+$lang->budget->name = 'Name of fee';
+$lang->budget->amount = 'Estimated amount';
+$lang->budget->desc = 'Explain';
+$lang->budget->yuan = 'yuan';
+$lang->budget->dollar = 'Dollars';
+$lang->budget->createdBy = 'CreatedBy';
+$lang->budget->createdDate = 'CreatedDate';
+$lang->budget->lastEditedBy = 'LastEditBy';
+$lang->budget->lastEditedDate = 'LastEditedDate';
+$lang->budget->basicInfo = 'BasicInfo';
+$lang->budget->noData = 'No Data';
+
+$lang->budget->summaryReport = 'SummaryReport';
+$lang->budget->confirmDelete = 'Are you sure you want to delete it?';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 12f36948d2..25c50283c0 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -199,3 +199,5 @@ $lang->custom->conceptOptions->story['1'] = 'Story';
$lang->custom->conceptOptions->hourPoint = array();
$lang->custom->conceptOptions->hourPoint['0'] = 'Hour';
$lang->custom->conceptOptions->hourPoint['1'] = 'Story Point';
+$lang->custom->conceptOptions->hourPoint['2'] = 'Function Ponit';
+$lang->custom->conceptOptions->hourPoint['3'] = 'Code Line';
diff --git a/module/design/control.php b/module/design/control.php
index 2dc9931925..f2b748f22f 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -68,7 +68,7 @@ class design extends control
* @access public
* @return void
*/
- public function create($productID = 0, $prevModule = '', $prevID = 0)
+ public function create($productID = 0)
{
$productID = $this->loadModel('product')->saveState($productID, $this->product->getPairs('nocode'));
$this->design->setProductMenu($productID);
@@ -231,9 +231,9 @@ class design extends control
$repos = $this->loadModel('repo')->getRepoPairs();
$repoID = $repoID ? $repoID : key($repos);
- $repo = $this->loadModel('repo')->getRepoByID($repoID);
+ $repo = $repoID ? $this->loadModel('repo')->getRepoByID($repoID) : '';
- $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', $pager, $begin, $end);
+ $revisions = $repo ? $this->repo->getCommits($repo, '', 'HEAD', '', $pager, $begin, $end) : '';
if($_POST)
{
diff --git a/module/design/lang/en.php b/module/design/lang/en.php
index 94c96296e8..2106dabc73 100644
--- a/module/design/lang/en.php
+++ b/module/design/lang/en.php
@@ -1,4 +1,14 @@
+ * @package design
+ * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
+ * @link http://www.zentao.net
+ */
$lang->design->common = 'Design';
$lang->design->browse = 'List';
$lang->design->commit = 'Link Commit';
@@ -26,6 +36,7 @@ $lang->design->desc = 'Description';
$lang->design->product = 'Linked Product';
$lang->design->basicInfo = 'Basic Information';
$lang->design->commitDate = 'Committed Date';
+$lang->design->commitBy = 'Commit By';
$lang->design->affectedStory = "{$lang->storyCommon}";
$lang->design->affectedTasks = 'Task';
$lang->design->submit = 'Submit Review';
@@ -46,6 +57,7 @@ $lang->design->typeList['ADS'] = 'API';
$lang->design->range = 'Impact';
$lang->design->errorSelection = 'No record selected!';
$lang->design->noDesign = 'No record.';
+$lang->design->noCommit = 'No record commited.';
$lang->design->rangeList = array();
$lang->design->rangeList['all'] = 'All';
diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php
index 2f54df9741..51880e9792 100644
--- a/module/design/lang/zh-cn.php
+++ b/module/design/lang/zh-cn.php
@@ -1,4 +1,14 @@
+ * @package design
+ * @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
+ * @link http://www.zentao.net
+ */
$lang->design->common = '设计';
$lang->design->browse = '浏览列表';
$lang->design->commit = '关联提交';
@@ -46,6 +56,7 @@ $lang->design->typeList['ADS'] = '接口设计';
$lang->design->range = '影响范围';
$lang->design->errorSelection = '还没有选中记录!';
$lang->design->noDesign = '暂时没有记录';
+$lang->design->noCommit = '暂时没有提交记录';
$lang->design->rangeList = array();
$lang->design->rangeList['all'] = '全部记录';
diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index 08c2796dc8..e50b8687a0 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -27,7 +27,7 @@
" . $lang->design->batchCreate, '', "class='btn btn-primary'");?>
- createLink('design', 'create', "productID=$productID&designID=0"), " {$lang->design->create}", '', "class='btn btn-primary'");?>
+ " . $lang->design->create, '', "class='btn btn-primary'");?>
diff --git a/module/design/view/commit.html.php b/module/design/view/commit.html.php
index c194f9c363..4951c04483 100644
--- a/module/design/view/commit.html.php
+++ b/module/design/view/commit.html.php
@@ -19,6 +19,11 @@
arrow . $lang->design->commit;?>