diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 638d10c6ee..c67bafcbd6 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -25,6 +25,7 @@ $lang->action->undelete = '還原'; $lang->action->hideOne = '隱藏'; $lang->action->hideAll = '全部隱藏'; $lang->action->editComment = '修改備註'; +$lang->action->create = '添加備註'; $lang->action->comment = '備註'; $lang->action->trashTips = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。'; @@ -115,7 +116,7 @@ $lang->action->desc->finished = '$date, 由 $actor 完成 $lang->action->desc->paused = '$date, 由 $actor 暫停。' . "\n"; $lang->action->desc->verified = '$date, 由 $actor 驗收。' . "\n"; $lang->action->desc->diff1 = '修改了 %s，舊值為 "%s"，新值為 "%s"。
' . "\n"; -$lang->action->desc->diff2 = '修改了 %s，區別為：' . "\n" . "
%s
" . "\n"; +$lang->action->desc->diff2 = '修改了 %s，區別為：' . "\n" . "
%s
" . "\n
%s
"; $lang->action->desc->diff3 = '將檔案名 %s 改為 %s 。' . "\n"; $lang->action->desc->linked2bug = '$date 由 $actor 關聯到版本 $extra'; diff --git a/module/block/control.php b/module/block/control.php index 805faf2520..a8f6cb432b 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -69,11 +69,12 @@ class block extends control { $this->get->set('mode', 'getblocklist'); $this->view->blocks = $this->fetch('block', 'main', "module=$module&id=$id"); + $this->view->module = $module; } - $this->view->title = $title; - $this->view->block = $this->block->getByID($id); - $this->view->blockID = $id; + $this->view->title = $title; + $this->view->block = $this->block->getByID($id); + $this->view->blockID = $id; $this->display(); } diff --git a/module/block/js/admin.js b/module/block/js/admin.js index d5e5408db9..1c5e14fb32 100644 --- a/module/block/js/admin.js +++ b/module/block/js/admin.js @@ -89,4 +89,5 @@ $(function() }); if(blockID) setTimeout(function(){getBlocks($('#modules').val());}, 200); + if(module) $blocksList.data('module', module); }); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index aa74dd0005..5c890c4459 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -268,9 +268,9 @@ $lang->block->orderByList->story['status_desc'] = 'Status Descending'; $lang->block->orderByList->story['stage_asc'] = 'Stage Ascending'; $lang->block->orderByList->story['stage_desc'] = 'Stage Descending'; -$lang->block->todoNum = 'Todo Number'; -$lang->block->taskNum = 'Task Number'; -$lang->block->bugNum = 'Bug Number'; +$lang->block->todoNum = 'Todo Number'; +$lang->block->taskNum = 'Task Number'; +$lang->block->bugNum = 'Bug Number'; $lang->block->typeList = new stdclass(); diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 5cf7f1f3ff..0b6466a6a2 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -268,9 +268,9 @@ $lang->block->orderByList->story['status_desc'] = '状态倒序'; $lang->block->orderByList->story['stage_asc'] = '阶段正序'; $lang->block->orderByList->story['stage_desc'] = '阶段倒序'; -$lang->block->todoNum = '待办数'; -$lang->block->taskNum = '任务数'; -$lang->block->bugNum = 'Bug数'; +$lang->block->todoNum = '待办数'; +$lang->block->taskNum = '任务数'; +$lang->block->bugNum = 'Bug数'; $lang->block->typeList = new stdclass(); diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 3a302336cf..c675271ed0 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -268,9 +268,9 @@ $lang->block->orderByList->story['status_desc'] = '狀態倒序'; $lang->block->orderByList->story['stage_asc'] = '階段正序'; $lang->block->orderByList->story['stage_desc'] = '階段倒序'; -$lang->block->todoNum = '待辦數'; -$lang->block->taskNum = '任務數'; -$lang->block->bugNum = 'Bug數'; +$lang->block->todoNum = '待辦數'; +$lang->block->taskNum = '任務數'; +$lang->block->bugNum = 'Bug數'; $lang->block->typeList = new stdclass(); @@ -326,7 +326,7 @@ $lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->welcomeList['06:00'] = '%s，早上好！'; -$lang->block->welcomeList['11:30'] = '%s，中文好！'; +$lang->block->welcomeList['11:30'] = '%s，中午好！'; $lang->block->welcomeList['13:30'] = '%s，下午好！'; $lang->block->welcomeList['19:00'] = '%s，晚上好！'; diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 9cac5bec90..463eeff3e5 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -17,6 +17,7 @@ include '../../common/view/chosen.html.php'; ?>
+
@@ -27,7 +28,9 @@ include '../../common/view/chosen.html.php';
- + + +
@@ -36,10 +39,11 @@ include '../../common/view/chosen.html.php';
-   - +   +
- + + diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 088535fc2a..89db013132 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -32,7 +32,7 @@ $useGuest = $this->app->user->account == 'guest';