From 00fe28cc807a262c3af2663e19e2996b448cd832 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 26 Aug 2020 08:33:11 +0800 Subject: [PATCH 01/11] * Unified button format. --- module/design/control.php | 2 +- module/design/view/browse.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index 2a57875ef5..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); 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'");?>
From 76628a20a59485068e9f39ed0e14309c50a223e5 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 26 Aug 2020 09:02:43 +0800 Subject: [PATCH 02/11] * Add English lang file. --- module/custom/lang/en.php | 2 ++ module/holiday/lang/en.php | 7 +++++++ module/subject/lang/en.php | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 module/subject/lang/en.php 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/holiday/lang/en.php b/module/holiday/lang/en.php index f88ae0b3ad..b22e4e0ea4 100644 --- a/module/holiday/lang/en.php +++ b/module/holiday/lang/en.php @@ -6,14 +6,21 @@ $lang->holiday->create = 'Create'; $lang->holiday->edit = 'Edit'; $lang->holiday->delete = 'Delete'; +$lang->holiday->createAction = 'Create Holiday'; +$lang->holiday->editAction = 'Edit Holiday'; +$lang->holiday->deleteAction = 'Delete Holiday'; + $lang->holiday->id = 'ID'; $lang->holiday->name = 'Name'; $lang->holiday->desc = 'Description'; $lang->holiday->type = 'Type'; $lang->holiday->begin = 'Begin'; $lang->holiday->end = 'End'; +$lang->holiday->all = 'All'; $lang->holiday->holiday = 'Holiday'; $lang->holiday->typeList['holiday'] = 'Holiday'; $lang->holiday->typeList['working'] = 'Working Day'; + +$lang->holiday->emptyTip = 'No Holiday'; diff --git a/module/subject/lang/en.php b/module/subject/lang/en.php new file mode 100644 index 0000000000..17a546f008 --- /dev/null +++ b/module/subject/lang/en.php @@ -0,0 +1,6 @@ +subject->common = 'Subject'; +$lang->subject->manage = 'Manage Subject'; +$lang->subject->manageChild = 'Manage Child Subject'; +$lang->subject->name = 'Subject Name'; +$lang->subject->browse = 'Browse Subject'; From 41ecce79d5e290f7ef122db1484ecd7c3a7e1266 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 26 Aug 2020 09:05:49 +0800 Subject: [PATCH 03/11] * Add comment. --- module/design/lang/en.php | 10 ++++++++++ module/design/lang/zh-cn.php | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/module/design/lang/en.php b/module/design/lang/en.php index ca38242760..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'; diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index 25cca10d46..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 = '关联提交'; From f4ccf99b1d9002c97f454537ef79eda4d7959a3b Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 26 Aug 2020 09:10:23 +0800 Subject: [PATCH 04/11] * Edit English lang file for user module. --- module/user/lang/en.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/user/lang/en.php b/module/user/lang/en.php index ab521245af..305d6bb547 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -11,6 +11,8 @@ */ $lang->user->common = 'User'; $lang->user->id = 'ID'; +$lang->user->inside = 'Inside Members'; +$lang->user->outside = 'Outside Members'; $lang->user->company = 'Company'; $lang->user->dept = 'Department'; $lang->user->account = 'Account'; From 77cf55dd790f9121277a2e68a286482ec9510d4e Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 26 Aug 2020 09:23:01 +0800 Subject: [PATCH 05/11] * Fix system menu header. --- config/filter.php | 1 + module/common/lang/zh-cn.php | 12 ++++-------- module/common/view/header.html.php | 2 ++ module/custom/model.php | 19 +++++++++++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/config/filter.php b/config/filter.php index 244e589df6..71cb71ac32 100644 --- a/config/filter.php +++ b/config/filter.php @@ -26,6 +26,7 @@ $filter->default->cookie['lang'] = 'reg::lang'; $filter->default->cookie['theme'] = 'reg::word'; $filter->default->cookie['fingerprint'] = 'reg::word'; $filter->default->cookie['hideMenu'] = 'equal::true'; +$filter->default->cookie['systemModel'] = 'code'; $filter->bug = new stdclass(); $filter->caselib = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 2056de9939..ba48f6e9f3 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -144,27 +144,20 @@ $lang->program = new stdclass(); /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->subMenu = new stdclass(); -$lang->system->subMenu->setmodel = new stdclass(); -$lang->system->menu->setmodel = array('link' => 'cmmi|custom|setcmmi|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->estimate = array('link' => '估算|custom|estimate|'); $lang->system->menu->stage = array('link' => '阶段|stage|browse|', 'subModule' => 'stage'); $lang->system->menu->subject = array('link' => '科目|subject|browse|'); $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); $lang->system->menu->custom = array('link' => '自定义|custom|plan|'); -$lang->system->subMenu->setmodel->scrum ='scrum|custom|setscrum|'; $lang->system->dividerMenu = ',auditcl,subject,'; -if($_COOKIE['systemModel'] == 'scrum') +if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') { $lang->system->menu = new stdclass(); - $lang->system->subMenu->setmodel = new stdclass(); - $lang->system->menu->setmodel = array('link' => 'scrum|custom|setscrum|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->subject = array('link' => '科目|subject|browse|'); $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); $lang->system->menu->custom = array('link' => '自定义|custom|concept|'); - $lang->system->subMenu->setmodel->cmmi ='cmmi|custom|setcmmi|'; $lang->mainNav->system = ' 组织|subject|browse|'; unset($lang->system->dividerMenu); } @@ -174,6 +167,9 @@ $lang->stage->menu = new stdclass(); $lang->stage->menu->browse = array('link' => '阶段列表|stage|browse|', 'alias' => 'create,edit,batchcreate'); $lang->stage->menu->settype = '阶段类型|stage|settype|'; +$lang->measurement = new stdclass(); +$lang->measurement->menu = new stdclass(); + /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = "{$lang->storyCommon}"; diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index fa2b4a1c97..e2cfbb1c78 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -15,6 +15,7 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; app->loadConfig('sso');?> sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?> navGroup, $app->rawModule) == 'program');?> +navGroup, $app->rawModule) == 'system');?>