From c72a51076fd2a817dbde5159229cb4d8ec5ab3b1 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Tue, 15 Nov 2016 13:10:39 +0800 Subject: [PATCH 1/5] * finish task #2696. --- module/bug/view/browse.html.php | 36 ++++++++++++++++-------- module/product/view/browse.html.php | 36 ++++++++++++++++-------- module/project/view/taskheader.html.php | 21 +++++++++++--- module/testcase/view/caseheader.html.php | 27 +++++++++++++----- 4 files changed, 85 insertions(+), 35 deletions(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 0898151e53..5af222fd7c 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -62,18 +62,30 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
- createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"), " {$lang->bug->create}",'', "class='btn btn-bug-create'"); - } - else - { - common::printIcon('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", 'btn', 'button', 'plus', '', 'btn-bug-create'); - } - ?> +
+ + +
'>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index c96fc9a092..62e8f8b693 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -56,18 +56,30 @@
- createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams"), " {$lang->story->create}",'', "class='btn create-story-btn'"); - } - else - { - common::printIcon('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID", 'btn', 'button', 'plus', '', 'create-story-btn'); - } - ?> +
+ + +
'>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php index 119c999d62..22964e4fac 100644 --- a/module/project/view/taskheader.html.php +++ b/module/project/view/taskheader.html.php @@ -121,10 +121,23 @@
- +
+ + +
'>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 173126ebd7..8b4fa7d0c9 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -76,13 +76,26 @@ ?> - + + +
+
+ + +
'>
From 6dc42d23e26e36fa137bd76e1625b209883857bf Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Tue, 15 Nov 2016 13:56:08 +0800 Subject: [PATCH 2/5] * finish task #2686. --- module/common/lang/en.php | 1 + module/common/lang/zh-cn.php | 1 + module/common/model.php | 3 ++- www/js/my.full.js | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 364eb23590..cb51afcc69 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -74,6 +74,7 @@ $lang->tutorialConfirm = 'You are using tutorial. Do you want to exit right now $lang->preShortcutKey = '[Shortcut:←]'; $lang->nextShortcutKey = '[Shortcut:→]'; +$lang->backShortcutKey = '[Shortcut:Alt+↑]'; $lang->select = 'Select'; $lang->selectAll = 'Select All'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 48f2012440..9ceed8cdec 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -74,6 +74,7 @@ $lang->tutorialConfirm = '检测到你尚未退出新手教程模式，是否现 $lang->preShortcutKey = '[快捷键:←]'; $lang->nextShortcutKey = '[快捷键:→]'; +$lang->backShortcutKey = '[快捷键:Alt+↑]'; $lang->select = '选择'; $lang->selectAll = '全选'; diff --git a/module/common/model.php b/module/common/model.php index 22416013d0..632ca7de18 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -828,7 +828,8 @@ class commonModel extends model global $lang, $app; if(isonlybody()) return false; - echo html::a($backLink, '', '', "class='btn' title={$lang->goback}"); + $title = $lang->goback . $lang->backShortcutKey; + echo html::a($backLink, '', '', "id='back' class='btn' title={$title}"); if(isset($preAndNext->pre) and $preAndNext->pre) { diff --git a/www/js/my.full.js b/www/js/my.full.js index e1701fa4c5..ff067f5070 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1684,6 +1684,13 @@ function initHotKey() return false; }); + /* Alt+up, go back to the previous page. */ + $(document).bind('keydown', 'Alt+up', function(evt) + { + backLink = ($('#back').attr("href")); + if(typeof(backLink) != 'undefined') location.href = backLink; + }); + /* left, go to pre object. */ $(document).bind('keydown', 'left', function(evt) { From 8a3e3c3b0e1552baaa204bfe62a270ba9c6e4337 Mon Sep 17 00:00:00 2001 From: Renee Date: Tue, 15 Nov 2016 14:01:23 +0800 Subject: [PATCH 3/5] Update en.php --- module/task/lang/en.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/module/task/lang/en.php b/module/task/lang/en.php index d72af9cd0d..b8bc32b52a 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -126,25 +126,25 @@ $lang->task->reasonList[''] = ''; $lang->task->reasonList['done'] = 'Done'; $lang->task->reasonList['cancel'] = 'Cancelled'; -$lang->task->afterChoices['continueAdding'] = 'Contine Add Task'; +$lang->task->afterChoices['continueAdding'] = 'Continue adding Tasks'; $lang->task->afterChoices['toTaskList'] = 'Back to Task List'; $lang->task->afterChoices['toStoryList'] = 'Back to Story List'; $lang->task->legendBasic = 'Basic Info'; $lang->task->legendEffort = 'Man-Hour'; $lang->task->legendLife = 'Task Life'; -$lang->task->legendDesc = 'Task Desn'; +$lang->task->legendDesc = 'Task Desc'; $lang->task->confirmDelete = "Do you want to delete this Task?"; $lang->task->confirmDeleteEstimate = "Do you want to delete it?"; $lang->task->copyStoryTitle = "Same Story"; -$lang->task->afterSubmit = "After Created"; +$lang->task->afterSubmit = "After Created,"; $lang->task->successSaved = "Created!"; $lang->task->delayWarning = " Delay %s days "; $lang->task->remindBug = "This Task is converted from a Bug. Do you want to update te Bug:%s?"; -$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module,Story and Assignor will be changed. Do you want to do it?"; -$lang->task->confirmFinish = '"Estimated Left" is 0. Do you want to change the Status to "Done"?'; -$lang->task->confirmRecord = '"Left" is 0. Do you want to set Task as "Done"?'; +$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?"; +$lang->task->confirmFinish = '"Estimated reamin hour" is 0. Do you want to change the Status to "Done"?'; +$lang->task->confirmRecord = '"Remain hour" is 0. Do you want to set Task as "Done"?'; $lang->task->noticeSaveRecord = 'Your man-hour is not saved. Please save it first.'; $lang->task->commentActions = '%s. %s, commented by %s.'; @@ -206,11 +206,11 @@ $lang->task->report->tasksPerType->item = 'Type'; $lang->task->report->tasksPerPri->item = 'Priority'; $lang->task->report->tasksPerStatus->item = 'Status'; $lang->task->report->tasksPerDeadline->item = 'Date'; -$lang->task->report->tasksPerEstimate->item = '预计'; -$lang->task->report->tasksPerLeft->item = '剩余'; -$lang->task->report->tasksPerConsumed->item = '消耗'; +$lang->task->report->tasksPerEstimate->item = 'Est.'; +$lang->task->report->tasksPerLeft->item = 'Reamin'; +$lang->task->report->tasksPerConsumed->item = 'Consume'; $lang->task->report->tasksPerFinishedBy->item = 'User'; -$lang->task->report->tasksPerClosedReason->item = '原因'; +$lang->task->report->tasksPerClosedReason->item = 'Reason'; $lang->task->report->finishedTasksPerDay->item = 'Date'; $lang->task->report->tasksPerProject->graph = new stdclass(); From 49c5f6346bb303e91e8558a7a45b12ecc284b3c1 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Tue, 15 Nov 2016 14:45:57 +0800 Subject: [PATCH 4/5] * finish task #2693. --- module/productplan/model.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/module/productplan/model.php b/module/productplan/model.php index b663bc21c4..173b04f20f 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -91,12 +91,26 @@ class productplanModel extends model public function getPairs($product = 0, $branch = 0, $expired = '') { $date = date('Y-m-d'); - return array('' => '') + $this->dao->select('id,CONCAT(title, " [", begin, " ~ ", end, "]") as title')->from(TABLE_PRODUCTPLAN) + $plans = $this->dao->select('id,CONCAT(title, " [", begin, " ~ ", end, "]") as title')->from(TABLE_PRODUCTPLAN) ->where('product')->in($product) ->andWhere('deleted')->eq(0) ->beginIF($branch)->andWhere("branch")->in("0,$branch")->fi() ->beginIF($expired == 'unexpired')->andWhere('end')->gt($date)->fi() - ->orderBy('begin desc')->fetchPairs(); + ->orderBy('begin desc') + ->fetchPairs(); + + if($expired == 'unexpired' and empty($plans)) + { + $plans = $this->dao->select('id,CONCAT(title, " [", begin, " ~ ", end, "]") as title')->from(TABLE_PRODUCTPLAN) + ->where('product')->in($product) + ->andWhere('deleted')->eq(0) + ->beginIF($branch)->andWhere("branch")->in("0,$branch")->fi() + ->orderBy('begin desc') + ->limit(5) + ->fetchPairs(); + } + + return array('' => '') + $plans; } /** From 90312c8124857f795b769e5d16720308d4d1224b Mon Sep 17 00:00:00 2001 From: Renee Date: Tue, 15 Nov 2016 14:46:58 +0800 Subject: [PATCH 5/5] Update en.php --- module/tree/lang/en.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index f4ddfd98ac..0e4d8ba40e 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -33,17 +33,17 @@ $lang->tree->dragAndSort = "Drag and Sort"; $lang->tree->addChild = "Add Child Module"; $lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?'; -$lang->tree->confirmRoot = "Modify the module {$lang->productCommon}s, modified the {$lang->productCommon}s belong to the needs of the module, bug, use case, and {$lang->projectCommon} and {$lang->productCommon} relationship. This is dangerous, please be careful. To confirm the change?"; -$lang->tree->successSave = 'Successfully saved'; -$lang->tree->successFixed = 'Successfully fixed.'; -$lang->tree->repeatName = 'The name "%s" has exists!'; +$lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?"; +$lang->tree->successSave = 'Saved.'; +$lang->tree->successFixed = 'Fixed.'; +$lang->tree->repeatName = 'The name "%s" has existed!'; $lang->tree->name = 'Name'; $lang->tree->parent = 'Parent'; $lang->tree->child = 'Child'; $lang->tree->owner = 'Owner'; $lang->tree->order = 'Order'; -$lang->tree->short = 'Sort'; +$lang->tree->short = 'Short'; $lang->tree->all = 'All Modules'; $lang->tree->projectDoc = "{$lang->projectCommon} Doc"; $lang->tree->product = $lang->productCommon;