From c8036c78900e2b1055551ef7bd7957787b0584ba Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 10 Mar 2021 10:23:54 +0800
Subject: [PATCH 1/2] * Fix bug.

---
 module/execution/view/ajaxgetdropmenu.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 5354282d6f..bcb55035d0 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -49,7 +49,7 @@ foreach($executions as $execution)
     ?>
     </div>
     <div class="col-footer">
-      <?php echo html::a(helper::createLink('program', 'prjbrowse'), '<i class="icon icon-cards-view muted"></i> ' . $lang->execution->all, '', 'class="not-list-item"'); ?>
+      <?php echo html::a(helper::createLink('execution', 'all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->execution->all, '', 'class="not-list-item"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->execution->doneProjects?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>

From 183feb39368b4cc0b44ea55e7baa7237f4b8c695 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 10 Mar 2021 10:24:13 +0800
Subject: [PATCH 2/2] * Finish task #36465.

---
 module/common/lang/de.php        | 17 ++++++----------
 module/common/lang/en.php        | 17 ++++++----------
 module/common/lang/fr.php        | 17 ++++++----------
 module/common/lang/menuOrder.php | 33 +++++++++++++++-----------------
 module/common/lang/vi.php        | 15 +++++----------
 module/common/lang/zh-cn.php     | 20 +++++++++----------
 module/company/control.php       |  6 ++++++
 module/index/js/index.js         |  2 ++
 module/my/control.php            |  3 +++
 module/project/js/browse.js      |  1 -
 module/user/model.php            |  3 +--
 11 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 8f95d4b7d1..600abec13f 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Benutzer|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Abteilung|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Gruppen|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Verlauf|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Unternehmen|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index acd0fd49c7..1d16ce4860 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'User|company|browse', 'subModule' => ',user,');
 $lang->company->menu->dept        = array('link' => 'Dept|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Dynamic|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Company|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 930f2a06d4..5fc3b7c015 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Utilisateurs|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Compartiments|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Privilèges|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Historique|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Entreprise|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 9c4dc357d6..34ebb1b60d 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -49,16 +49,14 @@ $lang->index->menuOrder[10] = 'project';
 
 /* my menu order. */
 $lang->my->menuOrder[5]  = 'index';
-$lang->my->menuOrder[10] = 'calendar';
-$lang->my->menuOrder[15] = 'myWork';
-$lang->my->menuOrder[20] = 'myProject';
-$lang->my->menuOrder[25] = 'myExecution';
-$lang->my->menuOrder[30] = 'contribute';
-$lang->my->menuOrder[35] = 'score';
-$lang->my->menuOrder[40] = 'dynamic';
-$lang->my->menuOrder[45] = 'follow';
-$lang->my->menuOrder[50] = 'team';
-$lang->my->menuOrder[55] = 'contacts';
+$lang->my->menuOrder[10] = 'myWork';
+$lang->my->menuOrder[15] = 'myProject';
+$lang->my->menuOrder[20] = 'myExecution';
+$lang->my->menuOrder[25] = 'contribute';
+$lang->my->menuOrder[30] = 'score';
+$lang->my->menuOrder[35] = 'dynamic';
+$lang->my->menuOrder[40] = 'follow';
+$lang->my->menuOrder[45] = 'contacts';
 $lang->todo->menuOrder = $lang->my->menuOrder;
 
 /* product menu order. */
@@ -142,19 +140,18 @@ $lang->report->menuOrder[25] = 'staff';
 $lang->company->menuOrder[5]  = 'browseUser';
 $lang->company->menuOrder[10] = 'dept';
 $lang->company->menuOrder[15] = 'browseGroup';
-$lang->company->menuOrder[20] = 'dynamic';
-$lang->company->menuOrder[25] = 'view';
-$lang->company->menuOrder[30] = 'addGroup';
-$lang->company->menuOrder[35] = 'batchAddUser';
-$lang->company->menuOrder[40] = 'addUser';
+$lang->company->menuOrder[20] = 'addGroup';
+$lang->company->menuOrder[25] = 'batchAddUser';
+$lang->company->menuOrder[30] = 'addUser';
 $lang->dept->menuOrder        = $lang->company->menuOrder;
 $lang->group->menuOrder       = $lang->company->menuOrder;
 $lang->user->menuOrder        = $lang->company->menuOrder;
 
 /* system menu order. */
-$lang->system->menuOrder[5]  = 'company';
-$lang->system->menuOrder[10] = 'scrum';
-$lang->system->menuOrder[15] = 'waterfall';
+$lang->system->menuOrder[5]  = 'team';
+$lang->system->menuOrder[10] = 'calendar';
+$lang->system->menuOrder[15] = 'dynamic';
+$lang->system->menuOrder[20] = 'view';
 
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 581daef645..128ae940d3 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Người dùng|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Phòng/Ban|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Phân quyền|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Lịch sử|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Doanh nghiệp|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bffb9ba04f..c0b0704f52 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> 测试|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文档|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> 统计|report|productSummary|";
-$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|custom|browsestoryconcept|';
+$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> 项目集|$programModule|$programMethod|";
 
@@ -221,11 +221,15 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->system->menu->team     = array('link' => '团队|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = '动态|company|dynamic|';
+$lang->system->menu->view     = array('link' => '公司|company|view');
+//$lang->system->menu->company  = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday');
 
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
+//$lang->subject = new stdclass();
+//$lang->subject->menu = new stdclass();
+//$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -291,7 +295,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = '仪表盘|my|index';
-$lang->my->menu->calendar    = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => '待处理|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -305,7 +308,6 @@ else
 $lang->my->menu->contribute  = array('link' => '贡献|my|contribute|mode=task');
 $lang->my->menu->dynamic     = '动态|my|dynamic|';
 $lang->my->menu->score       = array('link' => '积分|my|score|', 'subModule' => 'score');
-$lang->my->menu->team        = array('link' => '团队|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = '联系人|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -324,7 +326,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
 $lang->my->contributeMenu->testtask    = '测试单|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -521,8 +523,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => '用户|company|browse', 'subModule' => ',user,');
 $lang->company->menu->dept        = array('link' => '部门|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = '动态|company|dynamic|';
-$lang->company->menu->view        = array('link' => '公司|company|view');
 
 /* 后台管理菜单设置。*/
 $lang->admin = new stdclass();
diff --git a/module/company/control.php b/module/company/control.php
index b1ab021140..7fb824c385 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -147,6 +147,9 @@ class company extends control
      */
     public function view()
     {
+        $this->lang->navGroup->company = 'system';
+        $this->lang->noMenuModule[] = 'company';
+
         $this->company->setMenu();
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $this->lang->company->view;
         $this->view->position[] = $this->lang->company->view;
@@ -167,6 +170,9 @@ class company extends control
      */
     public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
+        $this->lang->navGroup->company = 'system';
+        $this->lang->noMenuModule[] = 'company';
+
         $this->company->setMenu();
         $this->app->loadLang('user');
         $this->app->loadLang('execution');
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 774584d135..6fff2ff7fd 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -117,6 +117,8 @@
         {
             if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
         }
+        if(moduleName === 'my')      if(methodLowerCase === 'team' || methodLowerCase == 'calendar') return 'system';
+        if(moduleName === 'company') if(methodLowerCase === 'view' || methodLowerCase == 'dynamic') return 'system';
         if(moduleName === 'tree')
         {
             if(methodLowerCase === 'browse')
diff --git a/module/my/control.php b/module/my/control.php
index 7586287af1..dbe9775c20 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -129,6 +129,7 @@ class my extends control
      */
     public function todo($type = 'before', $userID = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $this->lang->navGroup->my = 'system';
         /* Save session. */
         $uri = $this->app->getURI(true);
         if($this->app->viewType != 'json')
@@ -615,6 +616,8 @@ class my extends control
      */
     public function team($orderBy = 'id', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
+        $this->lang->navGroup->my = 'system';
+
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
diff --git a/module/project/js/browse.js b/module/project/js/browse.js
index 6efb00afd4..f3f57b523e 100644
--- a/module/project/js/browse.js
+++ b/module/project/js/browse.js
@@ -8,5 +8,4 @@ $(function()
     });
 });
 
-$('#project' + projectID).addClass('active');
 $(".tree .active").parent('li').addClass('active');
diff --git a/module/user/model.php b/module/user/model.php
index ee31789cd9..8fa6513a76 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -2467,8 +2467,7 @@ class userModel extends model
      */
     public function resetMenu()
     {
-        $this->lang->navGroup->user = 'my';
-        $this->lang->admin->menu    = $this->lang->my->menu;
+        $this->lang->navGroup->user = 'system';
         $this->lang->noMenuModule[] = 'user';
     }
 }