From b9d288fd2302d66cf564e090fa2282e38e61912f Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 13 Feb 2023 16:56:34 +0800
Subject: [PATCH 001/319] * Code for add langitem.html.php

---
 module/common/lang/de.php         |  1 +
 module/common/lang/en.php         |  1 +
 module/common/lang/fr.php         |  1 +
 module/common/lang/menu.php       | 11 ++++++-----
 module/common/lang/vi.php         |  1 +
 module/common/lang/zh-cn.php      |  1 +
 module/dev/control.php            | 16 ++++++++++++++++
 module/dev/view/langitem.html.php | 17 +++++++++++++++++
 8 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 module/dev/view/langitem.html.php

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 400a8dd593..7258017932 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -249,6 +249,7 @@ $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
 $lang->db              = 'Database';
+$lang->langItem        = 'Lang Item';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 7986be63c8..eb95ced05d 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -249,6 +249,7 @@ $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
 $lang->db              = 'Database';
+$lang->langItem        = 'Lang Item';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index e5fffcfc7d..c9d76e2a8d 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -249,6 +249,7 @@ $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
 $lang->db              = 'Database';
+$lang->langItem        = 'Lang Item';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 833575eb33..ba57557add 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -624,11 +624,12 @@ $lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->u
 $lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
 $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
 
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
+$lang->admin->menu->dev['subMenu']           = new stdclass();
+$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
+$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
+$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langItem");
+$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
+$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
 $lang->admin->menu->dev['menuOrder'][5]  = 'api';
 $lang->admin->menu->dev['menuOrder'][10] = 'db';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index d632cd775d..fed24b15d8 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -27,6 +27,7 @@ $lang->welcome         = "%s";
 $lang->logout          = 'Thoát';
 $lang->login           = 'Đăng nhập';
 $lang->help            = 'Trợ giúp';
+$lang->langItem        = 'Lang Item';
 $lang->aboutZenTao     = 'Giới thiệu';
 $lang->profile         = 'Hồ sơ';
 $lang->changePassword  = 'Mật khẩu';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index de9520beef..b282fc5e19 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -249,6 +249,7 @@ $lang->model           = '模型';
 $lang->redev           = '二次开发';
 $lang->browser         = '浏览器';
 $lang->db              = '数据库';
+$lang->langItem        = '语言项';
 $lang->editor          = '编辑器';
 $lang->timezone        = '时区';
 $lang->security        = '安全';
diff --git a/module/dev/control.php b/module/dev/control.php
index ee06641655..0559645367 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -81,4 +81,20 @@ class dev extends control
 
         $this->display();
     }
+
+    /**
+     * LangItem.
+     *
+     * @access public
+     * @return void
+     */
+    public function langItem()
+    {
+        $this->view->title      = $this->lang->langItem;
+        $this->view->position[] = $this->lang->langItem;
+
+	$this->view->tab = 'langItem';
+
+        $this->display();
+    }
 }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
new file mode 100644
index 0000000000..975a51eec3
--- /dev/null
+++ b/module/dev/view/langitem.html.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ *  * The editor view file of dev module of ZenTaoPMS.
+ *   *
+ *    * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ *     * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ *      * @author      Yidong Wang <yidong@cnezsoft.com>
+ *       * @package     dev
+ *        * @version     $Id$
+ *         * @link        http://www.zentao.net
+ *          */
+?>
+<?php include 'header.html.php';?>
+<div id='mainContent' class='main-content'>
+</div>
+<?php include '../../common/view/footer.html.php';?>
+

From f25bcb9edc43a75c72d5b752061465678b183f34 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 14 Feb 2023 08:39:58 +0800
Subject: [PATCH 002/319] - Code for dev/control.php refactors.

---
 module/dev/control.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 0559645367..b0d9a5620e 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -91,9 +91,6 @@ class dev extends control
     public function langItem()
     {
         $this->view->title      = $this->lang->langItem;
-        $this->view->position[] = $this->lang->langItem;
-
-	$this->view->tab = 'langItem';
 
         $this->display();
     }

From 6bf8c6388e6d544e1b5032963764ea1688f0c801 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 14 Feb 2023 08:45:35 +0800
Subject: [PATCH 003/319] * Code for add menuOrder in langItem .

---
 module/common/lang/menu.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index ba57557add..a78c73a6b2 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -633,8 +633,9 @@ $lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->e
 
 $lang->admin->menu->dev['menuOrder'][5]  = 'api';
 $lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
+$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
+$lang->admin->menu->dev['menuOrder'][20] = 'editor';
+$lang->admin->menu->dev['menuOrder'][25] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
 $lang->admin->menu->system['subMenu']->mode        = array('link' => "{$lang->custom->mode}|custom|mode");

From 00725d482f46954ac91781e3f0021187d200bb77 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 14 Feb 2023 10:49:29 +0800
Subject: [PATCH 004/319] * Add section aplit when language get.

---
 module/custom/model.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 9dad54b82c..0930adf920 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -44,7 +44,13 @@ class customModel extends model
         foreach($allCustomLang as $id => $customLang)
         {
             if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
-            $processedLang[$customLang->module][$customLang->section][$customLang->key] = $customLang->value;
+
+            $sections     = explode('.', $customLang->section);
+            $sectionIndex = count($sections) - 1;
+            $sectionArr   = array($customLang->key => $customLang->value);
+            for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
+
+            $processedLang[$customLang->module] = $sectionArr;
         }
 
         return $processedLang;

From 31b8e72a3fb22a6af1198fe7190029bd56fa9b80 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 14 Feb 2023 11:48:07 +0800
Subject: [PATCH 005/319] * Code for css in langitem.

---
 module/dev/css/langitem.css       | 14 ++++++++++++++
 module/dev/view/langitem.html.php | 19 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 module/dev/css/langitem.css

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
new file mode 100644
index 0000000000..55c837e70f
--- /dev/null
+++ b/module/dev/css/langitem.css
@@ -0,0 +1,14 @@
+.flex {display: flex;}
+.h-32 {height: 32px;}
+.py-6 {padding: 6px 0;}
+.my-6 {margin: 6px 0;}
+.title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
+
+/* side-left */
+.main-content > .side-left {flex: 0 0 160px; margin-left: 64px; width: 160px;}
+.label-list > .input-label {display: flex; align-items: center; justify-content: center;}
+
+/* side-right */
+.main-content > .side-right {margin-left: 50px;}
+.main-content > .side-right > .input-list > .input-control {position: relative;}
+.main-content > .side-right > .input-list > .input-control > i.icon {position: absolute; font-size: 25px; left: -60px; top: 8px;}
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 975a51eec3..337fa5bff9 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -11,7 +11,24 @@
  *          */
 ?>
 <?php include 'header.html.php';?>
-<div id='mainContent' class='main-content'>
+<div id='mainContent' class='main-content flex'>
+  <div class="side-left">
+    <div class="title">默认值</div>
+    <div class="label-list">
+      <div class="input-label h-32 my-6">项目集</div>
+    </div>
+  </div>
+  <div class="side-right">
+    <div class="title">修改值</div>
+    <div class="input-list">
+     <div class="input-control h-32 py-6">
+       <i class="icon icon-angle-right text-primary"></i>
+       <input class="form-control" placeholder="项目集"></input>
+     </div>
+    </div>
+  </div>
+  <div class="side-main">
+  </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
 

From ff5bc056bde5c66a8a1a9a9dc33b6d5652edd52d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 14 Feb 2023 13:35:12 +0800
Subject: [PATCH 006/319]  * code for replace menu lang.

---
 db/update18.2.sql          |  1 +
 framework/router.class.php | 15 +++++++++
 module/common/model.php    | 64 ++++++++++++++++++++++++++++++++++++--
 module/custom/model.php    |  2 +-
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 db/update18.2.sql

diff --git a/db/update18.2.sql b/db/update18.2.sql
new file mode 100644
index 0000000000..8191f3d34d
--- /dev/null
+++ b/db/update18.2.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_lang` ADD `systemMode` varchar(10) COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'ALM';
diff --git a/framework/router.class.php b/framework/router.class.php
index 9be28106e7..71e76c2776 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -108,6 +108,17 @@ class router extends baseRouter
 
         parent::loadLang($moduleName, $appName);
 
+        /* Replace main nav lang. */
+        if($moduleName == 'common' and $this->dbh and !empty($this->config->db->name))
+        {
+            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `section`='mainNav' AND `lang`='{$this->clientLang}' AND `vision`='{$this->config->vision}' AND `systemMode`='{$this->config->systemMode}'")->fetchAll();
+            foreach($customMenus as $menu)
+            {
+                $menuKey = $menu->key;
+                if(isset($lang->mainNav->$menuKey)) $lang->mainNav->$menuKey = zget($lang->navIcons, $menuKey, '') . " {$menu->value}" . substr($lang->mainNav->$menuKey, strpos($lang->mainNav->$menuKey, '|'));
+            }
+        }
+
         /* Merge from the db lang. */
         if($moduleName != 'common' and isset($lang->db->custom[$moduleName]))
         {
@@ -284,6 +295,10 @@ class router extends baseRouter
                 $lang->URCommon = isset($URPairs[$config->URSR]) ? $URPairs[$config->URSR] : reset($URPairs);
                 $lang->SRCommon = isset($SRPairs[$config->URSR]) ? $SRPairs[$config->URSR] : reset($SRPairs);
             }
+
+            /* Replace common lang. */
+            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}' AND `systemMode`='{$config->systemMode}'")->fetchAll();
+            foreach($customMenus as $menu) if(isset($lang->{$menu->key})) $lang->{$menu->key} = $menu->value;
         }
     }
 
diff --git a/module/common/model.php b/module/common/model.php
index c6c4974b34..c429d4b5d1 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1117,8 +1117,9 @@ class commonModel extends model
         global $app, $lang, $config;
 
         /* Set main menu by app tab and module. */
-        self::setMainMenu();
-        self::checkMenuVarsReplaced();
+        static::replaceMenuLang();
+        static::setMainMenu();
+        static::checkMenuVarsReplaced();
 
         $activeMenu = '';
         $tab = $app->tab;
@@ -3535,6 +3536,65 @@ EOD;
         return true;
     }
 
+    /**
+     * Replace menu lang.
+     *
+     * @static
+     * @access public
+     * @return void
+     */
+    public static function replaceMenuLang()
+    {
+        global $lang;
+        foreach($lang->db->custom as $moduleName => $sectionMenus)
+        {
+            if(strpos($moduleName, 'Menu') === false) continue;
+
+            $isSecondMenu = strpos($moduleName, 'subMenu') === false;
+            $moduleName   = str_replace($isSecondMenu ? 'Menu' : 'subMenu', '', $moduleName);
+
+            foreach($sectionMenus as $section => $menus)
+            {
+                foreach($menus as $key => $value)
+                {
+                    $settingMenu = null;
+                    /* Get second menu. */
+                    if($isSecondMenu)
+                    {
+                        $isDropMenu = strpos($section, 'dropMenu') !== false;
+                        if(!$isDropMenu)
+                        {
+                            if(!isset($lang->{$moduleName}->{$section})) break;
+                            if(is_object($lang->{$moduleName}->{$section}) and isset($lang->{$moduleName}->{$section}->{$key})) $settingMenu = &$lang->{$moduleName}->{$section}->{$key};
+                            if(is_array($lang->{$moduleName}->{$section})  and isset($lang->{$moduleName}->{$section}[$key]))   $settingMenu = &$lang->{$moduleName}->{$section}[$key];
+                        }
+                        else
+                        {
+                            /* Get drop menu in second menu. */
+                            $dropMenuKey = str_replace('dropMenu', '', $section);
+                            if(!isset($lang->{$moduleName}->menu->{$dropMenuKey}['dropMenu']->{$key})) break;
+                            $settingMenu = &$lang->{$moduleName}->menu->{$dropMenuKey}['dropMenu']->{$key};
+                        }
+                    }
+                    /* Get third menu. */
+                    elseif(isset($lang->{$moduleName}->menu->{$section}['subMenu']))
+                    {
+                        $subMenu = $lang->{$moduleName}->menu->{$section}['subMenu'];
+                        if(is_object($subMenu) and isset($subMenu->{$key})) $settingMenu = &$lang->{$moduleName}->menu->{$section}['subMenu']->{$key};
+                        if(is_array($subMenu)  and isset($subMenu[$key]))   $settingMenu = &$lang->{$moduleName}->menu->{$section}['subMenu'][$key];
+                    }
+
+                    /* Set custom menu lang. */
+                    if(!empty($settingMenu))
+                    {
+                        if(is_string($settingMenu)) $settingMenu = $value . substr($settingMenu, strpos($settingMenu, '|'));
+                        if(is_array($settingMenu) and isset($settingMenu['link'])) $settingMenu['link'] = $value . substr($settingMenu['link'], strpos($settingMenu['link'], '|'));
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Check valid row.
      *
diff --git a/module/custom/model.php b/module/custom/model.php
index 0930adf920..0f45ad973d 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -23,7 +23,7 @@ class customModel extends model
 
         try
         {
-            $sql  = $this->dao->select('*')->from(TABLE_LANG)->where('`lang`')->in("$currentLang,all")->andWhere('vision')->eq($this->config->vision)->orderBy('lang,id')->get();
+            $sql  = $this->dao->select('*')->from(TABLE_LANG)->where('`lang`')->in("$currentLang,all")->andWhere('vision')->eq($this->config->vision)->andWhere('systemMode')->eq($this->config->systemMode)->orderBy('lang,id')->get();
             $stmt = $this->dbh->query($sql);
 
             $allCustomLang = array();

From dff2e8a00c1890eab216a9fb75936c98c0b186c3 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 14 Feb 2023 14:01:16 +0800
Subject: [PATCH 007/319] * Add search tab.

---
 module/common/lang/menu.php       | 2 +-
 module/dev/config.php             | 3 +++
 module/dev/control.php            | 9 +++++----
 module/dev/lang/de.php            | 6 ++++++
 module/dev/lang/en.php            | 6 ++++++
 module/dev/lang/fr.php            | 6 ++++++
 module/dev/lang/zh-cn.php         | 6 ++++++
 module/dev/view/langitem.html.php | 9 +++++++++
 8 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index a78c73a6b2..350dc33beb 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -627,7 +627,7 @@ $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->p
 $lang->admin->menu->dev['subMenu']           = new stdclass();
 $lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
 $lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langItem");
+$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
 $lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
 $lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
diff --git a/module/dev/config.php b/module/dev/config.php
index 697b172c04..21a21368e9 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -243,3 +243,6 @@ $config->dev->postParams['testcase']['create']['keywords']     = 'string';
 
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
+
+$config->dev->disableMainMenu = array();
+if($config->systemMode == 'light') $config->dev->disableMainMenu = array('project');
diff --git a/module/dev/control.php b/module/dev/control.php
index b0d9a5620e..122251f66e 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -83,15 +83,16 @@ class dev extends control
     }
 
     /**
-     * LangItem.
+     * Lang item.
      *
+     * @param  string $type
      * @access public
      * @return void
      */
-    public function langItem()
+    public function langItem($type = 'common')
     {
-        $this->view->title      = $this->lang->langItem;
-
+        $this->view->title = $this->lang->langItem;
+        $this->view->type  = $type;
         $this->display();
     }
 }
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 4785a529cc..84bf3954d1 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -177,3 +177,9 @@ if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
 $lang->dev->endGroupList['other']  = 'Andere';
+
+$lang->dev->featureBar['langItem']['common']  = 'Common';
+$lang->dev->featureBar['langItem']['first']   = 'First Menu';
+$lang->dev->featureBar['langItem']['second']  = 'Second Menu';
+$lang->dev->featureBar['langItem']['third']   = 'Third Menu';
+$lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 3218ee96b0..b11c005f6e 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -177,3 +177,9 @@ if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
 $lang->dev->endGroupList['other']  = 'Others';
+
+$lang->dev->featureBar['langItem']['common']  = 'Common';
+$lang->dev->featureBar['langItem']['first']   = 'First Menu';
+$lang->dev->featureBar['langItem']['second']  = 'Second Menu';
+$lang->dev->featureBar['langItem']['third']   = 'Third Menu';
+$lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 3218ee96b0..b11c005f6e 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -177,3 +177,9 @@ if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
 $lang->dev->endGroupList['other']  = 'Others';
+
+$lang->dev->featureBar['langItem']['common']  = 'Common';
+$lang->dev->featureBar['langItem']['first']   = 'First Menu';
+$lang->dev->featureBar['langItem']['second']  = 'Second Menu';
+$lang->dev->featureBar['langItem']['third']   = 'Third Menu';
+$lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 57100dfe2b..a194e1843b 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -177,3 +177,9 @@ if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 $lang->dev->endGroupList['admin']  = '后台';
 $lang->dev->endGroupList['system'] = '系统';
 $lang->dev->endGroupList['other']  = '其他';
+
+$lang->dev->featureBar['langItem']['common']  = '公共';
+$lang->dev->featureBar['langItem']['first']   = '一级菜单';
+$lang->dev->featureBar['langItem']['second']  = '二级菜单';
+$lang->dev->featureBar['langItem']['third']   = '三级菜单';
+$lang->dev->featureBar['langItem']['feature'] = '检索标签';
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 337fa5bff9..16d190701d 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -11,6 +11,15 @@
  *          */
 ?>
 <?php include 'header.html.php';?>
+<div id='mainMenu' class='clearfix'>
+  <div class="btn-toolBar pull-left">
+    <?php foreach($lang->dev->featureBar['langItem'] as $key => $label):?>
+    <?php $active = $type == $key ? 'btn-active-text' : '';?>
+    <?php $label = "<span class='text'>$label</span>";?>
+    <?php echo html::a(inlink('langItem', "type=$key"), $label, '', "class='btn btn-link $active'");?>
+    <?php endforeach;?>
+  </div>
+</div>
 <div id='mainContent' class='main-content flex'>
   <div class="side-left">
     <div class="title">默认值</div>

From ec1d388334b43ab635b7433b2c355a97bc7678c2 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 14 Feb 2023 14:32:09 +0800
Subject: [PATCH 008/319]  * fix bug.

---
 module/common/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/common/model.php b/module/common/model.php
index c429d4b5d1..361eb90429 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3546,6 +3546,7 @@ EOD;
     public static function replaceMenuLang()
     {
         global $lang;
+        if(empty($lang->db->custom)) return;
         foreach($lang->db->custom as $moduleName => $sectionMenus)
         {
             if(strpos($moduleName, 'Menu') === false) continue;

From 41ddc2562b255d63f43d4cb75d65e75d7bc680e3 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 14 Feb 2023 14:38:21 +0800
Subject: [PATCH 009/319]  * fix bug.

---
 module/common/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index 361eb90429..dea080e6f2 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3558,7 +3558,6 @@ EOD;
             {
                 foreach($menus as $key => $value)
                 {
-                    $settingMenu = null;
                     /* Get second menu. */
                     if($isSecondMenu)
                     {
@@ -3590,6 +3589,7 @@ EOD;
                     {
                         if(is_string($settingMenu)) $settingMenu = $value . substr($settingMenu, strpos($settingMenu, '|'));
                         if(is_array($settingMenu) and isset($settingMenu['link'])) $settingMenu['link'] = $value . substr($settingMenu['link'], strpos($settingMenu['link'], '|'));
+                        unset($settingMenu);
                     }
                 }
             }

From 87b3c95cebf9cf10554e94866e91721865a2e40a Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 15 Feb 2023 10:00:27 +0800
Subject: [PATCH 010/319] * Langitem: code for task #84531

---
 module/dev/css/langitem.css       |  8 ++++---
 module/dev/js/langitem.js         | 35 +++++++++++++++++++++++++++++++
 module/dev/view/langitem.html.php | 13 ++++++++----
 3 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 module/dev/js/langitem.js

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index 55c837e70f..eff84ac637 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -1,14 +1,16 @@
 .flex {display: flex;}
 .h-32 {height: 32px;}
 .py-6 {padding: 6px 0;}
-.my-6 {margin: 6px 0;}
+.my-12 {margin: 12px 0;}
 .title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
 
 /* side-left */
 .main-content > .side-left {flex: 0 0 160px; margin-left: 64px; width: 160px;}
-.label-list > .input-label {display: flex; align-items: center; justify-content: center;}
+.label-list {background: #F8F8F8; padding: 5px 0;}
+.label-list > .input-label {display: flex; align-items: center; cursor: pointer; padding-left: 40px;}
 
 /* side-right */
 .main-content > .side-right {margin-left: 50px;}
+.main-content > .side-right > .input-list {padding: 5px 0;}
 .main-content > .side-right > .input-list > .input-control {position: relative;}
-.main-content > .side-right > .input-list > .input-control > i.icon {position: absolute; font-size: 25px; left: -60px; top: 8px;}
+.main-content > .side-right > .input-list > .input-control > i.icon {position: absolute; font-size: 25px; left: -40px; top: 3px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
new file mode 100644
index 0000000000..b6c10ce50c
--- /dev/null
+++ b/module/dev/js/langitem.js
@@ -0,0 +1,35 @@
+$(function()
+{ 
+    $(".input-list").on("click", 'input', function(event) 
+    {
+        addActive(event.target.id);
+    });
+    $(".input-list").on("blur", 'input', function(event) 
+    {
+	removeActive(event.target.id);
+    });
+    $('.label-list').on('click', '.input-label', function(e)
+    {
+	var clearId = $('.label-list > .text-primary').attr('labelid');
+        var clickId = $(e.target).attr('labelid');
+	if (clearId && clearId != clickId)
+	{
+            removeActive(clearId);
+	}
+	if (clickId && clickId != clearId)
+	{
+            addActive(clickId);
+	    $('#' + clickId).focus();
+	}
+    });
+    function addActive(id)
+    {
+        $('[labelid=' + id + ']').addClass('text-primary');
+        $('[iconid=' + id + ']').removeClass('hidden');
+    };
+    function removeActive(id)
+    {
+        $('[labelid=' + id + ']').removeClass('text-primary');
+        $('[iconid=' + id + ']').addClass('hidden');
+    };
+})
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 16d190701d..1e640740b9 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -24,15 +24,20 @@
   <div class="side-left">
     <div class="title">默认值</div>
     <div class="label-list">
-      <div class="input-label h-32 my-6">项目集</div>
+      <div labelId="123456Input" class="input-label h-32 my-12">项目集</div>
+      <div labelId="223456Input" class="input-label h-32 my-12">产品</div>
     </div>
   </div>
   <div class="side-right">
     <div class="title">修改值</div>
     <div class="input-list">
-     <div class="input-control h-32 py-6">
-       <i class="icon icon-angle-right text-primary"></i>
-       <input class="form-control" placeholder="项目集"></input>
+     <div class="input-control h-32 my-12">
+       <input id="123456Input" class="form-control shadow-primary-hover" placeholder="项目集"></input>
+       <i iconId="123456Input" class="icon icon-angle-right text-primary hidden"></i>
+     </div>
+     <div class="input-control h-32 my-12">
+       <input id="223456Input" class="form-control shadow-primary-hover" placeholder="产品"></input>
+       <i iconId="223456Input" class="icon icon-angle-right text-primary hidden"></i>
      </div>
     </div>
   </div>

From 0d5f437607c3cca050fff3aeef58c8e6c390aaee Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 15 Feb 2023 10:23:54 +0800
Subject: [PATCH 011/319] * Adjust code.

---
 module/dev/js/langitem.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index b6c10ce50c..15e9144419 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -1,35 +1,36 @@
 $(function()
-{ 
-    $(".input-list").on("click", 'input', function(event) 
+{
+    $(".input-list").on("click", 'input', function(event)
     {
         addActive(event.target.id);
     });
-    $(".input-list").on("blur", 'input', function(event) 
+    $(".input-list").on("blur", 'input', function(event)
     {
-	removeActive(event.target.id);
+        removeActive(event.target.id);
     });
+
     $('.label-list').on('click', '.input-label', function(e)
     {
 	var clearId = $('.label-list > .text-primary').attr('labelid');
         var clickId = $(e.target).attr('labelid');
-	if (clearId && clearId != clickId)
-	{
-            removeActive(clearId);
-	}
-	if (clickId && clickId != clearId)
-	{
+        if(clearId && clearId != clickId) removeActive(clearId);
+
+        if(clickId && clickId != clearId)
+        {
             addActive(clickId);
-	    $('#' + clickId).focus();
-	}
+            $('#' + clickId).focus();
+        }
     });
+
     function addActive(id)
     {
         $('[labelid=' + id + ']').addClass('text-primary');
         $('[iconid=' + id + ']').removeClass('hidden');
-    };
+    }
+
     function removeActive(id)
     {
         $('[labelid=' + id + ']').removeClass('text-primary');
         $('[iconid=' + id + ']').addClass('hidden');
-    };
+    }
 })

From ff9c2419b235806dd43ba633b819536dbd33b88d Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 15 Feb 2023 11:08:42 +0800
Subject: [PATCH 012/319] * Code for task#84531

---
 module/dev/js/langitem.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 15e9144419..cd9e427713 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -32,5 +32,6 @@ $(function()
     {
         $('[labelid=' + id + ']').removeClass('text-primary');
         $('[iconid=' + id + ']').addClass('hidden');
+        $('#' + id).blur();
     }
 })

From 3bf16c880e65b064a72b585a5b0a2cd55f7b19cf Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 15 Feb 2023 11:22:42 +0800
Subject: [PATCH 013/319] * Optimize main and ext files get, and add get
 default lang function.

---
 framework/base/router.class.php   | 107 ++++++++++++++++--------------
 module/dev/control.php            |   4 +-
 module/dev/model.php              |  30 +++++++++
 module/dev/view/langitem.html.php |   2 +-
 4 files changed, 90 insertions(+), 53 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 5c51cbe7ef..fc837a7ccd 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -2506,29 +2506,9 @@ class baseRouter
 
         if($config and (!isset($config->$moduleName) or !is_object($config->$moduleName))) $config->$moduleName = new stdclass();
 
-        /* 初始化数组。Init the variables. */
-        $extConfigFiles       = array();
-        $commonExtConfigFiles = array();
-        $siteExtConfigFiles   = array();
-
-        /* 先获得模块的主配置文件。Get the main config file for current module first. */
-        $mainConfigFile = $this->getModulePath($appName, $moduleName) . 'config.php';
-
-        /* 查找扩展配置文件。Get extension config files. */
-        if($config->framework->extensionLevel > 0) $extConfigPath = $this->getModuleExtPath($appName, $moduleName, 'config');
-        if($config->framework->extensionLevel >= 1)
-        {
-            if(!empty($extConfigPath['common'])) $commonExtConfigFiles = helper::ls($extConfigPath['common'], '.php');
-            if(!empty($extConfigPath['xuan']))   $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['xuan'], '.php'));
-            if(!empty($extConfigPath['vision'])) $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['vision'], '.php'));
-            if(!empty($extConfigPath['saas']))   $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['saas'], '.php'));
-            if(!empty($extConfigPath['custom'])) $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['custom'], '.php'));
-        }
-        if($config->framework->extensionLevel == 2 and !empty($extConfigPath['site'])) $siteExtConfigFiles = helper::ls($extConfigPath['site'], '.php');
-        $extConfigFiles = array_merge($commonExtConfigFiles, $siteExtConfigFiles);
-
         /* 将主配置文件和扩展配置文件合并在一起。Put the main config file and extension config files together. */
-        $configFiles = array_merge(array($mainConfigFile), $extConfigFiles);
+        $configFiles = $this->getMainAndExtFiles($moduleName, $appName, 'config');
+        if(empty($configFiles)) return false;
 
         /* 加载每一个配置文件。Load every config file. */
         static $loadedConfigs = array();
@@ -2670,36 +2650,8 @@ class baseRouter
      */
     public function loadLang($moduleName, $appName = '')
     {
-        /* 初始化变量。Init vars. */
-        $modulePath      = $this->getModulePath($appName, $moduleName);
-        $extLangFiles    = array();
-        $langFilesToLoad = array();
-
-        /* 判断主语言文件是否存在。Whether the main lang file exists or not. */
-        $mainLangFile = $this->getMainLangFile($moduleName, $appName);
-        if($mainLangFile) $langFilesToLoad[] = $mainLangFile;
-
-        /* 获取扩展语言文件。If extensionLevel > 0, get extension lang files. */
-        if($this->config->framework->extensionLevel > 0)
-        {
-            $commonExtLangFiles = array();
-            $siteExtLangFiles   = array();
-
-            $extLangPath = $this->getModuleExtPath($appName, $moduleName, 'lang');
-            if($this->config->framework->extensionLevel >= 1)
-            {
-                if(!empty($extLangPath['common'])) $commonExtLangFiles = helper::ls($extLangPath['common'] . $this->clientLang, '.php');
-                if(!empty($extLangPath['xuan']))   $commonExtLangFiles = array_merge($commonExtLangFiles, helper::ls($extLangPath['xuan'] . $this->clientLang, '.php'));
-                if(!empty($extLangPath['vision'])) $commonExtLangFiles = array_merge($commonExtLangFiles, helper::ls($extLangPath['vision'] . $this->clientLang, '.php'));
-                if(!empty($extLangPath['custom'])) $commonExtLangFiles = array_merge($commonExtLangFiles, helper::ls($extLangPath['custom'] . $this->clientLang, '.php'));
-                if(!empty($extLangPath['saas']))   $commonExtLangFiles = array_merge($commonExtLangFiles, helper::ls($extLangPath['saas'] . $this->clientLang, '.php'));
-            }
-            if($this->config->framework->extensionLevel == 2 and !empty($extLangPath['site'])) $siteExtLangFiles = helper::ls($extLangPath['site'] . $this->clientLang, '.php');
-            $extLangFiles  = array_merge($commonExtLangFiles, $siteExtLangFiles);
-        }
-
         /* 计算最终要加载的语言文件。 Get the lang files to be loaded. */
-        $langFilesToLoad = array_merge($langFilesToLoad, $extLangFiles);
+        $langFilesToLoad = $this->getMainAndExtFiles($moduleName, $appName, 'lang');
         if(empty($langFilesToLoad)) return false;
 
         /* 加载语言文件。Load lang files. */
@@ -2972,6 +2924,59 @@ class baseRouter
     {
         return strtolower(getenv('IS_CONTAINER')) == 'true';
     }
+
+    /**
+     * Get main file and ext files.
+     *
+     * @param  string $moduleName
+     * @param  string $appName
+     * @param  string $type        lang|config|control|model
+     * @access public
+     * @return array
+     */
+    public function getMainAndExtFiles($moduleName, $appName = '', $type = 'lang')
+    {
+        /* 初始化变量。Init vars. */
+        $modulePath  = $this->getModulePath($appName, $moduleName);
+        $extFiles    = array();
+        $filesToLoad = array();
+
+        /* 判断主文件是否存在。Whether the main file exists or not. */
+        if($type == 'lang')
+        {
+            $mainFile = $this->getMainLangFile($moduleName, $appName);
+        }
+        else
+        {
+            $mainFile = $modulePath . $type . '.php';
+        }
+        if($mainFile) $filesToLoad[] = $mainFile;
+
+        /* 获取扩展文件。If extensionLevel > 0, get extension files. */
+        if($this->config->framework->extensionLevel > 0)
+        {
+            $commonExtFiles = array();
+            $siteExtFiles   = array();
+
+            $extPath = $this->getModuleExtPath($appName, $moduleName, $type);
+            if($this->config->framework->extensionLevel >= 1)
+            {
+                $client = $type == 'lang' and isset($this->client) ? $this->client : '';
+                if(!empty($extPath['common'])) $commonExtFiles = helper::ls($extPath['common'] . $client, '.php');
+                if(!empty($extPath['xuan']))   $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['xuan'] . $client, '.php'));
+                if(!empty($extPath['vision'])) $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['vision'] . $client, '.php'));
+                if(!empty($extPath['custom'])) $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['custom'] . $client, '.php'));
+                if(!empty($extPath['saas']))   $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['saas'] . $client, '.php'));
+            }
+            if($this->config->framework->extensionLevel == 2 and !empty($extPath['site'])) $siteExtFiles = helper::ls($extPath['site'] . $client, '.php');
+            $extFiles  = array_merge($commonExtFiles, $siteExtFiles);
+        }
+
+        /* 计算最终要加载的文件。 Get the files to be loaded. */
+        $filesToLoad = array_merge($filesToLoad, $extFiles);
+        if(empty($filesToLoad)) return false;
+        return $filesToLoad;
+    }
 }
 
 /**
diff --git a/module/dev/control.php b/module/dev/control.php
index 122251f66e..6f302b651c 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -89,10 +89,12 @@ class dev extends control
      * @access public
      * @return void
      */
-    public function langItem($type = 'common')
+    public function langItem($type = 'common', $module = 'my', $method = 'browse')
     {
+        $this->dev->loadLang();
         $this->view->title = $this->lang->langItem;
         $this->view->type  = $type;
+        $this->view->featureBar = $this->lang->dev->featureBar['langItem'];
         $this->display();
     }
 }
diff --git a/module/dev/model.php b/module/dev/model.php
index 2380ab8e5a..d370e620d4 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -295,4 +295,34 @@ class devModel extends model
     {
         return ltrim(rtrim($line), "* \t\n\r\0\x0B");
     }
+
+    /**
+     * Load default lang.
+     *
+     * @access public
+     * @return object
+     */
+    public function loadDefaultLang()
+    {
+        $langFilesToLoad = $this->app->getMainAndExtFiles('common');
+        if(empty($langFilesToLoad)) return false;
+
+        $lang = new language();
+        $lang->URCommon        = $this->lang->URCommon;
+        $lang->SRCommon        = $this->lang->SRCommon;
+        $lang->productCommon   = $this->lang->productCommon;
+        $lang->projectCommon   = $this->lang->projectCommon;
+        $lang->executionCommon = $this->lang->executionCommon;
+        if(!isset($lang->common)) $lang->common = new stdclass();
+
+        $loadedLangs = array();
+        foreach($langFilesToLoad as $langFile)
+        {
+            if(in_array($langFile, $loadedLangs)) continue;
+            include $langFile;
+            $loadedLangs[] = $langFile;
+        }
+
+        return $lang;
+    }
 }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 1e640740b9..a9bbc4502e 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -13,7 +13,7 @@
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class="btn-toolBar pull-left">
-    <?php foreach($lang->dev->featureBar['langItem'] as $key => $label):?>
+    <?php foreach($featureBar as $key => $label):?>
     <?php $active = $type == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php echo html::a(inlink('langItem', "type=$key"), $label, '', "class='btn btn-link $active'");?>

From 734a64958c29732826afe948192cf098ccc63535 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 15 Feb 2023 15:51:02 +0800
Subject: [PATCH 014/319]  * code for custom menu lang.

---
 db/update18.2.sql                 |  1 -
 framework/router.class.php        |  4 +-
 module/custom/model.php           |  2 +-
 module/dev/control.php            | 39 ++++++++++++++++---
 module/dev/lang/zh-cn.php         |  3 ++
 module/dev/model.php              | 37 +++++++++++++++++-
 module/dev/view/header.html.php   |  2 +
 module/dev/view/langitem.html.php | 65 ++++++++++++++++---------------
 8 files changed, 112 insertions(+), 41 deletions(-)
 delete mode 100644 db/update18.2.sql

diff --git a/db/update18.2.sql b/db/update18.2.sql
deleted file mode 100644
index 8191f3d34d..0000000000
--- a/db/update18.2.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `zt_lang` ADD `systemMode` varchar(10) COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'ALM';
diff --git a/framework/router.class.php b/framework/router.class.php
index 71e76c2776..6696361244 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -111,7 +111,7 @@ class router extends baseRouter
         /* Replace main nav lang. */
         if($moduleName == 'common' and $this->dbh and !empty($this->config->db->name))
         {
-            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `section`='mainNav' AND `lang`='{$this->clientLang}' AND `vision`='{$this->config->vision}' AND `systemMode`='{$this->config->systemMode}'")->fetchAll();
+            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `section`='mainNav' AND `lang`='{$this->clientLang}' AND `vision`='{$this->config->vision}'")->fetchAll();
             foreach($customMenus as $menu)
             {
                 $menuKey = $menu->key;
@@ -297,7 +297,7 @@ class router extends baseRouter
             }
 
             /* Replace common lang. */
-            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}' AND `systemMode`='{$config->systemMode}'")->fetchAll();
+            $customMenus = $this->dbh->query('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}'")->fetchAll();
             foreach($customMenus as $menu) if(isset($lang->{$menu->key})) $lang->{$menu->key} = $menu->value;
         }
     }
diff --git a/module/custom/model.php b/module/custom/model.php
index 0f45ad973d..0930adf920 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -23,7 +23,7 @@ class customModel extends model
 
         try
         {
-            $sql  = $this->dao->select('*')->from(TABLE_LANG)->where('`lang`')->in("$currentLang,all")->andWhere('vision')->eq($this->config->vision)->andWhere('systemMode')->eq($this->config->systemMode)->orderBy('lang,id')->get();
+            $sql  = $this->dao->select('*')->from(TABLE_LANG)->where('`lang`')->in("$currentLang,all")->andWhere('vision')->eq($this->config->vision)->orderBy('lang,id')->get();
             $stmt = $this->dbh->query($sql);
 
             $allCustomLang = array();
diff --git a/module/dev/control.php b/module/dev/control.php
index 6f302b651c..960de30b3e 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -89,12 +89,41 @@ class dev extends control
      * @access public
      * @return void
      */
-    public function langItem($type = 'common', $module = 'my', $method = 'browse')
+    public function langItem($type = 'common', $module = '', $method = '', $language = 'zh_cn')
     {
-        $this->dev->loadLang();
-        $this->view->title = $this->lang->langItem;
-        $this->view->type  = $type;
-        $this->view->featureBar = $this->lang->dev->featureBar['langItem'];
+        $language   = str_replace('_', '-', $language);
+        $moduleName = $module;
+        if($type == 'common') $moduleName = 'common';
+        if($type == 'second') $moduleName = $module . 'Menu';
+        if($type == 'third')  $moduleName = $module . 'subMenu';
+
+        if($_POST)
+        {
+            $section = '';
+            if($type == 'common') $section = '&section=';
+            if($type == 'first')  $section = '&section=mainNav';
+            $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}");
+
+            $data = fixer::input('post')->get();
+            foreach($data as $langKey => $customedLang)
+            {
+                if(strpos($langKey, "{$moduleName}_") !== 0) continue;
+                if(empty($customedLang)) continue;
+
+                $this->custom->setItem("{$language}." . str_replace('_', '.', $langKey), $customedLang);
+            }
+            return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
+        }
+
+        $this->dev->loadDefaultLang();
+
+        $this->view->title         = $this->lang->langItem;
+        $this->view->type          = $type;
+        $this->view->featureBar    = $this->lang->dev->featureBar['langItem'];
+        $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, str_replace('_', '-', $language));
+        $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, str_replace('_', '-', $language));
+        $this->view->moduleName    = $moduleName;
+        $this->view->language      = $language;
         $this->display();
     }
 }
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index a194e1843b..a277760592 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -19,6 +19,9 @@ $lang->dev->paramMailto   = "填写帐号，多个账号用','分隔。";
 $lang->dev->noteEditor    = "编辑器功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>扩展编辑器</a> 插件。";
 $lang->dev->noteTranslate = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
 
+$lang->dev->UR = '用户需求';
+$lang->dev->SR = '研发需求';
+
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = '序号';
 $lang->dev->fields['name']   = '字段';
diff --git a/module/dev/model.php b/module/dev/model.php
index d370e620d4..42d5657139 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -284,6 +284,38 @@ class devModel extends model
         return $extPaths;
     }
 
+    public function getOriginalLang($type, $module = '', $language = 'zh-cn')
+    {
+        $originalLangs = array();
+        if($type == 'common')
+        {
+            $projectKey = (int)$this->loadModel('setting')->getItem('owner=system&key=sprintConcept');
+            $clientLang = $this->app->getClientLang();
+            $originalLangs['productCommon']   = $this->config->productCommonList[$clientLang][PRODUCT_KEY];
+            $originalLangs['projectCommon']   = $this->config->projectCommonList[$clientLang][PROJECT_KEY];
+            $originalLangs['executionCommon'] = $this->config->executionCommonList[$clientLang][$projectKey];
+            $originalLangs['URCommon']        = $this->lang->dev->UR;
+            $originalLangs['SRCommon']        = $this->lang->dev->SR;
+        }
+
+        return $originalLangs;
+    }
+
+    public function getCustomedLang($type, $module = '', $language = 'zh-cn')
+    {
+        $customedLangs = array();
+        $clientLang    = $this->app->getClientLang();
+        if($type == 'common')
+        {
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=&vision={$this->config->vision}&systemMode={$this->config->systemMode}");
+            foreach($customeds as $customed) $customedLangs[$customed->key] = $customed->value;
+            $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
+            $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
+        }
+
+        return $customedLangs;
+    }
+
     /**
      * Trim asterisks and whitespace from the beginning and whitespace from the end of lines.
      *
@@ -302,9 +334,12 @@ class devModel extends model
      * @access public
      * @return object
      */
-    public function loadDefaultLang()
+    public function loadDefaultLang($language = 'zh-cn')
     {
+        $clientLang = $this->app->clientLang;
+        if($language != $clientLang) $this->app->clientLang = $language;
         $langFilesToLoad = $this->app->getMainAndExtFiles('common');
+        if($language != $clientLang) $this->app->clientLang = $clientLang;
         if(empty($langFilesToLoad)) return false;
 
         $lang = new language();
diff --git a/module/dev/view/header.html.php b/module/dev/view/header.html.php
index 9efce6496b..bca5b7c33b 100644
--- a/module/dev/view/header.html.php
+++ b/module/dev/view/header.html.php
@@ -2,4 +2,6 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('dev');?></div>
 </div>
+<?php if(isset($tab)):?>
 <script>$('#mainMenu #<?php echo $tab;?>').addClass('btn-active-text')</script>
+<?php endif;?>
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index a9bbc4502e..ea0eff2b3b 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -1,14 +1,14 @@
 <?php
 /**
- *  * The editor view file of dev module of ZenTaoPMS.
- *   *
- *    * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- *     * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
- *      * @author      Yidong Wang <yidong@cnezsoft.com>
- *       * @package     dev
- *        * @version     $Id$
- *         * @link        http://www.zentao.net
- *          */
+ * The editor view file of dev module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     dev
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
 ?>
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix'>
@@ -20,29 +20,32 @@
     <?php endforeach;?>
   </div>
 </div>
-<div id='mainContent' class='main-content flex'>
-  <div class="side-left">
-    <div class="title">默认值</div>
-    <div class="label-list">
-      <div labelId="123456Input" class="input-label h-32 my-12">项目集</div>
-      <div labelId="223456Input" class="input-label h-32 my-12">产品</div>
+<form class='main-form form-ajax' method='post'>
+  <div id='mainContent' class='main-content flex'>
+    <div class="side-left">
+      <div class="title">默认值</div>
+      <div class="label-list">
+        <?php foreach($originalLangs as $langKey => $originalLang):?>
+        <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
+        <?php endforeach;?>
+      </div>
     </div>
-  </div>
-  <div class="side-right">
-    <div class="title">修改值</div>
-    <div class="input-list">
-     <div class="input-control h-32 my-12">
-       <input id="123456Input" class="form-control shadow-primary-hover" placeholder="项目集"></input>
-       <i iconId="123456Input" class="icon icon-angle-right text-primary hidden"></i>
-     </div>
-     <div class="input-control h-32 my-12">
-       <input id="223456Input" class="form-control shadow-primary-hover" placeholder="产品"></input>
-       <i iconId="223456Input" class="icon icon-angle-right text-primary hidden"></i>
-     </div>
+    <div class="side-right">
+      <div class="title">修改值</div>
+      <div class="input-list">
+        <?php foreach($originalLangs as $langKey => $originalLang):?>
+        <div class="input-control h-32 my-12">
+          <?php
+          $disabled = '';
+          if($type == 'common' and ($langKey == 'URCommon' or $langKey == 'SRCommon')) $disabled = 'disabled';
+          ?>
+          <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover {$disabled}' {$disabled} placeholder='{$originalLang}'");?>
+          <i iconId="<?php echo "{$moduleName}_{$langKey}"?>" class="icon icon-angle-right text-primary hidden"></i>
+        </div>
+        <?php endforeach;?>
+      </div>
     </div>
+    <div class="side-main"></div>
   </div>
-  <div class="side-main">
-  </div>
-</div>
+</form>
 <?php include '../../common/view/footer.html.php';?>
-

From dfb7a22c126357bf64c8ca7fcebad9e4b0e4d647 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 15 Feb 2023 15:54:02 +0800
Subject: [PATCH 015/319]  * adjust code.

---
 module/common/model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 9371f28f82..59417cbdf0 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3556,8 +3556,8 @@ EOD;
         {
             if(strpos($moduleName, 'Menu') === false) continue;
 
-            $isSecondMenu = strpos($moduleName, 'subMenu') === false;
-            $moduleName   = str_replace($isSecondMenu ? 'Menu' : 'subMenu', '', $moduleName);
+            $isSecondMenu = strpos($moduleName, 'SubMenu') === false;
+            $moduleName   = str_replace($isSecondMenu ? 'Menu' : 'SubMenu', '', $moduleName);
 
             foreach($sectionMenus as $section => $menus)
             {
@@ -3566,7 +3566,7 @@ EOD;
                     /* Get second menu. */
                     if($isSecondMenu)
                     {
-                        $isDropMenu = strpos($section, 'dropMenu') !== false;
+                        $isDropMenu = strpos($section, 'DropMenu') !== false;
                         if(!$isDropMenu)
                         {
                             if(!isset($lang->{$moduleName}->{$section})) break;
@@ -3576,7 +3576,7 @@ EOD;
                         else
                         {
                             /* Get drop menu in second menu. */
-                            $dropMenuKey = str_replace('dropMenu', '', $section);
+                            $dropMenuKey = str_replace('DropMenu', '', $section);
                             if(!isset($lang->{$moduleName}->menu->{$dropMenuKey}['dropMenu']->{$key})) break;
                             $settingMenu = &$lang->{$moduleName}->menu->{$dropMenuKey}['dropMenu']->{$key};
                         }

From f53617aa6de57ed1fc947bbe08e0991253cfd225 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 15 Feb 2023 17:11:48 +0800
Subject: [PATCH 016/319] * Modify language get.

---
 framework/base/router.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index fc837a7ccd..0499a36011 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -2961,14 +2961,14 @@ class baseRouter
             $extPath = $this->getModuleExtPath($appName, $moduleName, $type);
             if($this->config->framework->extensionLevel >= 1)
             {
-                $client = $type == 'lang' and isset($this->client) ? $this->client : '';
-                if(!empty($extPath['common'])) $commonExtFiles = helper::ls($extPath['common'] . $client, '.php');
-                if(!empty($extPath['xuan']))   $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['xuan'] . $client, '.php'));
-                if(!empty($extPath['vision'])) $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['vision'] . $client, '.php'));
-                if(!empty($extPath['custom'])) $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['custom'] . $client, '.php'));
-                if(!empty($extPath['saas']))   $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['saas'] . $client, '.php'));
+                $clientLang = $type == 'lang' ? $this->clientLang : '';
+                if(!empty($extPath['common'])) $commonExtFiles = helper::ls($extPath['common'] . $clientLang, '.php');
+                if(!empty($extPath['xuan']))   $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['xuan'] . $clientLang, '.php'));
+                if(!empty($extPath['vision'])) $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['vision'] . $clientLang, '.php'));
+                if(!empty($extPath['custom'])) $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['custom'] . $clientLang, '.php'));
+                if(!empty($extPath['saas']))   $commonExtFiles = array_merge($commonExtFiles, helper::ls($extPath['saas'] . $clientLang, '.php'));
             }
-            if($this->config->framework->extensionLevel == 2 and !empty($extPath['site'])) $siteExtFiles = helper::ls($extPath['site'] . $client, '.php');
+            if($this->config->framework->extensionLevel == 2 and !empty($extPath['site'])) $siteExtFiles = helper::ls($extPath['site'] . $clientLang, '.php');
             $extFiles  = array_merge($commonExtFiles, $siteExtFiles);
         }
 

From 8afb07632afa3cf4283947363fbfedd6c38125bc Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Feb 2023 08:11:21 +0800
Subject: [PATCH 017/319] * Code for langItem refactors.

---
 module/dev/css/langitem.css       |  6 +++++-
 module/dev/js/langitem.js         | 15 +++++++++------
 module/dev/view/langitem.html.php |  5 +++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index eff84ac637..837d15c01e 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -2,10 +2,11 @@
 .h-32 {height: 32px;}
 .py-6 {padding: 6px 0;}
 .my-12 {margin: 12px 0;}
+.ml-20 {margin-left: 20px;}
 .title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
 
 /* side-left */
-.main-content > .side-left {flex: 0 0 160px; margin-left: 64px; width: 160px;}
+.main-content > .side-left {flex: 0 0 160px; margin-left: 64px;}
 .label-list {background: #F8F8F8; padding: 5px 0;}
 .label-list > .input-label {display: flex; align-items: center; cursor: pointer; padding-left: 40px;}
 
@@ -14,3 +15,6 @@
 .main-content > .side-right > .input-list {padding: 5px 0;}
 .main-content > .side-right > .input-list > .input-control {position: relative;}
 .main-content > .side-right > .input-list > .input-control > i.icon {position: absolute; font-size: 25px; left: -40px; top: 3px;}
+
+/* bottom-btn */
+.bottom-btn {display: flex; align-items: center; background: #fff;padding-left: 150px; padding-bottom: 20px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index cd9e427713..8a4cd27b95 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -9,17 +9,19 @@ $(function()
         removeActive(event.target.id);
     });
 
-    $('.label-list').on('click', '.input-label', function(e)
+    $('.label-list > .input-label').on('click', function(e)
     {
 	var clearId = $('.label-list > .text-primary').attr('labelid');
-        var clickId = $(e.target).attr('labelid');
-        if(clearId && clearId != clickId) removeActive(clearId);
+        var clickId = $(this).attr('labelid');
+        if(clearId && clearId !== clickId) 
+	{
+	    removeActive(clearId);
+	};
 
         if(clickId && clickId != clearId)
         {
             addActive(clickId);
-            $('#' + clickId).focus();
-        }
+        };
     });
 
     function addActive(id)
@@ -32,6 +34,7 @@ $(function()
     {
         $('[labelid=' + id + ']').removeClass('text-primary');
         $('[iconid=' + id + ']').addClass('hidden');
-        $('#' + id).blur();
     }
+
+
 })
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index ea0eff2b3b..e55a4faa7f 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -48,4 +48,9 @@
     <div class="side-main"></div>
   </div>
 </form>
+<div class="bottom-btn">
+  <?php echo html::submitButton(); ?>
+  <button id="reset" class="btn btn-wide ml-20"><?php echo $lang->restore?> </button>
+</div>
+</div>
 <?php include '../../common/view/footer.html.php';?>

From b2a664edf2b80252b7bfaaa2e6ce06da0eec1f59 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Feb 2023 08:41:08 +0800
Subject: [PATCH 018/319] * Code for langitems js refactors.

---
 module/dev/js/langitem.js | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 8a4cd27b95..033734fc93 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -1,27 +1,17 @@
 $(function()
 {
-    $(".input-list").on("click", 'input', function(event)
+    $(".input-list").on("click", 'input', function(e)
     {
-        addActive(event.target.id);
+	handleClickItem(e.target.id);
     });
-    $(".input-list").on("blur", 'input', function(event)
+    $(".input-list").on("blur", 'input', function(e)
     {
-        removeActive(event.target.id);
+        removeActive(e.target.id);
     });
 
     $('.label-list > .input-label').on('click', function(e)
     {
-	var clearId = $('.label-list > .text-primary').attr('labelid');
-        var clickId = $(this).attr('labelid');
-        if(clearId && clearId !== clickId) 
-	{
-	    removeActive(clearId);
-	};
-
-        if(clickId && clickId != clearId)
-        {
-            addActive(clickId);
-        };
+	handleClickItem($(this).attr('labelid'));
     });
 
     function addActive(id)
@@ -36,5 +26,17 @@ $(function()
         $('[iconid=' + id + ']').addClass('hidden');
     }
 
+    function handleClickItem(clickId)
+    {
+	var clearId = $('.label-list > .text-primary').attr('labelid');
+        if(clearId && clearId !== clickId) 
+	{
+	    removeActive(clearId);
+	};
 
+        if(clickId && clickId != clearId)
+        {
+            addActive(clickId);
+        };
+    }
 })

From d46ea686b72307ac21396a19131695f92232d6b4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Feb 2023 09:49:45 +0800
Subject: [PATCH 019/319] * Modify default lang get.

---
 module/custom/model.php |   2 +-
 module/dev/control.php  |   4 +-
 module/dev/model.php    | 128 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 126 insertions(+), 8 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index c6def684f5..ae2f629a47 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -45,7 +45,7 @@ class customModel extends model
         {
             if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
 
-            $sections     = explode('.', $customLang->section);
+            $sections     = explode('-', $customLang->section);
             $sectionIndex = count($sections) - 1;
             $sectionArr   = array($customLang->key => $customLang->value);
             for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
diff --git a/module/dev/control.php b/module/dev/control.php
index 960de30b3e..b9441f8f12 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -120,8 +120,8 @@ class dev extends control
         $this->view->title         = $this->lang->langItem;
         $this->view->type          = $type;
         $this->view->featureBar    = $this->lang->dev->featureBar['langItem'];
-        $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, str_replace('_', '-', $language));
-        $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, str_replace('_', '-', $language));
+        $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, $method, $language);
+        $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, $method, $language);
         $this->view->moduleName    = $moduleName;
         $this->view->language      = $language;
         $this->display();
diff --git a/module/dev/model.php b/module/dev/model.php
index 42d5657139..7e53f8a9ff 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -1,6 +1,14 @@
 <?php
 class devModel extends model
 {
+    /**
+     * Default lang object.
+     *
+     * @var    object
+     * @access public
+     */
+    public $defaultLang;
+
     /**
      * Get All tables.
      *
@@ -284,23 +292,131 @@ class devModel extends model
         return $extPaths;
     }
 
-    public function getOriginalLang($type, $module = '', $language = 'zh-cn')
+    /**
+     * Get original lang.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $method
+     * @param  string $language
+     * @access public
+     * @return array
+     */
+    public function getOriginalLang($type, $module = '', $method = '', $language = 'zh-cn')
     {
+        // Defalut value set, remove when left tree display.
+        if($type == 'feature')
+        {
+            $module = 'program';
+            $method = 'browse';
+        }
+        elseif($type == 'second')
+        {
+            $module = 'scrum';
+        }
+        elseif($type == 'third')
+        {
+            $module = 'kanbanProject';
+            $method = 'settings';
+        }
+        // Defalut value set end.
+
         $originalLangs = array();
+        $clientLang    = $this->app->getClientLang();
+
+        $defaultLang   = $this->loadDefaultLang();
+        if($type == 'feature')
+        {
+            $this->defaultLang = $defaultLang;
+            $defaultLang = $this->loadDefaultLang($clientLang, $module);
+        }
+
+        $lang    = new stdClass();
+        $langKey = '';
         if($type == 'common')
         {
             $projectKey = (int)$this->loadModel('setting')->getItem('owner=system&key=sprintConcept');
-            $clientLang = $this->app->getClientLang();
             $originalLangs['productCommon']   = $this->config->productCommonList[$clientLang][PRODUCT_KEY];
             $originalLangs['projectCommon']   = $this->config->projectCommonList[$clientLang][PROJECT_KEY];
             $originalLangs['executionCommon'] = $this->config->executionCommonList[$clientLang][$projectKey];
             $originalLangs['URCommon']        = $this->lang->dev->UR;
             $originalLangs['SRCommon']        = $this->lang->dev->SR;
         }
+        elseif($type == 'feature')
+        {
+            $originalLangs = $defaultLang->$module->featureBar[$method];
+        }
+        elseif($type == 'first')
+        {
+           $lang    = $defaultLang->mainNav;
+           $langKey = 'mainMenu_';
+        }
+        elseif($type == 'second')
+        {
+            $menus = new stdclass();
+            if(isset($defaultLang->$module->homeMenu))
+            {
+                foreach($defaultLang->$module->homeMenu as $menuKey => $menu)
+                {
+                    $menuKey = 'homeMenu_' . $menuKey;
+                    $menus->{$menuKey} = $menu;
+                }
+            }
+
+            if(isset($defaultLang->$module->menu))
+            {
+                foreach($defaultLang->$module->menu as $menuKey => $menu)
+                {
+                    if(is_array($menu) and !isset($menu['link'])) continue;
+
+                    $newKey = 'menu_' . $menuKey;
+                    $menus->{$newKey} = $menu;
+
+                    if(isset($menu['dropMenu']))
+                    {
+                        foreach($menu['dropMenu'] as $menuKey => $menu)
+                        {
+                            $menuKey = 'dropMenu_' . $menuKey;
+                            $menus->{$menuKey} = $menu;
+                        }
+                    }
+                }
+            }
+            $lang = $menus;
+        }
+        elseif($type == 'third')
+        {
+            $langKey = "{$module}SubMenu_menu_{$method}_";
+            $lang    = $defaultLang->$module->menu->$method['subMenu'];
+        }
+
+        foreach($lang as $linkKey => $link)
+        {
+            if(is_array($link))
+            {
+                if(!isset($link['link'])) continue;
+                $link = $link['link'];
+            }
+
+            $link = strip_tags($link);
+            $link = explode('|', $link);
+
+            if($type == 'second') $langKey = $module . 'Menu_' . $linkKey . '_';
+            $originalLangs[$langKey . $linkKey] = trim($link[0]);
+        }
 
         return $originalLangs;
     }
 
+    /**
+     * Get customed lang.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $language
+     * @access public
+     * @return array
+     */
     public function getCustomedLang($type, $module = '', $language = 'zh-cn')
     {
         $customedLangs = array();
@@ -331,18 +447,20 @@ class devModel extends model
     /**
      * Load default lang.
      *
+     * @param  string $language
+     * @param  string $module
      * @access public
      * @return object
      */
-    public function loadDefaultLang($language = 'zh-cn')
+    public function loadDefaultLang($language = 'zh-cn', $module = 'common')
     {
         $clientLang = $this->app->clientLang;
         if($language != $clientLang) $this->app->clientLang = $language;
-        $langFilesToLoad = $this->app->getMainAndExtFiles('common');
+        $langFilesToLoad = $this->app->getMainAndExtFiles($module);
         if($language != $clientLang) $this->app->clientLang = $clientLang;
         if(empty($langFilesToLoad)) return false;
 
-        $lang = new language();
+        $lang = $module == 'common' ? new language() : $this->defaultLang;
         $lang->URCommon        = $this->lang->URCommon;
         $lang->SRCommon        = $this->lang->SRCommon;
         $lang->productCommon   = $this->lang->productCommon;

From 872950ac314cd15a17b57a79bb78c26a56b807eb Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 16 Feb 2023 10:31:17 +0800
Subject: [PATCH 020/319] * Modify feature bar list.

---
 module/dev/model.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 7e53f8a9ff..b476cc9cd4 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -307,7 +307,7 @@ class devModel extends model
         // Defalut value set, remove when left tree display.
         if($type == 'feature')
         {
-            $module = 'program';
+            $module = 'product';
             $method = 'browse';
         }
         elseif($type == 'second')
@@ -323,12 +323,11 @@ class devModel extends model
 
         $originalLangs = array();
         $clientLang    = $this->app->getClientLang();
-
         $defaultLang   = $this->loadDefaultLang();
         if($type == 'feature')
         {
             $this->defaultLang = $defaultLang;
-            $defaultLang = $this->loadDefaultLang($clientLang, $module);
+            $defaultLang       = $this->loadDefaultLang($clientLang, $module);
         }
 
         $lang    = new stdClass();
@@ -344,7 +343,18 @@ class devModel extends model
         }
         elseif($type == 'feature')
         {
-            $originalLangs = $defaultLang->$module->featureBar[$method];
+            $langKey = $module . '_feature-' . $method . '_';
+            foreach($defaultLang->$module->featureBar[$method] as $feature => $featureName)
+            {
+                $selectKey = $feature . 'Selects';
+                if(isset($defaultLang->$module->$selectKey))
+                {
+                    foreach($defaultLang->$module->$selectKey as $feature => $featureName) $originalLangs[$langKey . $feature] = $featureName;
+                    continue;
+                }
+                $originalLangs[$langKey . $feature] = $featureName;
+            }
+
         }
         elseif($type == 'first')
         {
@@ -466,6 +476,7 @@ class devModel extends model
         $lang->productCommon   = $this->lang->productCommon;
         $lang->projectCommon   = $this->lang->projectCommon;
         $lang->executionCommon = $this->lang->executionCommon;
+        $lang->hourCommon      = $this->lang->hourCommon;
         if(!isset($lang->common)) $lang->common = new stdclass();
 
         $loadedLangs = array();

From bb1cc9d480ba86bfd3783424ec103690d228b8f0 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Feb 2023 11:14:07 +0800
Subject: [PATCH 021/319]  * code for task #84532.

---
 module/custom/model.php           |  9 +++++++--
 module/dev/control.php            | 14 ++++++++++++--
 module/dev/lang/de.php            |  3 +++
 module/dev/lang/en.php            |  3 +++
 module/dev/lang/fr.php            |  3 +++
 module/dev/lang/zh-cn.php         |  2 +-
 module/dev/model.php              | 13 ++++++++++++-
 module/dev/view/langitem.html.php | 15 +++++----------
 8 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index ae2f629a47..eaa7e7bad2 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -789,9 +789,14 @@ class customModel extends model
 
         if(!$data->SRName || !$data->URName) return false;
 
+        $oldValue = $this->dao->select('*')->from(TABLE_LANG)->where('`key`')->eq($key)->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($lang)->andWhere('module')->eq('custom')->fetch('value');
+        $oldValue = json_decode($oldValue);
+
         $URSRList = new stdclass();
-        $URSRList->SRName = $data->SRName;
-        $URSRList->URName = $data->URName;
+        $URSRList->SRName        = $data->SRName;
+        $URSRList->URName        = $data->URName;
+        $URSRList->defaultSRName = zget($oldValue, 'defaultSRName', $oldValue->SRName);
+        $URSRList->defaultURName = zget($oldValue, 'defaultURName', $oldValue->URName);
 
         $value = json_encode($URSRList);
         $this->dao->update(TABLE_LANG)->set('value')->eq($value)
diff --git a/module/dev/control.php b/module/dev/control.php
index b9441f8f12..d6ae39d565 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -95,9 +95,9 @@ class dev extends control
         $moduleName = $module;
         if($type == 'common') $moduleName = 'common';
         if($type == 'second') $moduleName = $module . 'Menu';
-        if($type == 'third')  $moduleName = $module . 'subMenu';
+        if($type == 'third')  $moduleName = $module . 'SubMenu';
 
-        if($_POST)
+        if($this->server->request_method == 'POST')
         {
             $section = '';
             if($type == 'common') $section = '&section=';
@@ -105,6 +105,7 @@ class dev extends control
             $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}");
 
             $data = fixer::input('post')->get();
+            if($type == 'common') unset($data->common_SRCommon, $data->common_URCommon);
             foreach($data as $langKey => $customedLang)
             {
                 if(strpos($langKey, "{$moduleName}_") !== 0) continue;
@@ -112,6 +113,15 @@ class dev extends control
 
                 $this->custom->setItem("{$language}." . str_replace('_', '.', $langKey), $customedLang);
             }
+            if($type == 'common' and $this->config->custom->URSR)
+            {
+                $post  = $_POST;
+                $_POST = array();
+                if(!empty($post['common_SRCommon'])) $_POST['SRName'] = $post['common_SRCommon'];
+                if(!empty($post['common_URCommon'])) $_POST['URName'] = $post['common_URCommon'];
+                $this->custom->updateURAndSR($this->config->custom->URSR);
+            }
+
             return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
         }
 
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 84bf3954d1..d50019e51d 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -19,6 +19,9 @@ $lang->dev->paramMailto   = "User account. Separate accounts by ','.";
 $lang->dev->noteEditor    = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
 $lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 
+$lang->dev->UR = 'Epic';
+$lang->dev->SR = 'Story';
+
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
 $lang->dev->fields['name']   = 'Feld';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index b11c005f6e..4f4f80eb1a 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -19,6 +19,9 @@ $lang->dev->paramMailto   = "User account. Separate accounts by ','.";
 $lang->dev->noteEditor    = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
 $lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 
+$lang->dev->UR = 'Epic';
+$lang->dev->SR = 'Story';
+
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
 $lang->dev->fields['name']   = 'Feild';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index b11c005f6e..4f4f80eb1a 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -19,6 +19,9 @@ $lang->dev->paramMailto   = "User account. Separate accounts by ','.";
 $lang->dev->noteEditor    = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
 $lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 
+$lang->dev->UR = 'Epic';
+$lang->dev->SR = 'Story';
+
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
 $lang->dev->fields['name']   = 'Feild';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index a277760592..affa5b12bf 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -20,7 +20,7 @@ $lang->dev->noteEditor    = "编辑器功能因为安全原因被禁用。使用
 $lang->dev->noteTranslate = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
 
 $lang->dev->UR = '用户需求';
-$lang->dev->SR = '研发需求';
+$lang->dev->SR = '软件需求';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = '序号';
diff --git a/module/dev/model.php b/module/dev/model.php
index b476cc9cd4..0194d84d0f 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -340,6 +340,7 @@ class devModel extends model
             $originalLangs['executionCommon'] = $this->config->executionCommonList[$clientLang][$projectKey];
             $originalLangs['URCommon']        = $this->lang->dev->UR;
             $originalLangs['SRCommon']        = $this->lang->dev->SR;
+            if(!$this->config->URAndSR) unset($originalLangs['SRCommon']);
         }
         elseif($type == 'feature')
         {
@@ -433,10 +434,20 @@ class devModel extends model
         $clientLang    = $this->app->getClientLang();
         if($type == 'common')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=&vision={$this->config->vision}&systemMode={$this->config->systemMode}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=&vision={$this->config->vision}");
             foreach($customeds as $customed) $customedLangs[$customed->key] = $customed->value;
+
             $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
             $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
+            if($this->config->custom->URSR)
+            {
+                $URSRList = $this->custom->getItems("lang={$clientLang}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                $URSRList = array_shift($URSRList);
+                $URSRList = json_decode($URSRList->value);
+                $customedLangs['URCommon'] = $this->lang->dev->UR == $URSRList->URName ? '' : $URSRList->URName;
+                $customedLangs['SRCommon'] = $this->lang->dev->SR == $URSRList->SRName ? '' : $URSRList->SRName;
+            }
+            if(!$this->config->URAndSR) unset($customedLangs['SRCommon']);
         }
 
         return $customedLangs;
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index e55a4faa7f..7a79e3b958 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -35,11 +35,7 @@
       <div class="input-list">
         <?php foreach($originalLangs as $langKey => $originalLang):?>
         <div class="input-control h-32 my-12">
-          <?php
-          $disabled = '';
-          if($type == 'common' and ($langKey == 'URCommon' or $langKey == 'SRCommon')) $disabled = 'disabled';
-          ?>
-          <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover {$disabled}' {$disabled} placeholder='{$originalLang}'");?>
+          <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
           <i iconId="<?php echo "{$moduleName}_{$langKey}"?>" class="icon icon-angle-right text-primary hidden"></i>
         </div>
         <?php endforeach;?>
@@ -47,10 +43,9 @@
     </div>
     <div class="side-main"></div>
   </div>
+  <div class="bottom-btn">
+    <?php echo html::submitButton(); ?>
+    <button id="reset" class="btn btn-wide ml-20"><?php echo $lang->restore?> </button>
+  </div>
 </form>
-<div class="bottom-btn">
-  <?php echo html::submitButton(); ?>
-  <button id="reset" class="btn btn-wide ml-20"><?php echo $lang->restore?> </button>
-</div>
-</div>
 <?php include '../../common/view/footer.html.php';?>

From ca3508d1df26611c25b130280a069f249aee05de Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Feb 2023 13:40:16 +0800
Subject: [PATCH 022/319] * Code for add menuTree to langItem

---
 module/dev/config.php             |  2 +
 module/dev/css/langitem.css       |  9 ++++
 module/dev/js/langitem.js         | 59 ++++++++++++++++++++++++++
 module/dev/view/langitem.html.php | 69 ++++++++++++++++++-------------
 4 files changed, 111 insertions(+), 28 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index 21a21368e9..db19feb668 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -241,6 +241,8 @@ $config->dev->postParams['testcase']['create']['expect']       = 'string';
 $config->dev->postParams['testcase']['create']['mailto']       = 'string';
 $config->dev->postParams['testcase']['create']['keywords']     = 'string';
 
+$config->dev->arrTypesWithMenu = array('second', 'third', 'feature');
+
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
 
diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index 837d15c01e..98b680089f 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -1,9 +1,18 @@
 .flex {display: flex;}
+.flex-1 {flex: 1;}
+.align-center {align-items: center;}
+.justify-center {justify-content: center;}
 .h-32 {height: 32px;}
 .py-6 {padding: 6px 0;}
 .my-12 {margin: 12px 0;}
 .ml-20 {margin-left: 20px;}
 .title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
+.gap-15 {gap: 15px;}
+
+/* menu-tree */
+.menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;}
+.menu-tree > .tree {padding-top: 20px;}
+.menu-tree li {padding: 5px 25px;}
 
 /* side-left */
 .main-content > .side-left {flex: 0 0 160px; margin-left: 64px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 033734fc93..633c2d6159 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -14,6 +14,8 @@ $(function()
 	handleClickItem($(this).attr('labelid'));
     });
 
+    initMenu();
+
     function addActive(id)
     {
         $('[labelid=' + id + ']').addClass('text-primary');
@@ -39,4 +41,61 @@ $(function()
             addActive(clickId);
         };
     }
+    
+    function initMenu()
+    {
+      if (arrTypesWithMenu.includes(type))
+      {
+	var myTreeData = [{
+	    title: '水果',
+	    children: [
+	        {title: '橘子'},
+		{title: '瓜'}
+            ]
+	}, {
+            title: '坚果',
+            children: [
+                {title: '向日葵'},
+                {title: '瓜子'}
+            ]
+	}, {
+            title: '蔬菜'
+	}];
+        $('#menuTree').tree(
+        {
+            data: myTreeData
+        });
+      }
+      $('#searchInputTree').on('input', function()
+      {
+	  var val = $(this).val();
+	  if (!val)
+          {
+              var updateData = JSON.parse(JSON.stringify(myTreeData));
+          }
+          else
+          {
+              var updateData = [];
+              for (var i = 0; i < myTreeData.length; i++)
+	      {
+                  var item = {};
+                  $.extend(true, item, myTreeData[i])
+                  if (item.children)
+                  {
+                      var children = [];
+                      for (var j = 0; j < item.children.length; j++)
+                      {
+                          if (item.children[j].title.includes(val))
+                          {
+                              children.push(item.children[j]);
+			  }
+		      }
+                      item.children = children;
+		  }
+                  updateData.push(item);
+	      }
+          }
+          $('#menuTree').data('zui.tree').reload(updateData);
+      })
+    }
 })
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index e55a4faa7f..c056fa8737 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -10,6 +10,8 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php js::set('type', $type); ?>
+<?php js::set('arrTypesWithMenu', $config->dev->arrTypesWithMenu); ?>
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class="btn-toolBar pull-left">
@@ -20,37 +22,48 @@
     <?php endforeach;?>
   </div>
 </div>
-<form class='main-form form-ajax' method='post'>
-  <div id='mainContent' class='main-content flex'>
-    <div class="side-left">
-      <div class="title">默认值</div>
-      <div class="label-list">
-        <?php foreach($originalLangs as $langKey => $originalLang):?>
-        <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
-        <?php endforeach;?>
-      </div>
+<div class="flex gap-15">
+<?php if(in_array($type, $config->dev->arrTypesWithMenu , false)):?>
+  <div class="menu-tree">
+    <div class="input-control search-box has-icon-left has-icon-right search-example">
+      <input id="searchInputTree" type="search" class="form-control search-input empty">
+      <label class="input-control-icon-left search-icon flex align-center justify-center"><i class="icon icon-search"></i></label>
     </div>
-    <div class="side-right">
-      <div class="title">修改值</div>
-      <div class="input-list">
-        <?php foreach($originalLangs as $langKey => $originalLang):?>
-        <div class="input-control h-32 my-12">
-          <?php
-          $disabled = '';
-          if($type == 'common' and ($langKey == 'URCommon' or $langKey == 'SRCommon')) $disabled = 'disabled';
-          ?>
-          <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover {$disabled}' {$disabled} placeholder='{$originalLang}'");?>
-          <i iconId="<?php echo "{$moduleName}_{$langKey}"?>" class="icon icon-angle-right text-primary hidden"></i>
+    <div id="menuTree" ></div>
+  </div>
+<?php endif;?>
+  <form class='main-form form-ajax flex-1' method='post'>
+    <div id='mainContent' class='main-content flex'>
+      <div class="side-left">
+        <div class="title">默认值</div>
+        <div class="label-list">
+          <?php foreach($originalLangs as $langKey => $originalLang):?>
+          <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
+          <?php endforeach;?>
         </div>
-        <?php endforeach;?>
       </div>
-    </div>
-    <div class="side-main"></div>
+      <div class="side-right">
+        <div class="title">修改值</div>
+        <div class="input-list">
+          <?php foreach($originalLangs as $langKey => $originalLang):?>
+          <div class="input-control h-32 my-12">
+            <?php
+            $disabled = '';
+            if($type == 'common' and ($langKey == 'URCommon' or $langKey == 'SRCommon')) $disabled = 'disabled';
+            ?>
+            <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover {$disabled}' {$disabled} placeholder='{$originalLang}'");?>
+            <i iconId="<?php echo "{$moduleName}_{$langKey}"?>" class="icon icon-angle-right text-primary hidden"></i>
+          </div>
+          <?php endforeach;?>
+        </div>
+        </div>
+        <div class="side-main"></div>
+      </div>
+      <div class="bottom-btn">
+        <?php echo html::submitButton(); ?>
+        <button id="reset" class="btn btn-wide ml-20"><?php echo $lang->restore?> </button>
+      </div>
+    </form>
   </div>
-</form>
-<div class="bottom-btn">
-  <?php echo html::submitButton(); ?>
-  <button id="reset" class="btn btn-wide ml-20"><?php echo $lang->restore?> </button>
-</div>
 </div>
 <?php include '../../common/view/footer.html.php';?>

From 1b70d6e8a427cc7c0aea71874fc15ecd9624a7cf Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Feb 2023 13:55:23 +0800
Subject: [PATCH 023/319]  * code for task #84532.

---
 module/common/lang/menu.php       |  6 ++--
 module/custom/model.php           |  7 +++--
 module/dev/control.php            | 46 ++++++++++++++++++++++++++++---
 module/dev/lang/de.php            | 13 +++++----
 module/dev/lang/en.php            | 13 +++++----
 module/dev/lang/fr.php            | 13 +++++----
 module/dev/lang/zh-cn.php         | 13 +++++----
 module/dev/model.php              |  9 ++++--
 module/dev/view/langitem.html.php |  2 +-
 9 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 059abacbf3..8f50a3c669 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -35,9 +35,9 @@ if(defined('TUTORIAL'))
 $lang->mainNav            = new stdclass();
 $lang->mainNav->my        = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|";
 $lang->mainNav->program   = "{$lang->navIcons['program']} {$lang->program->common}|$programModule|$programMethod|";
-$lang->mainNav->product   = "{$lang->navIcons['product']} {$lang->product->common}|$productModule|$productMethod|";
-$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|";
-$lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->execution->common}|$executionModule|$executionMethod|";
+$lang->mainNav->product   = "{$lang->navIcons['product']} {$lang->productCommon}|$productModule|$productMethod|";
+$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|";
+$lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->executionCommon}|$executionModule|$executionMethod|";
 $lang->mainNav->qa        = "{$lang->navIcons['qa']} {$lang->qa->common}|qa|index|";
 $lang->mainNav->devops    = "{$lang->navIcons['devops']} DevOps|repo|browse|";
 $lang->mainNav->kanban    = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|";
diff --git a/module/custom/model.php b/module/custom/model.php
index eaa7e7bad2..debea8d153 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -778,13 +778,14 @@ class customModel extends model
     /**
      * Edit UR and SR concept.
      *
-     * @param  int $key
+     * @param  int    $key
+     * @param  string $lang    zh-cn|zh-tw|en|fr|de
      * @access public
      * @return bool
      */
-    public function updateURAndSR($key = 0)
+    public function updateURAndSR($key = 0, $lang = '')
     {
-        $lang = $this->app->getClientLang();
+        if(empty($lang)) $lang = $this->app->getClientLang();
         $data = fixer::input('post')->get();
 
         if(!$data->SRName || !$data->URName) return false;
diff --git a/module/dev/control.php b/module/dev/control.php
index d6ae39d565..bc495de102 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -83,9 +83,12 @@ class dev extends control
     }
 
     /**
-     * Lang item.
+     *  Custom menu lang item.
      *
-     * @param  string $type
+     * @param  string $type       common|first|second|third|feature
+     * @param  string $module
+     * @param  string $method
+     * @param  string $language   zh_cn|en|fr|de|zh_tw
      * @access public
      * @return void
      */
@@ -119,7 +122,7 @@ class dev extends control
                 $_POST = array();
                 if(!empty($post['common_SRCommon'])) $_POST['SRName'] = $post['common_SRCommon'];
                 if(!empty($post['common_URCommon'])) $_POST['URName'] = $post['common_URCommon'];
-                $this->custom->updateURAndSR($this->config->custom->URSR);
+                $this->custom->updateURAndSR($this->config->custom->URSR, $language);
             }
 
             return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
@@ -133,7 +136,42 @@ class dev extends control
         $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, $method, $language);
         $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, $method, $language);
         $this->view->moduleName    = $moduleName;
-        $this->view->language      = $language;
+        $this->view->language      = str_replace('-', '_', $language);
         $this->display();
     }
+
+    /**
+     * Reset customed menu lang.
+     *
+     * @param  string $type       common|first|second|third|feature
+     * @param  string $module
+     * @param  string $language   zh_cn|en|fr|de|zh_tw
+     * @param  string $confirm    no|yes
+     * @access public
+     * @return void
+     */
+    public function resetLang($type = 'common', $module = '', $language = 'zh_cn', $confirm = 'no')
+    {
+        if($confirm == 'no') return print(js::confirm($this->lang->dev->confirmRestore, inlink('resetLang', "type={$type}&module={$module}&language={$language}&confirm=yes")));
+
+        $language = str_replace('_', '-', $language);
+        $section  = '';
+        if($type == 'common') $section = '&section=';
+        if($type == 'first')  $section = '&section=mainNav';
+        $this->loadModel('custom')->deleteItems("lang={$language}&module={$module}&vision={$this->config->vision}{$section}");
+        if($type == 'common' and $this->config->custom->URSR)
+        {
+            $oldValue = $this->dao->select('*')->from(TABLE_LANG)->where('`key`')->eq($this->config->custom->URSR)->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($language)->andWhere('module')->eq('custom')->fetch('value');
+            if($oldValue)
+            {
+                $oldValue = json_decode($oldValue);
+                $_POST    = array();
+                $_POST['SRName'] = zget($oldValue, 'defaultSRName', $oldValue->SRName);
+                $_POST['URName'] = zget($oldValue, 'defaultURName', $oldValue->URName);
+                $this->custom->updateURAndSR($this->config->custom->URSR, $language);
+            }
+        }
+
+        return print(js::reload('parent'));
+    }
 }
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index d50019e51d..26036eaa07 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -12,12 +12,13 @@ $lang->dev->desc       = 'Beschreibung';
 $lang->dev->noParams   = 'Keine Parameter';
 $lang->dev->post       = 'POST Parameter';
 
-$lang->dev->paramRange    = 'Parameter Range: %s';
-$lang->dev->paramDate     = 'Date format: YY-mm-dd, e.g 2019-01-01';
-$lang->dev->paramColor    = 'Color format: #RGB, e.g. #3da7f5';
-$lang->dev->paramMailto   = "User account. Separate accounts by ','.";
-$lang->dev->noteEditor    = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
-$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
+$lang->dev->paramRange     = 'Parameter Range: %s';
+$lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
+$lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
+$lang->dev->paramMailto    = "User account. Separate accounts by ','.";
+$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
+$lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
+$lang->dev->confirmRestore = 'Do you want to reset?';
 
 $lang->dev->UR = 'Epic';
 $lang->dev->SR = 'Story';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 4f4f80eb1a..433b82fc65 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -12,12 +12,13 @@ $lang->dev->desc       = 'Description';
 $lang->dev->noParams   = 'No Parameters';
 $lang->dev->post       = 'POST Parameter';
 
-$lang->dev->paramRange    = 'Parameter Range: %s';
-$lang->dev->paramDate     = 'Date format: YY-mm-dd, e.g 2019-01-01';
-$lang->dev->paramColor    = 'Color format: #RGB, e.g. #3da7f5';
-$lang->dev->paramMailto   = "User account. Separate accounts by ','.";
-$lang->dev->noteEditor    = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
-$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
+$lang->dev->paramRange     = 'Parameter Range: %s';
+$lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
+$lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
+$lang->dev->paramMailto    = "User account. Separate accounts by ','.";
+$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
+$lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
+$lang->dev->confirmRestore = 'Do you want to reset?';
 
 $lang->dev->UR = 'Epic';
 $lang->dev->SR = 'Story';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 4f4f80eb1a..433b82fc65 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -12,12 +12,13 @@ $lang->dev->desc       = 'Description';
 $lang->dev->noParams   = 'No Parameters';
 $lang->dev->post       = 'POST Parameter';
 
-$lang->dev->paramRange    = 'Parameter Range: %s';
-$lang->dev->paramDate     = 'Date format: YY-mm-dd, e.g 2019-01-01';
-$lang->dev->paramColor    = 'Color format: #RGB, e.g. #3da7f5';
-$lang->dev->paramMailto   = "User account. Separate accounts by ','.";
-$lang->dev->noteEditor    = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
-$lang->dev->noteTranslate = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
+$lang->dev->paramRange     = 'Parameter Range: %s';
+$lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
+$lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
+$lang->dev->paramMailto    = "User account. Separate accounts by ','.";
+$lang->dev->noteEditor     = "The editor is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of the <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>editor</a>.";
+$lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
+$lang->dev->confirmRestore = 'Do you want to reset?';
 
 $lang->dev->UR = 'Epic';
 $lang->dev->SR = 'Story';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index affa5b12bf..2e8f75bbba 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -12,12 +12,13 @@ $lang->dev->desc       = '描述';
 $lang->dev->noParams   = '无参数';
 $lang->dev->post       = 'POST参数';
 
-$lang->dev->paramRange    = '取值范围：%s';
-$lang->dev->paramDate     = '日期格式：YY-mm-dd，如：2019-01-01';
-$lang->dev->paramColor    = '颜色格式：#RGB，如：#3da7f5';
-$lang->dev->paramMailto   = "填写帐号，多个账号用','分隔。";
-$lang->dev->noteEditor    = "编辑器功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>扩展编辑器</a> 插件。";
-$lang->dev->noteTranslate = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
+$lang->dev->paramRange     = '取值范围：%s';
+$lang->dev->paramDate      = '日期格式：YY-mm-dd，如：2019-01-01';
+$lang->dev->paramColor     = '颜色格式：#RGB，如：#3da7f5';
+$lang->dev->paramMailto    = "填写帐号，多个账号用','分隔。";
+$lang->dev->noteEditor     = "编辑器功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>扩展编辑器</a> 插件。";
+$lang->dev->noteTranslate  = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
+$lang->dev->confirmRestore = '是否要恢复默认？';
 
 $lang->dev->UR = '用户需求';
 $lang->dev->SR = '软件需求';
diff --git a/module/dev/model.php b/module/dev/model.php
index 0194d84d0f..eaad5b7e53 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -443,9 +443,12 @@ class devModel extends model
             {
                 $URSRList = $this->custom->getItems("lang={$clientLang}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
                 $URSRList = array_shift($URSRList);
-                $URSRList = json_decode($URSRList->value);
-                $customedLangs['URCommon'] = $this->lang->dev->UR == $URSRList->URName ? '' : $URSRList->URName;
-                $customedLangs['SRCommon'] = $this->lang->dev->SR == $URSRList->SRName ? '' : $URSRList->SRName;
+                if($URSRList)
+                {
+                    $URSRList = json_decode($URSRList->value);
+                    $customedLangs['URCommon'] = $this->lang->dev->UR == $URSRList->URName ? '' : $URSRList->URName;
+                    $customedLangs['SRCommon'] = $this->lang->dev->SR == $URSRList->SRName ? '' : $URSRList->SRName;
+                }
             }
             if(!$this->config->URAndSR) unset($customedLangs['SRCommon']);
         }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 7a79e3b958..09110b1787 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -45,7 +45,7 @@
   </div>
   <div class="bottom-btn">
     <?php echo html::submitButton(); ?>
-    <button id="reset" class="btn btn-wide ml-20"><?php echo $lang->restore?> </button>
+    <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>
   </div>
 </form>
 <?php include '../../common/view/footer.html.php';?>

From 9e1cfb2b256b02cfd84eb19eb717a468ce29084b Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Feb 2023 14:53:30 +0800
Subject: [PATCH 024/319]  * code for task #84532.

---
 module/common/lang/menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 8f50a3c669..49fff2da37 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -37,7 +37,7 @@ $lang->mainNav->my        = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my
 $lang->mainNav->program   = "{$lang->navIcons['program']} {$lang->program->common}|$programModule|$programMethod|";
 $lang->mainNav->product   = "{$lang->navIcons['product']} {$lang->productCommon}|$productModule|$productMethod|";
 $lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|";
-$lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->executionCommon}|$executionModule|$executionMethod|";
+$lang->mainNav->execution = "{$lang->navIcons['execution']} {$lang->execution->common}|$executionModule|$executionMethod|";
 $lang->mainNav->qa        = "{$lang->navIcons['qa']} {$lang->qa->common}|qa|index|";
 $lang->mainNav->devops    = "{$lang->navIcons['devops']} DevOps|repo|browse|";
 $lang->mainNav->kanban    = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|";

From 7c927412cc221ff2e3f2769ebebb8971b6ca061e Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 16 Feb 2023 16:25:22 +0800
Subject: [PATCH 025/319]  * adjust code for langitem page.

---
 module/dev/lang/de.php            | 6 ++++--
 module/dev/lang/en.php            | 6 ++++--
 module/dev/lang/fr.php            | 6 ++++--
 module/dev/lang/zh-cn.php         | 6 ++++--
 module/dev/view/langitem.html.php | 4 ++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 26036eaa07..eb01161e19 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -20,8 +20,10 @@ $lang->dev->noteEditor     = "The editor is disabled for security reasons. To us
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
-$lang->dev->UR = 'Epic';
-$lang->dev->SR = 'Story';
+$lang->dev->default = 'Default';
+$lang->dev->change  = 'Change';
+$lang->dev->UR      = 'Epic';
+$lang->dev->SR      = 'Story';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 433b82fc65..b51f9af773 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -20,8 +20,10 @@ $lang->dev->noteEditor     = "The editor is disabled for security reasons. To us
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
-$lang->dev->UR = 'Epic';
-$lang->dev->SR = 'Story';
+$lang->dev->default = 'Default';
+$lang->dev->change  = 'Change';
+$lang->dev->UR      = 'Epic';
+$lang->dev->SR      = 'Story';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 433b82fc65..b51f9af773 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -20,8 +20,10 @@ $lang->dev->noteEditor     = "The editor is disabled for security reasons. To us
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
-$lang->dev->UR = 'Epic';
-$lang->dev->SR = 'Story';
+$lang->dev->default = 'Default';
+$lang->dev->change  = 'Change';
+$lang->dev->UR      = 'Epic';
+$lang->dev->SR      = 'Story';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 2e8f75bbba..452eadbabf 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -20,8 +20,10 @@ $lang->dev->noteEditor     = "编辑器功能因为安全原因被禁用。使
 $lang->dev->noteTranslate  = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
 $lang->dev->confirmRestore = '是否要恢复默认？';
 
-$lang->dev->UR = '用户需求';
-$lang->dev->SR = '软件需求';
+$lang->dev->default = '默认值';
+$lang->dev->change  = '修改值';
+$lang->dev->UR      = '用户需求';
+$lang->dev->SR      = '软件需求';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = '序号';
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 09110b1787..36942ce22c 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -23,7 +23,7 @@
 <form class='main-form form-ajax' method='post'>
   <div id='mainContent' class='main-content flex'>
     <div class="side-left">
-      <div class="title">默认值</div>
+      <div class="title"><?php echo $lang->dev->default;?></div>
       <div class="label-list">
         <?php foreach($originalLangs as $langKey => $originalLang):?>
         <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
@@ -31,7 +31,7 @@
       </div>
     </div>
     <div class="side-right">
-      <div class="title">修改值</div>
+      <div class="title"><?php echo $lang->dev->change?></div>
       <div class="input-list">
         <?php foreach($originalLangs as $langKey => $originalLang):?>
         <div class="input-control h-32 my-12">

From 0e840ae40fde6fb2525593675d25ea6ee98143d5 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 16 Feb 2023 16:48:15 +0800
Subject: [PATCH 026/319] * Code for change arr to navTypes

---
 module/dev/config.php             | 2 +-
 module/dev/js/langitem.js         | 2 +-
 module/dev/view/langitem.html.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index db19feb668..23b889cf3c 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -241,7 +241,7 @@ $config->dev->postParams['testcase']['create']['expect']       = 'string';
 $config->dev->postParams['testcase']['create']['mailto']       = 'string';
 $config->dev->postParams['testcase']['create']['keywords']     = 'string';
 
-$config->dev->arrTypesWithMenu = array('second', 'third', 'feature');
+$config->dev->navTypes = array('second', 'third', 'feature');
 
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 7be272ce0b..ee7a104ea2 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -44,7 +44,7 @@ $(function()
     
     function initMenu()
     {
-      if (arrTypesWithMenu.includes(type))
+      if (navTypes.includes(type))
       {
           var myTreeData = [{
 	      title: '水果',
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index e869773f81..ad732fe7cc 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php js::set('type', $type); ?>
-<?php js::set('arrTypesWithMenu', $config->dev->arrTypesWithMenu); ?>
+<?php js::set('navTypes', $config->dev->navTypes); ?>
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class="btn-toolBar pull-left">
@@ -23,7 +23,7 @@
   </div>
 </div>
 <div class="flex gap-15">
-<?php if(in_array($type, $config->dev->arrTypesWithMenu , false)):?>
+<?php if(in_array($type, $config->dev->navTypes , false)):?>
   <div class="menu-tree">
     <div class="input-control search-box has-icon-left has-icon-right search-example">
       <input type="search" class="form-control search-input" />

From 17c3ddbd21590fd7b62a42fe0c93c167e113d9ca Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Fri, 17 Feb 2023 08:33:51 +0800
Subject: [PATCH 027/319] * Code for add lang to langItem .

---
 module/dev/lang/de.php            | 27 +++++++++++++++------------
 module/dev/lang/en.php            | 27 +++++++++++++++------------
 module/dev/lang/fr.php            | 27 +++++++++++++++------------
 module/dev/lang/vi.php            | 27 +++++++++++++++------------
 module/dev/lang/zh-cn.php         | 26 ++++++++++++++------------
 module/dev/view/langitem.html.php |  6 +++---
 6 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index eb01161e19..eae95d0b83 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -1,16 +1,19 @@
 <?php
-$lang->dev->common     = 'Entwicklung';
-$lang->dev->api        = 'API';
-$lang->dev->db         = 'Datenbank';
-$lang->dev->editor     = 'Bearbeiter';
-$lang->dev->translate  = 'Translate';
-$lang->dev->dbList     = 'Datenbank';
-$lang->dev->moduleList = 'Module';
-$lang->dev->params     = 'Parameter';
-$lang->dev->type       = 'Typ';
-$lang->dev->desc       = 'Beschreibung';
-$lang->dev->noParams   = 'Keine Parameter';
-$lang->dev->post       = 'POST Parameter';
+$lang->dev->common       = 'Entwicklung';
+$lang->dev->api          = 'API';
+$lang->dev->db           = 'Datenbank';
+$lang->dev->editor       = 'Bearbeiter';
+$lang->dev->translate    = 'Translate';
+$lang->dev->dbList       = 'Datenbank';
+$lang->dev->moduleList   = 'Module';
+$lang->dev->params       = 'Parameter';
+$lang->dev->type         = 'Typ';
+$lang->dev->desc         = 'Beschreibung';
+$lang->dev->noParams     = 'Keine Parameter';
+$lang->dev->post         = 'POST Parameter';
+$lang->dev->modifyValue  = 'modifyValue';
+$lang->dev->defaultValue = 'defaultValue';
+
 
 $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index b51f9af773..61a9720778 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -1,16 +1,19 @@
 <?php
-$lang->dev->common     = 'Develop';
-$lang->dev->api        = 'API';
-$lang->dev->db         = 'Database';
-$lang->dev->editor     = 'Editor';
-$lang->dev->translate  = 'Translate';
-$lang->dev->dbList     = 'Database';
-$lang->dev->moduleList = 'Modules';
-$lang->dev->params     = 'Parameters';
-$lang->dev->type       = 'Type';
-$lang->dev->desc       = 'Description';
-$lang->dev->noParams   = 'No Parameters';
-$lang->dev->post       = 'POST Parameter';
+$lang->dev->common       = 'Develop';
+$lang->dev->api          = 'API';
+$lang->dev->db           = 'Database';
+$lang->dev->editor       = 'Editor';
+$lang->dev->translate    = 'Translate';
+$lang->dev->dbList       = 'Database';
+$lang->dev->moduleList   = 'Modules';
+$lang->dev->params       = 'Parameters';
+$lang->dev->type         = 'Type';
+$lang->dev->desc         = 'Description';
+$lang->dev->noParams     = 'No Parameters';
+$lang->dev->post         = 'POST Parameter';
+$lang->dev->modifyValue  = 'modifyValue';
+$lang->dev->defaultValue = 'defaultValue';
+
 
 $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index b51f9af773..61a9720778 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -1,16 +1,19 @@
 <?php
-$lang->dev->common     = 'Develop';
-$lang->dev->api        = 'API';
-$lang->dev->db         = 'Database';
-$lang->dev->editor     = 'Editor';
-$lang->dev->translate  = 'Translate';
-$lang->dev->dbList     = 'Database';
-$lang->dev->moduleList = 'Modules';
-$lang->dev->params     = 'Parameters';
-$lang->dev->type       = 'Type';
-$lang->dev->desc       = 'Description';
-$lang->dev->noParams   = 'No Parameters';
-$lang->dev->post       = 'POST Parameter';
+$lang->dev->common       = 'Develop';
+$lang->dev->api          = 'API';
+$lang->dev->db           = 'Database';
+$lang->dev->editor       = 'Editor';
+$lang->dev->translate    = 'Translate';
+$lang->dev->dbList       = 'Database';
+$lang->dev->moduleList   = 'Modules';
+$lang->dev->params       = 'Parameters';
+$lang->dev->type         = 'Type';
+$lang->dev->desc         = 'Description';
+$lang->dev->noParams     = 'No Parameters';
+$lang->dev->post         = 'POST Parameter';
+$lang->dev->modifyValue  = 'modifyValue';
+$lang->dev->defaultValue = 'defaultValue';
+
 
 $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
diff --git a/module/dev/lang/vi.php b/module/dev/lang/vi.php
index 118d02ad5e..4a7dcadf88 100644
--- a/module/dev/lang/vi.php
+++ b/module/dev/lang/vi.php
@@ -1,16 +1,19 @@
 <?php
-$lang->dev->common     = 'Phát triển';
-$lang->dev->api        = 'API';
-$lang->dev->db         = 'Database';
-$lang->dev->editor     = 'Editor';
-$lang->dev->translate  = 'Translate';
-$lang->dev->dbList     = 'Database';
-$lang->dev->moduleList = 'Modules';
-$lang->dev->params     = 'Thông số';
-$lang->dev->type       = 'Loại';
-$lang->dev->desc       = 'Mô tả';
-$lang->dev->noParams   = 'Không có Parameters';
-$lang->dev->post       = 'POST Parameter';
+$lang->dev->common       = 'Phát triển';
+$lang->dev->api          = 'API';
+$lang->dev->db           = 'Database';
+$lang->dev->editor       = 'Editor';
+$lang->dev->translate    = 'Translate';
+$lang->dev->dbList       = 'Database';
+$lang->dev->moduleList   = 'Modules';
+$lang->dev->params       = 'Thông số';
+$lang->dev->type         = 'Loại';
+$lang->dev->desc         = 'Mô tả';
+$lang->dev->noParams     = 'Không có Parameters';
+$lang->dev->post         = 'POST Parameter';
+$lang->dev->modifyValue  = 'modifyValue';
+$lang->dev->defaultValue = 'defaultValue';
+
 
 $lang->dev->paramRange    = 'Parameter Range: %s';
 $lang->dev->paramDate     = 'Date format: YY-mm-dd, e.g 2019-01-01';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 452eadbabf..77e2ee1db1 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -1,16 +1,18 @@
 <?php
-$lang->dev->common     = '二次开发';
-$lang->dev->api        = 'API';
-$lang->dev->db         = '数据库';
-$lang->dev->editor     = '编辑器';
-$lang->dev->translate  = '翻译';
-$lang->dev->dbList     = '数据库';
-$lang->dev->moduleList = '模块列表';
-$lang->dev->params     = '参数列表';
-$lang->dev->type       = '类型';
-$lang->dev->desc       = '描述';
-$lang->dev->noParams   = '无参数';
-$lang->dev->post       = 'POST参数';
+$lang->dev->common       = '二次开发';
+$lang->dev->api          = 'API';
+$lang->dev->db           = '数据库';
+$lang->dev->editor       = '编辑器';
+$lang->dev->translate    = '翻译';
+$lang->dev->dbList       = '数据库';
+$lang->dev->moduleList   = '模块列表';
+$lang->dev->params       = '参数列表';
+$lang->dev->type         = '类型';
+$lang->dev->desc         = '描述';
+$lang->dev->noParams     = '无参数';
+$lang->dev->post         = 'POST参数';
+$lang->dev->modifyValue  = '修改值';
+$lang->dev->defaultValue = '默认值';
 
 $lang->dev->paramRange     = '取值范围：%s';
 $lang->dev->paramDate      = '日期格式：YY-mm-dd，如：2019-01-01';
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index ad732fe7cc..2486276631 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -23,7 +23,7 @@
   </div>
 </div>
 <div class="flex gap-15">
-<?php if(in_array($type, $config->dev->navTypes , false)):?>
+<?php if(in_array($type, $config->dev->navTypes)):?>
   <div class="menu-tree">
     <div class="input-control search-box has-icon-left has-icon-right search-example">
       <input type="search" class="form-control search-input" />
@@ -35,7 +35,7 @@
   <form class='main-form form-ajax flex-1' method='post'>
     <div id='mainContent' class='main-content flex'>
       <div class="side-left">
-        <div class="title">默认值</div>
+      <div class="title"><?php echo $lang->dev->defaultValue ?> </div>
         <div class="label-list">
           <?php foreach($originalLangs as $langKey => $originalLang):?>
           <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
@@ -43,7 +43,7 @@
         </div>
       </div>
       <div class="side-right">
-        <div class="title">修改值</div>
+      <div class="title"><?php echo $lang->dev->modifyValue?></div>
         <div class="input-list">
           <?php foreach($originalLangs as $langKey => $originalLang):?>
           <div class="input-control h-32 my-12">

From bcc46505803d066f93cf62286e33e92a94daa8ae Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 09:55:07 +0800
Subject: [PATCH 028/319] * Modify database lang get.

---
 extension/lite/common/ext/lang/de/lite.php    | 16 ++---
 extension/lite/common/ext/lang/en/lite.php    | 16 ++---
 extension/lite/common/ext/lang/fr/lite.php    | 16 ++---
 extension/lite/common/ext/lang/zh-cn/lite.php | 16 ++---
 module/dev/config.php                         |  3 +-
 module/dev/model.php                          | 63 ++++++++++++++++---
 6 files changed, 92 insertions(+), 38 deletions(-)

diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php
index 0a74146ca0..911da4653c 100644
--- a/extension/lite/common/ext/lang/de/lite.php
+++ b/extension/lite/common/ext/lang/de/lite.php
@@ -189,16 +189,18 @@ $lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->u
 $lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
 $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
 
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
+$lang->admin->menu->dev['subMenu']           = new stdclass();
+$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
+$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
+$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
+$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
+$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
 $lang->admin->menu->dev['menuOrder'][5]  = 'api';
 $lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
+$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
+$lang->admin->menu->dev['menuOrder'][20] = 'editor';
+$lang->admin->menu->dev['menuOrder'][25] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
 $lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index 0a74146ca0..911da4653c 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -189,16 +189,18 @@ $lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->u
 $lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
 $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
 
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
+$lang->admin->menu->dev['subMenu']           = new stdclass();
+$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
+$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
+$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
+$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
+$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
 $lang->admin->menu->dev['menuOrder'][5]  = 'api';
 $lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
+$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
+$lang->admin->menu->dev['menuOrder'][20] = 'editor';
+$lang->admin->menu->dev['menuOrder'][25] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
 $lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php
index 0a74146ca0..911da4653c 100644
--- a/extension/lite/common/ext/lang/fr/lite.php
+++ b/extension/lite/common/ext/lang/fr/lite.php
@@ -189,16 +189,18 @@ $lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->u
 $lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
 $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
 
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
+$lang->admin->menu->dev['subMenu']           = new stdclass();
+$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
+$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
+$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
+$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
+$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
 $lang->admin->menu->dev['menuOrder'][5]  = 'api';
 $lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
+$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
+$lang->admin->menu->dev['menuOrder'][20] = 'editor';
+$lang->admin->menu->dev['menuOrder'][25] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
 $lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index bf296cab43..a8a683a383 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -190,16 +190,18 @@ $lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->u
 $lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
 $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
 
-$lang->admin->menu->dev['subMenu']         = new stdclass();
-$lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
+$lang->admin->menu->dev['subMenu']           = new stdclass();
+$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
+$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
+$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
+$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
+$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
 $lang->admin->menu->dev['menuOrder'][5]  = 'api';
 $lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'editor';
-$lang->admin->menu->dev['menuOrder'][20] = 'entry';
+$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
+$lang->admin->menu->dev['menuOrder'][20] = 'editor';
+$lang->admin->menu->dev['menuOrder'][25] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
 $lang->admin->menu->system['subMenu']->backup      = array('link' => "{$lang->backup->common}|backup|index");
diff --git a/module/dev/config.php b/module/dev/config.php
index 23b889cf3c..2b3d032639 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -246,5 +246,4 @@ $config->dev->navTypes = array('second', 'third', 'feature');
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
 
-$config->dev->disableMainMenu = array();
-if($config->systemMode == 'light') $config->dev->disableMainMenu = array('project');
+$config->dev->disableMainMenu = array('project', 'product', 'execution');
diff --git a/module/dev/model.php b/module/dev/model.php
index eaad5b7e53..dd8e57614d 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -344,7 +344,7 @@ class devModel extends model
         }
         elseif($type == 'feature')
         {
-            $langKey = $module . '_feature-' . $method . '_';
+            $langKey = 'featureBar-' . $method . '_';
             foreach($defaultLang->$module->featureBar[$method] as $feature => $featureName)
             {
                 $selectKey = $feature . 'Selects';
@@ -360,7 +360,7 @@ class devModel extends model
         elseif($type == 'first')
         {
            $lang    = $defaultLang->mainNav;
-           $langKey = 'mainMenu_';
+           $langKey = 'mainNav_';
         }
         elseif($type == 'second')
         {
@@ -385,10 +385,10 @@ class devModel extends model
 
                     if(isset($menu['dropMenu']))
                     {
-                        foreach($menu['dropMenu'] as $menuKey => $menu)
+                        foreach($menu['dropMenu'] as $key => $menu)
                         {
-                            $menuKey = 'dropMenu_' . $menuKey;
-                            $menus->{$menuKey} = $menu;
+                            $dropMenuKey = $menuKey . 'DropMenu_' . $key;
+                            $menus->{$dropMenuKey} = $menu;
                         }
                     }
                 }
@@ -397,12 +397,13 @@ class devModel extends model
         }
         elseif($type == 'third')
         {
-            $langKey = "{$module}SubMenu_menu_{$method}_";
+            $langKey = "{$method}_";
             $lang    = $defaultLang->$module->menu->$method['subMenu'];
         }
 
         foreach($lang as $linkKey => $link)
         {
+            if($type == 'first' and in_array($linkKey, $this->config->dev->disableMainMenu)) continue;
             if(is_array($link))
             {
                 if(!isset($link['link'])) continue;
@@ -412,7 +413,6 @@ class devModel extends model
             $link = strip_tags($link);
             $link = explode('|', $link);
 
-            if($type == 'second') $langKey = $module . 'Menu_' . $linkKey . '_';
             $originalLangs[$langKey . $linkKey] = trim($link[0]);
         }
 
@@ -424,14 +424,35 @@ class devModel extends model
      *
      * @param  string $type
      * @param  string $module
+     * @param  string $method
      * @param  string $language
      * @access public
      * @return array
      */
-    public function getCustomedLang($type, $module = '', $language = 'zh-cn')
+    public function getCustomedLang($type, $module = '', $method = '', $language = 'zh-cn')
     {
         $customedLangs = array();
         $clientLang    = $this->app->getClientLang();
+
+        // Defalut value set, remove when left tree display.
+        if($type == 'feature')
+        {
+            $module = 'product';
+            $method = 'browse';
+        }
+        elseif($type == 'second')
+        {
+            $module = 'scrum';
+        }
+        elseif($type == 'third')
+        {
+            $module = 'kanbanProject';
+            $method = 'settings';
+        }
+        // Defalut value set end.
+
+        $langKey   = '';
+        $customeds = array();
         if($type == 'common')
         {
             $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=&vision={$this->config->vision}");
@@ -452,6 +473,32 @@ class devModel extends model
             }
             if(!$this->config->URAndSR) unset($customedLangs['SRCommon']);
         }
+        elseif($type == 'first')
+        {
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=mainNav&vision={$this->config->vision}");
+            $langKey   = 'mainNav_';
+        }
+        elseif($type == 'second')
+        {
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}Menu&section=&vision={$this->config->vision}");
+        }
+        elseif($type == 'third')
+        {
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}SubMenu&section=$method&vision={$this->config->vision}");
+            $langKey   = "{$method}_";
+        }
+        elseif($type == 'feature')
+        {
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
+            $langKey   = "featureBar-{$method}_";
+        }
+
+        foreach($customeds as $customed)
+        {
+            $customedKey = $customed->key;
+            if($type == 'second') $customedKey = $customed->section . '_' . $customed->key;
+            $customedLangs[$langKey . $customedKey] = $customed->value;
+        }
 
         return $customedLangs;
     }

From fc6d8cd82123b3f3617418870dabf4d05fea86b1 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 10:21:10 +0800
Subject: [PATCH 029/319] * Remove lite mode nav menu.

---
 extension/lite/common/ext/lang/de/lite.php    | 74 ------------------
 extension/lite/common/ext/lang/en/lite.php    | 74 ------------------
 extension/lite/common/ext/lang/fr/lite.php    | 74 ------------------
 extension/lite/common/ext/lang/zh-cn/lite.php | 75 -------------------
 module/admin/lang/menu.php                    | 14 ++--
 module/dev/view/langitem.html.php             |  2 +-
 6 files changed, 9 insertions(+), 304 deletions(-)

diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php
index ad31ea21d7..07f243d0a8 100644
--- a/extension/lite/common/ext/lang/de/lite.php
+++ b/extension/lite/common/ext/lang/de/lite.php
@@ -143,82 +143,8 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
 /* Admin menu. */
 $lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = 'Chat|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "Message|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']           = new stdclass();
-$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
-$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
-$lang->admin->menu->dev['menuOrder'][20] = 'editor';
-$lang->admin->menu->dev['menuOrder'][25] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "License|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
 
 /* adjust items of search. */
 $lang->searchObjects['all']       = 'All';
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index ad31ea21d7..07f243d0a8 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -143,82 +143,8 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
 /* Admin menu. */
 $lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = 'Chat|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "Message|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']           = new stdclass();
-$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
-$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
-$lang->admin->menu->dev['menuOrder'][20] = 'editor';
-$lang->admin->menu->dev['menuOrder'][25] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "License|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
 
 /* adjust items of search. */
 $lang->searchObjects['all']       = 'All';
diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php
index ad31ea21d7..07f243d0a8 100644
--- a/extension/lite/common/ext/lang/fr/lite.php
+++ b/extension/lite/common/ext/lang/fr/lite.php
@@ -143,82 +143,8 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
 /* Admin menu. */
 $lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = 'Chat|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "Message|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']           = new stdclass();
-$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
-$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
-$lang->admin->menu->dev['menuOrder'][20] = 'editor';
-$lang->admin->menu->dev['menuOrder'][25] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "License|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
 
 /* adjust items of search. */
 $lang->searchObjects['all']       = 'All';
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index bbb3a47c84..d0016acc06 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -143,83 +143,8 @@ $lang->doc->menuOrder[30] = 'custom';
 $lang->doc->menu->project['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']  = new stdclass();
 
-if(isset($lang->admin->menu->xuanxuan)) $xuanxuanMenu = $lang->admin->menu->xuanxuan;
 /* Admin menu. */
 $lang->admin->menu            = new stdclass();
-$lang->admin->menu->index     = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-if(isset($xuanxuanMenu)) $lang->admin->menu->xuanxuan = $xuanxuanMenu;
-$lang->admin->menu->company   = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
-$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
-$lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
-$lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
-
-if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link']  = '聊天|admin|xuanxuan';
-
-/* Admin menu order. */
-$lang->admin->menuOrder = array();
-$lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[6]  = 'xuanxuan';
-$lang->admin->menuOrder[10] = 'company';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
-$lang->admin->menuOrder[30] = 'dev';
-$lang->admin->menuOrder[35] = 'system';
-
-$lang->admin->menu->message['subMenu']          = new stdclass();
-$lang->admin->menu->message['subMenu']->message = array();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
-$lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
-
-if($config->edition != 'open') $lang->admin->menu->message['subMenu']->sms = array('link' => "短信|sms|index");
-
-$lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
-$lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
-
-$lang->admin->menu->message['menuOrder'][5]  = 'mail';
-$lang->admin->menu->message['menuOrder'][10] = 'webhook';
-$lang->admin->menu->message['menuOrder'][11] = 'sms';
-$lang->admin->menu->message['menuOrder'][15] = 'browser';
-$lang->admin->menu->message['menuOrder'][20] = 'setting';
-
-$lang->admin->menu->company['subMenu']              = new stdclass();
-$lang->admin->menu->company['subMenu']->browseUser  = array('link' => "{$lang->user->common}|company|browse", 'subModule' => 'user');
-$lang->admin->menu->company['subMenu']->dept        = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept');
-$lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group');
-
-$lang->admin->menu->dev['subMenu']           = new stdclass();
-$lang->admin->menu->dev['subMenu']->api      = array('link' => "API|dev|api");
-$lang->admin->menu->dev['subMenu']->db       = array('link' => "$lang->db|dev|db");
-$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem");
-$lang->admin->menu->dev['subMenu']->editor   = array('link' => "$lang->editor|dev|editor");
-$lang->admin->menu->dev['subMenu']->entry    = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
-
-$lang->admin->menu->dev['menuOrder'][5]  = 'api';
-$lang->admin->menu->dev['menuOrder'][10] = 'db';
-$lang->admin->menu->dev['menuOrder'][15] = 'langItem';
-$lang->admin->menu->dev['menuOrder'][20] = 'editor';
-$lang->admin->menu->dev['menuOrder'][25] = 'entry';
-
-$lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->backup      = array('link' => "{$lang->backup->common}|backup|index");
-$lang->admin->menu->system['subMenu']->trash       = array('link' => "{$lang->action->trash}|action|trash");
-$lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
-$lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
-$lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
-$lang->admin->menu->system['subMenu']->buildIndex  = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
-
-if($config->visions == ',lite,' and $config->edition != 'open') $lang->admin->menu->system['subMenu']->license = array('link' => "授权信息|admin|license'", 'alias' => 'license');
-if($config->visions != ',lite,') unset($lang->admin->menu->system['subMenu']->buildIndex);
-
-if($config->edition != 'open')
-{
-    $lang->admin->menu->system['subMenu']->ldap        = array('link' => 'LDAP|ldap|set', 'subModule' => 'ldap');
-    $lang->admin->menu->system['subMenu']->libreoffice = array('link' => 'Office|custom|libreoffice');
-}
-
-$lang->admin->dividerMenu = ',company,message,system,';
 
 /* adjust items of search. */
 $lang->searchObjects['all']       = '全部';
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index d3cf02f789..5a3e04a771 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -157,15 +157,17 @@ $lang->admin->menuList->message['menuOrder']['10'] = 'webhook';
 $lang->admin->menuList->message['menuOrder']['20'] = 'browser';
 $lang->admin->menuList->message['menuOrder']['25'] = 'setting';
 
-$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "API|dev|api|module=index");
-$lang->admin->menuList->dev['subMenu']['db']     = array('link' => "{$lang->database}|dev|db|table=" . trim(TABLE_EFFORT, '`'));
-$lang->admin->menuList->dev['subMenu']['editor'] = array('link' => "{$lang->editor}|dev|editor|");
-$lang->admin->menuList->dev['subMenu']['entry']  = array('link' => "{$lang->admin->entry}|entry|browse|", 'subModule' => 'entry');
+$lang->admin->menuList->dev['subMenu']['api']      = array('link' => "API|dev|api|module=index");
+$lang->admin->menuList->dev['subMenu']['db']       = array('link' => "{$lang->database}|dev|db|table=" . trim(TABLE_EFFORT, '`'));
+$lang->admin->menuList->dev['subMenu']['langItem'] = array('link' => "{$lang->langItem}|dev|langitem|");
+$lang->admin->menuList->dev['subMenu']['editor']   = array('link' => "{$lang->editor}|dev|editor|");
+$lang->admin->menuList->dev['subMenu']['entry']    = array('link' => "{$lang->admin->entry}|entry|browse|", 'subModule' => 'entry');
 
 $lang->admin->menuList->dev['menuOrder']['5']  = 'api';
 $lang->admin->menuList->dev['menuOrder']['10'] = 'db';
-$lang->admin->menuList->dev['menuOrder']['15'] = 'editor';
-$lang->admin->menuList->dev['menuOrder']['20'] = 'entry';
+$lang->admin->menuList->dev['menuOrder']['15'] = 'langItem';
+$lang->admin->menuList->dev['menuOrder']['20'] = 'editor';
+$lang->admin->menuList->dev['menuOrder']['25'] = 'entry';
 
 if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum'], $lang->admin->menuList->model['menuOrder']['10'], $lang->admin->menuList->template);
 if(!helper::hasFeature('waterfall'))
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 2486276631..e5bc613392 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -13,7 +13,7 @@
 <?php js::set('type', $type); ?>
 <?php js::set('navTypes', $config->dev->navTypes); ?>
 <?php include 'header.html.php';?>
-<div id='mainMenu' class='clearfix'>
+<div id='mainMenu' class='clearfix menu-secondary'>
   <div class="btn-toolBar pull-left">
     <?php foreach($featureBar as $key => $label):?>
     <?php $active = $type == $key ? 'btn-active-text' : '';?>

From 9eb9981ae7d37dba817bf81195cfacf7f094cd28 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 17 Feb 2023 14:08:57 +0800
Subject: [PATCH 030/319] * Add function for left menu tree.

---
 module/dev/config.php             |  1 +
 module/dev/control.php            |  1 +
 module/dev/js/langitem.js         | 27 +++-------
 module/dev/lang/de.php            |  5 ++
 module/dev/lang/en.php            |  5 ++
 module/dev/lang/fr.php            |  5 ++
 module/dev/lang/zh-cn.php         |  5 ++
 module/dev/model.php              | 88 +++++++++++++++++++++++++++----
 module/dev/view/langitem.html.php |  1 +
 9 files changed, 107 insertions(+), 31 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index 2b3d032639..bf7f07bc1c 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -247,3 +247,4 @@ $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
 
 $config->dev->disableMainMenu = array('project', 'product', 'execution');
+$config->dev->projectMenus    = array('project', 'scrum', 'waterfall', 'kanbanProject');
diff --git a/module/dev/control.php b/module/dev/control.php
index bc495de102..6811636eed 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -135,6 +135,7 @@ class dev extends control
         $this->view->featureBar    = $this->lang->dev->featureBar['langItem'];
         $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, $method, $language);
         $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, $method, $language);
+        $this->view->menuTree      = $this->dev->getMenuTree($type, $module, $method);
         $this->view->moduleName    = $moduleName;
         $this->view->language      = str_replace('-', '_', $language);
         $this->display();
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index ee7a104ea2..4a9c7a3742 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -31,7 +31,7 @@ $(function()
     function handleClickItem(clickId)
     {
 	var clearId = $('.label-list > .text-primary').attr('labelid');
-        if(clearId && clearId !== clickId) 
+        if(clearId && clearId !== clickId)
 	{
 	    removeActive(clearId);
 	};
@@ -41,29 +41,14 @@ $(function()
             addActive(clickId);
         };
     }
-    
+
     function initMenu()
     {
       if (navTypes.includes(type))
       {
-          var myTreeData = [{
-	      title: '水果',
-	      children: [
-	          {title: '橘子', key: 'juzi jz'},
-                  {title: '瓜', key: '123'}
-              ]
-          }, {
-              title: '坚果',
-              children: [
-                  {title: '向日葵'},
-                  {title: '瓜子'}
-              ]
-          }, {
-              title: '蔬菜'
-	  }];
         $('#menuTree').tree(
         {
-            data: myTreeData
+            data: menuTree
         });
       }
       $('.menu-tree .search-input').on('input', function()
@@ -71,15 +56,15 @@ $(function()
           var val = $(this).val();
 	  if (!val)
           {
-              var updateData = myTreeData;
+              var updateData = menuTree;
           }
           else
           {
               var updateData = [];
-              for (var i = 0; i < myTreeData.length; i++)
+              for (var i = 0; i < menuTree.length; i++)
 	      {
                   var item = {};
-                  $.extend(true, item, myTreeData[i])
+                  $.extend(true, item, menuTree[i])
                   if (item.children)
                   {
                       var children = [];
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index eae95d0b83..82c4fb69d0 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -192,3 +192,8 @@ $lang->dev->featureBar['langItem']['first']   = 'First Menu';
 $lang->dev->featureBar['langItem']['second']  = 'Second Menu';
 $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
 $lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
+
+$lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
+$lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
+$lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 61a9720778..520a1ac668 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -192,3 +192,8 @@ $lang->dev->featureBar['langItem']['first']   = 'First Menu';
 $lang->dev->featureBar['langItem']['second']  = 'Second Menu';
 $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
 $lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
+
+$lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
+$lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
+$lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 61a9720778..520a1ac668 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -192,3 +192,8 @@ $lang->dev->featureBar['langItem']['first']   = 'First Menu';
 $lang->dev->featureBar['langItem']['second']  = 'Second Menu';
 $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
 $lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
+
+$lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
+$lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
+$lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 77e2ee1db1..938106279a 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -191,3 +191,8 @@ $lang->dev->featureBar['langItem']['first']   = '一级菜单';
 $lang->dev->featureBar['langItem']['second']  = '二级菜单';
 $lang->dev->featureBar['langItem']['third']   = '三级菜单';
 $lang->dev->featureBar['langItem']['feature'] = '检索标签';
+
+$lang->dev->projectMenu['project']       = "{$lang->projectCommon}通用";
+$lang->dev->projectMenu['scrum']         = "敏捷{$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "瀑布{$lang->projectCommon}";
+$lang->dev->projectMenu['kanbanProject'] = "看板{$lang->projectCommon}";
diff --git a/module/dev/model.php b/module/dev/model.php
index dd8e57614d..07094660db 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -401,19 +401,12 @@ class devModel extends model
             $lang    = $defaultLang->$module->menu->$method['subMenu'];
         }
 
-        foreach($lang as $linkKey => $link)
+        $menus = $this->getLinkTitle($lang);
+        foreach($menus as $linkKey => $menu)
         {
             if($type == 'first' and in_array($linkKey, $this->config->dev->disableMainMenu)) continue;
-            if(is_array($link))
-            {
-                if(!isset($link['link'])) continue;
-                $link = $link['link'];
-            }
 
-            $link = strip_tags($link);
-            $link = explode('|', $link);
-
-            $originalLangs[$langKey . $linkKey] = trim($link[0]);
+            $originalLangs[$langKey . $linkKey] = $menu;
         }
 
         return $originalLangs;
@@ -550,4 +543,79 @@ class devModel extends model
 
         return $lang;
     }
+
+    /**
+     * Get menu tree.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return array
+     */
+    public function getMenuTree($type = 'second', $module = '', $method = '')
+    {
+        $menuTree = array();
+        if(!in_array($type, $this->config->dev->navTypes)) return $menuTree;
+
+        $lang = new stdclass();
+        if($type == 'second')
+        {
+            if(empty($module)) $module = 'my';
+            $menus       = $this->getLinkTitle($this->lang->mainNav);
+            $menusPinYin = common::convert2Pinyin($menus);
+            foreach($menus as $menuKey => $menu)
+            {
+                $menuItem = new stdclass();
+                $menuItem->title    = $menu;
+                $menuItem->module   = $menuKey;
+                $menuItem->method   = '';
+                $menuItem->active   = ($module == $menuKey and $method == '') ? 1 : 0;
+                $menuItem->key      = zget($menusPinYin, $menu, '');
+                $menuItem->children = array();
+
+                if($menuKey == 'project')
+                {
+                    $menusPinYin = common::convert2Pinyin($this->lang->dev->projectMenu);
+                    foreach($this->config->dev->projectMenus as $subMenuKey)
+                    {
+                        $subMenu = new stdClass();
+                        $subMenu->title  = $this->lang->dev->projectMenu[$subMenuKey];
+                        $subMenu->key    = zget($menusPinYin, $this->lang->dev->projectMenu[$subMenuKey], '');
+                        $subMenu->module = $subMenuKey;
+                        $subMenu->method = '';
+                        $subMenu->active = ($module == $subMenuKey and $method == '') ? 1 : 0;
+
+                        $menuItem->children[] = $subMenu;
+                    }
+                }
+                $menuTree[] = $menuItem;
+            }
+        }
+
+        return $menuTree;
+    }
+
+    /**
+     * Get links title.
+     *
+     * @param  array  $menus
+     * @access public
+     * @return void
+     */
+    public function getLinkTitle($menus)
+    {
+        $linksTitle = array();
+        foreach($menus as $menuKey => $menu)
+        {
+            if(is_array($menu) and !isset($menu['link'])) continue;
+
+            $link = is_array($menu) ? strip_tags($menu['link']) : strip_tags($menu);
+            $link = explode('|', $link);
+
+            $linksTitle[$menuKey] = trim($link[0]);
+        }
+
+        return $linksTitle;
+    }
 }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index e5bc613392..b9d3fc4d37 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php js::set('type', $type); ?>
 <?php js::set('navTypes', $config->dev->navTypes); ?>
+<?php js::set('menuTree', $menuTree)?>
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix menu-secondary'>
   <div class="btn-toolBar pull-left">

From 6da9c011047a0e96e5b23cfbb9d2592d0bbd188a Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 20 Feb 2023 10:00:43 +0800
Subject: [PATCH 031/319] * Code for add js to module/langItem .

---
 module/block/view/preference.html.php |  2 +-
 module/dev/css/langitem.css           |  5 +++--
 module/dev/js/langitem.js             | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/module/block/view/preference.html.php b/module/block/view/preference.html.php
index 3f93a22484..406ca41e13 100644
--- a/module/block/view/preference.html.php
+++ b/module/block/view/preference.html.php
@@ -204,4 +204,4 @@ $(function()
     initPreference();
 })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index 98b680089f..bc9dc7b982 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -12,10 +12,11 @@
 /* menu-tree */
 .menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;}
 .menu-tree > .tree {padding-top: 20px;}
-.menu-tree li {padding: 5px 25px;}
+li.has-list > ul > li {padding-left: 10px;}
+.tree ul {margin-bottom: 0;}
 
 /* side-left */
-.main-content > .side-left {flex: 0 0 160px; margin-left: 64px;}
+.main-content > .side-left {flex: 0 0 160px; margin-left: 44px;}
 .label-list {background: #F8F8F8; padding: 5px 0;}
 .label-list > .input-label {display: flex; align-items: center; cursor: pointer; padding-left: 40px;}
 
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 4a9c7a3742..190a309766 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -48,9 +48,14 @@ $(function()
       {
         $('#menuTree').tree(
         {
-            data: menuTree
+            data: menuTree,
+            itemCreator: function($li, item) 
+            {
+                $li.append($('<a data-module="' + item.module  + '"data-method="' + item.method + '"data-has-children="' + !!item.children + '" />', {href: item.url}).text(item.title));
+	    }
         });
       }
+
       $('.menu-tree .search-input').on('input', function()
       {
           var val = $(this).val();
@@ -77,10 +82,19 @@ $(function()
 		      }
                       item.children = children;
 		  }
-                  updateData.push(item);
+                  if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)) )
+                  {
+                      updateData.push(item);
+		  }
               }
           }
           $('#menuTree').data('zui.tree').reload(updateData);
       })
+      
+      $('#menuTree').on('click', 'a', function(e)
+      {
+          var clickTarget = e.target;
+          debugger;
+      })
     }
 })

From d229986cffee9b09ebaaac72a01373960f281a5b Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 20 Feb 2023 11:14:40 +0800
Subject: [PATCH 032/319] * Code for add js to module dev/langItem .

---
 module/dev/js/langitem.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 190a309766..5995f2a40d 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -51,7 +51,7 @@ $(function()
             data: menuTree,
             itemCreator: function($li, item) 
             {
-                $li.append($('<a data-module="' + item.module  + '"data-method="' + item.method + '"data-has-children="' + !!item.children + '" />', {href: item.url}).text(item.title));
+                $li.append($('<a data-module="' + item.module  + '"data-method="' + item.method + '"data-has-children="' + (item.children ? !!item.children.length : false) + '" />', {href: item.url}).text(item.title));
 	    }
         });
       }
@@ -93,8 +93,12 @@ $(function()
       
       $('#menuTree').on('click', 'a', function(e)
       {
-          var clickTarget = e.target;
-          debugger;
+          var target = $(e.target);
+          if (target.attr('data-has-children') === 'true')
+          {
+              return;
+          }
+          self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
       })
     }
 })

From 684fa3557ccdeff110cab42cba4fdfe33bfeabd9 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 20 Feb 2023 11:16:41 +0800
Subject: [PATCH 033/319] * Code refactors in preference.html.php .

---
 module/block/view/preference.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/block/view/preference.html.php b/module/block/view/preference.html.php
index 406ca41e13..e55c9bde39 100644
--- a/module/block/view/preference.html.php
+++ b/module/block/view/preference.html.php
@@ -205,3 +205,4 @@ $(function()
 })
 
 </script>
+

From cbf26f0ef1b3cee18f51978d49cb3a5d28ca553b Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 20 Feb 2023 13:46:27 +0800
Subject: [PATCH 034/319] * Code for langItem module refactors .

---
 module/dev/js/langitem.js         | 10 ++++------
 module/dev/view/langitem.html.php |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 5995f2a40d..28d63e0312 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -51,7 +51,7 @@ $(function()
             data: menuTree,
             itemCreator: function($li, item) 
             {
-                $li.append($('<a data-module="' + item.module  + '"data-method="' + item.method + '"data-has-children="' + (item.children ? !!item.children.length : false) + '" />', {href: item.url}).text(item.title));
+                $li.append('<a data-module="' + item.module  + '" data-method="' + item.method + '" data-has-children="' + (item.children ? !!item.children.length : false)  + '"class="text-muted""' + '" href=# >' + item.title + '</a>');
 	    }
         });
       }
@@ -82,7 +82,7 @@ $(function()
 		      }
                       item.children = children;
 		  }
-                  if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)) )
+                  if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)))
                   {
                       updateData.push(item);
 		  }
@@ -94,10 +94,8 @@ $(function()
       $('#menuTree').on('click', 'a', function(e)
       {
           var target = $(e.target);
-          if (target.attr('data-has-children') === 'true')
-          {
-              return;
-          }
+          if (target.attr('data-has-children') === 'true') return
+
           self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
       })
     }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index b9d3fc4d37..f1de76bee7 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -30,7 +30,7 @@
       <input type="search" class="form-control search-input" />
       <label class="input-control-icon-left search-icon flex align-center justify-center"><i class="icon icon-search"></i></label>
     </div>
-    <div id="menuTree"></div>
+    <div id="menuTree" class="menu-active-primary menu-hover-primary"></div>
   </div>
 <?php endif;?>
   <form class='main-form form-ajax flex-1' method='post'>

From afe06808dae9f77ad5d3cbd6cffb41718984a279 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 20 Feb 2023 14:09:25 +0800
Subject: [PATCH 035/319] * Add menu tree.

---
 module/dev/model.php | 143 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 113 insertions(+), 30 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 07094660db..22b8611187 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -544,6 +544,104 @@ class devModel extends model
         return $lang;
     }
 
+    /**
+     * Get second menus.
+     *
+     * @param  string $menu
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return array
+     */
+    public function getSecondMenus($menu, $module = '', $method = '')
+    {
+        $menus = array();
+        if($menu == 'project')
+        {
+            $menusPinYin = common::convert2Pinyin($this->lang->dev->projectMenu);
+            foreach($this->config->dev->projectMenus as $subMenuKey)
+            {
+                $subMenu = new stdClass();
+                $subMenu->title  = $this->lang->dev->projectMenu[$subMenuKey];
+                $subMenu->key    = zget($menusPinYin, $this->lang->dev->projectMenu[$subMenuKey], '');
+                $subMenu->module = $subMenuKey;
+                $subMenu->method = '';
+                $subMenu->active = ($module == $subMenuKey and $method == '') ? 1 : 0;
+
+                $menus[] = $subMenu;
+            }
+        }
+
+        return $menus;
+    }
+
+    /**
+     * Get third menus.
+     *
+     * @param  string $menu
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return array
+     */
+    public function getThirdMenus($menu, $module = '', $method = '')
+    {
+        $menus = array();
+        if(!isset($this->lang->$menu->menu)) return $menus;
+
+        $menuLang    = $this->getLinkTitle($this->lang->$menu->menu);
+        $menusPinYin = common::convert2Pinyin($menuLang);
+        foreach($menuLang as $menuKey => $menuName)
+        {
+            if(!isset($this->lang->$menu->menu->$menuKey['subMenu'])) continue;
+
+            $subMenu = new stdClass();
+            $subMenu->title  = $menuName;
+            $subMenu->key    = zget($menusPinYin, $menuName, '');
+            $subMenu->module = $menu;
+            $subMenu->method = $menuKey;
+            $subMenu->active = ($method == $menuKey and $module == $menu) ? 1 : 0;
+
+            $menus[] = $subMenu;
+        }
+
+        return $menus;
+    }
+
+    /**
+     * Get feature menus.
+     *
+     * @param  string $menu
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return array
+     */
+    public function getFeatureMenus($menu, $module = '', $method = '')
+    {
+        $this->app->loadLang($menu);
+        $menus = array();
+        if(isset($this->lang->$menu->featureBar))
+        {
+            $featureBar = $this->lang->$menu->featureBar;
+            foreach($featureBar as $methodName => $feature)
+            {
+                if($methodName == 'caselib') $methodName = 'caseLib';
+
+                $subMenu = new stdClass();
+                $subMenu->title  = zget($this->lang->$menu, $methodName);
+                $subMenu->key    = '';
+                $subMenu->module = $menu;
+                $subMenu->method = $methodName;
+                $subMenu->active = ($method == $methodName and $module == $menu) ? 1 : 0;
+
+                $menus[] = $subMenu;
+            }
+        }
+
+        return $menus;
+    }
+
     /**
      * Get menu tree.
      *
@@ -558,39 +656,24 @@ class devModel extends model
         $menuTree = array();
         if(!in_array($type, $this->config->dev->navTypes)) return $menuTree;
 
-        $lang = new stdclass();
-        if($type == 'second')
+        $mainNav       = $this->getLinkTitle($this->lang->mainNav);
+        $maimNavPinYin = common::convert2Pinyin($mainNav);
+
+        if(empty($module)) $module = 'my';
+        foreach($mainNav as $menuKey => $menu)
         {
-            if(empty($module)) $module = 'my';
-            $menus       = $this->getLinkTitle($this->lang->mainNav);
-            $menusPinYin = common::convert2Pinyin($menus);
-            foreach($menus as $menuKey => $menu)
-            {
-                $menuItem = new stdclass();
-                $menuItem->title    = $menu;
-                $menuItem->module   = $menuKey;
-                $menuItem->method   = '';
-                $menuItem->active   = ($module == $menuKey and $method == '') ? 1 : 0;
-                $menuItem->key      = zget($menusPinYin, $menu, '');
-                $menuItem->children = array();
+            $menuItem = new stdclass();
+            $menuItem->title  = $menu;
+            $menuItem->module = $menuKey;
+            $menuItem->method = '';
+            $menuItem->active = ($module == $menuKey and $method == '') ? 1 : 0;
+            $menuItem->key    = zget($maimNavPinYin, $menu, '');
 
-                if($menuKey == 'project')
-                {
-                    $menusPinYin = common::convert2Pinyin($this->lang->dev->projectMenu);
-                    foreach($this->config->dev->projectMenus as $subMenuKey)
-                    {
-                        $subMenu = new stdClass();
-                        $subMenu->title  = $this->lang->dev->projectMenu[$subMenuKey];
-                        $subMenu->key    = zget($menusPinYin, $this->lang->dev->projectMenu[$subMenuKey], '');
-                        $subMenu->module = $subMenuKey;
-                        $subMenu->method = '';
-                        $subMenu->active = ($module == $subMenuKey and $method == '') ? 1 : 0;
+            $childFunc = 'get' . ucfirst($type) . 'Menus';
+            $menuItem->children = $this->$childFunc($menuKey, $module, $method);
+            if($type != 'second' and empty($menuItem->children)) continue;
 
-                        $menuItem->children[] = $subMenu;
-                    }
-                }
-                $menuTree[] = $menuItem;
-            }
+            $menuTree[] = $menuItem;
         }
 
         return $menuTree;

From de9c7e44f4c27106a07b4294ced6a2e2c6c1a1bf Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 20 Feb 2023 15:15:52 +0800
Subject: [PATCH 036/319] * Code for js in module langitem .

---
 module/dev/js/langitem.js | 113 ++++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 52 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 28d63e0312..8a237c5262 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -2,7 +2,7 @@ $(function()
 {
     $(".input-list").on("click", 'input', function(e)
     {
-	handleClickItem(e.target.id);
+        handleClickItem(e.target.id);
     });
     $(".input-list").on("blur", 'input', function(e)
     {
@@ -11,11 +11,15 @@ $(function()
 
     $('.label-list > .input-label').on('click', function(e)
     {
-	handleClickItem($(this).attr('labelid'));
+        handleClickItem($(this).attr('labelid'));
     });
 
     initMenu();
 
+    $('li.has-list > ul').addClass("menu-active-primary menu-hover-primary")
+
+    handleInputSearch();
+
     function addActive(id)
     {
         $('[labelid=' + id + ']').addClass('text-primary');
@@ -42,61 +46,66 @@ $(function()
         };
     }
 
+    function handleInputSearch()
+    {
+        $('.menu-tree .search-input').on('input', function()
+        {
+            var val = $(this).val();
+            if (!val)
+            {
+                var updateData = menuTree;
+            }
+            else
+            {
+                var updateData = [];
+                for (var i = 0; i < menuTree.length; i++)
+                {
+                    var item = {};
+                    $.extend(true, item, menuTree[i])
+                    if (item.children)
+                    {
+                        var children = [];
+                        for (var j = 0; j < item.children.length; j++)
+                        {
+                            if (item.children[j].title.includes(val) || (item.children[j].key && item.children[j].key.includes(val)))
+                            {
+                                children.push(item.children[j]);
+              	            }
+                        }
+                        item.children = children;
+                    }
+                    if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)))
+                    {
+                        updateData.push(item);
+                    }
+                }
+            }
+            $('#menuTree').data('zui.tree').reload(updateData);
+        })
+    }
+
     function initMenu()
     {
-      if (navTypes.includes(type))
-      {
-        $('#menuTree').tree(
+        if (navTypes.includes(type))
         {
-            data: menuTree,
-            itemCreator: function($li, item) 
+            $('#menuTree').tree(
             {
-                $li.append('<a data-module="' + item.module  + '" data-method="' + item.method + '" data-has-children="' + (item.children ? !!item.children.length : false)  + '"class="text-muted""' + '" href=# >' + item.title + '</a>');
-	    }
-        });
-      }
+                data: menuTree,
+                initialState: 'active',
+                itemCreator: function($li, item)
+                {
+                    $li.append('<a data-module="' + item.module  + '" data-method="' + item.method + '" data-has-children="' + (item.children ? !!item.children.length : false) + '" href=# >' + item.title + '</a>');
+                    if (item.active) $li.addClass('active open in');
+                }
+            });
+        }
 
-      $('.menu-tree .search-input').on('input', function()
-      {
-          var val = $(this).val();
-	  if (!val)
-          {
-              var updateData = menuTree;
-          }
-          else
-          {
-              var updateData = [];
-              for (var i = 0; i < menuTree.length; i++)
-	      {
-                  var item = {};
-                  $.extend(true, item, menuTree[i])
-                  if (item.children)
-                  {
-                      var children = [];
-                      for (var j = 0; j < item.children.length; j++)
-                      {
-                          if (item.children[j].title.includes(val) || (item.children[j].key && item.children[j].key.includes(val)))
-                          {
-                              children.push(item.children[j]);
-              	          }
-		      }
-                      item.children = children;
-		  }
-                  if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)))
-                  {
-                      updateData.push(item);
-		  }
-              }
-          }
-          $('#menuTree').data('zui.tree').reload(updateData);
-      })
-      
-      $('#menuTree').on('click', 'a', function(e)
-      {
-          var target = $(e.target);
-          if (target.attr('data-has-children') === 'true') return
+        $('#menuTree').on('click', 'a', function(e)
+        {
+            var target = $(e.target);
+            if (target.attr('data-has-children') === 'true') return
 
-          self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
-      })
+            self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
+        })
     }
 })

From 51855da58233167a951d4e2e89e1755bbf93318b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 20 Feb 2023 15:44:08 +0800
Subject: [PATCH 037/319] * Modify menu tree data.

---
 module/dev/control.php            | 15 ++++++---
 module/dev/model.php              | 54 ++++++++++---------------------
 module/dev/view/langitem.html.php |  2 +-
 3 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 6811636eed..716aaf4010 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -92,13 +92,21 @@ class dev extends control
      * @access public
      * @return void
      */
-    public function langItem($type = 'common', $module = '', $method = '', $language = 'zh_cn')
+    public function langItem($type = 'common', $module = 'my', $method = '', $language = 'zh_cn')
     {
         $language   = str_replace('_', '-', $language);
         $moduleName = $module;
+
         if($type == 'common') $moduleName = 'common';
         if($type == 'second') $moduleName = $module . 'Menu';
-        if($type == 'third')  $moduleName = $module . 'SubMenu';
+
+        if($type == 'third')
+        {
+            if(empty($method)) $method = 'work';
+            $moduleName = $module . 'SubMenu';
+        }
+
+        if($type == 'feature' and empty($method)) $method = 'todo';
 
         if($this->server->request_method == 'POST')
         {
@@ -128,11 +136,8 @@ class dev extends control
             return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
         }
 
-        $this->dev->loadDefaultLang();
-
         $this->view->title         = $this->lang->langItem;
         $this->view->type          = $type;
-        $this->view->featureBar    = $this->lang->dev->featureBar['langItem'];
         $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, $method, $language);
         $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, $method, $language);
         $this->view->menuTree      = $this->dev->getMenuTree($type, $module, $method);
diff --git a/module/dev/model.php b/module/dev/model.php
index 22b8611187..e3f99139f8 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -304,23 +304,6 @@ class devModel extends model
      */
     public function getOriginalLang($type, $module = '', $method = '', $language = 'zh-cn')
     {
-        // Defalut value set, remove when left tree display.
-        if($type == 'feature')
-        {
-            $module = 'product';
-            $method = 'browse';
-        }
-        elseif($type == 'second')
-        {
-            $module = 'scrum';
-        }
-        elseif($type == 'third')
-        {
-            $module = 'kanbanProject';
-            $method = 'settings';
-        }
-        // Defalut value set end.
-
         $originalLangs = array();
         $clientLang    = $this->app->getClientLang();
         $defaultLang   = $this->loadDefaultLang();
@@ -398,7 +381,7 @@ class devModel extends model
         elseif($type == 'third')
         {
             $langKey = "{$method}_";
-            $lang    = $defaultLang->$module->menu->$method['subMenu'];
+            $lang    = $defaultLang->$module->menu->{$method}['subMenu'];
         }
 
         $menus = $this->getLinkTitle($lang);
@@ -427,23 +410,6 @@ class devModel extends model
         $customedLangs = array();
         $clientLang    = $this->app->getClientLang();
 
-        // Defalut value set, remove when left tree display.
-        if($type == 'feature')
-        {
-            $module = 'product';
-            $method = 'browse';
-        }
-        elseif($type == 'second')
-        {
-            $module = 'scrum';
-        }
-        elseif($type == 'third')
-        {
-            $module = 'kanbanProject';
-            $method = 'settings';
-        }
-        // Defalut value set end.
-
         $langKey   = '';
         $customeds = array();
         if($type == 'common')
@@ -593,7 +559,7 @@ class devModel extends model
         $menusPinYin = common::convert2Pinyin($menuLang);
         foreach($menuLang as $menuKey => $menuName)
         {
-            if(!isset($this->lang->$menu->menu->$menuKey['subMenu'])) continue;
+            if(!isset($this->lang->$menu->menu->{$menuKey}['subMenu']) or !get_object_vars($this->lang->$menu->menu->{$menuKey}['subMenu'])) continue;
 
             $subMenu = new stdClass();
             $subMenu->title  = $menuName;
@@ -656,7 +622,21 @@ class devModel extends model
         $menuTree = array();
         if(!in_array($type, $this->config->dev->navTypes)) return $menuTree;
 
-        $mainNav       = $this->getLinkTitle($this->lang->mainNav);
+        $mainNav = $type == 'second' ? $this->lang->mainNav : array();
+        if($type != 'second')
+        {
+            foreach($this->lang->mainNav as $menuKey => $menu)
+            {
+                if($menuKey == 'project')
+                {
+                    foreach($this->config->dev->projectMenus as $subMenuKey) $mainNav[$subMenuKey] = $this->lang->dev->projectMenu[$subMenuKey];
+                }
+
+                $mainNav[$menuKey] = $menu;
+            }
+        }
+
+        $mainNav       = $this->getLinkTitle($mainNav);
         $maimNavPinYin = common::convert2Pinyin($mainNav);
 
         if(empty($module)) $module = 'my';
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index f1de76bee7..2f7e9b0df3 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -16,7 +16,7 @@
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix menu-secondary'>
   <div class="btn-toolBar pull-left">
-    <?php foreach($featureBar as $key => $label):?>
+    <?php foreach($lang->dev->featureBar['langItem'] as $key => $label):?>
     <?php $active = $type == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php echo html::a(inlink('langItem', "type=$key"), $label, '', "class='btn btn-link $active'");?>

From e88b8e616086f18314e8811e79e6159d675c1fee Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 21 Feb 2023 08:48:09 +0800
Subject: [PATCH 038/319]  * adjust code.

---
 module/dev/control.php |  3 ++-
 module/dev/model.php   | 36 +-----------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 6811636eed..a8825cb380 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -95,8 +95,9 @@ class dev extends control
     public function langItem($type = 'common', $module = '', $method = '', $language = 'zh_cn')
     {
         $language   = str_replace('_', '-', $language);
+        if($type == 'second' and empty($module)) $module = 'my';
         $moduleName = $module;
-        if($type == 'common') $moduleName = 'common';
+        if($type == 'common' or $type == 'first') $moduleName = 'common';
         if($type == 'second') $moduleName = $module . 'Menu';
         if($type == 'third')  $moduleName = $module . 'SubMenu';
 
diff --git a/module/dev/model.php b/module/dev/model.php
index 22b8611187..49c8debf7d 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -304,23 +304,6 @@ class devModel extends model
      */
     public function getOriginalLang($type, $module = '', $method = '', $language = 'zh-cn')
     {
-        // Defalut value set, remove when left tree display.
-        if($type == 'feature')
-        {
-            $module = 'product';
-            $method = 'browse';
-        }
-        elseif($type == 'second')
-        {
-            $module = 'scrum';
-        }
-        elseif($type == 'third')
-        {
-            $module = 'kanbanProject';
-            $method = 'settings';
-        }
-        // Defalut value set end.
-
         $originalLangs = array();
         $clientLang    = $this->app->getClientLang();
         $defaultLang   = $this->loadDefaultLang();
@@ -427,23 +410,6 @@ class devModel extends model
         $customedLangs = array();
         $clientLang    = $this->app->getClientLang();
 
-        // Defalut value set, remove when left tree display.
-        if($type == 'feature')
-        {
-            $module = 'product';
-            $method = 'browse';
-        }
-        elseif($type == 'second')
-        {
-            $module = 'scrum';
-        }
-        elseif($type == 'third')
-        {
-            $module = 'kanbanProject';
-            $method = 'settings';
-        }
-        // Defalut value set end.
-
         $langKey   = '';
         $customeds = array();
         if($type == 'common')
@@ -473,7 +439,7 @@ class devModel extends model
         }
         elseif($type == 'second')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}Menu&section=&vision={$this->config->vision}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}Menu&vision={$this->config->vision}");
         }
         elseif($type == 'third')
         {

From b51cb2325f87b90ede0a8969f2407f35730f0bb6 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 21 Feb 2023 09:26:31 +0800
Subject: [PATCH 039/319] * Code for module tido lang refactors .

---
 module/my/view/todo.html.php |  4 ++--
 module/todo/lang/de.php      | 16 ++++++++--------
 module/todo/lang/en.php      | 16 ++++++++--------
 module/todo/lang/fr.php      | 16 ++++++++--------
 module/todo/lang/vi.php      | 16 ++++++++--------
 module/todo/lang/zh-cn.php   | 16 ++++++++--------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index ae6d25fd18..5226b0097e 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -15,7 +15,7 @@
 <?php js::set('confirmDelete', $lang->todo->confirmDelete)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->todo->periods as $period => $label):?>
+    <?php foreach($lang->todo->featureBar['todo'] as $period => $label):?>
     <?php
     $vars = "date=$period";
     if($period == 'before') $vars .= "&userID={$app->user->id}&status=undone";
@@ -123,7 +123,7 @@ $doingCount = 0;
           </td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-width='80%' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
-          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
+          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->featureBar['todo']['future'] : $todo->date;?></td>
           <td class="c-status"><span class="status-todo status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <?php if($type == 'assignedToOther'):?>
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index f044e97168..115dbeccc0 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->periods['all']             = 'Alle';
-$lang->todo->periods['before']          = 'Nicht abgeschlossen';
-$lang->todo->periods['future']          = 'Wartend';
-$lang->todo->periods['thisWeek']        = 'This Week';
-$lang->todo->periods['thisMonth']       = 'This Month';
-$lang->todo->periods['thisYear']        = 'Dieses Jahr';
-$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
-$lang->todo->periods['cycle']           = 'Wiederkehrend';
+$lang->todo->featureBar['todo']['all']             = 'Alle';
+$lang->todo->featureBar['todo']['before']          = 'Nicht abgeschlossen';
+$lang->todo->featureBar['todo']['future']          = 'Wartend';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'Dieses Jahr';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Wiederkehrend';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, wurde $extra von <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 78d6a45b7d..62e946b45d 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->periods['all']             = 'Assigned To Yourself';
-$lang->todo->periods['before']          = 'Unfinished';
-$lang->todo->periods['future']          = 'TBD';
-$lang->todo->periods['thisWeek']        = 'This Week';
-$lang->todo->periods['thisMonth']       = 'This Month';
-$lang->todo->periods['thisYear']        = 'This Year';
-$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
-$lang->todo->periods['cycle']           = 'Recurrence';
+$lang->todo->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->todo->featureBar['todo']['before']          = 'Unfinished';
+$lang->todo->featureBar['todo']['future']          = 'TBD';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'This Year';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Recurrence';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, is $extra by <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index d5c24c90e4..e9c0dbd59b 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = "Les entrées de l'ID %s ne sont pas terminés et
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->periods['all']             = 'Toutes les entrées';
-$lang->todo->periods['before']          = 'Non terminée';
-$lang->todo->periods['future']          = 'A définir';
-$lang->todo->periods['thisWeek']        = 'This Week';
-$lang->todo->periods['thisMonth']       = 'This Month';
-$lang->todo->periods['thisYear']        = 'Cette Année';
-$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
-$lang->todo->periods['cycle']           = 'Récurrence';
+$lang->todo->featureBar['todo']['all']             = 'Toutes les entrées';
+$lang->todo->featureBar['todo']['before']          = 'Non terminée';
+$lang->todo->featureBar['todo']['future']          = 'A définir';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'Cette Année';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Récurrence';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, est $extra par <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php
index 3a54b597ec..59afb5ae4c 100644
--- a/module/todo/lang/vi.php
+++ b/module/todo/lang/vi.php
@@ -110,14 +110,14 @@ $lang->todo->noTodo         = 'Không có việc của loại này.';
 $lang->todo->noAssignedTo   = "Người được giao không nên trống.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 
-$lang->todo->periods['all']             = 'Tất cả việc';
-$lang->todo->periods['before']          = 'Chưa kết thúc';
-$lang->todo->periods['future']          = 'TBD';
-$lang->todo->periods['thisWeek']        = 'This Week';
-$lang->todo->periods['thisMonth']       = 'This Month';
-$lang->todo->periods['thisYear']        = 'Năm nay';
-$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
-$lang->todo->periods['cycle']           = 'Lặp lại';
+$lang->todo->featureBar['todo']['all']             = 'Tất cả việc';
+$lang->todo->featureBar['todo']['before']          = 'Chưa kết thúc';
+$lang->todo->featureBar['todo']['future']          = 'TBD';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'Năm nay';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Lặp lại';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, là $extra bởi <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 76f8d444e4..4d79637256 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。'
 $lang->todo->today          = '今日待办';
 $lang->todo->selectProduct  = "请选择产品";
 
-$lang->todo->periods['all']             = '指派自己';
-$lang->todo->periods['before']          = '未完';
-$lang->todo->periods['future']          = '待定';
-$lang->todo->periods['thisWeek']        = '本周';
-$lang->todo->periods['thisMonth']       = '本月';
-$lang->todo->periods['thisYear']        = '本年';
-$lang->todo->periods['assignedToOther'] = '指派他人';
-$lang->todo->periods['cycle']           = '周期';
+$lang->todo->featureBar['todo']['all']             = '指派自己';
+$lang->todo->featureBar['todo']['before']          = '未完';
+$lang->todo->featureBar['todo']['future']          = '待定';
+$lang->todo->featureBar['todo']['thisWeek']        = '本周';
+$lang->todo->featureBar['todo']['thisMonth']       = '本月';
+$lang->todo->featureBar['todo']['thisYear']        = '本年';
+$lang->todo->featureBar['todo']['assignedToOther'] = '指派他人';
+$lang->todo->featureBar['todo']['cycle']           = '周期';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, 由 <strong>$actor</strong> $extra。$appendLink', 'extra' => 'reasonList');

From 35569ad22c8c785da6b65c64535857743a57495a Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 21 Feb 2023 10:03:34 +0800
Subject: [PATCH 040/319] * Code refactors in module todo lang.

---
 module/my/view/todo.html.php |  4 ++--
 module/todo/lang/de.php      | 16 ++++++++--------
 module/todo/lang/en.php      | 16 ++++++++--------
 module/todo/lang/fr.php      | 16 ++++++++--------
 module/todo/lang/vi.php      | 16 ++++++++--------
 module/todo/lang/zh-cn.php   | 16 ++++++++--------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 5226b0097e..0179de3b4b 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -15,7 +15,7 @@
 <?php js::set('confirmDelete', $lang->todo->confirmDelete)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->todo->featureBar['todo'] as $period => $label):?>
+    <?php foreach($lang->my->featureBar['todo'] as $period => $label):?>
     <?php
     $vars = "date=$period";
     if($period == 'before') $vars .= "&userID={$app->user->id}&status=undone";
@@ -123,7 +123,7 @@ $doingCount = 0;
           </td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-width='80%' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
-          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->featureBar['todo']['future'] : $todo->date;?></td>
+          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->my->featureBar['todo']['future'] : $todo->date;?></td>
           <td class="c-status"><span class="status-todo status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <?php if($type == 'assignedToOther'):?>
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 115dbeccc0..c2c4301347 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->featureBar['todo']['all']             = 'Alle';
-$lang->todo->featureBar['todo']['before']          = 'Nicht abgeschlossen';
-$lang->todo->featureBar['todo']['future']          = 'Wartend';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'Dieses Jahr';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Wiederkehrend';
+$lang->my->featureBar['todo']['all']             = 'Alle';
+$lang->my->featureBar['todo']['before']          = 'Nicht abgeschlossen';
+$lang->my->featureBar['todo']['future']          = 'Wartend';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'Dieses Jahr';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Wiederkehrend';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, wurde $extra von <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 62e946b45d..f4a6ea6518 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->todo->featureBar['todo']['before']          = 'Unfinished';
-$lang->todo->featureBar['todo']['future']          = 'TBD';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'This Year';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->my->featureBar['todo']['before']          = 'Unfinished';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'This Year';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, is $extra by <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index e9c0dbd59b..9f8e68ce42 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = "Les entrées de l'ID %s ne sont pas terminés et
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->featureBar['todo']['all']             = 'Toutes les entrées';
-$lang->todo->featureBar['todo']['before']          = 'Non terminée';
-$lang->todo->featureBar['todo']['future']          = 'A définir';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'Cette Année';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Récurrence';
+$lang->my->featureBar['todo']['all']             = 'Toutes les entrées';
+$lang->my->featureBar['todo']['before']          = 'Non terminée';
+$lang->my->featureBar['todo']['future']          = 'A définir';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'Cette Année';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Récurrence';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, est $extra par <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php
index 59afb5ae4c..0b33c3ff18 100644
--- a/module/todo/lang/vi.php
+++ b/module/todo/lang/vi.php
@@ -110,14 +110,14 @@ $lang->todo->noTodo         = 'Không có việc của loại này.';
 $lang->todo->noAssignedTo   = "Người được giao không nên trống.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 
-$lang->todo->featureBar['todo']['all']             = 'Tất cả việc';
-$lang->todo->featureBar['todo']['before']          = 'Chưa kết thúc';
-$lang->todo->featureBar['todo']['future']          = 'TBD';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'Năm nay';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Lặp lại';
+$lang->my->featureBar['todo']['all']             = 'Tất cả việc';
+$lang->my->featureBar['todo']['before']          = 'Chưa kết thúc';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'Năm nay';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Lặp lại';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, là $extra bởi <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 4d79637256..a8a823cb34 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。'
 $lang->todo->today          = '今日待办';
 $lang->todo->selectProduct  = "请选择产品";
 
-$lang->todo->featureBar['todo']['all']             = '指派自己';
-$lang->todo->featureBar['todo']['before']          = '未完';
-$lang->todo->featureBar['todo']['future']          = '待定';
-$lang->todo->featureBar['todo']['thisWeek']        = '本周';
-$lang->todo->featureBar['todo']['thisMonth']       = '本月';
-$lang->todo->featureBar['todo']['thisYear']        = '本年';
-$lang->todo->featureBar['todo']['assignedToOther'] = '指派他人';
-$lang->todo->featureBar['todo']['cycle']           = '周期';
+$lang->my->featureBar['todo']['all']             = '指派自己';
+$lang->my->featureBar['todo']['before']          = '未完';
+$lang->my->featureBar['todo']['future']          = '待定';
+$lang->my->featureBar['todo']['thisWeek']        = '本周';
+$lang->my->featureBar['todo']['thisMonth']       = '本月';
+$lang->my->featureBar['todo']['thisYear']        = '本年';
+$lang->my->featureBar['todo']['assignedToOther'] = '指派他人';
+$lang->my->featureBar['todo']['cycle']           = '周期';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, 由 <strong>$actor</strong> $extra。$appendLink', 'extra' => 'reasonList');

From cdbbf26ff3f2fe40ed59a07859e85a8fd5d4a15a Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 21 Feb 2023 10:06:39 +0800
Subject: [PATCH 041/319]  * code for task #84544.

---
 module/program/lang/de.php           | 11 +++++++++++
 module/program/lang/en.php           | 11 +++++++++++
 module/program/lang/fr.php           | 11 +++++++++++
 module/program/lang/zh-cn.php        |  7 +++++++
 module/program/view/project.html.php |  4 ++--
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 775f17f112..9b7ef57ff4 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -151,6 +151,17 @@ $lang->program->featureBar['browse']['doing']     = 'Doing';
 $lang->program->featureBar['browse']['suspended'] = 'Suspended';
 $lang->program->featureBar['browse']['closed']    = 'Closed';
 
+$lang->program->featureBar['product']['all']      = 'Alle ' . $lang->productCommon;
+$lang->program->featureBar['product']['noclosed'] = 'Offen';
+$lang->program->featureBar['product']['closed']   = 'Geschlossen';
+
+$lang->program->featureBar['project']['all']       = 'All';
+$lang->program->featureBar['project']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['project']['wait']      = 'Waiting';
+$lang->program->featureBar['project']['doing']     = 'Doing';
+$lang->program->featureBar['project']['suspended'] = 'Suspended';
+$lang->program->featureBar['project']['closed']    = 'Closed';
+
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
 $lang->program->kanban->typeList['my']     = 'My Programs';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index dc99890ddb..08978c0499 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -151,6 +151,17 @@ $lang->program->featureBar['browse']['doing']     = 'Doing';
 $lang->program->featureBar['browse']['suspended'] = 'Suspended';
 $lang->program->featureBar['browse']['closed']    = 'Closed';
 
+$lang->program->featureBar['product']['all']      = 'All';
+$lang->program->featureBar['product']['noclosed'] = 'Open';
+$lang->program->featureBar['product']['closed']   = 'Closed';
+
+$lang->program->featureBar['project']['all']       = 'All';
+$lang->program->featureBar['project']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['project']['wait']      = 'Waiting';
+$lang->program->featureBar['project']['doing']     = 'Doing';
+$lang->program->featureBar['project']['suspended'] = 'Suspended';
+$lang->program->featureBar['project']['closed']    = 'Closed';
+
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
 $lang->program->kanban->typeList['my']     = 'My Programs';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 0ab43ce951..dc915f9142 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -151,6 +151,17 @@ $lang->program->featureBar['browse']['doing']     = 'En Cours';
 $lang->program->featureBar['browse']['suspended'] = 'Suspendues';
 $lang->program->featureBar['browse']['closed']    = 'Fermées';
 
+$lang->program->featureBar['product']['all']      = 'Tous';
+$lang->program->featureBar['product']['noclosed'] = 'Ouvertes';
+$lang->program->featureBar['product']['closed']   = 'Fermé';
+
+$lang->program->featureBar['project']['all']       = 'All';
+$lang->program->featureBar['project']['unclosed']  = 'Unclosed';
+$lang->program->featureBar['project']['wait']      = 'En Attente';
+$lang->program->featureBar['project']['doing']     = 'En Cours';
+$lang->program->featureBar['project']['suspended'] = 'Suspendues';
+$lang->program->featureBar['project']['closed']    = 'Fermées';
+
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = 'Program Kanban';
 $lang->program->kanban->typeList['my']     = 'My Programs';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 189cff48a6..ed43005598 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -155,6 +155,13 @@ $lang->program->featureBar['product']['all']      = '全部' . $lang->productCom
 $lang->program->featureBar['product']['noclosed'] = '未关闭';
 $lang->program->featureBar['product']['closed']   = '结束';
 
+$lang->program->featureBar['project']['all']       = '全部';
+$lang->program->featureBar['project']['unclosed']  = '未关闭';
+$lang->program->featureBar['project']['wait']      = '未开始';
+$lang->program->featureBar['project']['doing']     = '进行中';
+$lang->program->featureBar['project']['suspended'] = '已挂起';
+$lang->program->featureBar['project']['closed']    = '已关闭';
+
 $lang->program->kanban = new stdclass();
 $lang->program->kanban->common             = '项目集看板';
 $lang->program->kanban->typeList['my']     = '我参与的项目集';
diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php
index 003313db9f..103557ca0c 100644
--- a/module/program/view/project.html.php
+++ b/module/program/view/project.html.php
@@ -22,8 +22,8 @@ $closedCount    = 0;
 ?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolBar pull-left">
-    <?php common::sortFeatureMenu('program', 'browse');?>
-    <?php foreach($lang->program->featureBar['browse'] as $key => $label):?>
+    <?php common::sortFeatureMenu('program', 'project');?>
+    <?php foreach($lang->program->featureBar['project'] as $key => $label):?>
     <?php $active = $browseType == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($browseType == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>

From 546cc63fb2364a03018ff14083681934d89f3519 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 21 Feb 2023 10:46:32 +0800
Subject: [PATCH 042/319]  * code for task #84544.

---
 module/product/lang/de.php           | 7 +++++++
 module/product/lang/en.php           | 7 +++++++
 module/product/lang/fr.php           | 7 +++++++
 module/product/lang/zh-cn.php        | 8 ++++++++
 module/product/view/project.html.php | 2 +-
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index 81edf02b69..a37f0971e3 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -225,6 +225,13 @@ $lang->product->featureBar['all']['all']      = $lang->product->allProduct;
 $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
 $lang->product->featureBar['all']['closed']   = $lang->product->statusList['closed'];
 
+$lang->product->featureBar['project']['all']       = 'Alle';
+$lang->product->featureBar['project']['undone']    = 'Geschlossen';
+$lang->product->featureBar['project']['wait']      = 'Wartend';
+$lang->product->featureBar['project']['doing']     = 'In Arbeit';
+$lang->product->featureBar['project']['suspended'] = 'Ausgesetzt';
+$lang->product->featureBar['project']['closed']    = 'Geschlossen';
+
 $lang->product->moreSelects['openedbyme']     = $lang->product->openedByMe;
 $lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
 $lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 185c6fe48c..1b5c115b31 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -225,6 +225,13 @@ $lang->product->featureBar['all']['all']      = $lang->product->allProduct;
 $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
 $lang->product->featureBar['all']['closed']   = $lang->product->statusList['closed'];
 
+$lang->product->featureBar['project']['all']       = 'All';
+$lang->product->featureBar['project']['undone']    = 'Unfinished';
+$lang->product->featureBar['project']['wait']      = 'Waiting';
+$lang->product->featureBar['project']['doing']     = 'Doing';
+$lang->product->featureBar['project']['suspended'] = 'Suspended';
+$lang->product->featureBar['project']['closed']    = 'Closed';
+
 $lang->product->moreSelects['openedbyme']     = $lang->product->openedByMe;
 $lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
 $lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index ce45b9b082..3624cc9632 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -225,6 +225,13 @@ $lang->product->featureBar['all']['all']      = $lang->product->allProduct;
 $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
 $lang->product->featureBar['all']['closed']   = $lang->product->statusList['closed'];
 
+$lang->product->featureBar['project']['all']       = "Tous les {$lang->executionCommon}s";
+$lang->product->featureBar['project']['undone']    = 'Non Terminé';
+$lang->product->featureBar['project']['wait']      = 'En attente';
+$lang->product->featureBar['project']['doing']     = 'En cours';
+$lang->product->featureBar['project']['suspended'] = 'Suspendu';
+$lang->product->featureBar['project']['closed']    = 'Fermé';
+
 $lang->product->moreSelects['openedbyme']     = $lang->product->openedByMe;
 $lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
 $lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index db01fc2f2e..939402533b 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -225,6 +225,14 @@ $lang->product->featureBar['all']['all']      = '全部' . $lang->productCommon;
 $lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
 $lang->product->featureBar['all']['closed']   = $lang->product->statusList['closed'];
 
+$lang->product->featureBar['project']['all']       = '全部';
+$lang->product->featureBar['project']['undone']    = '未完成';
+$lang->product->featureBar['project']['wait']      = '未开始';
+$lang->product->featureBar['project']['doing']     = '进行中';
+$lang->product->featureBar['project']['suspended'] = '已挂起';
+$lang->product->featureBar['project']['closed']    = '已关闭';
+
+
 $lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
 $lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
 $lang->product->moreSelects['closedbyme']     = $lang->product->closedByMe;
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 34a7a337ad..6ebdce6889 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -12,7 +12,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
+    <?php foreach($lang->product->featureBar['project'] as $key => $label):?>
     <?php echo html::a(inlink("project", "status=$key&productID=$productID"), "<span class='text'>{$label}</span>" . ($status == $key ? " <span class='label label-light label-badge'>" . count($projectStats) . "</span>" : ''), '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?>
     <?php endforeach;?>
     <?php echo html::checkbox('involved', array('1' => $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>

From 86aa7086c4f5ee50866ac7a03bf774fc91fe833e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 21 Feb 2023 11:00:50 +0800
Subject: [PATCH 043/319] * Modify feature bar get.

---
 module/dev/control.php |  1 -
 module/dev/model.php   | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 6b04643e40..3ad1fb4cd0 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -95,7 +95,6 @@ class dev extends control
     public function langItem($type = 'common', $module = 'my', $method = '', $language = 'zh_cn')
     {
         $language   = str_replace('_', '-', $language);
-        if($type == 'second' and empty($module)) $module = 'my';
         $moduleName = $module;
         if($type == 'common' or $type == 'first') $moduleName = 'common';
         if($type == 'second') $moduleName = $module . 'Menu';
diff --git a/module/dev/model.php b/module/dev/model.php
index 8432aa9226..03e7c89d38 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -583,16 +583,24 @@ class devModel extends model
      * @access public
      * @return array
      */
-    public function getFeatureMenus($menu, $module = '', $method = '')
+    public function getFeatureMenus($menu, $module = '', $method = '', $loadModules = array())
     {
-        $this->app->loadLang($menu);
         $menus = array();
+        $this->app->loadLang($menu);
+        if(!in_array($menu, $loadModules) and isset($this->lang->$menu->menu))
+        {
+            $loadModules[] = $menu;
+            $menuLang      = $this->getLinkTitle($this->lang->$menu->menu);
+            foreach($menuLang as $menuKey => $menuName) $menus += $this->getFeatureMenus($menuKey, $module, $method, $loadModules);
+        }
+
         if(isset($this->lang->$menu->featureBar))
         {
-            $featureBar = $this->lang->$menu->featureBar;
+            $featureBar   = $this->lang->$menu->featureBar;
             foreach($featureBar as $methodName => $feature)
             {
                 if($methodName == 'caselib') $methodName = 'caseLib';
+                if($methodName == 'all')     $methodName = 'browse';
 
                 $subMenu = new stdClass();
                 $subMenu->title  = zget($this->lang->$menu, $methodName);
@@ -638,8 +646,6 @@ class devModel extends model
 
         $mainNav       = $this->getLinkTitle($mainNav);
         $maimNavPinYin = common::convert2Pinyin($mainNav);
-
-        if(empty($module)) $module = 'my';
         foreach($mainNav as $menuKey => $menu)
         {
             $menuItem = new stdclass();

From 9ef211ef57a0782847a7549c6fbebda91b9efcae Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 21 Feb 2023 15:32:37 +0800
Subject: [PATCH 044/319]  * code for task #84544.

---
 merge.sh                                 |  9 ---------
 module/project/lang/de.php               | 18 ++++++++++++++++++
 module/project/lang/en.php               | 18 ++++++++++++++++++
 module/project/lang/fr.php               | 18 ++++++++++++++++++
 module/project/lang/zh-cn.php            | 18 ++++++++++++++++++
 module/project/view/bug.html.php         |  9 +++++++--
 module/project/view/execution.html.php   |  4 ++--
 module/testcase/view/caseheader.html.php | 13 +++++++++++--
 8 files changed, 92 insertions(+), 15 deletions(-)
 delete mode 100755 merge.sh

diff --git a/merge.sh b/merge.sh
deleted file mode 100755
index adf6a97447..0000000000
--- a/merge.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-vim  extension/lite/common/ext/lang/de/lite.php
-vim  extension/lite/common/ext/lang/en/lite.php
-vim  extension/lite/common/ext/lang/fr/lite.php
-vim  extension/lite/common/ext/lang/zh-cn/lite.php
-vim  module/common/lang/de.php
-vim  module/common/lang/en.php
-vim  module/common/lang/fr.php
-vim  module/common/lang/menu.php
-vim  module/common/lang/zh-cn.php
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index dfd375a94d..5355bbaee8 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['execution']['all']       = 'Alle';
+$lang->project->featureBar['execution']['undone']    = 'Geschlossen';
+$lang->project->featureBar['execution']['wait']      = 'Wartend';
+$lang->project->featureBar['execution']['doing']     = 'In Arbeit';
+$lang->project->featureBar['execution']['suspended'] = 'Ausgesetzt';
+$lang->project->featureBar['execution']['closed']    = 'Geschlossen';
+
+$lang->project->featureBar['bug']['all']        = 'All';
+$lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
+
+$lang->project->featureBar['testcase']['all']         = 'Alle';
+$lang->project->featureBar['testcase']['wait']        = 'Wartend';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story geändert";
+$lang->project->featureBar['testcase']['group']       = 'Group View';
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['suite']       = 'Suite';
+$lang->project->featureBar['testcase']['autocase']    = 'Automated';
+
 $lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index d25999685f..61728d5485 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['execution']['all']       = 'All';
+$lang->project->featureBar['execution']['undone']    = 'Unfinished';
+$lang->project->featureBar['execution']['wait']      = 'Waiting';
+$lang->project->featureBar['execution']['doing']     = 'Doing';
+$lang->project->featureBar['execution']['suspended'] = 'Suspended';
+$lang->project->featureBar['execution']['closed']    = 'Closed';
+
+$lang->project->featureBar['bug']['all']        = 'All';
+$lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
+
+$lang->project->featureBar['testcase']['all']         = 'All';
+$lang->project->featureBar['testcase']['wait']        = 'Waiting';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story Changed";
+$lang->project->featureBar['testcase']['group']       = 'Group View';
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['suite']       = 'Suite';
+$lang->project->featureBar['testcase']['autocase']    = 'Automated';
+
 $lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 5e82bde244..7b3879e08a 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = 'En Cours';
 $lang->project->featureBar['browse']['suspended'] = 'Suspendues';
 $lang->project->featureBar['browse']['closed']    = 'Fermées';
 
+$lang->project->featureBar['execution']['all']       = "Tous les {$lang->executionCommon}s";
+$lang->project->featureBar['execution']['undone']    = 'Non Terminé';
+$lang->project->featureBar['execution']['wait']      = 'En attente';
+$lang->project->featureBar['execution']['doing']     = 'En cours';
+$lang->project->featureBar['execution']['suspended'] = 'Suspendu';
+$lang->project->featureBar['execution']['closed']    = 'Fermé';
+
+$lang->project->featureBar['bug']['all']        = 'All';
+$lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
+
+$lang->project->featureBar['testcase']['all']         = 'Tous';
+$lang->project->featureBar['testcase']['wait']        = 'En Attente';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story Changée";
+$lang->project->featureBar['testcase']['group']       = 'Group View';
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['suite']       = 'Suite';
+$lang->project->featureBar['testcase']['autocase']    = 'Automated';
+
 $lang->project->featureBar['build']['all'] = 'Build List';
 
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index be8f261079..e80fc6c19f 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -281,6 +281,24 @@ $lang->project->featureBar['browse']['doing']     = '进行中';
 $lang->project->featureBar['browse']['suspended'] = '已挂起';
 $lang->project->featureBar['browse']['closed']    = '已关闭';
 
+$lang->project->featureBar['execution']['all']       = '全部';
+$lang->project->featureBar['execution']['undone']    = '未完成';
+$lang->project->featureBar['execution']['wait']      = '未开始';
+$lang->project->featureBar['execution']['doing']     = '进行中';
+$lang->project->featureBar['execution']['suspended'] = '已挂起';
+$lang->project->featureBar['execution']['closed']    = '已关闭';
+
+$lang->project->featureBar['bug']['all']        = '全部';
+$lang->project->featureBar['bug']['unresolved'] = '未解决';
+
+$lang->project->featureBar['testcase']['all']         = '所有';
+$lang->project->featureBar['testcase']['wait']        = '待评审';
+$lang->project->featureBar['testcase']['needconfirm'] = "需求变动";
+$lang->project->featureBar['testcase']['group']       = '分组查看';
+$lang->project->featureBar['testcase']['zerocase']    = "零用例需求";
+$lang->project->featureBar['testcase']['suite']       = '套件';
+$lang->project->featureBar['testcase']['autocase']    = '自动化';
+
 $lang->project->featureBar['build']['all'] = '全部版本';
 
 $lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 117edf7df0..4c7143392c 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -36,8 +36,13 @@
     <?php
     $buildName = $build ? " <span class='label label-danger'>Build:{$build->name}</span>" : '';
     $module    = $type != 'bysearch' ?  "&param=$param" : '';
-    echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=all$module"), "<span class='text'>{$lang->bug->featureBar['browse']['all']}</span>" . ($type == 'all' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
-    echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=unresolved$module"), "<span class='text'>{$lang->bug->unResolved}</span>" . ($type == 'unresolved' ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'");
+    foreach($lang->project->featureBar['bug'] as $key => $label)
+    {
+        $activeClass = $key == $type ? 'btn-active-text' : '';
+        $label       = "<span class='text'>{$label}</span>";
+        if($type == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>$buildName";
+        echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type={$key}$module"), $label, '', "id='{$key}Tab' class='btn btn-link {$activeClass}'");
+    }
     ?>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->bug->search;?></a>
   </div>
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 8ed16b257d..93d32adccf 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -34,8 +34,8 @@
       </ul>
     </div>
     <?php endif;?>
-    <?php common::sortFeatureMenu('execution', 'all');?>
-    <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
+    <?php common::sortFeatureMenu();?>
+    <?php foreach($lang->project->featureBar['execution'] as $key => $label):?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
     <?php echo html::a($this->createLink('project', 'execution', "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), $label, '', "class='btn btn-link' id='{$key}Tab'");?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index e7820cb408..91a8b52a71 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -79,7 +79,16 @@
     <?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}UnitTab' class='btn btn-link' data-app='{$this->app->tab}'");?>
     <?php endforeach;?>
     <?php else:?>
-    <?php foreach(customModel::getFeatureMenu('testcase', 'browse') as $menuItem):?>
+    <?php
+    $rawModule = $this->app->rawModule;
+    $rawMethod = $this->app->rawMethod;
+    if(!isset($lang->{$rawModule}->featureBar[$rawMethod]))
+    {
+        $rawModule = 'testcase';
+        $rawMethod = 'browse';
+    }
+    ?>
+    <?php foreach(customModel::getFeatureMenu($rawModule, $rawMethod) as $menuItem):?>
     <?php
     if(isset($menuItem->hidden)) continue;
     $menuType = $menuItem->name;
@@ -196,7 +205,7 @@
     <?php if(!empty($productID)): ?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
-        <i class='icon icon-export muted'></i> 
+        <i class='icon icon-export muted'></i>
         <span class='caret'></span>
       </button>
       <ul class='dropdown-menu pull-right' id='exportActionMenu'>

From aeb2ae52f84b5f20c04fca0e89bbcd430ddd9e55 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 21 Feb 2023 16:49:09 +0800
Subject: [PATCH 045/319] * Modify the filter label of the mr Module.

---
 module/mr/lang/de.php          |  7 +++++++
 module/mr/lang/en.php          |  7 +++++++
 module/mr/lang/fr.php          |  7 +++++++
 module/mr/lang/zh-cn.php       |  7 +++++++
 module/mr/view/browse.html.php | 27 +++++++++++++--------------
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php
index 4c79f02014..2970661f04 100644
--- a/module/mr/lang/de.php
+++ b/module/mr/lang/de.php
@@ -205,3 +205,10 @@ $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
 $lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
+
+$lang->mr->featureBar['browse']['all']      = $lang->mr->statusList['all'];
+$lang->mr->featureBar['browse']['opened']   = $lang->mr->statusList['opened'];
+$lang->mr->featureBar['browse']['merged']   = $lang->mr->statusList['merged'];
+$lang->mr->featureBar['browse']['closed']   = $lang->mr->statusList['closed'];
+$lang->mr->featureBar['browse']['assignee'] = $lang->mr->assignedToMe;
+$lang->mr->featureBar['browse']['creator']  = $lang->mr->createdByMe;
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index 4c79f02014..2970661f04 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -205,3 +205,10 @@ $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
 $lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
+
+$lang->mr->featureBar['browse']['all']      = $lang->mr->statusList['all'];
+$lang->mr->featureBar['browse']['opened']   = $lang->mr->statusList['opened'];
+$lang->mr->featureBar['browse']['merged']   = $lang->mr->statusList['merged'];
+$lang->mr->featureBar['browse']['closed']   = $lang->mr->statusList['closed'];
+$lang->mr->featureBar['browse']['assignee'] = $lang->mr->assignedToMe;
+$lang->mr->featureBar['browse']['creator']  = $lang->mr->createdByMe;
diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php
index 4c79f02014..2970661f04 100644
--- a/module/mr/lang/fr.php
+++ b/module/mr/lang/fr.php
@@ -205,3 +205,10 @@ $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
 $lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
+
+$lang->mr->featureBar['browse']['all']      = $lang->mr->statusList['all'];
+$lang->mr->featureBar['browse']['opened']   = $lang->mr->statusList['opened'];
+$lang->mr->featureBar['browse']['merged']   = $lang->mr->statusList['merged'];
+$lang->mr->featureBar['browse']['closed']   = $lang->mr->statusList['closed'];
+$lang->mr->featureBar['browse']['assignee'] = $lang->mr->assignedToMe;
+$lang->mr->featureBar['browse']['creator']  = $lang->mr->createdByMe;
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index e2f257ed93..3b45e1a2af 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -205,3 +205,10 @@ $lang->mr->confirmUnlinkTask = "您确认移除该任务吗？";
 $lang->mr->taskSummary       = "本页共 <strong>%s</strong> 个任务";
 $lang->mr->notDelbranch      = "源分支为受保护分支时不可删除";
 $lang->mr->addForApp         = "该服务器下没有项目，是否前往添加？";
+
+$lang->mr->featureBar['browse']['all']      = $lang->mr->statusList['all'];
+$lang->mr->featureBar['browse']['opened']   = $lang->mr->statusList['opened'];
+$lang->mr->featureBar['browse']['merged']   = $lang->mr->statusList['merged'];
+$lang->mr->featureBar['browse']['closed']   = $lang->mr->statusList['closed'];
+$lang->mr->featureBar['browse']['assignee'] = $lang->mr->assignedToMe;
+$lang->mr->featureBar['browse']['creator']  = $lang->mr->createdByMe;
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index 3a08d78bdd..282b634e21 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -11,20 +11,19 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolBar pull-left">
-    <?php foreach($lang->mr->statusList as $key => $label):?>
-    <?php $active = $param == $key ? 'btn-active-text' : '';?>
-    <?php $label = "<span class='text'>$label</span>";?>
-    <?php if($param == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
-    <?php echo html::a(inlink('browse', "repoID=$repoID&mode=status&param=$key"), $label, '', "class='btn btn-link $active'");?>
-    <?php endforeach;?>
-    <?php $active = $mode == 'assignee' ? 'btn-active-text' : '';?>
-    <?php $label = "<span class='text'>{$lang->mr->assignedToMe}</span>";?>
-    <?php if($mode == 'assignee') $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
-    <?php echo html::a(inlink('browse', "repoID=$repoID&mode=assignee&param={$this->app->user->account}"), $label, '', "class='btn btn-link $active'");?>
-    <?php $active = $mode == 'creator' ? 'btn-active-text' : '';?>
-    <?php $label = "<span class='text'>{$lang->mr->createdByMe}</span>";?>
-    <?php if($mode == 'creator') $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
-    <?php echo html::a(inlink('browse', "repoID=$repoID&mode=creator&param={$this->app->user->account}"), $label, '', "class='btn btn-link $active'");?>
+    <?php
+    $menus = customModel::getFeatureMenu('mr', 'browse');
+    foreach($menus as $menuItem)
+    {
+        $label     = "<span class='text'>{$menuItem->text}</span>";
+        $active    = ($param == $menuItem->name or $mode == $menuItem->name) ? 'btn-active-text' : '';
+        $modeParam = in_array($menuItem->name, array('assignee', 'creator')) ? $menuItem->name : 'status';
+        $paramName = in_array($menuItem->name, array('assignee', 'creator')) ? $this->app->user->account : $menuItem->name;
+
+        if($param == $menuItem->name) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+        echo html::a(inlink('browse', "repoID=$repoID&mode=$modeParam&param=$paramName"), $label, '', "class='btn btn-link $active'");
+    }
+    ?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('mr', 'create', '', "<i class='icon icon-plus'></i> " . $lang->mr->create, '', "class='btn btn-primary'");?>

From 1bf09c95ed3f51211934790dac5303e8a5b66902 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 21 Feb 2023 17:10:52 +0800
Subject: [PATCH 046/319] * Modify the filter label of the job Module.

---
 module/compile/view/browse.html.php |  8 ++++++--
 module/job/lang/de.php              |  3 +++
 module/job/lang/en.php              |  3 +++
 module/job/lang/fr.php              |  3 +++
 module/job/lang/zh-cn.php           |  3 +++
 module/job/view/browse.html.php     | 10 ++++++++--
 6 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/module/compile/view/browse.html.php b/module/compile/view/browse.html.php
index 28af0b3337..e04439c77f 100644
--- a/module/compile/view/browse.html.php
+++ b/module/compile/view/browse.html.php
@@ -14,8 +14,12 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    echo html::a($this->createLink('job', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->list}</span>", '', "class='btn btn-link'");
-    echo html::a($this->createLink('compile', 'browse', "repoID=$repoID&jobID=$jobID"), "<span class='text'>" . ($jobID ? $job->name : '') . " {$lang->ci->history}</span>", '', "class='btn btn-link btn-active-text'");
+    $menus = customModel::getFeatureMenu('job', 'browse');
+    foreach($menus as $menuItem)
+    {
+        $active = $menuItem->name == 'compile' ? 'btn-active-text' : '';
+        echo html::a($this->createLink($menuItem->name, 'browse', "repoID=$repoID"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link $active'");
+    }
     ?>
   </div>
 </div>
diff --git a/module/job/lang/de.php b/module/job/lang/de.php
index 78072999ed..5fd9c49559 100644
--- a/module/job/lang/de.php
+++ b/module/job/lang/de.php
@@ -100,3 +100,6 @@ $lang->job->pipelineVariables                 = "Variables";
 $lang->job->pipelineVariablesKeyPlaceHolder   = "Input variable key";
 $lang->job->pipelineVariablesValuePlaceHolder = "Input variable value";
 $lang->job->pipelineVariablesTips             = "Specify variable values to be used in this run. The values specified in CI/CD settings will be used by default.";
+
+$lang->job->featureBar['browse']['job']     = 'List';
+$lang->job->featureBar['browse']['compile'] = 'History';
diff --git a/module/job/lang/en.php b/module/job/lang/en.php
index bec5a4a940..0356380338 100644
--- a/module/job/lang/en.php
+++ b/module/job/lang/en.php
@@ -100,3 +100,6 @@ $lang->job->pipelineVariables                 = "Variables";
 $lang->job->pipelineVariablesKeyPlaceHolder   = "Input variable key";
 $lang->job->pipelineVariablesValuePlaceHolder = "Input variable value";
 $lang->job->pipelineVariablesTips             = "Specify variable values to be used in this run. The values specified in CI/CD settings will be used by default.";
+
+$lang->job->featureBar['browse']['job']     = 'List';
+$lang->job->featureBar['browse']['compile'] = 'History';
diff --git a/module/job/lang/fr.php b/module/job/lang/fr.php
index 5bc3abe9b0..09f6f216bf 100644
--- a/module/job/lang/fr.php
+++ b/module/job/lang/fr.php
@@ -100,3 +100,6 @@ $lang->job->pipelineVariables                 = "Variables";
 $lang->job->pipelineVariablesKeyPlaceHolder   = "Input variable key";
 $lang->job->pipelineVariablesValuePlaceHolder = "Input variable value";
 $lang->job->pipelineVariablesTips             = "Specify variable values to be used in this run. The values specified in CI/CD settings will be used by default.";
+
+$lang->job->featureBar['browse']['job']     = 'List';
+$lang->job->featureBar['browse']['compile'] = 'History';
diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php
index 7c53b987e8..f10093ea5b 100644
--- a/module/job/lang/zh-cn.php
+++ b/module/job/lang/zh-cn.php
@@ -101,3 +101,6 @@ $lang->job->pipelineVariablesKeyPlaceHolder   = "输入变量的名称";
 $lang->job->pipelineVariablesValuePlaceHolder = "输入变量的值";
 $lang->job->pipelineVariablesTips             = "指定要在此次运行中使用的变量值。CI/CD设置中指定的值将用作默认值。";
 $lang->job->setReferenceTips                  = "在执行构建前，请先设置代码库的分支信息。";
+
+$lang->job->featureBar['browse']['job']     = '列表';
+$lang->job->featureBar['browse']['compile'] = '构建历史';
diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php
index 6d7c8d4c2d..f430b00f49 100644
--- a/module/job/view/browse.html.php
+++ b/module/job/view/browse.html.php
@@ -13,8 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php echo html::a($this->createLink('job', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->list}</span>", '', "class='btn btn-link btn-active-text'");?>
-    <?php echo html::a($this->createLink('compile', 'browse', "repoID=$repoID"), "<span class='text'>{$lang->ci->history}</span>", '', "class='btn btn-link'");?>
+    <?php
+    $menus = customModel::getFeatureMenu('job', 'browse');
+    foreach($menus as $menuItem)
+    {
+        $active = $menuItem->name == 'job' ? 'btn-active-text' : '';
+        echo html::a($this->createLink($menuItem->name, 'browse', "repoID=$repoID"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link $active'");
+    }
+    ?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('job', 'create')) common::printLink('job', 'create', "", "<i class='icon icon-plus'></i> " . $lang->job->create, '', "class='btn btn-primary'");?>

From bb44e8030af3ca326e949fe1135c9b0954053aab Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 22 Feb 2023 09:54:14 +0800
Subject: [PATCH 047/319] * Code for js refactors in langitem .

---
 module/dev/js/langitem.js | 129 +++++++++++++++++++++++++-------------
 1 file changed, 85 insertions(+), 44 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 8a237c5262..878d67287c 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -1,51 +1,54 @@
 $(function()
 {
-    $(".input-list").on("click", 'input', function(e)
-    {
-        handleClickItem(e.target.id);
-    });
-    $(".input-list").on("blur", 'input', function(e)
-    {
-        removeActive(e.target.id);
-    });
-
-    $('.label-list > .input-label').on('click', function(e)
-    {
-        handleClickItem($(this).attr('labelid'));
-    });
-
-    initMenu();
-
-    $('li.has-list > ul').addClass("menu-active-primary menu-hover-primary")
-
-    handleInputSearch();
-
+    /**
+     * Add class active while click item in form.
+     *
+     * @param  string $id
+     * @access public
+     * @return void
+     */
     function addActive(id)
     {
         $('[labelid=' + id + ']').addClass('text-primary');
         $('[iconid=' + id + ']').removeClass('hidden');
     }
 
+    /**
+     * Remove class active while blur or click item in form.
+     *
+     * @param  string $id
+     * @access public
+     * @return void
+     */
     function removeActive(id)
     {
         $('[labelid=' + id + ']').removeClass('text-primary');
         $('[iconid=' + id + ']').addClass('hidden');
     }
 
+    /**
+     * Handle function click in label.
+     *
+     * @param  string $id
+     * @access public
+     * @return void
+     */
     function handleClickItem(clickId)
     {
-	var clearId = $('.label-list > .text-primary').attr('labelid');
-        if(clearId && clearId !== clickId)
-	{
-	    removeActive(clearId);
-	};
-
-        if(clickId && clickId != clearId)
+	      var clearId = $('.label-list > .text-primary').attr('labelid');
+        if(clearId !== clickId)
         {
-            addActive(clickId);
+            if(clearId) removeActive(clearId); 
+            if(clickId) addActive(clickId);
         };
     }
 
+    /**
+     * Handle function input on search comp and update menu tree.
+     *
+     * @access public
+     * @return void
+     */
     function handleInputSearch()
     {
         $('.menu-tree .search-input').on('input', function()
@@ -61,20 +64,9 @@ $(function()
                 for (var i = 0; i < menuTree.length; i++)
                 {
                     var item = {};
-                    $.extend(true, item, menuTree[i])
-                    if (item.children)
-                    {
-                        var children = [];
-                        for (var j = 0; j < item.children.length; j++)
-                        {
-                            if (item.children[j].title.includes(val) || (item.children[j].key && item.children[j].key.includes(val)))
-                            {
-                                children.push(item.children[j]);
-              	            }
-                        }
-                        item.children = children;
-                    }
-                    if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)))
+                    $.extend(true, item, menuTree[i]);
+                    item.children = filterChildren(item, val);
+                    if ((item.children && item.children.length) || item.title.indexOf(val) != -1 || (item.key && item.key.indexOf(val) != -1))
                     {
                         updateData.push(item);
                     }
@@ -84,9 +76,40 @@ $(function()
         })
     }
 
+    /**
+     * Handle function filter in array children in every item in menu tree.
+     *
+     * @access public
+     * @return array
+     */
+    function filterChildren(item, val)
+    {
+        var childern = null;
+        if (item && item.children)
+        {
+             children = [];
+             for (var i = 0; i < item.children.length; i++)
+             {
+                 item.children[i].children = filterChildren(item.children[i], val);
+                 if (item.children[i].title.indexOf(val) != -1 || (item.children[i].key && item.children[i].key.indexOf(val) != -1) || item.children[i].children)
+                 {
+                     children.push(item.children[i]);
+                 }
+             }
+        }
+
+        return children;
+    }
+
+    /**
+     * Init menu tree by zui.
+     *
+     * @access public
+     * @return void
+     */
     function initMenu()
     {
-        if (navTypes.includes(type))
+        if (navTypes.indexOf(type) != -1)
         {
             $('#menuTree').tree(
             {
@@ -103,9 +126,27 @@ $(function()
         $('#menuTree').on('click', 'a', function(e)
         {
             var target = $(e.target);
-            if (target.attr('data-has-children') === 'true') return
+            if (target.attr('data-has-children') === 'true') return;
 
             self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
         })
     }
+
+    $(".input-list").on("click", 'input', function(e)
+    {
+        handleClickItem(e.target.id);
+    }).on("blur", 'input', function(e)
+    {
+        removeActive(e.target.id);
+    });
+
+    $('.label-list > .input-label').on('click', function()
+    {
+        handleClickItem($(this).attr('labelid'));
+    });
+
+    initMenu();
+    handleInputSearch();
+
+    $('li.has-list > ul').addClass("menu-active-primary menu-hover-primary")
 })

From f3e7a7f45170f8edcdacde39ad88478fa93afcd0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 11:22:02 +0800
Subject: [PATCH 048/319] * Update language.

---
 module/my/view/todo.html.php |  4 ++--
 module/todo/lang/de.php      | 16 ++++++++--------
 module/todo/lang/en.php      | 16 ++++++++--------
 module/todo/lang/fr.php      | 16 ++++++++--------
 module/todo/lang/zh-cn.php   | 16 ++++++++--------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 0179de3b4b..5226b0097e 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -15,7 +15,7 @@
 <?php js::set('confirmDelete', $lang->todo->confirmDelete)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->my->featureBar['todo'] as $period => $label):?>
+    <?php foreach($lang->todo->featureBar['todo'] as $period => $label):?>
     <?php
     $vars = "date=$period";
     if($period == 'before') $vars .= "&userID={$app->user->id}&status=undone";
@@ -123,7 +123,7 @@ $doingCount = 0;
           </td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-width='80%' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
-          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->my->featureBar['todo']['future'] : $todo->date;?></td>
+          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->featureBar['todo']['future'] : $todo->date;?></td>
           <td class="c-status"><span class="status-todo status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <?php if($type == 'assignedToOther'):?>
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index c2c4301347..115dbeccc0 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->my->featureBar['todo']['all']             = 'Alle';
-$lang->my->featureBar['todo']['before']          = 'Nicht abgeschlossen';
-$lang->my->featureBar['todo']['future']          = 'Wartend';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'Dieses Jahr';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Wiederkehrend';
+$lang->todo->featureBar['todo']['all']             = 'Alle';
+$lang->todo->featureBar['todo']['before']          = 'Nicht abgeschlossen';
+$lang->todo->featureBar['todo']['future']          = 'Wartend';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'Dieses Jahr';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Wiederkehrend';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, wurde $extra von <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index f4a6ea6518..62e946b45d 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->todo->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->todo->featureBar['todo']['before']          = 'Unfinished';
+$lang->todo->featureBar['todo']['future']          = 'TBD';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'This Year';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Recurrence';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, is $extra by <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 9f8e68ce42..e9c0dbd59b 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = "Les entrées de l'ID %s ne sont pas terminés et
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->my->featureBar['todo']['all']             = 'Toutes les entrées';
-$lang->my->featureBar['todo']['before']          = 'Non terminée';
-$lang->my->featureBar['todo']['future']          = 'A définir';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'Cette Année';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Récurrence';
+$lang->todo->featureBar['todo']['all']             = 'Toutes les entrées';
+$lang->todo->featureBar['todo']['before']          = 'Non terminée';
+$lang->todo->featureBar['todo']['future']          = 'A définir';
+$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->todo->featureBar['todo']['thisYear']        = 'Cette Année';
+$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->todo->featureBar['todo']['cycle']           = 'Récurrence';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, est $extra par <strong>$actor</strong>.', 'extra' => 'reasonList');
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index a8a823cb34..4d79637256 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -119,14 +119,14 @@ $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。'
 $lang->todo->today          = '今日待办';
 $lang->todo->selectProduct  = "请选择产品";
 
-$lang->my->featureBar['todo']['all']             = '指派自己';
-$lang->my->featureBar['todo']['before']          = '未完';
-$lang->my->featureBar['todo']['future']          = '待定';
-$lang->my->featureBar['todo']['thisWeek']        = '本周';
-$lang->my->featureBar['todo']['thisMonth']       = '本月';
-$lang->my->featureBar['todo']['thisYear']        = '本年';
-$lang->my->featureBar['todo']['assignedToOther'] = '指派他人';
-$lang->my->featureBar['todo']['cycle']           = '周期';
+$lang->todo->featureBar['todo']['all']             = '指派自己';
+$lang->todo->featureBar['todo']['before']          = '未完';
+$lang->todo->featureBar['todo']['future']          = '待定';
+$lang->todo->featureBar['todo']['thisWeek']        = '本周';
+$lang->todo->featureBar['todo']['thisMonth']       = '本月';
+$lang->todo->featureBar['todo']['thisYear']        = '本年';
+$lang->todo->featureBar['todo']['assignedToOther'] = '指派他人';
+$lang->todo->featureBar['todo']['cycle']           = '周期';
 
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, 由 <strong>$actor</strong> $extra。$appendLink', 'extra' => 'reasonList');

From a691c99853bb54118c89f292fad5222590ed38b2 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 22 Feb 2023 11:35:22 +0800
Subject: [PATCH 049/319]  * code for task #84529.

---
 module/dev/control.php            | 11 +++++--
 module/dev/lang/zh-cn.php         | 10 ++++---
 module/dev/model.php              | 25 ++++++++--------
 module/dev/view/langitem.html.php | 48 ++++++++++++++++++++-----------
 4 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 6b04643e40..38fb08f16a 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -92,9 +92,12 @@ class dev extends control
      * @access public
      * @return void
      */
-    public function langItem($type = 'common', $module = 'my', $method = '', $language = 'zh_cn')
+    public function langItem($type = 'common', $module = '', $method = '', $language = '')
     {
-        $language   = str_replace('_', '-', $language);
+        $clientLang = $this->app->getClientLang();
+        if(empty($language)) $language = $clientLang;
+        $language = str_replace('_', '-', $language);
+
         if($type == 'second' and empty($module)) $module = 'my';
         $moduleName = $module;
         if($type == 'common' or $type == 'first') $moduleName = 'common';
@@ -106,6 +109,7 @@ class dev extends control
             $moduleName = $module . 'SubMenu';
         }
 
+        if($type == 'feature' and empty($module)) $module = 'my';
         if($type == 'feature' and empty($method)) $method = 'todo';
 
         if($this->server->request_method == 'POST')
@@ -136,12 +140,15 @@ class dev extends control
             return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
         }
 
+        if($clientLang != $language) $this->view->currentLangs = $this->dev->getOriginalLang($type, $module, $method, $clientLang);
         $this->view->title         = $this->lang->langItem;
         $this->view->type          = $type;
         $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, $method, $language);
         $this->view->customedLangs = $this->dev->getCustomedLang($type, $module, $method, $language);
         $this->view->menuTree      = $this->dev->getMenuTree($type, $module, $method);
         $this->view->moduleName    = $moduleName;
+        $this->view->module        = $module;
+        $this->view->method        = $method;
         $this->view->language      = str_replace('-', '_', $language);
         $this->display();
     }
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 938106279a..b253e9a6b0 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -22,10 +22,12 @@ $lang->dev->noteEditor     = "编辑器功能因为安全原因被禁用。使
 $lang->dev->noteTranslate  = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
 $lang->dev->confirmRestore = '是否要恢复默认？';
 
-$lang->dev->default = '默认值';
-$lang->dev->change  = '修改值';
-$lang->dev->UR      = '用户需求';
-$lang->dev->SR      = '软件需求';
+$lang->dev->language    = '语言：%s';
+$lang->dev->default     = '默认值';
+$lang->dev->currentLang = '当前语言';
+$lang->dev->change      = '修改值';
+$lang->dev->UR          = '用户需求';
+$lang->dev->SR          = '软件需求';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = '序号';
diff --git a/module/dev/model.php b/module/dev/model.php
index 8432aa9226..5db2d1a3ea 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -304,13 +304,13 @@ class devModel extends model
      */
     public function getOriginalLang($type, $module = '', $method = '', $language = 'zh-cn')
     {
+        if(empty($language)) $language = $this->app->getClientLang();
         $originalLangs = array();
-        $clientLang    = $this->app->getClientLang();
-        $defaultLang   = $this->loadDefaultLang();
+        $defaultLang   = $this->loadDefaultLang($language);
         if($type == 'feature')
         {
             $this->defaultLang = $defaultLang;
-            $defaultLang       = $this->loadDefaultLang($clientLang, $module);
+            $defaultLang       = $this->loadDefaultLang($language, $module);
         }
 
         $lang    = new stdClass();
@@ -318,9 +318,9 @@ class devModel extends model
         if($type == 'common')
         {
             $projectKey = (int)$this->loadModel('setting')->getItem('owner=system&key=sprintConcept');
-            $originalLangs['productCommon']   = $this->config->productCommonList[$clientLang][PRODUCT_KEY];
-            $originalLangs['projectCommon']   = $this->config->projectCommonList[$clientLang][PROJECT_KEY];
-            $originalLangs['executionCommon'] = $this->config->executionCommonList[$clientLang][$projectKey];
+            $originalLangs['productCommon']   = $this->config->productCommonList[$language][PRODUCT_KEY];
+            $originalLangs['projectCommon']   = $this->config->projectCommonList[$language][PROJECT_KEY];
+            $originalLangs['executionCommon'] = $this->config->executionCommonList[$language][$projectKey];
             $originalLangs['URCommon']        = $this->lang->dev->UR;
             $originalLangs['SRCommon']        = $this->lang->dev->SR;
             if(!$this->config->URAndSR) unset($originalLangs['SRCommon']);
@@ -408,20 +408,19 @@ class devModel extends model
     public function getCustomedLang($type, $module = '', $method = '', $language = 'zh-cn')
     {
         $customedLangs = array();
-        $clientLang    = $this->app->getClientLang();
 
         $langKey   = '';
         $customeds = array();
         if($type == 'common')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=&vision={$this->config->vision}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=&vision={$this->config->vision}");
             foreach($customeds as $customed) $customedLangs[$customed->key] = $customed->value;
 
             $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
             $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
             if($this->config->custom->URSR)
             {
-                $URSRList = $this->custom->getItems("lang={$clientLang}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
                 $URSRList = array_shift($URSRList);
                 if($URSRList)
                 {
@@ -434,21 +433,21 @@ class devModel extends model
         }
         elseif($type == 'first')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common&section=mainNav&vision={$this->config->vision}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=mainNav&vision={$this->config->vision}");
             $langKey   = 'mainNav_';
         }
         elseif($type == 'second')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}Menu&vision={$this->config->vision}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}Menu&vision={$this->config->vision}");
         }
         elseif($type == 'third')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}SubMenu&section=$method&vision={$this->config->vision}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}SubMenu&section=$method&vision={$this->config->vision}");
             $langKey   = "{$method}_";
         }
         elseif($type == 'feature')
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
+            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
             $langKey   = "featureBar-{$method}_";
         }
 
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 2f7e9b0df3..9a73c0411a 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -16,10 +16,22 @@
 <?php include 'header.html.php';?>
 <div id='mainMenu' class='clearfix menu-secondary'>
   <div class="btn-toolBar pull-left">
+    <div class="dropdown">
+      <button class="btn" type="button" data-toggle="dropdown"><?php printf($lang->dev->language, $config->langs[str_replace('_', '-', $language)]);?> <span class="caret"></span></button>
+      <ul class="dropdown-menu">
+        <?php foreach($config->langs as $key => $value):?>
+        <?php
+        $key    = str_replace('-', '_', $key);
+        $active = $key == $language ? 'active' : '';
+        ?>
+        <li class='<?php echo $active?>'><?php echo html::a(inlink('langItem', "type=$type&module=$module&method=$method&language=$key"), $value);?></li>
+        <?php endforeach;?>
+      </ul>
+    </div>
     <?php foreach($lang->dev->featureBar['langItem'] as $key => $label):?>
     <?php $active = $type == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
-    <?php echo html::a(inlink('langItem', "type=$key"), $label, '', "class='btn btn-link $active'");?>
+    <?php echo html::a(inlink('langItem', "type=$key&module=$module&method=$method&language=$language"), $label, '', "class='btn btn-link $active'");?>
     <?php endforeach;?>
   </div>
 </div>
@@ -35,8 +47,18 @@
 <?php endif;?>
   <form class='main-form form-ajax flex-1' method='post'>
     <div id='mainContent' class='main-content flex'>
+      <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
       <div class="side-left">
-      <div class="title"><?php echo $lang->dev->defaultValue ?> </div>
+        <div class="title"><?php echo $lang->dev->currentLang;?> </div>
+        <div class="label-list">
+          <?php foreach($currentLangs as $langKey => $originalLang):?>
+          <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
+          <?php endforeach;?>
+        </div>
+      </div>
+      <?php endif;?>
+      <div class="side-left">
+        <div class="title"><?php echo $lang->dev->defaultValue ?> </div>
         <div class="label-list">
           <?php foreach($originalLangs as $langKey => $originalLang):?>
           <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
@@ -44,28 +66,22 @@
         </div>
       </div>
       <div class="side-right">
-      <div class="title"><?php echo $lang->dev->modifyValue?></div>
+        <div class="title"><?php echo $lang->dev->modifyValue?></div>
         <div class="input-list">
           <?php foreach($originalLangs as $langKey => $originalLang):?>
           <div class="input-control h-32 my-12">
-            <?php
-            $disabled = '';
-            if($type == 'common' and ($langKey == 'URCommon' or $langKey == 'SRCommon')) $disabled = 'disabled';
-            ?>
-            <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover {$disabled}' {$disabled} placeholder='{$originalLang}'");?>
+            <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
             <i iconId="<?php echo "{$moduleName}_{$langKey}"?>" class="icon icon-angle-right text-primary hidden"></i>
           </div>
           <?php endforeach;?>
         </div>
-        </div>
-        <div class="side-main"></div>
       </div>
-      <div class="bottom-btn">
-        <?php echo html::submitButton(); ?>
-        <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>
-      </div>
-    </form>
+      <div class="side-main"></div>
     </div>
-  </div>
+    <div class="bottom-btn">
+      <?php echo html::submitButton(); ?>
+      <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>
+    </div>
+  </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>

From 305453880d57ce41870a0b3d0c3796a6b04cd024 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 17:19:34 +0800
Subject: [PATCH 050/319] * Modify my module language.

---
 module/my/lang/de.php               |  9 +++++
 module/my/lang/en.php               |  9 +++++
 module/my/lang/fr.php               |  9 +++++
 module/my/lang/zh-cn.php            | 63 +++++++++++++++++++++++++++++
 module/my/view/audit.html.php       |  4 +-
 module/my/view/bug.html.php         | 11 +----
 module/my/view/doc.html.php         |  6 ++-
 module/my/view/dynamic.html.php     |  2 +-
 module/my/view/execution.html.php   |  6 ++-
 module/my/view/project.html.php     |  2 +-
 module/my/view/requirement.html.php | 12 +-----
 module/my/view/story.html.php       | 12 +-----
 module/my/view/task.html.php        | 12 +-----
 module/my/view/testcase.html.php    |  8 +---
 module/my/view/testtask.html.php    |  5 ++-
 module/my/view/todo.html.php        |  2 +-
 module/todo/lang/de.php             |  9 -----
 module/todo/lang/en.php             |  9 -----
 module/todo/lang/fr.php             |  9 -----
 module/todo/lang/zh-cn.php          |  9 -----
 module/user/lang/zh-cn.php          |  9 +++++
 module/user/view/todo.html.php      |  2 +-
 22 files changed, 127 insertions(+), 92 deletions(-)

diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 1d9f272c19..0bc11bfeb0 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -156,3 +156,12 @@ $lang->my->guideChangeTheme = <<<EOT
   <p>Click <span style='color: #0c60e1'>Avatar-Theme-Young Blue</span>. It is done!</p>
 </div>
 EOT;
+
+$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->my->featureBar['todo']['before']          = 'Unfinished';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'This Year';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 1d9f272c19..0bc11bfeb0 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -156,3 +156,12 @@ $lang->my->guideChangeTheme = <<<EOT
   <p>Click <span style='color: #0c60e1'>Avatar-Theme-Young Blue</span>. It is done!</p>
 </div>
 EOT;
+
+$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->my->featureBar['todo']['before']          = 'Unfinished';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'This Year';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 1d9f272c19..fca182b434 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -156,3 +156,12 @@ $lang->my->guideChangeTheme = <<<EOT
   <p>Click <span style='color: #0c60e1'>Avatar-Theme-Young Blue</span>. It is done!</p>
 </div>
 EOT;
+
+$lang->my->featureBar['todo']['all']             = 'Toutes les entrées';
+$lang->my->featureBar['todo']['before']          = 'Non terminée';
+$lang->my->featureBar['todo']['future']          = 'A définir';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'Cette Année';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Récurrence';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index b6e0038cf1..ea3a3cee6d 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -156,3 +156,66 @@ $lang->my->guideChangeTheme = <<<EOT
   <p>鼠标经过<span style='color: #0c60e1'>【头像-主题-青春蓝】</span>，点击青春蓝，设置成功！</p>
 </div>
 EOT;
+
+$lang->my->featureBar['todo']['all']             = '指派自己';
+$lang->my->featureBar['todo']['before']          = '未完';
+$lang->my->featureBar['todo']['future']          = '待定';
+$lang->my->featureBar['todo']['thisWeek']        = '本周';
+$lang->my->featureBar['todo']['thisMonth']       = '本月';
+$lang->my->featureBar['todo']['thisYear']        = '本年';
+$lang->my->featureBar['todo']['assignedToOther'] = '指派他人';
+$lang->my->featureBar['todo']['cycle']           = '周期';
+
+$lang->my->featureBar['audit']['all']      = '全部';
+$lang->my->featureBar['audit']['story']    = '需求';
+$lang->my->featureBar['audit']['testcase'] = '用例';
+
+$lang->my->featureBar['project']['doing']      = '进行中';
+$lang->my->featureBar['project']['wait']       = '未开始';
+$lang->my->featureBar['project']['suspended']  = '已挂起';
+$lang->my->featureBar['project']['closed']     = '已关闭';
+$lang->my->featureBar['project']['openedbyme'] = '由我创建';
+
+$lang->my->featureBar['execution']['undone'] = '未完成';
+$lang->my->featureBar['execution']['done']   = '已完成';
+
+$lang->my->featureBar['dynamic']['all']       = '全部';
+$lang->my->featureBar['dynamic']['today']     = '今天';
+$lang->my->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->my->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->my->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->my->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->my->featureBar['dynamic']['lastMonth'] = '上月';
+
+$lang->my->featureBar['work']['task']['assignedTo']     = $lang->my->assignedToMe;
+$lang->my->featureBar['work']['testcase']['assigntome'] = $lang->my->assignedToMe;
+
+$lang->my->featureBar['work']['requirement'] = $lang->my->featureBar['work']['task'];
+$lang->my->featureBar['work']['requirement']['reviewBy'] = '待我评审';
+
+$lang->my->featureBar['work']['story'] = $lang->my->featureBar['work']['requirement'];
+$lang->my->featureBar['work']['bug']   = $lang->my->featureBar['work']['task'];
+
+$lang->my->featureBar['contribute']['task']['openedBy']   = '由我创建';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = '由我完成';
+$lang->my->featureBar['contribute']['task']['closedBy']   = '由我关闭';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = '由我取消';
+$lang->my->featureBar['contribute']['task']['assignedBy'] = '由我指派';
+
+$lang->my->featureBar['contribute']['requirement']['openedBy']   = '由我创建';
+$lang->my->featureBar['contribute']['requirement']['reviewedBy'] = '由我评审';
+$lang->my->featureBar['contribute']['requirement']['closedBy']   = '由我关闭';
+$lang->my->featureBar['contribute']['requirement']['assignedBy'] = '由我指派';
+
+$lang->my->featureBar['contribute']['story'] = $lang->my->featureBar['contribute']['requirement'];
+$lang->my->featureBar['contribute']['bug']   = $lang->my->featureBar['contribute']['requirement'];
+
+$lang->my->featureBar['contribute']['testcase']['openedbyme'] = '我建的用例';
+
+$lang->my->featureBar['contribute']['testtask']['done'] = '已测测试单';
+
+$lang->my->featureBar['contribute']['audit']['reviewedbyme'] = '由我评审';
+$lang->my->featureBar['contribute']['audit']['createdbyme']  = '由我发起';
+
+$lang->my->featureBar['contribute']['doc']['openedbyme'] = '由我创建';
+$lang->my->featureBar['contribute']['doc']['editedbyme'] = '由我编辑';
diff --git a/module/my/view/audit.html.php b/module/my/view/audit.html.php
index 1e2320c92e..2344239a68 100644
--- a/module/my/view/audit.html.php
+++ b/module/my/view/audit.html.php
@@ -5,8 +5,8 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $rawMethod = $app->rawMethod;?>
-    <?php $menuKey   = $rawMethod . 'Menu';?>
-    <?php foreach($lang->my->$menuKey->audit as $key => $type):?>
+    <?php $menuLang  = $rawMethod == 'audit' ? $lang->my->featureBar['audit'] : $lang->my->featureBar[$rawMethod]['audit'];?>
+    <?php foreach($menuLang as $key => $type):?>
     <?php
     $active = $key == $browseType ? 'btn-active-text' : '';
 
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index f627c0da6e..81a54dd107 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -18,16 +18,9 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    if($app->rawMethod == 'contribute')
+    foreach($lang->my->featureBar[$app->rawMethod]['bug'] as $typeKey => $name)
     {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"),   "<span class='text'>{$lang->bug->openedByMe}</span>" . ($type == 'openedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=resolvedBy"), "<span class='text'>{$lang->bug->resolvedByMe}</span>" . ($type == 'resolvedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'resolvedBy' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),   "<span class='text'>{$lang->bug->closedByMe}</span>" . ($type == 'closedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedBy"), "<span class='text'>{$lang->bug->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
-    }
-    else
-    {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedTo"), "<span class='text'>{$lang->bug->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$typeKey"), "<span class='text'>{$name}</span>" . ($type == $typeKey ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey ? ' btn-active-text' : '') . "'");
     }
     ?>
   </div>
diff --git a/module/my/view/doc.html.php b/module/my/view/doc.html.php
index 4a0f0133df..94feca1fdc 100644
--- a/module/my/view/doc.html.php
+++ b/module/my/view/doc.html.php
@@ -16,8 +16,10 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink($app->rawMethod, "mode=doc&type=openedbyme"), "<span class='text'>{$lang->doc->openedByMe}</span>" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=doc&type=editedbyme"), "<span class='text'>{$lang->doc->editedByMe}</span>" . ($type == 'editedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'editedbyme' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['doc'] as $typeKey => $name)
+    {
+        echo html::a(inlink($app->rawMethod, "mode=doc&type=$typeKey"), "<span class='text'>{$name}</span>" . ($type == $typeKey ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey ? ' btn-active-text' : '') . "'");
+    }
     ?>
   </div>
   <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->my->byQuery;?></a>
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index dff03b099a..56a2ee5219 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->my->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 2c7b73f4c9..039746771e 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -16,8 +16,10 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink('execution', "type=undone&orderBy=id_desc&recTotal=0&recPerPage={$pager->recPerPage}"),  "<span class='text'>{$lang->my->executionMenu->undone}</span>" . ($type == 'undone' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'undone' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink('execution', "type=done&orderBy=id_desc&recTotal=0&recPerPage={$pager->recPerPage}"),  "<span class='text'>{$lang->my->executionMenu->done}</span>" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar['execution'] as $key => $name)
+    {
+        echo html::a(inlink('execution', "type=$key&orderBy=id_desc&recTotal=0&recPerPage={$pager->recPerPage}"), "<span class='text'>{$name}</span>" . ($type == $key ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $key ? ' btn-active-text' : '') . "'");
+    }
     ?>
   </div>
 </div>
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index d3e54a68ac..771371e3c8 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->my->projectMenu as $key => $label):?>
+    <?php foreach($lang->my->featureBar['project'] as $key => $label):?>
     <?php $active = $status == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 6b884b64ae..3666483c4a 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -19,17 +19,9 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    if($app->rawMethod == 'contribute')
+    foreach($lang->my->featureBar[$app->rawMethod]['requirement'] as $typeKey => $name)
     {
-        echo html::a(inlink($app->rawMethod, "mode=requirement&type=openedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),    "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=requirement&type=reviewedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),  "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=requirement&type=closedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),   "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=requirement&type=assignedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
-    }
-    else
-    {
-        echo html::a(inlink($app->rawMethod, "mode=requirement&type=assignedTo&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=requirement&type=reviewBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),   "<span class='text'>{$lang->my->storyMenu->reviewByMe}</span>"   . ($type == 'reviewBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewBy'   ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=requirement&type=$typeKey&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$name}</span>" . ($type == $typeKey   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey   ? ' btn-active-text' : '') . "'");
     }
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->search->common;?></a>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 4d2264eaf2..fe38c60509 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -18,17 +18,9 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    if($app->rawMethod == 'contribute')
+    foreach($lang->my->featureBar[$app->rawMethod]['story'] as $typeKey => $name)
     {
-        echo html::a(inlink($app->rawMethod, "mode=story&type=openedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),   "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=story&type=reviewedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=story&type=closedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),   "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=story&type=assignedBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
-    }
-    else
-    {
-        echo html::a(inlink($app->rawMethod, "mode=story&type=assignedTo&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=story&type=reviewBy&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"),   "<span class='text'>{$lang->my->storyMenu->reviewByMe}</span>"   . ($type == 'reviewBy' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'reviewBy'   ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=story&type=$typeKey&param=$param&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$name}</span>" . ($type == $typeKey   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey   ? ' btn-active-text' : '') . "'");
     }
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->search->common;?></a>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index d33245e3b3..f473ca77ea 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -19,17 +19,9 @@
   <div class="btn-toolbar pull-left">
     <?php $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>"; ?>
     <?php
-    if($app->rawMethod == 'contribute')
+    foreach($lang->my->featureBar[$app->rawMethod]['task'] as $param => $name)
     {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"),   "<span class='text'>{$lang->my->taskMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=finishedBy"), "<span class='text'>{$lang->my->taskMenu->finishedByMe}</span>" . ($type == 'finishedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'finishedBy' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),   "<span class='text'>{$lang->my->taskMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=canceledBy"), "<span class='text'>{$lang->my->taskMenu->canceledByMe}</span>" . ($type == 'canceledBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'canceledBy' ? ' btn-active-text' : '') . "'");
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedBy"), "<span class='text'>{$lang->my->taskMenu->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
-    }
-    else
-    {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedTo"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$param"),   "<span class='text'>{$name}</span>"   . ($type == $param ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $param   ? ' btn-active-text' : '') . "'");
     }
     ?>
   </div>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index d9cd5d29f2..4e678a8276 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -19,13 +19,9 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    if($app->rawMethod == 'contribute')
+    foreach($lang->my->featureBar[$app->rawMethod]['testcase'] as $typeKey => $name)
     {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedbyme"), "<span class='text'>{$lang->testcase->openedByMe}</span>" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'");
-    }
-    else
-    {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "<span class='text'>{$lang->my->assignedToMe}</span>" . ($type == 'assigntome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assigntome' ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$typeKey"), "<span class='text'>{$name}</span>" . ($type == $typeKey ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey ? ' btn-active-text' : '') . "'");
     }
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->search->common;?></a>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 04da960dd4..b9ecacdf6c 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -19,7 +19,10 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=$mode&type=done"), "<span class='text'>{$lang->testtask->done}</span>" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['testtask'] as $typeKey => $name)
+    {
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$typeKey"), "<span class='text'>{$name}</span>" . ($type == $typeKey ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey ? ' btn-active-text' : '') . "'");
+    }
     ?>
   </div>
 </div>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 5226b0097e..3f13469623 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -15,7 +15,7 @@
 <?php js::set('confirmDelete', $lang->todo->confirmDelete)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->todo->featureBar['todo'] as $period => $label):?>
+    <?php foreach($lang->my->featureBar['todo'] as $period => $label):?>
     <?php
     $vars = "date=$period";
     if($period == 'before') $vars .= "&userID={$app->user->id}&status=undone";
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 115dbeccc0..238f36745c 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -119,15 +119,6 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->featureBar['todo']['all']             = 'Alle';
-$lang->todo->featureBar['todo']['before']          = 'Nicht abgeschlossen';
-$lang->todo->featureBar['todo']['future']          = 'Wartend';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'Dieses Jahr';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Wiederkehrend';
-
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, wurde $extra von <strong>$actor</strong>.', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, wurde von <strong>$actor</strong> als <strong>$extra</strong> markiert.', 'extra' => 'statusList');
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 62e946b45d..09ff40e167 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -119,15 +119,6 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->todo->featureBar['todo']['before']          = 'Unfinished';
-$lang->todo->featureBar['todo']['future']          = 'TBD';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'This Year';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Recurrence';
-
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, is $extra by <strong>$actor</strong>.', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, is marked by <strong>$actor</strong> as <strong>$extra</strong>.', 'extra' => 'statusList');
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index e9c0dbd59b..8d58bef8e0 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -119,15 +119,6 @@ $lang->todo->unfinishedTodo = "Les entrées de l'ID %s ne sont pas terminés et
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
-$lang->todo->featureBar['todo']['all']             = 'Toutes les entrées';
-$lang->todo->featureBar['todo']['before']          = 'Non terminée';
-$lang->todo->featureBar['todo']['future']          = 'A définir';
-$lang->todo->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->todo->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->todo->featureBar['todo']['thisYear']        = 'Cette Année';
-$lang->todo->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->todo->featureBar['todo']['cycle']           = 'Récurrence';
-
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, est $extra par <strong>$actor</strong>.', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, est marqué par <strong>$actor</strong> comme <strong>$extra</strong>.', 'extra' => 'statusList');
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 4d79637256..563487a90c 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -119,15 +119,6 @@ $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。'
 $lang->todo->today          = '今日待办';
 $lang->todo->selectProduct  = "请选择产品";
 
-$lang->todo->featureBar['todo']['all']             = '指派自己';
-$lang->todo->featureBar['todo']['before']          = '未完';
-$lang->todo->featureBar['todo']['future']          = '待定';
-$lang->todo->featureBar['todo']['thisWeek']        = '本周';
-$lang->todo->featureBar['todo']['thisMonth']       = '本月';
-$lang->todo->featureBar['todo']['thisYear']        = '本年';
-$lang->todo->featureBar['todo']['assignedToOther'] = '指派他人';
-$lang->todo->featureBar['todo']['cycle']           = '周期';
-
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, 由 <strong>$actor</strong> $extra。$appendLink', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, 由 <strong>$actor</strong> 标记为<strong>$extra</strong>。', 'extra' => 'statusList');
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index bb4af38381..cda3ddb925 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -322,3 +322,12 @@ $lang->user->jumping = "<span id='time'>10</span>秒钟后页面将自动跳转
 
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = '退出登录';
+
+$lang->user->featureBar['todo']['all']             = '指派自己';
+$lang->user->featureBar['todo']['before']          = '未完';
+$lang->user->featureBar['todo']['future']          = '待定';
+$lang->user->featureBar['todo']['thisWeek']        = '本周';
+$lang->user->featureBar['todo']['thisMonth']       = '本月';
+$lang->user->featureBar['todo']['thisYear']        = '本年';
+$lang->user->featureBar['todo']['assignedToOther'] = '指派他人';
+$lang->user->featureBar['todo']['cycle']           = '周期';
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 88199fa612..0bf050f4dd 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -19,7 +19,7 @@
   <nav id='contentNav'>
     <ul class='nav nav-default'>
       <?php
-      foreach($lang->todo->periods as $period => $label)
+      foreach($lang->user->featureBar['todo'] as $period => $label)
       {
           $active = $type == $period ? 'active' : '';
           $vars = "userID={$user->id}&date=$period";

From 37ee577a4ff3dbc37055c9fdb0ce55716a9d51f9 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 09:00:42 +0800
Subject: [PATCH 051/319] * Add language.

---
 module/my/lang/de.php | 54 +++++++++++++++++++++++++++++++++++++++++++
 module/my/lang/en.php | 54 +++++++++++++++++++++++++++++++++++++++++++
 module/my/lang/fr.php | 54 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+)

diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 0bc11bfeb0..70defe1a7a 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -165,3 +165,57 @@ $lang->my->featureBar['todo']['thisMonth']       = 'This Month';
 $lang->my->featureBar['todo']['thisYear']        = 'This Year';
 $lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
 $lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->my->featureBar['audit']['all']      = 'All';
+$lang->my->featureBar['audit']['story']    = 'Story';
+$lang->my->featureBar['audit']['testcase'] = 'Test case';
+
+$lang->my->featureBar['project']['doing']      = 'Doing';
+$lang->my->featureBar['project']['wait']       = 'Waiting';
+$lang->my->featureBar['project']['suspended']  = 'Suspended';
+$lang->my->featureBar['project']['closed']     = 'Closed';
+$lang->my->featureBar['project']['openedbyme'] = 'CreatedByMe';
+
+$lang->my->featureBar['execution']['undone'] = 'Undone';
+$lang->my->featureBar['execution']['done']   = 'Done';
+
+$lang->my->featureBar['dynamic']['all']       = 'All';
+$lang->my->featureBar['dynamic']['today']     = 'Today';
+$lang->my->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->my->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->my->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->my->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->my->featureBar['dynamic']['lastMonth'] = 'Last Month';
+
+$lang->my->featureBar['work']['task']['assignedTo']     = $lang->my->assignedToMe;
+$lang->my->featureBar['work']['testcase']['assigntome'] = $lang->my->assignedToMe;
+
+$lang->my->featureBar['work']['requirement'] = $lang->my->featureBar['work']['task'];
+$lang->my->featureBar['work']['requirement']['reviewBy'] = 'ReviewByMe';
+
+$lang->my->featureBar['work']['story'] = $lang->my->featureBar['work']['requirement'];
+$lang->my->featureBar['work']['bug']   = $lang->my->featureBar['work']['task'];
+
+$lang->my->featureBar['contribute']['task']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe';
+$lang->my->featureBar['contribute']['task']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe';
+$lang->my->featureBar['contribute']['task']['assignedBy'] = 'AssignedByMe';
+
+$lang->my->featureBar['contribute']['requirement']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['requirement']['reviewedBy'] = 'ReviewedByMe';
+$lang->my->featureBar['contribute']['requirement']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['requirement']['assignedBy'] = 'AssignedByMe';
+
+$lang->my->featureBar['contribute']['story'] = $lang->my->featureBar['contribute']['requirement'];
+$lang->my->featureBar['contribute']['bug']   = $lang->my->featureBar['contribute']['requirement'];
+
+$lang->my->featureBar['contribute']['testcase']['openedbyme'] = 'CreatedByMe';
+
+$lang->my->featureBar['contribute']['testtask']['done'] = 'Tested';
+
+$lang->my->featureBar['contribute']['audit']['reviewedbyme'] = 'ReviewedByMe';
+$lang->my->featureBar['contribute']['audit']['createdbyme']  = 'CreatedByMe';
+
+$lang->my->featureBar['contribute']['doc']['openedbyme'] = 'CreatedByMe';
+$lang->my->featureBar['contribute']['doc']['editedbyme'] = 'EditedByMe';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 0bc11bfeb0..70defe1a7a 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -165,3 +165,57 @@ $lang->my->featureBar['todo']['thisMonth']       = 'This Month';
 $lang->my->featureBar['todo']['thisYear']        = 'This Year';
 $lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
 $lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->my->featureBar['audit']['all']      = 'All';
+$lang->my->featureBar['audit']['story']    = 'Story';
+$lang->my->featureBar['audit']['testcase'] = 'Test case';
+
+$lang->my->featureBar['project']['doing']      = 'Doing';
+$lang->my->featureBar['project']['wait']       = 'Waiting';
+$lang->my->featureBar['project']['suspended']  = 'Suspended';
+$lang->my->featureBar['project']['closed']     = 'Closed';
+$lang->my->featureBar['project']['openedbyme'] = 'CreatedByMe';
+
+$lang->my->featureBar['execution']['undone'] = 'Undone';
+$lang->my->featureBar['execution']['done']   = 'Done';
+
+$lang->my->featureBar['dynamic']['all']       = 'All';
+$lang->my->featureBar['dynamic']['today']     = 'Today';
+$lang->my->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->my->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->my->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->my->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->my->featureBar['dynamic']['lastMonth'] = 'Last Month';
+
+$lang->my->featureBar['work']['task']['assignedTo']     = $lang->my->assignedToMe;
+$lang->my->featureBar['work']['testcase']['assigntome'] = $lang->my->assignedToMe;
+
+$lang->my->featureBar['work']['requirement'] = $lang->my->featureBar['work']['task'];
+$lang->my->featureBar['work']['requirement']['reviewBy'] = 'ReviewByMe';
+
+$lang->my->featureBar['work']['story'] = $lang->my->featureBar['work']['requirement'];
+$lang->my->featureBar['work']['bug']   = $lang->my->featureBar['work']['task'];
+
+$lang->my->featureBar['contribute']['task']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe';
+$lang->my->featureBar['contribute']['task']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe';
+$lang->my->featureBar['contribute']['task']['assignedBy'] = 'AssignedByMe';
+
+$lang->my->featureBar['contribute']['requirement']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['requirement']['reviewedBy'] = 'ReviewedByMe';
+$lang->my->featureBar['contribute']['requirement']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['requirement']['assignedBy'] = 'AssignedByMe';
+
+$lang->my->featureBar['contribute']['story'] = $lang->my->featureBar['contribute']['requirement'];
+$lang->my->featureBar['contribute']['bug']   = $lang->my->featureBar['contribute']['requirement'];
+
+$lang->my->featureBar['contribute']['testcase']['openedbyme'] = 'CreatedByMe';
+
+$lang->my->featureBar['contribute']['testtask']['done'] = 'Tested';
+
+$lang->my->featureBar['contribute']['audit']['reviewedbyme'] = 'ReviewedByMe';
+$lang->my->featureBar['contribute']['audit']['createdbyme']  = 'CreatedByMe';
+
+$lang->my->featureBar['contribute']['doc']['openedbyme'] = 'CreatedByMe';
+$lang->my->featureBar['contribute']['doc']['editedbyme'] = 'EditedByMe';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index fca182b434..33be1faa33 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -165,3 +165,57 @@ $lang->my->featureBar['todo']['thisMonth']       = 'This Month';
 $lang->my->featureBar['todo']['thisYear']        = 'Cette Année';
 $lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
 $lang->my->featureBar['todo']['cycle']           = 'Récurrence';
+
+$lang->my->featureBar['audit']['all']      = 'All';
+$lang->my->featureBar['audit']['story']    = 'Story';
+$lang->my->featureBar['audit']['testcase'] = 'Test case';
+
+$lang->my->featureBar['project']['doing']      = 'Doing';
+$lang->my->featureBar['project']['wait']       = 'Waiting';
+$lang->my->featureBar['project']['suspended']  = 'Suspended';
+$lang->my->featureBar['project']['closed']     = 'Closed';
+$lang->my->featureBar['project']['openedbyme'] = 'CreatedByMe';
+
+$lang->my->featureBar['execution']['undone'] = 'Undone';
+$lang->my->featureBar['execution']['done']   = 'Done';
+
+$lang->my->featureBar['dynamic']['all']       = 'All';
+$lang->my->featureBar['dynamic']['today']     = 'Today';
+$lang->my->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->my->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->my->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->my->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->my->featureBar['dynamic']['lastMonth'] = 'Last Month';
+
+$lang->my->featureBar['work']['task']['assignedTo']     = $lang->my->assignedToMe;
+$lang->my->featureBar['work']['testcase']['assigntome'] = $lang->my->assignedToMe;
+
+$lang->my->featureBar['work']['requirement'] = $lang->my->featureBar['work']['task'];
+$lang->my->featureBar['work']['requirement']['reviewBy'] = 'ReviewByMe';
+
+$lang->my->featureBar['work']['story'] = $lang->my->featureBar['work']['requirement'];
+$lang->my->featureBar['work']['bug']   = $lang->my->featureBar['work']['task'];
+
+$lang->my->featureBar['contribute']['task']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe';
+$lang->my->featureBar['contribute']['task']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe';
+$lang->my->featureBar['contribute']['task']['assignedBy'] = 'AssignedByMe';
+
+$lang->my->featureBar['contribute']['requirement']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['requirement']['reviewedBy'] = 'ReviewedByMe';
+$lang->my->featureBar['contribute']['requirement']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['requirement']['assignedBy'] = 'AssignedByMe';
+
+$lang->my->featureBar['contribute']['story'] = $lang->my->featureBar['contribute']['requirement'];
+$lang->my->featureBar['contribute']['bug']   = $lang->my->featureBar['contribute']['requirement'];
+
+$lang->my->featureBar['contribute']['testcase']['openedbyme'] = 'CreatedByMe';
+
+$lang->my->featureBar['contribute']['testtask']['done'] = 'Tested';
+
+$lang->my->featureBar['contribute']['audit']['reviewedbyme'] = 'ReviewedByMe';
+$lang->my->featureBar['contribute']['audit']['createdbyme']  = 'CreatedByMe';
+
+$lang->my->featureBar['contribute']['doc']['openedbyme'] = 'CreatedByMe';
+$lang->my->featureBar['contribute']['doc']['editedbyme'] = 'EditedByMe';

From 0c167c57fdaf471e215977dbf6b43366b3fefd64 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 09:05:11 +0800
Subject: [PATCH 052/319] * Add language.

---
 module/user/lang/de.php | 12 ++++++++++++
 module/user/lang/en.php | 12 ++++++++++++
 module/user/lang/fr.php | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 6f76721c44..caeb58dcc0 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -319,3 +319,15 @@ $lang->user->mkdirLinux = <<<EOT
 EOT;
 
 $lang->user->jumping = "This page will redirect to the previous page in <span id='time'>3</span> seconds. <a href='%s' class='btn btn-primary btn-xs'>Redirect Now</a>";
+
+$lang->user->zentaoapp = new stdclass();
+$lang->user->zentaoapp->logout = 'Logout';
+
+$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->my->featureBar['todo']['before']          = 'Unfinished';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'This Year';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 98eac1e38a..d1f3cecfeb 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -319,3 +319,15 @@ $lang->user->mkdirLinux = <<<EOT
 EOT;
 
 $lang->user->jumping = "This page will redirect to the previous page in <span id='time'>3</span> seconds. <a href='%s' class='btn btn-primary btn-xs'>Redirect Now</a>";
+
+$lang->user->zentaoapp = new stdclass();
+$lang->user->zentaoapp->logout = 'Logout';
+
+$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->my->featureBar['todo']['before']          = 'Unfinished';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'This Year';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index baf596c304..208d0d6cfb 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -319,3 +319,15 @@ $lang->user->mkdirLinux = <<<EOT
 EOT;
 
 $lang->user->jumping = "This page will redirect to the previous page in <span id='time'>3</span> seconds. <a href='%s' class='btn btn-primary btn-xs'>Redirect Now</a>";
+
+$lang->user->zentaoapp = new stdclass();
+$lang->user->zentaoapp->logout = 'Logout';
+
+$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->my->featureBar['todo']['before']          = 'Unfinished';
+$lang->my->featureBar['todo']['future']          = 'TBD';
+$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->my->featureBar['todo']['thisYear']        = 'This Year';
+$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->my->featureBar['todo']['cycle']           = 'Recurrence';

From 10da3ef8026338bbc9d3781052f89559a346ef93 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 09:32:56 +0800
Subject: [PATCH 053/319] * Modify language defined.

---
 module/block/view/reviewblock.html.php |  2 +-
 module/my/control.php                  |  2 +-
 module/my/lang/de.php                  | 17 +++--------------
 module/my/lang/en.php                  | 17 +++--------------
 module/my/lang/fr.php                  | 17 +++--------------
 module/my/lang/zh-cn.php               | 17 +++--------------
 module/my/model.php                    |  2 +-
 module/my/view/audit.html.php          |  2 +-
 8 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/module/block/view/reviewblock.html.php b/module/block/view/reviewblock.html.php
index 99d7e0859d..7ea1d6454b 100644
--- a/module/block/view/reviewblock.html.php
+++ b/module/block/view/reviewblock.html.php
@@ -33,7 +33,7 @@
 
       $typeName = '';
       if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
-      if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
+      if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
       if($review->type == 'projectreview') $typeName = $lang->project->common;
       if(isset($flows[$review->type])) $typeName = $flows[$review->type];
 
diff --git a/module/my/control.php b/module/my/control.php
index d683f1f131..0ea2358b25 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -968,7 +968,7 @@ EOF;
             $typeList = $this->my->getReviewingTypeList();
             if(!isset($typeList->$browseType)) $browseType = 'all';
 
-            $this->lang->my->auditMenu->audit = $typeList;
+            $this->lang->my->featureBar['audit'] = (array)$typeList;
             $reviewList = $this->my->getReviewingList($browseType, $orderBy, $pager);
         }
 
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 70defe1a7a..a75646bc7d 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = 'All';
-$lang->my->auditMenu->audit->story    = 'Story';
-$lang->my->auditMenu->audit->testcase = 'Case';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
-$lang->my->contributeMenu->audit->createdbyme  = 'CreatedByMe';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = 'Doing';
 $lang->my->projectMenu->wait       = 'Waiting';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = 'Recurrence';
 $lang->my->featureBar['audit']['all']      = 'All';
 $lang->my->featureBar['audit']['story']    = 'Story';
 $lang->my->featureBar['audit']['testcase'] = 'Test case';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
 
 $lang->my->featureBar['project']['doing']      = 'Doing';
 $lang->my->featureBar['project']['wait']       = 'Waiting';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 70defe1a7a..a75646bc7d 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = 'All';
-$lang->my->auditMenu->audit->story    = 'Story';
-$lang->my->auditMenu->audit->testcase = 'Case';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
-$lang->my->contributeMenu->audit->createdbyme  = 'CreatedByMe';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = 'Doing';
 $lang->my->projectMenu->wait       = 'Waiting';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = 'Recurrence';
 $lang->my->featureBar['audit']['all']      = 'All';
 $lang->my->featureBar['audit']['story']    = 'Story';
 $lang->my->featureBar['audit']['testcase'] = 'Test case';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
 
 $lang->my->featureBar['project']['doing']      = 'Doing';
 $lang->my->featureBar['project']['wait']       = 'Waiting';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 33be1faa33..e67590d444 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = 'All';
-$lang->my->auditMenu->audit->story    = 'Story';
-$lang->my->auditMenu->audit->testcase = 'Case';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
-$lang->my->contributeMenu->audit->createdbyme  = 'CreatedByMe';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = 'Doing';
 $lang->my->projectMenu->wait       = 'Waiting';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = 'Récurrence';
 $lang->my->featureBar['audit']['all']      = 'All';
 $lang->my->featureBar['audit']['story']    = 'Story';
 $lang->my->featureBar['audit']['testcase'] = 'Test case';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
 
 $lang->my->featureBar['project']['doing']      = 'Doing';
 $lang->my->featureBar['project']['wait']       = 'Waiting';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index ea3a3cee6d..e3eedd1d7e 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s的补班申请：%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s的加班申请：%s';
 $lang->my->auditField->oaTitle['lieu']     = '%s的调休申请：%s';
 
-$lang->my->auditMenu = new stdclass();
-$lang->my->auditMenu->audit = new stdclass();
-$lang->my->auditMenu->audit->all      = '所有';
-$lang->my->auditMenu->audit->story    = '需求';
-$lang->my->auditMenu->audit->testcase = '用例';
-if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
-if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = '反馈';
-if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = '办公';
-
-$lang->my->contributeMenu = new stdclass();
-$lang->my->contributeMenu->audit = new stdclass();
-$lang->my->contributeMenu->audit->reviewedbyme = '由我评审';
-$lang->my->contributeMenu->audit->createdbyme  = '由我发起';
-
 $lang->my->projectMenu = new stdclass();
 $lang->my->projectMenu->doing      = '进行中';
 $lang->my->projectMenu->wait       = '未开始';
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle']           = '周期';
 $lang->my->featureBar['audit']['all']      = '全部';
 $lang->my->featureBar['audit']['story']    = '需求';
 $lang->my->featureBar['audit']['testcase'] = '用例';
+if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
+if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = '反馈';
+if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = '办公';
 
 $lang->my->featureBar['project']['doing']      = '进行中';
 $lang->my->featureBar['project']['wait']       = '未开始';
diff --git a/module/my/model.php b/module/my/model.php
index 18f2c46b0e..89e57f22ea 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1017,7 +1017,7 @@ class myModel extends model
 
         $flows = ($this->config->edition == 'open') ? array() : $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('module')->in($typeList)->andWhere('buildin')->eq(0)->fetchPairs('module', 'name');
         $menu  = new stdclass();
-        $menu->all = $this->lang->my->auditMenu->audit->all;
+        $menu->all = $this->lang->my->featureBar['audit']['all'];
         foreach($typeList as $type)
         {
             $this->app->loadLang($type);
diff --git a/module/my/view/audit.html.php b/module/my/view/audit.html.php
index 2344239a68..59172a19cd 100644
--- a/module/my/view/audit.html.php
+++ b/module/my/view/audit.html.php
@@ -57,7 +57,7 @@
 
       $typeName = '';
       if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
-      if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
+      if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
       if($review->type == 'projectreview') $typeName = $lang->project->common;
       if(isset($flows[$review->type])) $typeName = $flows[$review->type];
 

From e7c8ceed8dff3fea774cd4b847745fd5c730f5ea Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 10:10:11 +0800
Subject: [PATCH 054/319] * Modify dynamic language.

---
 module/action/lang/de.php              |  8 --------
 module/action/lang/en.php              |  8 --------
 module/action/lang/fr.php              |  8 --------
 module/action/lang/vi.php              |  8 --------
 module/action/lang/zh-cn.php           |  8 --------
 module/action/view/trash.html.php      |  2 +-
 module/common/lang/zh-cn.php           |  2 +-
 module/company/lang/de.php             |  8 ++++++++
 module/company/lang/en.php             |  8 ++++++++
 module/company/lang/fr.php             |  8 ++++++++
 module/company/lang/zh-cn.php          |  8 ++++++++
 module/company/view/dynamic.html.php   |  2 +-
 module/execution/lang/de.php           |  8 ++++++++
 module/execution/lang/en.php           |  8 ++++++++
 module/execution/lang/fr.php           |  8 ++++++++
 module/execution/lang/zh-cn.php        |  8 ++++++++
 module/execution/view/dynamic.html.php |  2 +-
 module/product/lang/de.php             |  8 ++++++++
 module/product/lang/en.php             |  8 ++++++++
 module/product/lang/fr.php             |  8 ++++++++
 module/product/lang/zh-cn.php          |  8 ++++++++
 module/product/view/dynamic.html.php   |  2 +-
 module/project/lang/de.php             |  8 ++++++++
 module/project/lang/en.php             |  8 ++++++++
 module/project/lang/fr.php             |  8 ++++++++
 module/project/lang/zh-cn.php          |  8 ++++++++
 module/project/view/dynamic.html.php   |  2 +-
 module/user/lang/de.php                | 24 ++++++++++++++++--------
 module/user/lang/en.php                | 24 ++++++++++++++++--------
 module/user/lang/fr.php                | 24 ++++++++++++++++--------
 module/user/lang/zh-cn.php             |  8 ++++++++
 module/user/view/dynamic.html.php      |  2 +-
 32 files changed, 191 insertions(+), 71 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index a7a7f77f09..792a8c88b0 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = 'Alle';
 $lang->action->dynamic->hidden     = 'Versteckt';
 $lang->action->dynamic->search     = 'Suche';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Branch';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index ff66717f78..4467cd45e0 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = 'All';
 $lang->action->dynamic->hidden     = 'Hidden';
 $lang->action->dynamic->search     = 'Search';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Branch';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 4418cc164a..70f3bf9d56 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = 'Tout';
 $lang->action->dynamic->hidden     = 'Caché';
 $lang->action->dynamic->search     = 'Rechercher';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Branche';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 5c9fb30f1e..32c4719635 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -60,14 +60,6 @@ $lang->action->dynamic->all        = 'Tất cả';
 $lang->action->dynamic->hidden     = 'Ẩn';
 $lang->action->dynamic->search     = 'Tìm kiếm';
 
-$lang->action->periods['all']       = $lang->action->dynamic->all;
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = 'Nhánh';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 7a5cf3a901..b5e846f1be 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -91,14 +91,6 @@ $lang->action->dynamic->all        = '所有';
 $lang->action->dynamic->hidden     = '已隐藏';
 $lang->action->dynamic->search     = '搜索';
 
-$lang->action->periods['all']       = '全部';
-$lang->action->periods['today']     = $lang->action->dynamic->today;
-$lang->action->periods['yesterday'] = $lang->action->dynamic->yesterday;
-$lang->action->periods['thisweek']  = $lang->action->dynamic->thisWeek;
-$lang->action->periods['lastweek']  = $lang->action->dynamic->lastWeek;
-$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
-$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
-
 $lang->action->objectTypes['product']          = $lang->productCommon;
 $lang->action->objectTypes['branch']           = '分支';
 $lang->action->objectTypes['story']            = $lang->SRCommon;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 2a43305edc..80ae3a9bff 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -14,7 +14,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php $activeClass = $currentObjectType == 'all' ? 'btn-active-text' : '';?>
-    <?php echo html::a($this->createLink('action', 'trash', "objectType=all&type=$type"), "<span class='text'>" . $lang->action->periods['all'] . "</span>", '', "class='btn btn-link $activeClass'");?>
+    <?php echo html::a($this->createLink('action', 'trash', "objectType=all&type=$type"), "<span class='text'>" . $lang->all . "</span>", '', "class='btn btn-link $activeClass'");?>
     <?php
     /* Output the objectType order by preferredTypeConfig. */
     foreach($preferredTypeConfig as $objectType)
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 074c2c2e92..441beb5ecb 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -85,7 +85,7 @@ $lang->waterfallModel     = '瀑布模型';
 $lang->scrumModel         = '敏捷模型';
 $lang->agilePlusModel     = '融合敏捷模型';
 $lang->waterfallPlusModel = '融合瀑布模型';
-$lang->all                = '所有';
+$lang->all                = '全部';
 $lang->viewDetails        = '查看详情';
 
 $lang->actions         = '操作';
diff --git a/module/company/lang/de.php b/module/company/lang/de.php
index 0a05da3932..a32b2de3af 100644
--- a/module/company/lang/de.php
+++ b/module/company/lang/de.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = 'Erlauben';
 
 $lang->company->order['date_desc'] = 'Descending';
 $lang->company->order['date_asc']  = 'Ascending';
+
+$lang->company->featureBar['dynamic']['all']       = 'All';
+$lang->company->featureBar['dynamic']['today']     = 'Today';
+$lang->company->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->company->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->company->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->company->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->company->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index bc34d4e497..dc931405c0 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = 'Allow';
 
 $lang->company->order['date_desc'] = 'Descending';
 $lang->company->order['date_asc']  = 'Ascending';
+
+$lang->company->featureBar['dynamic']['all']       = 'All';
+$lang->company->featureBar['dynamic']['today']     = 'Today';
+$lang->company->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->company->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->company->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->company->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->company->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php
index 01ec0bd1b1..772fc4490a 100644
--- a/module/company/lang/fr.php
+++ b/module/company/lang/fr.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = 'Autorisée';
 
 $lang->company->order['date_desc'] = 'Descending';
 $lang->company->order['date_asc']  = 'Ascending';
+
+$lang->company->featureBar['dynamic']['all']       = 'All';
+$lang->company->featureBar['dynamic']['today']     = 'Today';
+$lang->company->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->company->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->company->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->company->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->company->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index 4b983c646e..5ae22d14df 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -41,3 +41,11 @@ $lang->company->guestOptions[1] = '允许';
 
 $lang->company->order['date_desc'] = '倒序排列';
 $lang->company->order['date_asc']  = '正序排列';
+
+$lang->company->featureBar['dynamic']['all']       = '全部';
+$lang->company->featureBar['dynamic']['today']     = '今天';
+$lang->company->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->company->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->company->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->company->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->company->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index 6dcbf49141..b3e4814405 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -14,7 +14,7 @@
 <?php js::set('browseType', $browseType);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->company->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index aacc1a5dba..bd82bb3ddc 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
 $lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
+
+$lang->execution->featureBar['dynamic']['all']       = 'All';
+$lang->execution->featureBar['dynamic']['today']     = 'Today';
+$lang->execution->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->execution->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->execution->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->execution->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->execution->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index d8f522124d..2327a58fd0 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
 $lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
+
+$lang->execution->featureBar['dynamic']['all']       = 'All';
+$lang->execution->featureBar['dynamic']['today']     = 'Today';
+$lang->execution->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->execution->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->execution->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->execution->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->execution->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 46f9661aa7..0ea5357ac4 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
 $lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
+
+$lang->execution->featureBar['dynamic']['all']       = 'All';
+$lang->execution->featureBar['dynamic']['today']     = 'Today';
+$lang->execution->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->execution->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->execution->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->execution->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->execution->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 211e47444a..1e57527c1c 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -639,3 +639,11 @@ $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F
 
 $lang->execution->linkBranchStoryByPlanTips = "执行按计划关联需求时，只导入本执行所关联%s的激活状态的需求。";
 $lang->execution->linkNormalStoryByPlanTips = "执行按计划关联需求时，只导入激活状态的需求。";
+
+$lang->execution->featureBar['dynamic']['all']       = '全部';
+$lang->execution->featureBar['dynamic']['today']     = '今天';
+$lang->execution->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->execution->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->execution->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->execution->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->execution->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/execution/view/dynamic.html.php b/module/execution/view/dynamic.html.php
index d6f3b0c313..f6e4cec4cd 100755
--- a/module/execution/view/dynamic.html.php
+++ b/module/execution/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->execution->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index a37f0971e3..d6ca40aefc 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = 'All';
+$lang->product->featureBar['dynamic']['today']     = 'Today';
+$lang->product->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->product->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->product->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->product->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->product->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 1b5c115b31..cd0e20087a 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = 'All';
+$lang->product->featureBar['dynamic']['today']     = 'Today';
+$lang->product->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->product->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->product->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->product->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->product->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 3624cc9632..c724f9fd4b 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = 'All';
+$lang->product->featureBar['dynamic']['today']     = 'Today';
+$lang->product->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->product->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->product->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->product->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->product->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 939402533b..d0d2d481c1 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -241,3 +241,11 @@ $lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
 $lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
 $lang->product->moreSelects['willclose']      = $lang->product->willClose;
 $lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+
+$lang->product->featureBar['dynamic']['all']       = '全部';
+$lang->product->featureBar['dynamic']['today']     = '今天';
+$lang->product->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->product->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->product->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->product->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->product->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 94a906ab33..e223ed6cb3 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->product->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index a8b0031af4..64d48a7097 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -411,3 +411,11 @@ $lang->project->copyProject->daysTips           = '『Available working days』S
 $lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
 $lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
 $lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+
+$lang->project->featureBar['dynamic']['all']       = 'All';
+$lang->project->featureBar['dynamic']['today']     = 'Today';
+$lang->project->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->project->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->project->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->project->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->project->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 28816c3a44..33a03508c7 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -411,3 +411,11 @@ $lang->project->copyProject->daysTips           = '『Available working days』S
 $lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
 $lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
 $lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+
+$lang->project->featureBar['dynamic']['all']       = 'All';
+$lang->project->featureBar['dynamic']['today']     = 'Today';
+$lang->project->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->project->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->project->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->project->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->project->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 617331dfd5..9526c1929d 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -411,3 +411,11 @@ $lang->project->copyProject->daysTips           = '『Available working days』S
 $lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
 $lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
 $lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+
+$lang->project->featureBar['dynamic']['all']       = 'All';
+$lang->project->featureBar['dynamic']['today']     = 'Today';
+$lang->project->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->project->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->project->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->project->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->project->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 47a1447149..fe0f6ff9c8 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -412,3 +412,11 @@ $lang->project->linkBranchStoryByPlanTips = "项目按计划关联需求时，
 $lang->project->linkNormalStoryByPlanTips = "项目按计划关联需求时，只导入激活状态的需求。";
 
 $lang->project->cannotManageProducts = "该项目为项目型项目，不能关联产品。";
+
+$lang->project->featureBar['dynamic']['all']       = '全部';
+$lang->project->featureBar['dynamic']['today']     = '今天';
+$lang->project->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->project->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->project->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->project->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->project->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 6a6842cd5d..cd200d8375 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->project->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index caeb58dcc0..9ecf3de871 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -323,11 +323,19 @@ $lang->user->jumping = "This page will redirect to the previous page in <span id
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = 'Logout';
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->user->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->user->featureBar['todo']['before']          = 'Unfinished';
+$lang->user->featureBar['todo']['future']          = 'TBD';
+$lang->user->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->user->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->user->featureBar['todo']['thisYear']        = 'This Year';
+$lang->user->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->user->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->user->featureBar['dynamic']['all']       = 'All';
+$lang->user->featureBar['dynamic']['today']     = 'Today';
+$lang->user->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->user->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->user->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->user->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->user->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index d1f3cecfeb..62d6e01533 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -323,11 +323,19 @@ $lang->user->jumping = "This page will redirect to the previous page in <span id
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = 'Logout';
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->user->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->user->featureBar['todo']['before']          = 'Unfinished';
+$lang->user->featureBar['todo']['future']          = 'TBD';
+$lang->user->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->user->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->user->featureBar['todo']['thisYear']        = 'This Year';
+$lang->user->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->user->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->user->featureBar['dynamic']['all']       = 'All';
+$lang->user->featureBar['dynamic']['today']     = 'Today';
+$lang->user->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->user->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->user->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->user->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->user->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 208d0d6cfb..06d2ceb2c3 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -323,11 +323,19 @@ $lang->user->jumping = "This page will redirect to the previous page in <span id
 $lang->user->zentaoapp = new stdclass();
 $lang->user->zentaoapp->logout = 'Logout';
 
-$lang->my->featureBar['todo']['all']             = 'Assigned To Yourself';
-$lang->my->featureBar['todo']['before']          = 'Unfinished';
-$lang->my->featureBar['todo']['future']          = 'TBD';
-$lang->my->featureBar['todo']['thisWeek']        = 'This Week';
-$lang->my->featureBar['todo']['thisMonth']       = 'This Month';
-$lang->my->featureBar['todo']['thisYear']        = 'This Year';
-$lang->my->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
-$lang->my->featureBar['todo']['cycle']           = 'Recurrence';
+$lang->user->featureBar['todo']['all']             = 'Assigned To Yourself';
+$lang->user->featureBar['todo']['before']          = 'Unfinished';
+$lang->user->featureBar['todo']['future']          = 'TBD';
+$lang->user->featureBar['todo']['thisWeek']        = 'This Week';
+$lang->user->featureBar['todo']['thisMonth']       = 'This Month';
+$lang->user->featureBar['todo']['thisYear']        = 'This Year';
+$lang->user->featureBar['todo']['assignedToOther'] = 'Assigned To Other';
+$lang->user->featureBar['todo']['cycle']           = 'Recurrence';
+
+$lang->user->featureBar['dynamic']['all']       = 'All';
+$lang->user->featureBar['dynamic']['today']     = 'Today';
+$lang->user->featureBar['dynamic']['yesterday'] = 'Yesterday';
+$lang->user->featureBar['dynamic']['thisWeek']  = 'This Week';
+$lang->user->featureBar['dynamic']['lastWeek']  = 'Last Week';
+$lang->user->featureBar['dynamic']['thisMonth'] = 'This Month';
+$lang->user->featureBar['dynamic']['lastMonth'] = 'Last Month';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index cda3ddb925..fb0019e05a 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -331,3 +331,11 @@ $lang->user->featureBar['todo']['thisMonth']       = '本月';
 $lang->user->featureBar['todo']['thisYear']        = '本年';
 $lang->user->featureBar['todo']['assignedToOther'] = '指派他人';
 $lang->user->featureBar['todo']['cycle']           = '周期';
+
+$lang->user->featureBar['dynamic']['all']       = '全部';
+$lang->user->featureBar['dynamic']['today']     = '今天';
+$lang->user->featureBar['dynamic']['yesterday'] = '昨天';
+$lang->user->featureBar['dynamic']['thisWeek']  = '本周';
+$lang->user->featureBar['dynamic']['lastWeek']  = '上周';
+$lang->user->featureBar['dynamic']['thisMonth'] = '本月';
+$lang->user->featureBar['dynamic']['lastMonth'] = '上月';
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index c73393095c..c4a5c9f744 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -16,7 +16,7 @@
 <?php js::set('period', $type);?>
 <div id='mainContent'>
   <div id='contentNav'>
-    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php foreach($lang->user->featureBar['dynamic'] as $period => $label):?>
     <?php
     $label  = "<span class='text'>$label</span>";
     $active = '';

From 9358865db456fbfddf2df866b4729714108e1b05 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 23 Feb 2023 10:12:48 +0800
Subject: [PATCH 055/319] * Modify the filter label for the feedback and ticket
 list.

---
 module/my/control.php            |  1 +
 module/my/view/feedback.html.php | 11 ++++++++---
 module/my/view/ticket.html.php   | 13 +++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 0ea2358b25..5343ad894e 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1256,6 +1256,7 @@ EOF;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
         $this->view->browseType = $browseType;
+        $this->view->mode       = 'ticket';
         $this->display();
     }
 
diff --git a/module/my/view/feedback.html.php b/module/my/view/feedback.html.php
index 5ed3ab3b5f..983309a3ed 100644
--- a/module/my/view/feedback.html.php
+++ b/module/my/view/feedback.html.php
@@ -22,10 +22,15 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>"   . ($browseType == 'assigntome' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($browseType == 'assigntome' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['feedback'] as $key => $name)
+    {
+        $label  = "<span class='text'>{$name}</span>";
+        $label .= $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+        $active = $key == $browseType ? 'btn-active-text' : '';
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), $label, '', "class='btn btn-link $active'");
+    }
     ?>
-  <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
+    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
   </div>
 </div>
 <div id="mainContent">
diff --git a/module/my/view/ticket.html.php b/module/my/view/ticket.html.php
index 4c8395ded1..91e5a6d1ee 100644
--- a/module/my/view/ticket.html.php
+++ b/module/my/view/ticket.html.php
@@ -11,15 +11,20 @@
  */
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<?php js::set('mode', 'ticket');?>
+<?php js::set('mode', $mode);?>
 <?php js::set('rawMethod', $app->rawMethod);?>
 <div id='mainMenu' class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    echo html::a(inlink($app->rawMethod, "mode=ticket&type=assignedtome"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>"   . ($browseType == 'assignedtome' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($browseType == 'assignedtome' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['ticket'] as $key => $name)
+    {
+        $label  = "<span class='text'>{$name}</span>";
+        $label .= $key == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+        $active = $key == $browseType ? 'btn-active-text' : '';
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), $label, '', "class='btn btn-link $active'");
+    }
     ?>
-  <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
+    <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->user->search;?></a>
   </div>
 </div>
 <div id='mainContent' class="main-row fade">

From 22faecf1a4da507e24a07ae86c932d2e4afe48ff Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 10:12:50 +0800
Subject: [PATCH 056/319] * Remove unused language.

---
 module/my/lang/de.php    | 4 ----
 module/my/lang/en.php    | 4 ----
 module/my/lang/fr.php    | 4 ----
 module/my/lang/vi.php    | 4 ----
 module/my/lang/zh-cn.php | 4 ----
 5 files changed, 20 deletions(-)

diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index a75646bc7d..4e211d9168 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -61,10 +61,6 @@ $lang->my->code         = 'Code';
 $lang->my->projects     = 'Projects';
 $lang->my->executions   = 'Executions';
 
-$lang->my->executionMenu = new stdclass();
-$lang->my->executionMenu->undone = 'Undone';
-$lang->my->executionMenu->done   = 'Done';
-
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = 'AssignedToMe';
 $lang->my->taskMenu->openedByMe   = 'CreatedByMe';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index a75646bc7d..4e211d9168 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -61,10 +61,6 @@ $lang->my->code         = 'Code';
 $lang->my->projects     = 'Projects';
 $lang->my->executions   = 'Executions';
 
-$lang->my->executionMenu = new stdclass();
-$lang->my->executionMenu->undone = 'Undone';
-$lang->my->executionMenu->done   = 'Done';
-
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = 'AssignedToMe';
 $lang->my->taskMenu->openedByMe   = 'CreatedByMe';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index e67590d444..0812bf99d1 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -61,10 +61,6 @@ $lang->my->code         = 'Code';
 $lang->my->projects     = 'Projects';
 $lang->my->executions   = 'Executions';
 
-$lang->my->executionMenu = new stdclass();
-$lang->my->executionMenu->undone = 'Undone';
-$lang->my->executionMenu->done   = 'Done';
-
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = 'AssignedToMe';
 $lang->my->taskMenu->openedByMe   = 'CreatedByMe';
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index 62f85039bc..cf7fbc2db3 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -47,10 +47,6 @@ $lang->my->code         = 'Code';
 $lang->my->projects     = 'Project';
 $lang->my->executions   = 'Executions';
 
-$lang->my->executionMenu = new stdclass();
-$lang->my->executionMenu->undone = 'Undone';
-$lang->my->executionMenu->done   = 'Done';
-
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = 'AssignedToMe';
 $lang->my->taskMenu->openedByMe   = 'CreatedByMe';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index e3eedd1d7e..0e176b58d1 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -61,10 +61,6 @@ $lang->my->code         = '代号';
 $lang->my->projects     = '所属项目';
 $lang->my->executions   = "所属{$lang->executionCommon}";
 
-$lang->my->executionMenu = new stdclass();
-$lang->my->executionMenu->undone = '未完成';
-$lang->my->executionMenu->done   = '已完成';
-
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = '指派给我';
 $lang->my->taskMenu->openedByMe   = '由我创建';

From 0d847aaccc186f5c08d52a5de1c421f84b561e27 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 10:51:07 +0800
Subject: [PATCH 057/319] * Modify lite language.

---
 extension/lite/my/ext/lang/de/lite.php    | 7 +++++++
 extension/lite/my/ext/lang/en/lite.php    | 7 +++++++
 extension/lite/my/ext/lang/fr/lite.php    | 7 +++++++
 extension/lite/my/ext/lang/zh-cn/lite.php | 7 +++++++
 extension/lite/my/ext/view/task.html.php  | 9 ++++-----
 module/my/lang/de.php                     | 7 -------
 module/my/lang/en.php                     | 7 -------
 module/my/lang/fr.php                     | 7 -------
 module/my/lang/vi.php                     | 7 -------
 module/my/lang/zh-cn.php                  | 7 -------
 10 files changed, 32 insertions(+), 40 deletions(-)
 create mode 100644 extension/lite/my/ext/lang/de/lite.php
 create mode 100644 extension/lite/my/ext/lang/en/lite.php
 create mode 100644 extension/lite/my/ext/lang/fr/lite.php
 create mode 100644 extension/lite/my/ext/lang/zh-cn/lite.php

diff --git a/extension/lite/my/ext/lang/de/lite.php b/extension/lite/my/ext/lang/de/lite.php
new file mode 100644
index 0000000000..7364652099
--- /dev/null
+++ b/extension/lite/my/ext/lang/de/lite.php
@@ -0,0 +1,7 @@
+<?php
+$lang->my->featureBar['contribute']['task'] = array();
+$lang->my->featureBar['contribute']['task']['assignedTo'] = 'AssignedToMe';
+$lang->my->featureBar['contribute']['task']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe';
+$lang->my->featureBar['contribute']['task']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe';
diff --git a/extension/lite/my/ext/lang/en/lite.php b/extension/lite/my/ext/lang/en/lite.php
new file mode 100644
index 0000000000..7364652099
--- /dev/null
+++ b/extension/lite/my/ext/lang/en/lite.php
@@ -0,0 +1,7 @@
+<?php
+$lang->my->featureBar['contribute']['task'] = array();
+$lang->my->featureBar['contribute']['task']['assignedTo'] = 'AssignedToMe';
+$lang->my->featureBar['contribute']['task']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe';
+$lang->my->featureBar['contribute']['task']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe';
diff --git a/extension/lite/my/ext/lang/fr/lite.php b/extension/lite/my/ext/lang/fr/lite.php
new file mode 100644
index 0000000000..7364652099
--- /dev/null
+++ b/extension/lite/my/ext/lang/fr/lite.php
@@ -0,0 +1,7 @@
+<?php
+$lang->my->featureBar['contribute']['task'] = array();
+$lang->my->featureBar['contribute']['task']['assignedTo'] = 'AssignedToMe';
+$lang->my->featureBar['contribute']['task']['openedBy']   = 'CreatedByMe';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = 'FinishedByMe';
+$lang->my->featureBar['contribute']['task']['closedBy']   = 'ClosedByMe';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = 'CancelledByMe';
diff --git a/extension/lite/my/ext/lang/zh-cn/lite.php b/extension/lite/my/ext/lang/zh-cn/lite.php
new file mode 100644
index 0000000000..f3116c38e5
--- /dev/null
+++ b/extension/lite/my/ext/lang/zh-cn/lite.php
@@ -0,0 +1,7 @@
+<?php
+$lang->my->featureBar['contribute']['task'] = array();
+$lang->my->featureBar['contribute']['task']['assignedTo'] = '指派给我';
+$lang->my->featureBar['contribute']['task']['openedBy']   = '由我创建';
+$lang->my->featureBar['contribute']['task']['finishedBy'] = '由我完成';
+$lang->my->featureBar['contribute']['task']['closedBy']   = '由我关闭';
+$lang->my->featureBar['contribute']['task']['canceledBy'] = '由我取消';
diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php
index ae4eb268fc..2742bd5f3a 100644
--- a/extension/lite/my/ext/view/task.html.php
+++ b/extension/lite/my/ext/view/task.html.php
@@ -19,11 +19,10 @@
     <?php $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>"; ?>
     <?php if($app->rawMethod == 'contribute'):?>
     <?php
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedTo"),  "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"),    "<span class='text'>{$lang->my->taskMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=finishedBy"),  "<span class='text'>{$lang->my->taskMenu->finishedByMe}</span>" . ($type == 'finishedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'finishedBy' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),    "<span class='text'>{$lang->my->taskMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=canceledBy"),  "<span class='text'>{$lang->my->taskMenu->canceledByMe}</span>" . ($type == 'canceledBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'canceledBy' ? ' btn-active-text' : '') . "'");
+    foreach($lang->my->featureBar[$app->rawMethod]['task'] as $key => $name)
+    {
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$key"), "<span class='text'>{$name}</span>" . ($type == $key ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == $key ? ' btn-active-text' : '') . "'");
+    }
     ?>
     <?php endif;?>
   </div>
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 4e211d9168..1951a53acd 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -90,13 +90,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->projectMenu = new stdclass();
-$lang->my->projectMenu->doing      = 'Doing';
-$lang->my->projectMenu->wait       = 'Waiting';
-$lang->my->projectMenu->suspended  = 'Suspended';
-$lang->my->projectMenu->closed     = 'Closed';
-$lang->my->projectMenu->openedbyme = 'CreatedByMe';
-
 $lang->my->form = new stdclass();
 $lang->my->form->lblBasic   = 'Basic Info';
 $lang->my->form->lblContact = 'Contact Info';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 4e211d9168..1951a53acd 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -90,13 +90,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->projectMenu = new stdclass();
-$lang->my->projectMenu->doing      = 'Doing';
-$lang->my->projectMenu->wait       = 'Waiting';
-$lang->my->projectMenu->suspended  = 'Suspended';
-$lang->my->projectMenu->closed     = 'Closed';
-$lang->my->projectMenu->openedbyme = 'CreatedByMe';
-
 $lang->my->form = new stdclass();
 $lang->my->form->lblBasic   = 'Basic Info';
 $lang->my->form->lblContact = 'Contact Info';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 0812bf99d1..a3685d640f 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -90,13 +90,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s application for makeup:%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
 $lang->my->auditField->oaTitle['lieu']     = '%s application for lieu: %s';
 
-$lang->my->projectMenu = new stdclass();
-$lang->my->projectMenu->doing      = 'Doing';
-$lang->my->projectMenu->wait       = 'Waiting';
-$lang->my->projectMenu->suspended  = 'Suspended';
-$lang->my->projectMenu->closed     = 'Closed';
-$lang->my->projectMenu->openedbyme = 'CreatedByMe';
-
 $lang->my->form = new stdclass();
 $lang->my->form->lblBasic   = 'Basic Info';
 $lang->my->form->lblContact = 'Contact Info';
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index cf7fbc2db3..be9042bc1b 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -61,13 +61,6 @@ $lang->my->storyMenu->openedByMe   = 'CreatedByMe';
 $lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
 $lang->my->storyMenu->closedByMe   = 'ClosedByMe';
 
-$lang->my->projectMenu = new stdclass();
-$lang->my->projectMenu->doing      = 'Doing';
-$lang->my->projectMenu->wait       = 'Waiting';
-$lang->my->projectMenu->suspended  = 'Suspended';
-$lang->my->projectMenu->closed     = 'Closed';
-$lang->my->projectMenu->openedbyme = 'CreatedByMe';
-
 $lang->my->form = new stdclass();
 $lang->my->form->lblBasic   = 'Basic Info';
 $lang->my->form->lblContact = 'Contact Info';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 0e176b58d1..22e1bd8eb5 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -90,13 +90,6 @@ $lang->my->auditField->oaTitle['makeup']   = '%s的补班申请：%s';
 $lang->my->auditField->oaTitle['overtime'] = '%s的加班申请：%s';
 $lang->my->auditField->oaTitle['lieu']     = '%s的调休申请：%s';
 
-$lang->my->projectMenu = new stdclass();
-$lang->my->projectMenu->doing      = '进行中';
-$lang->my->projectMenu->wait       = '未开始';
-$lang->my->projectMenu->suspended  = '已挂起';
-$lang->my->projectMenu->closed     = '已关闭';
-$lang->my->projectMenu->openedbyme = '由我创建';
-
 $lang->my->form = new stdclass();
 $lang->my->form->lblBasic   = '基本信息';
 $lang->my->form->lblContact = '联系信息';

From e38e141d03bdc6de7b15f9a9af73f91f9f903c1e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 13:55:37 +0800
Subject: [PATCH 058/319] * Modify lite menu.

---
 module/dev/config.php             |  6 +++
 module/dev/control.php            | 11 ++++-
 module/dev/lang/de.php            |  1 +
 module/dev/lang/en.php            |  1 +
 module/dev/lang/fr.php            |  1 +
 module/dev/lang/zh-cn.php         |  1 +
 module/dev/model.php              | 67 +++++++++++++++----------------
 module/dev/view/langitem.html.php |  2 +-
 8 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index bf7f07bc1c..c28d160ca5 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -248,3 +248,9 @@ if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', '
 
 $config->dev->disableMainMenu = array('project', 'product', 'execution');
 $config->dev->projectMenus    = array('project', 'scrum', 'waterfall', 'kanbanProject');
+$config->dev->hideMainMenu    = array();
+if($config->vision == 'lite')
+{
+    $config->dev->projectMenus = array('project', 'kanbanProject');
+    $config->dev->hideMainMenu = array('execution', 'kanban');
+}
diff --git a/module/dev/control.php b/module/dev/control.php
index 38fb08f16a..a52d3a6756 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -105,7 +105,16 @@ class dev extends control
 
         if($type == 'third')
         {
-            if(empty($method)) $method = 'work';
+            if($this->config->vision == 'lite')
+            {
+                $module = $module == '' ? 'kanbanProject' : $module;
+                $method = $method == '' ? 'settings' : $method;
+            }
+            elseif(empty($method))
+            {
+                $module = 'my';
+                $method = 'work';
+            }
             $moduleName = $module . 'SubMenu';
         }
 
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 82c4fb69d0..67ec9bcd8c 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -197,3 +197,4 @@ $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
 $lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
 $lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
+if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 520a1ac668..84a58a2646 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -197,3 +197,4 @@ $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
 $lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
 $lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
+if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 520a1ac668..84a58a2646 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -197,3 +197,4 @@ $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
 $lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
 $lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
+if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index b253e9a6b0..d1e1d05c55 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -198,3 +198,4 @@ $lang->dev->projectMenu['project']       = "{$lang->projectCommon}通用";
 $lang->dev->projectMenu['scrum']         = "敏捷{$lang->projectCommon}";
 $lang->dev->projectMenu['waterfall']     = "瀑布{$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "看板{$lang->projectCommon}";
+if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/model.php b/module/dev/model.php
index a9505f1e9a..6c19f7cff6 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -411,44 +411,42 @@ class devModel extends model
 
         $langKey   = '';
         $customeds = array();
-        if($type == 'common')
+        switch($type)
         {
-            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=&vision={$this->config->vision}");
-            foreach($customeds as $customed) $customedLangs[$customed->key] = $customed->value;
+            case 'common':
+                $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=&vision={$this->config->vision}");
+                foreach($customeds as $customed) $customedLangs[$customed->key] = $customed->value;
 
-            $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
-            $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
-            if($this->config->custom->URSR)
-            {
-                $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
-                $URSRList = array_shift($URSRList);
-                if($URSRList)
+                $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
+                $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
+                if($this->config->custom->URSR)
                 {
-                    $URSRList = json_decode($URSRList->value);
-                    $customedLangs['URCommon'] = $this->lang->dev->UR == $URSRList->URName ? '' : $URSRList->URName;
-                    $customedLangs['SRCommon'] = $this->lang->dev->SR == $URSRList->SRName ? '' : $URSRList->SRName;
+                    $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                    $URSRList = array_shift($URSRList);
+                    if($URSRList)
+                    {
+                        $URSRList = json_decode($URSRList->value);
+                        $customedLangs['URCommon'] = $this->lang->dev->UR == $URSRList->URName ? '' : $URSRList->URName;
+                        $customedLangs['SRCommon'] = $this->lang->dev->SR == $URSRList->SRName ? '' : $URSRList->SRName;
+                    }
                 }
-            }
-            if(!$this->config->URAndSR) unset($customedLangs['SRCommon']);
-        }
-        elseif($type == 'first')
-        {
-            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=mainNav&vision={$this->config->vision}");
-            $langKey   = 'mainNav_';
-        }
-        elseif($type == 'second')
-        {
-            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}Menu&vision={$this->config->vision}");
-        }
-        elseif($type == 'third')
-        {
-            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}SubMenu&section=$method&vision={$this->config->vision}");
-            $langKey   = "{$method}_";
-        }
-        elseif($type == 'feature')
-        {
-            $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
-            $langKey   = "featureBar-{$method}_";
+                if(!$this->config->URAndSR) unset($customedLangs['SRCommon']);
+                break;
+            case 'first':
+                $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=mainNav&vision={$this->config->vision}");
+                $langKey   = 'mainNav_';
+                break;
+            case 'second':
+                $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}Menu&vision={$this->config->vision}");
+                break;
+            case 'third':
+                $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}SubMenu&section=$method&vision={$this->config->vision}");
+                $langKey   = "{$method}_";
+                break;
+            case 'feature':
+                $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
+                $langKey   = "featureBar-{$method}_";
+                break;
         }
 
         foreach($customeds as $customed)
@@ -657,6 +655,7 @@ class devModel extends model
             $childFunc = 'get' . ucfirst($type) . 'Menus';
             $menuItem->children = $this->$childFunc($menuKey, $module, $method);
             if($type != 'second' and empty($menuItem->children)) continue;
+            if($type == 'second' and in_array($menuKey, $this->config->dev->hideMainMenu)) continue;
 
             $menuTree[] = $menuItem;
         }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 9a73c0411a..c10e6869d9 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -31,7 +31,7 @@
     <?php foreach($lang->dev->featureBar['langItem'] as $key => $label):?>
     <?php $active = $type == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
-    <?php echo html::a(inlink('langItem', "type=$key&module=$module&method=$method&language=$language"), $label, '', "class='btn btn-link $active'");?>
+    <?php echo html::a(inlink('langItem', "type=$key&module=&method=&language=$language"), $label, '', "class='btn btn-link $active'");?>
     <?php endforeach;?>
   </div>
 </div>

From 602936271bf4132770bf5a458b8908c55285264b Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 23 Feb 2023 14:03:26 +0800
Subject: [PATCH 059/319] * Code refactors in module dev/js .

---
 module/dev/css/langitem.css       | 21 ++++++------
 module/dev/js/langitem.js         | 27 +++++++++-------
 module/dev/view/langitem.html.php | 53 ++++++++++++++-----------------
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index bc9dc7b982..ec628f155d 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -8,6 +8,7 @@
 .ml-20 {margin-left: 20px;}
 .title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
 .gap-15 {gap: 15px;}
+.h-full {height: 100%;}
 
 /* menu-tree */
 .menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;}
@@ -15,16 +16,18 @@
 li.has-list > ul > li {padding-left: 10px;}
 .tree ul {margin-bottom: 0;}
 
-/* side-left */
-.main-content > .side-left {flex: 0 0 160px; margin-left: 44px;}
-.label-list {background: #F8F8F8; padding: 5px 0;}
-.label-list > .input-label {display: flex; align-items: center; cursor: pointer; padding-left: 40px;}
 
-/* side-right */
-.main-content > .side-right {margin-left: 50px;}
-.main-content > .side-right > .input-list {padding: 5px 0;}
-.main-content > .side-right > .input-list > .input-control {position: relative;}
-.main-content > .side-right > .input-list > .input-control > i.icon {position: absolute; font-size: 25px; left: -40px; top: 3px;}
+/* title-content */
+.title-content {gap: 20px;}
+.title-content > .title {margin-left: 44px; width: 160px;}
+
+/* form-content */
+.form-item-content {padding-left: 44px;}
+.form-item-content > .form-item {gap: 20px; height: 56px; align-items: center; position: relative;}
+.form-item-content > .form-item >  .input-label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center;}
+.form-item-content > .form-item >  .input-control > input {margin-left: 40px;}
+.form-item-content > .form-item.active > .icon {display: unset;}
+.form-item-content > .form-item> .icon {display: none; position: absolute; left: 180px; font-size: 25px;}
 
 /* bottom-btn */
 .bottom-btn {display: flex; align-items: center; background: #fff;padding-left: 150px; padding-bottom: 20px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 878d67287c..ba1a895a58 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -9,8 +9,7 @@ $(function()
      */
     function addActive(id)
     {
-        $('[labelid=' + id + ']').addClass('text-primary');
-        $('[iconid=' + id + ']').removeClass('hidden');
+        $('[itemid=' + id + ']').addClass('text-primary active');
     }
 
     /**
@@ -22,8 +21,7 @@ $(function()
      */
     function removeActive(id)
     {
-        $('[labelid=' + id + ']').removeClass('text-primary');
-        $('[iconid=' + id + ']').addClass('hidden');
+        $('[itemid=' + id + ']').removeClass('text-primary active');
     }
 
     /**
@@ -35,10 +33,10 @@ $(function()
      */
     function handleClickItem(clickId)
     {
-	      var clearId = $('.label-list > .text-primary').attr('labelid');
+	    var clearId = $('.form-item.active').attr('itemid');
         if(clearId !== clickId)
         {
-            if(clearId) removeActive(clearId); 
+            if(clearId) removeActive(clearId);
             if(clickId) addActive(clickId);
         };
     }
@@ -97,7 +95,6 @@ $(function()
                  }
              }
         }
-
         return children;
     }
 
@@ -127,12 +124,11 @@ $(function()
         {
             var target = $(e.target);
             if (target.attr('data-has-children') === 'true') return;
-
             self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
         })
     }
 
-    $(".input-list").on("click", 'input', function(e)
+    $(".form-item-content").on("click", 'input', function(e)
     {
         handleClickItem(e.target.id);
     }).on("blur", 'input', function(e)
@@ -140,13 +136,22 @@ $(function()
         removeActive(e.target.id);
     });
 
-    $('.label-list > .input-label').on('click', function()
+    $('.form-item-content > .form-item > .input-label').on('click', function()
     {
         handleClickItem($(this).attr('labelid'));
     });
 
+    $(".form-item-content").on('mouseover', '.form-item', function()
+    {
+        if ($(this).hasClass('text-primary')) return;
+        $(this).addClass('text-primary');
+    }).on('mouseout', '.form-item', function()
+    {
+        $(this).removeClass('text-primary');
+    })
+
     initMenu();
     handleInputSearch();
 
-    $('li.has-list > ul').addClass("menu-active-primary menu-hover-primary")
+    $('li.has-list > ul').addClass("menu-active-primary menu-hover-primary");
 })
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 9a73c0411a..c2ac1c2b70 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -39,45 +39,38 @@
 <?php if(in_array($type, $config->dev->navTypes)):?>
   <div class="menu-tree">
     <div class="input-control search-box has-icon-left has-icon-right search-example">
-      <input type="search" class="form-control search-input" />
+      <input type="search" class="form-control search-input"/>
       <label class="input-control-icon-left search-icon flex align-center justify-center"><i class="icon icon-search"></i></label>
     </div>
     <div id="menuTree" class="menu-active-primary menu-hover-primary"></div>
   </div>
 <?php endif;?>
+
   <form class='main-form form-ajax flex-1' method='post'>
-    <div id='mainContent' class='main-content flex'>
-      <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
-      <div class="side-left">
-        <div class="title"><?php echo $lang->dev->currentLang;?> </div>
-        <div class="label-list">
-          <?php foreach($currentLangs as $langKey => $originalLang):?>
-          <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
-          <?php endforeach;?>
-        </div>
-      </div>
-      <?php endif;?>
-      <div class="side-left">
-        <div class="title"><?php echo $lang->dev->defaultValue ?> </div>
-        <div class="label-list">
-          <?php foreach($originalLangs as $langKey => $originalLang):?>
-          <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-32 my-12"><?php echo $originalLang?></div>
-          <?php endforeach;?>
-        </div>
-      </div>
-      <div class="side-right">
+    <div class="main-content">
+      <div class="title-content flex">
+        <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
+          <div class="title"><?php echo $lang->dev->currentLang;?> </div>
+        <?php endif;?>
+        <div class="title"><?php echo $lang->dev->defaultValue?></div>
         <div class="title"><?php echo $lang->dev->modifyValue?></div>
-        <div class="input-list">
-          <?php foreach($originalLangs as $langKey => $originalLang):?>
-          <div class="input-control h-32 my-12">
-            <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
-            <i iconId="<?php echo "{$moduleName}_{$langKey}"?>" class="icon icon-angle-right text-primary hidden"></i>
-          </div>
-          <?php endforeach;?>
-        </div>
       </div>
-      <div class="side-main"></div>
+      <div class="form-item-content">
+        <?php foreach($originalLangs as $langKey => $originalLang):?>
+          <div itemid="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
+            <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
+              <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
+            <?php endif;?>
+            <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
+            <i class="icon icon-angle-right text-primary"></i>
+            <div class="input-control">
+              <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
+            </div>
+          </div>
+        <?php endforeach;?>
+      </div>
     </div>
+
     <div class="bottom-btn">
       <?php echo html::submitButton(); ?>
       <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>

From f328bdb5f19c1940ba5f6dbaee9052b8d7198c33 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 14:34:31 +0800
Subject: [PATCH 060/319] * Split original lang get method.

---
 module/dev/model.php | 113 ++++++++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 50 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 6c19f7cff6..ca41e9398a 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -292,6 +292,58 @@ class devModel extends model
         return $extPaths;
     }
 
+    /**
+     * Get nav lang.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $method
+     * @param  object $defaultLang
+     * @access public
+     * @return object
+     */
+    public function getNavLang($type, $module, $method, $defaultLang = null)
+    {
+        if(empty($defaultLang)) $defaultLang = $this->loadDefaultLang();
+
+        $menus = new stdclass();
+        if($type == 'second')
+        {
+            if(isset($defaultLang->$module->homeMenu))
+            {
+                foreach($defaultLang->$module->homeMenu as $menuKey => $menu)
+                {
+                    $menuKey = 'homeMenu_' . $menuKey;
+                    $menus->{$menuKey} = $menu;
+                }
+            }
+
+            if(isset($defaultLang->$module->menu))
+            {
+                foreach($defaultLang->$module->menu as $menuKey => $menu)
+                {
+                    if(is_array($menu) and !isset($menu['link'])) continue;
+
+                    $newKey = 'menu_' . $menuKey;
+                    $menus->{$newKey} = $menu;
+
+                    if(!isset($menu['dropMenu'])) continue;
+                    foreach($menu['dropMenu'] as $key => $menu)
+                    {
+                        $dropMenuKey = $menuKey . 'DropMenu_' . $key;
+                        $menus->{$dropMenuKey} = $menu;
+                    }
+                }
+            }
+        }
+        else
+        {
+           $menus = $type == 'third' ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
+        }
+
+        return $menus;
+    }
+
     /**
      * Get original lang.
      *
@@ -323,7 +375,7 @@ class devModel extends model
             $originalLangs['executionCommon'] = $this->config->executionCommonList[$language][$projectKey];
             $originalLangs['URCommon']        = $this->lang->dev->UR;
             $originalLangs['SRCommon']        = $this->lang->dev->SR;
-            if(!$this->config->URAndSR) unset($originalLangs['SRCommon']);
+            if(!$this->config->URAndSR) unset($originalLangs['URCommon']);
         }
         elseif($type == 'feature')
         {
@@ -338,58 +390,19 @@ class devModel extends model
                 }
                 $originalLangs[$langKey . $feature] = $featureName;
             }
+        }
+        else
+        {
+            $lang    = $this->getNavLang($type, $module, $method, $defaultLang);
+            $langKey = $type == 'first' ? 'mainNav_' : ($type == 'third' ? "{$method}_" : '');
 
-        }
-        elseif($type == 'first')
-        {
-           $lang    = $defaultLang->mainNav;
-           $langKey = 'mainNav_';
-        }
-        elseif($type == 'second')
-        {
-            $menus = new stdclass();
-            if(isset($defaultLang->$module->homeMenu))
+            $menus = $this->getLinkTitle($lang);
+            foreach($menus as $linkKey => $menu)
             {
-                foreach($defaultLang->$module->homeMenu as $menuKey => $menu)
-                {
-                    $menuKey = 'homeMenu_' . $menuKey;
-                    $menus->{$menuKey} = $menu;
-                }
+                if($type == 'first' and in_array($linkKey, $this->config->dev->disableMainMenu)) continue;
+
+                $originalLangs[$langKey . $linkKey] = $menu;
             }
-
-            if(isset($defaultLang->$module->menu))
-            {
-                foreach($defaultLang->$module->menu as $menuKey => $menu)
-                {
-                    if(is_array($menu) and !isset($menu['link'])) continue;
-
-                    $newKey = 'menu_' . $menuKey;
-                    $menus->{$newKey} = $menu;
-
-                    if(isset($menu['dropMenu']))
-                    {
-                        foreach($menu['dropMenu'] as $key => $menu)
-                        {
-                            $dropMenuKey = $menuKey . 'DropMenu_' . $key;
-                            $menus->{$dropMenuKey} = $menu;
-                        }
-                    }
-                }
-            }
-            $lang = $menus;
-        }
-        elseif($type == 'third')
-        {
-            $langKey = "{$method}_";
-            $lang    = $defaultLang->$module->menu->{$method}['subMenu'];
-        }
-
-        $menus = $this->getLinkTitle($lang);
-        foreach($menus as $linkKey => $menu)
-        {
-            if($type == 'first' and in_array($linkKey, $this->config->dev->disableMainMenu)) continue;
-
-            $originalLangs[$langKey . $linkKey] = $menu;
         }
 
         return $originalLangs;

From 4e3fe4dc9fcd1325dca4f3f6a2f191638db9528d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 23 Feb 2023 14:42:06 +0800
Subject: [PATCH 061/319]  * code for feature bar.

---
 module/api/lang/de.php    |   1 -
 module/api/lang/en.php    |   1 -
 module/api/lang/fr.php    |   1 -
 module/api/lang/vi.php    |   1 -
 module/api/lang/zh-cn.php |   1 -
 module/api/lang/zh-tw.php |   1 -
 module/dev/lang/de.php    |  12 +--
 module/dev/lang/en.php    |  12 +--
 module/dev/lang/fr.php    |  12 +--
 module/dev/lang/zh-cn.php |   1 +
 module/dev/model.php      | 156 +++++++++++++++++++++++++++++---------
 11 files changed, 141 insertions(+), 58 deletions(-)

diff --git a/module/api/lang/de.php b/module/api/lang/de.php
index 8b6b1cfaf9..efc65af19e 100644
--- a/module/api/lang/de.php
+++ b/module/api/lang/de.php
@@ -9,7 +9,6 @@
  * @version     $Id: English.php 824 2010-05-02 15:32:06Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->api = new stdclass();
 $lang->api->common   = 'API';
 $lang->api->getModel = 'Super Model API';
 $lang->api->sql      = 'SQL Query API';
diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index 762f425fe6..9ade64dd07 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -9,7 +9,6 @@
  * @version     $Id: English.php 824 2010-05-02 15:32:06Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->api = new stdclass();
 $lang->api->common   = 'API';
 $lang->api->getModel = 'Super Model API';
 $lang->api->sql      = 'SQL Query API';
diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php
index 9bb3b5bcea..140be832f2 100644
--- a/module/api/lang/fr.php
+++ b/module/api/lang/fr.php
@@ -9,7 +9,6 @@
  * @version     $Id: English.php 824 2010-05-02 15:32:06Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->api = new stdclass();
 $lang->api->common   = 'API';
 $lang->api->getModel = 'Super Model API';
 $lang->api->sql      = 'SQL Query API';
diff --git a/module/api/lang/vi.php b/module/api/lang/vi.php
index 1d6a424c88..e132968307 100644
--- a/module/api/lang/vi.php
+++ b/module/api/lang/vi.php
@@ -9,7 +9,6 @@
  * @version  $Id: English.php 824 2010-05-02 15:32:06Z wwccss $
  * @link  http://www.zentao.net
  */
-$lang->api = new stdclass();
 $lang->api->common   = 'API';
 $lang->api->getModel = 'Super Model API';
 $lang->api->sql      = 'SQL Query API';
diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php
index 8772adf94b..204f2906a8 100755
--- a/module/api/lang/zh-cn.php
+++ b/module/api/lang/zh-cn.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-cn.php 5129 2013-07-15 00:16:07Z zhujinyonging@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->api = new stdclass();
 $lang->api->common   = 'API接口';
 $lang->api->getModel = '超级model调用接口';
 $lang->api->sql      = 'SQL查询接口';
diff --git a/module/api/lang/zh-tw.php b/module/api/lang/zh-tw.php
index f8c3aee086..ba2f1e1880 100644
--- a/module/api/lang/zh-tw.php
+++ b/module/api/lang/zh-tw.php
@@ -9,7 +9,6 @@
  * @version     $Id: zh-tw.php 5129 2013-07-15 00:16:07Z zhujinyonging@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->api = new stdclass();
 $lang->api->common   = 'API介面';
 $lang->api->getModel = '超級model調用介面';
 $lang->api->sql      = 'SQL查詢介面';
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 82c4fb69d0..3a0ed60a73 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -14,7 +14,6 @@ $lang->dev->post         = 'POST Parameter';
 $lang->dev->modifyValue  = 'modifyValue';
 $lang->dev->defaultValue = 'defaultValue';
 
-
 $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
 $lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
@@ -23,10 +22,13 @@ $lang->dev->noteEditor     = "The editor is disabled for security reasons. To us
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
-$lang->dev->default = 'Default';
-$lang->dev->change  = 'Change';
-$lang->dev->UR      = 'Epic';
-$lang->dev->SR      = 'Story';
+$lang->dev->language    = 'Language: %s';
+$lang->dev->default     = 'Default';
+$lang->dev->currentLang = 'Current Language';
+$lang->dev->change      = 'Change';
+$lang->dev->UR          = 'Epic';
+$lang->dev->SR          = 'Story';
+$lang->dev->branch      = 'Branch';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 520a1ac668..0e75b59582 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -14,7 +14,6 @@ $lang->dev->post         = 'POST Parameter';
 $lang->dev->modifyValue  = 'modifyValue';
 $lang->dev->defaultValue = 'defaultValue';
 
-
 $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
 $lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
@@ -23,10 +22,13 @@ $lang->dev->noteEditor     = "The editor is disabled for security reasons. To us
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
-$lang->dev->default = 'Default';
-$lang->dev->change  = 'Change';
-$lang->dev->UR      = 'Epic';
-$lang->dev->SR      = 'Story';
+$lang->dev->language    = 'Language: %s';
+$lang->dev->default     = 'Default';
+$lang->dev->currentLang = 'Current Language';
+$lang->dev->change      = 'Change';
+$lang->dev->UR          = 'Epic';
+$lang->dev->SR          = 'Story';
+$lang->dev->branch      = 'Branch';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 520a1ac668..0e75b59582 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -14,7 +14,6 @@ $lang->dev->post         = 'POST Parameter';
 $lang->dev->modifyValue  = 'modifyValue';
 $lang->dev->defaultValue = 'defaultValue';
 
-
 $lang->dev->paramRange     = 'Parameter Range: %s';
 $lang->dev->paramDate      = 'Date format: YY-mm-dd, e.g 2019-01-01';
 $lang->dev->paramColor     = 'Color format: #RGB, e.g. #3da7f5';
@@ -23,10 +22,13 @@ $lang->dev->noteEditor     = "The editor is disabled for security reasons. To us
 $lang->dev->noteTranslate  = "The translation is disabled for security reasons. To use this feature, please go to the official website to download and install the plugin of <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>translation</a>.";
 $lang->dev->confirmRestore = 'Do you want to reset?';
 
-$lang->dev->default = 'Default';
-$lang->dev->change  = 'Change';
-$lang->dev->UR      = 'Epic';
-$lang->dev->SR      = 'Story';
+$lang->dev->language    = 'Language: %s';
+$lang->dev->default     = 'Default';
+$lang->dev->currentLang = 'Current Language';
+$lang->dev->change      = 'Change';
+$lang->dev->UR          = 'Epic';
+$lang->dev->SR          = 'Story';
+$lang->dev->branch      = 'Branch';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = 'ID';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index b253e9a6b0..32dec004df 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -28,6 +28,7 @@ $lang->dev->currentLang = '当前语言';
 $lang->dev->change      = '修改值';
 $lang->dev->UR          = '用户需求';
 $lang->dev->SR          = '软件需求';
+$lang->dev->branch      = '平台/分支';
 
 $lang->dev->fields = array();
 $lang->dev->fields['id']     = '序号';
diff --git a/module/dev/model.php b/module/dev/model.php
index a9505f1e9a..9016b2ac25 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -307,6 +307,7 @@ class devModel extends model
         if(empty($language)) $language = $this->app->getClientLang();
         $originalLangs = array();
         $defaultLang   = $this->loadDefaultLang($language);
+        if($type == 'feature' and in_array($module, $this->config->dev->projectMenus)) $module = 'project';
         if($type == 'feature')
         {
             $this->defaultLang = $defaultLang;
@@ -327,8 +328,15 @@ class devModel extends model
         }
         elseif($type == 'feature')
         {
-            $langKey = 'featureBar-' . $method . '_';
-            foreach($defaultLang->$module->featureBar[$method] as $feature => $featureName)
+            $langKey     = 'featureBar-' . $method . '_';
+            $featureBars = zget($defaultLang->$module->featureBar, $method, array());
+            if(strpos($method, '_') !== false)
+            {
+                $langKey = 'featureBar-' . str_replace('_', '-', $method) . '_';
+                list($subMethod, $thirdMethod) = explode('_', $method);
+                $featureBars = $defaultLang->$module->featureBar[$subMethod][$thirdMethod];
+            }
+            foreach($featureBars as $feature => $featureName)
             {
                 $selectKey = $feature . 'Selects';
                 if(isset($defaultLang->$module->$selectKey))
@@ -338,7 +346,6 @@ class devModel extends model
                 }
                 $originalLangs[$langKey . $feature] = $featureName;
             }
-
         }
         elseif($type == 'first')
         {
@@ -447,6 +454,7 @@ class devModel extends model
         }
         elseif($type == 'feature')
         {
+            $method = str_replace('_', '-', $method);
             $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
             $langKey   = "featureBar-{$method}_";
         }
@@ -498,13 +506,7 @@ class devModel extends model
         $lang->hourCommon      = $this->lang->hourCommon;
         if(!isset($lang->common)) $lang->common = new stdclass();
 
-        $loadedLangs = array();
-        foreach($langFilesToLoad as $langFile)
-        {
-            if(in_array($langFile, $loadedLangs)) continue;
-            include $langFile;
-            $loadedLangs[] = $langFile;
-        }
+        foreach($langFilesToLoad as $langFile) include $langFile;
 
         return $lang;
     }
@@ -582,33 +584,82 @@ class devModel extends model
      * @access public
      * @return array
      */
-    public function getFeatureMenus($menu, $module = '', $method = '', $loadModules = array())
+    public function getFeatureMenus($module, $moduleName = '', $methodName = '')
     {
         $menus = array();
-        $this->app->loadLang($menu);
-        if(!in_array($menu, $loadModules) and isset($this->lang->$menu->menu))
+        foreach(array('homeMenu', 'menu') as $menu)
         {
-            $loadModules[] = $menu;
-            $menuLang      = $this->getLinkTitle($this->lang->$menu->menu);
-            foreach($menuLang as $menuKey => $menuName) $menus += $this->getFeatureMenus($menuKey, $module, $method, $loadModules);
-        }
-
-        if(isset($this->lang->$menu->featureBar))
-        {
-            $featureBar   = $this->lang->$menu->featureBar;
-            foreach($featureBar as $methodName => $feature)
+            if(!isset($this->lang->$module->$menu)) continue;
+            foreach($this->lang->$module->$menu as $menuKey => $menuValue)
             {
-                if($methodName == 'caselib') $methodName = 'caseLib';
-                if($methodName == 'all')     $methodName = 'browse';
+                if(is_array($menuValue) and !isset($menuValue['link'])) continue;
+                $link = is_array($menuValue) ? $menuValue['link'] : $menuValue;
+                if(strpos($link, '|') === false) continue;
+                list($label, $thisModule, $thisMethod) = explode('|', $link);
 
-                $subMenu = new stdClass();
-                $subMenu->title  = zget($this->lang->$menu, $methodName);
-                $subMenu->key    = '';
-                $subMenu->module = $menu;
-                $subMenu->method = $methodName;
-                $subMenu->active = ($method == $methodName and $module == $menu) ? 1 : 0;
+                $subMenu = new stdclass();
+                $subMenu->title    = $label;
+                $subMenu->key      = '';
+                $subMenu->module   = $thisModule;
+                $subMenu->method   = $thisMethod;
+                $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
+                $subMenu->children = array();
 
-                $menus[] = $subMenu;
+                $this->app->loadLang($thisModule);
+                $hasFeatureBar = false;
+                if(isset($this->lang->$thisModule->featureBar[$thisMethod])) $hasFeatureBar = true;
+
+                if(is_array($menuValue))
+                {
+                    foreach(array('subMenu', 'dropMenu') as $menu)
+                    {
+                        if(!isset($menuValue[$menu])) continue;
+                        foreach($menuValue[$menu] as $subMenuKey => $subMenuValue)
+                        {
+                            if(is_array($subMenuValue) and !isset($subMenuValue['link'])) continue;
+                            $link = is_array($subMenuValue) ? $subMenuValue['link'] : $subMenuValue;
+                            if(strpos($link, '|') === false) continue;
+                            list($label, $thisModule, $thisMethod) = explode('|', $link);
+                            if($label == '@branch@') $label = $this->lang->dev->branch;
+
+                            $this->app->loadLang($thisModule);
+                            if(isset($this->lang->$thisModule->featureBar[$menuKey][$subMenuKey]))
+                            {
+                                $thirdMenu = new stdClass();
+                                $thirdMenu->title  = $label;
+                                $thirdMenu->key    = '';
+                                $thirdMenu->module = $thisModule;
+                                $thirdMenu->method = "{$thisMethod}_{$subMenuKey}";
+                                $thirdMenu->active = ($methodName == $thirdMenu->method and $moduleName == $thisModule) ? 1 : 0;
+
+                                $subMenu->active     = 0;
+                                $subMenu->children[] = $thirdMenu;
+                                $hasFeatureBar = true;
+                            }
+                            elseif(isset($this->lang->$thisModule->featureBar[$thisMethod]))
+                            {
+                                if(is_array($this->lang->$thisModule->featureBar[$thisMethod]))
+                                {
+                                    $arrayKey = key($this->lang->$thisModule->featureBar[$thisMethod]);
+                                    if(is_array($this->lang->$thisModule->featureBar[$thisMethod][$arrayKey])) continue;
+                                }
+
+                                $subMenu = new stdClass();
+                                $subMenu->title    = $label;
+                                $subMenu->key      = '';
+                                $subMenu->module   = $thisModule;
+                                $subMenu->method   = $thisMethod;
+                                $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
+                                $subMenu->children = array();
+
+                                $menus[$subMenuKey] = $subMenu;
+                                $hasFeatureBar = false;
+                            }
+                        }
+                    }
+                }
+
+                if($hasFeatureBar) $menus[$menuKey] = $subMenu;
             }
         }
 
@@ -648,19 +699,50 @@ class devModel extends model
         foreach($mainNav as $menuKey => $menu)
         {
             $menuItem = new stdclass();
-            $menuItem->title  = $menu;
-            $menuItem->module = $menuKey;
-            $menuItem->method = '';
-            $menuItem->active = ($module == $menuKey and $method == '') ? 1 : 0;
-            $menuItem->key    = zget($maimNavPinYin, $menu, '');
+            $menuItem->title    = $menu;
+            $menuItem->module   = $menuKey;
+            $menuItem->method   = '';
+            $menuItem->active   = ($module == $menuKey and $method == '') ? 1 : 0;
+            $menuItem->key      = zget($maimNavPinYin, $menu, '');
+            $menuItem->children = array();
 
             $childFunc = 'get' . ucfirst($type) . 'Menus';
-            $menuItem->children = $this->$childFunc($menuKey, $module, $method);
+            if($type == 'feature' and in_array($menuKey, $this->config->dev->projectMenus))
+            {
+                if($menuKey != 'project') continue;
+                foreach($this->config->dev->projectMenus as $projectModule) $menuItem->children += $this->getFeatureMenus($projectModule, $module, $method);
+            }
+            else
+            {
+                $menuItem->children = $this->$childFunc($menuKey, $module, $method);
+            }
+            $menuItem->children = array_values($menuItem->children);
+
             if($type != 'second' and empty($menuItem->children)) continue;
 
             $menuTree[] = $menuItem;
         }
 
+        /* Unique menu tree by module and method. */
+        if($type == 'feature')
+        {
+            $methods = array();
+            foreach($menuTree as $index => $menuItem)
+            {
+                foreach($menuItem->children as $subIndex => $subMenuItem)
+                {
+                    $key = "{$subMenuItem->module}|{$subMenuItem->method}";
+                    if(isset($methods[$key]))
+                    {
+                        unset($menuItem->children[$subIndex]);
+                        continue;
+                    }
+                    $methods[$key] = true;
+                }
+                $menuItem->children = array_values($menuItem->children);
+            }
+        }
+
         return $menuTree;
     }
 

From 811d884802eea4f9f437ab91e186952943f6a855 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 15:06:22 +0800
Subject: [PATCH 062/319] * Hide admin menu.

---
 module/dev/config.php | 4 ++--
 module/dev/model.php  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index c28d160ca5..7e24682bbd 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -248,9 +248,9 @@ if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', '
 
 $config->dev->disableMainMenu = array('project', 'product', 'execution');
 $config->dev->projectMenus    = array('project', 'scrum', 'waterfall', 'kanbanProject');
-$config->dev->hideMainMenu    = array();
+$config->dev->hideMainMenu    = array('admin');
 if($config->vision == 'lite')
 {
     $config->dev->projectMenus = array('project', 'kanbanProject');
-    $config->dev->hideMainMenu = array('execution', 'kanban');
+    $config->dev->hideMainMenu = array('execution', 'kanban', 'admin');
 }
diff --git a/module/dev/model.php b/module/dev/model.php
index ca41e9398a..7d7633e315 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -298,11 +298,12 @@ class devModel extends model
      * @param  string $type
      * @param  string $module
      * @param  string $method
+     * @param  string $language
      * @param  object $defaultLang
      * @access public
      * @return object
      */
-    public function getNavLang($type, $module, $method, $defaultLang = null)
+    public function getNavLang($type, $module, $method, $language = 'zh-cn', $defaultLang = null)
     {
         if(empty($defaultLang)) $defaultLang = $this->loadDefaultLang();
 
@@ -393,7 +394,7 @@ class devModel extends model
         }
         else
         {
-            $lang    = $this->getNavLang($type, $module, $method, $defaultLang);
+            $lang    = $this->getNavLang($type, $module, $method, $language, $defaultLang);
             $langKey = $type == 'first' ? 'mainNav_' : ($type == 'third' ? "{$method}_" : '');
 
             $menus = $this->getLinkTitle($lang);
@@ -496,8 +497,10 @@ class devModel extends model
     {
         $clientLang = $this->app->clientLang;
         if($language != $clientLang) $this->app->clientLang = $language;
+
         $langFilesToLoad = $this->app->getMainAndExtFiles($module);
         if($language != $clientLang) $this->app->clientLang = $clientLang;
+
         if(empty($langFilesToLoad)) return false;
 
         $lang = $module == 'common' ? new language() : $this->defaultLang;

From 28d71e52025de44ce3a861f70e115f42f1fed2c2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 15:29:31 +0800
Subject: [PATCH 063/319] * Adjust code.

---
 module/dev/js/langitem.js         |  2 +-
 module/dev/view/langitem.html.php | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index ba1a895a58..34f47ebe0f 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -138,7 +138,7 @@ $(function()
 
     $('.form-item-content > .form-item > .input-label').on('click', function()
     {
-        handleClickItem($(this).attr('labelid'));
+        handleClickItem($(this).data('id'));
     });
 
     $(".form-item-content").on('mouseover', '.form-item', function()
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index c2ac1c2b70..8a693bdc7e 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -36,7 +36,7 @@
   </div>
 </div>
 <div class="flex gap-15">
-<?php if(in_array($type, $config->dev->navTypes)):?>
+  <?php if(in_array($type, $config->dev->navTypes)):?>
   <div class="menu-tree">
     <div class="input-control search-box has-icon-left has-icon-right search-example">
       <input type="search" class="form-control search-input"/>
@@ -44,7 +44,7 @@
     </div>
     <div id="menuTree" class="menu-active-primary menu-hover-primary"></div>
   </div>
-<?php endif;?>
+  <?php endif;?>
 
   <form class='main-form form-ajax flex-1' method='post'>
     <div class="main-content">
@@ -57,16 +57,16 @@
       </div>
       <div class="form-item-content">
         <?php foreach($originalLangs as $langKey => $originalLang):?>
-          <div itemid="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
-            <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
-              <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
-            <?php endif;?>
-            <div labelId="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
-            <i class="icon icon-angle-right text-primary"></i>
-            <div class="input-control">
-              <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
-            </div>
+        <div itemid="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
+          <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
+          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
+          <?php endif;?>
+          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
+          <i class="icon icon-angle-right text-primary"></i>
+          <div class="input-control">
+            <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
           </div>
+        </div>
         <?php endforeach;?>
       </div>
     </div>

From 534bae67faacfedb63ae617770d94328a97952c0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 15:36:05 +0800
Subject: [PATCH 064/319] * Adjust code.

---
 module/dev/js/langitem.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 34f47ebe0f..c9b3178ed7 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -143,7 +143,6 @@ $(function()
 
     $(".form-item-content").on('mouseover', '.form-item', function()
     {
-        if ($(this).hasClass('text-primary')) return;
         $(this).addClass('text-primary');
     }).on('mouseout', '.form-item', function()
     {

From 331d38825b62a269c533bd006d8edcc508856cdf Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 23 Feb 2023 16:09:27 +0800
Subject: [PATCH 065/319]  * code for feature bar.

---
 framework/router.class.php | 54 ++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index 6696361244..aba0b08a3d 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -124,29 +124,49 @@ class router extends baseRouter
         {
             foreach($lang->db->custom[$moduleName] as $section => $fields)
             {
-                if(isset($lang->{$moduleName}->{$section}['']))
+                if($section == 'featureBar')
                 {
-                    $nullKey   = '';
-                    $nullValue = $lang->{$moduleName}->{$section}[$nullKey];
+                    foreach($fields as $featureBarMethod => $featureBarValues)
+                    {
+                        foreach($featureBarValues as $featureBarKey => $featureBarValue)
+                        {
+                            if(is_array($featureBarValue))
+                            {
+                                foreach($featureBarValue as $key => $value) $lang->{$moduleName}->{$section}[$featureBarMethod][$featureBarKey][$key] = $value;
+                            }
+                            else
+                            {
+                                $lang->{$moduleName}->{$section}[$featureBarMethod][$featureBarKey] = $featureBarValue;
+                            }
+                        }
+                    }
                 }
-                elseif(isset($lang->{$moduleName}->{$section}[0]))
+                else
                 {
-                    $nullKey   = 0;
-                    $nullValue = $lang->{$moduleName}->{$section}[0];
-                }
-                unset($lang->{$moduleName}->{$section});
+                    if(isset($lang->{$moduleName}->{$section}['']))
+                    {
+                        $nullKey   = '';
+                        $nullValue = $lang->{$moduleName}->{$section}[$nullKey];
+                    }
+                    elseif(isset($lang->{$moduleName}->{$section}[0]))
+                    {
+                        $nullKey   = 0;
+                        $nullValue = $lang->{$moduleName}->{$section}[0];
+                    }
+                    unset($lang->{$moduleName}->{$section});
 
-                if(isset($nullKey))$lang->{$moduleName}->{$section}[$nullKey] = $nullValue;
-                foreach($fields as $key => $value)
-                {
-                    if($section == 'priList' and $key > 0 and trim($value) === '') continue; // Fix bug #23538.
+                    if(isset($nullKey))$lang->{$moduleName}->{$section}[$nullKey] = $nullValue;
+                    foreach($fields as $key => $value)
+                    {
+                        if($section == 'priList' and $key > 0 and trim($value) === '') continue; // Fix bug #23538.
 
-                    if(!isset($lang->{$moduleName})) $lang->{$moduleName} = new stdclass();
-                    if(!isset($lang->{$moduleName}->{$section})) $lang->{$moduleName}->{$section} = array();
-                    $lang->{$moduleName}->{$section}[$key] = $value;
+                        if(!isset($lang->{$moduleName})) $lang->{$moduleName} = new stdclass();
+                        if(!isset($lang->{$moduleName}->{$section})) $lang->{$moduleName}->{$section} = array();
+                        $lang->{$moduleName}->{$section}[$key] = $value;
+                    }
+                    unset($nullKey);
+                    unset($nullValue);
                 }
-                unset($nullKey);
-                unset($nullValue);
             }
         }
 

From b448eea1c6a35f8d16314126edab8b3da99d7c30 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 23 Feb 2023 16:21:22 +0800
Subject: [PATCH 066/319]  * adjust code for feature bar.

---
 module/dev/control.php            | 15 +++++++++------
 module/dev/view/langitem.html.php |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index a52d3a6756..7b39717571 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -124,8 +124,9 @@ class dev extends control
         if($this->server->request_method == 'POST')
         {
             $section = '';
-            if($type == 'common') $section = '&section=';
-            if($type == 'first')  $section = '&section=mainNav';
+            if($type == 'common')  $section = '&section=';
+            if($type == 'first')   $section = '&section=mainNav';
+            if($type == 'feature') $section = str_replace('_', '-', "&section=featureBar-{$method}");
             $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}");
 
             $data = fixer::input('post')->get();
@@ -167,19 +168,21 @@ class dev extends control
      *
      * @param  string $type       common|first|second|third|feature
      * @param  string $module
+     * @param  string $method
      * @param  string $language   zh_cn|en|fr|de|zh_tw
      * @param  string $confirm    no|yes
      * @access public
      * @return void
      */
-    public function resetLang($type = 'common', $module = '', $language = 'zh_cn', $confirm = 'no')
+    public function resetLang($type = 'common', $module = '', $method = '', $language = 'zh_cn', $confirm = 'no')
     {
-        if($confirm == 'no') return print(js::confirm($this->lang->dev->confirmRestore, inlink('resetLang', "type={$type}&module={$module}&language={$language}&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm($this->lang->dev->confirmRestore, inlink('resetLang', "type={$type}&module={$module}&method={$method}&language={$language}&confirm=yes")));
 
         $language = str_replace('_', '-', $language);
         $section  = '';
-        if($type == 'common') $section = '&section=';
-        if($type == 'first')  $section = '&section=mainNav';
+        if($type == 'common')  $section = '&section=';
+        if($type == 'first')   $section = '&section=mainNav';
+        if($type == 'feature') $section = str_replace('_', '-', "&section=featureBar-{$method}");
         $this->loadModel('custom')->deleteItems("lang={$language}&module={$module}&vision={$this->config->vision}{$section}");
         if($type == 'common' and $this->config->custom->URSR)
         {
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index c10e6869d9..5cda964829 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -80,7 +80,7 @@
     </div>
     <div class="bottom-btn">
       <?php echo html::submitButton(); ?>
-      <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>
+      <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&method={$method}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>
     </div>
   </form>
 </div>

From fcebbfcc5768746dc43f06b8737337e5ce4923cc Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 16:31:25 +0800
Subject: [PATCH 067/319] * Modify tag name.

---
 module/dev/config.php     |  2 +-
 module/dev/control.php    |  6 +++---
 module/dev/lang/de.php    |  2 +-
 module/dev/lang/en.php    |  2 +-
 module/dev/lang/fr.php    |  2 +-
 module/dev/lang/zh-cn.php |  2 +-
 module/dev/model.php      | 18 +++++++++---------
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index 7e24682bbd..a12815a900 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -241,7 +241,7 @@ $config->dev->postParams['testcase']['create']['expect']       = 'string';
 $config->dev->postParams['testcase']['create']['mailto']       = 'string';
 $config->dev->postParams['testcase']['create']['keywords']     = 'string';
 
-$config->dev->navTypes = array('second', 'third', 'feature');
+$config->dev->navTypes = array('second', 'third', 'tag');
 
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
diff --git a/module/dev/control.php b/module/dev/control.php
index a52d3a6756..9dd8c1c437 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -85,7 +85,7 @@ class dev extends control
     /**
      *  Custom menu lang item.
      *
-     * @param  string $type       common|first|second|third|feature
+     * @param  string $type       common|first|second|third|tag
      * @param  string $module
      * @param  string $method
      * @param  string $language   zh_cn|en|fr|de|zh_tw
@@ -118,8 +118,8 @@ class dev extends control
             $moduleName = $module . 'SubMenu';
         }
 
-        if($type == 'feature' and empty($module)) $module = 'my';
-        if($type == 'feature' and empty($method)) $method = 'todo';
+        if($type == 'tag' and empty($module)) $module = 'my';
+        if($type == 'tag' and empty($method)) $method = 'todo';
 
         if($this->server->request_method == 'POST')
         {
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 1e9843693b..fb484cc2d7 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common']  = 'Common';
 $lang->dev->featureBar['langItem']['first']   = 'First Menu';
 $lang->dev->featureBar['langItem']['second']  = 'Second Menu';
 $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
-$lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
+$lang->dev->featureBar['langItem']['tag']     = 'Search Tag';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
 $lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index af7bf8fb21..d385377cdb 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common']  = 'Common';
 $lang->dev->featureBar['langItem']['first']   = 'First Menu';
 $lang->dev->featureBar['langItem']['second']  = 'Second Menu';
 $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
-$lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
+$lang->dev->featureBar['langItem']['tag']     = 'Search Tag';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
 $lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index af7bf8fb21..d385377cdb 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common']  = 'Common';
 $lang->dev->featureBar['langItem']['first']   = 'First Menu';
 $lang->dev->featureBar['langItem']['second']  = 'Second Menu';
 $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
-$lang->dev->featureBar['langItem']['feature'] = 'Search Tab';
+$lang->dev->featureBar['langItem']['tag']     = 'Search Tag';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
 $lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index cef604e3bf..7929aff2f1 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -193,7 +193,7 @@ $lang->dev->featureBar['langItem']['common']  = '公共';
 $lang->dev->featureBar['langItem']['first']   = '一级菜单';
 $lang->dev->featureBar['langItem']['second']  = '二级菜单';
 $lang->dev->featureBar['langItem']['third']   = '三级菜单';
-$lang->dev->featureBar['langItem']['feature'] = '检索标签';
+$lang->dev->featureBar['langItem']['tag']     = '检索标签';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon}通用";
 $lang->dev->projectMenu['scrum']         = "敏捷{$lang->projectCommon}";
diff --git a/module/dev/model.php b/module/dev/model.php
index d1035d16a2..89a498e65e 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -360,8 +360,8 @@ class devModel extends model
         if(empty($language)) $language = $this->app->getClientLang();
         $originalLangs = array();
         $defaultLang   = $this->loadDefaultLang($language);
-        if($type == 'feature' and in_array($module, $this->config->dev->projectMenus)) $module = 'project';
-        if($type == 'feature')
+        if($type == 'tag' and in_array($module, $this->config->dev->projectMenus)) $module = 'project';
+        if($type == 'tag')
         {
             $this->defaultLang = $defaultLang;
             $defaultLang       = $this->loadDefaultLang($language, $module);
@@ -379,7 +379,7 @@ class devModel extends model
             $originalLangs['SRCommon']        = $this->lang->dev->SR;
             if(!$this->config->URAndSR) unset($originalLangs['URCommon']);
         }
-        elseif($type == 'feature')
+        elseif($type == 'tag')
         {
             $langKey     = 'featureBar-' . $method . '_';
             $featureBars = zget($defaultLang->$module->featureBar, $method, array());
@@ -465,7 +465,7 @@ class devModel extends model
                 $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}SubMenu&section=$method&vision={$this->config->vision}");
                 $langKey   = "{$method}_";
                 break;
-            case 'feature':
+            case 'tag':
                 $method = str_replace('_', '-', $method);
                 $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
                 $langKey   = "featureBar-{$method}_";
@@ -591,7 +591,7 @@ class devModel extends model
     }
 
     /**
-     * Get feature menus.
+     * Get tags.
      *
      * @param  string $menu
      * @param  string $module
@@ -599,7 +599,7 @@ class devModel extends model
      * @access public
      * @return array
      */
-    public function getFeatureMenus($module, $moduleName = '', $methodName = '')
+    public function getTagMenus($module, $moduleName = '', $methodName = '')
     {
         $menus = array();
         foreach(array('homeMenu', 'menu') as $menu)
@@ -722,10 +722,10 @@ class devModel extends model
             $menuItem->children = array();
 
             $childFunc = 'get' . ucfirst($type) . 'Menus';
-            if($type == 'feature' and in_array($menuKey, $this->config->dev->projectMenus))
+            if($type == 'tag' and in_array($menuKey, $this->config->dev->projectMenus))
             {
                 if($menuKey != 'project') continue;
-                foreach($this->config->dev->projectMenus as $projectModule) $menuItem->children += $this->getFeatureMenus($projectModule, $module, $method);
+                foreach($this->config->dev->projectMenus as $projectModule) $menuItem->children += $this->getTagMenus($projectModule, $module, $method);
             }
             else
             {
@@ -740,7 +740,7 @@ class devModel extends model
         }
 
         /* Unique menu tree by module and method. */
-        if($type == 'feature')
+        if($type == 'tag')
         {
             $methods = array();
             foreach($menuTree as $index => $menuItem)

From 20cab7c06cf18c49a3ee0d199e512e3b04473328 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 23 Feb 2023 16:40:17 +0800
Subject: [PATCH 068/319] * Code refactors in langitem .

---
 module/dev/css/langitem.css       | 13 ++++++-------
 module/dev/js/langitem.js         | 24 ++++++++++++------------
 module/dev/view/langitem.html.php |  6 +++---
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index ec628f155d..e863ba1a21 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -2,20 +2,19 @@
 .flex-1 {flex: 1;}
 .align-center {align-items: center;}
 .justify-center {justify-content: center;}
-.h-32 {height: 32px;}
-.py-6 {padding: 6px 0;}
-.my-12 {margin: 12px 0;}
-.ml-20 {margin-left: 20px;}
+.reset-btn {margin-left: 20px;}
 .title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
-.gap-15 {gap: 15px;}
 .h-full {height: 100%;}
 
 /* menu-tree */
 .menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;}
 .menu-tree > .tree {padding-top: 20px;}
-li.has-list > ul > li {padding-left: 10px;}
 .tree ul {margin-bottom: 0;}
+#menuTree > li.has-list > ul > li {padding-left: 10px;}
+#menuTree > li.has-list > ul > li.has-list {padding-left: 15px;}
 
+/* main-box */
+.flex.main-box {gap: 15px;}
 
 /* title-content */
 .title-content {gap: 20px;}
@@ -30,4 +29,4 @@ li.has-list > ul > li {padding-left: 10px;}
 .form-item-content > .form-item> .icon {display: none; position: absolute; left: 180px; font-size: 25px;}
 
 /* bottom-btn */
-.bottom-btn {display: flex; align-items: center; background: #fff;padding-left: 150px; padding-bottom: 20px;}
+.bottom-btn {display: flex; align-items: center; background: #fff; padding-left: 150px; padding-bottom: 20px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index c9b3178ed7..6346febc34 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -9,7 +9,7 @@ $(function()
      */
     function addActive(id)
     {
-        $('[itemid=' + id + ']').addClass('text-primary active');
+        $('[data-id=' + id + ']').addClass('text-primary active');
     }
 
     /**
@@ -21,7 +21,7 @@ $(function()
      */
     function removeActive(id)
     {
-        $('[itemid=' + id + ']').removeClass('text-primary active');
+        $('[data-id=' + id + ']').removeClass('text-primary active');
     }
 
     /**
@@ -33,7 +33,7 @@ $(function()
      */
     function handleClickItem(clickId)
     {
-	    var clearId = $('.form-item.active').attr('itemid');
+	    var clearId = $('.form-item.active').attr('data-id');
         if(clearId !== clickId)
         {
             if(clearId) removeActive(clearId);
@@ -85,15 +85,15 @@ $(function()
         var childern = null;
         if (item && item.children)
         {
-             children = [];
-             for (var i = 0; i < item.children.length; i++)
-             {
-                 item.children[i].children = filterChildren(item.children[i], val);
-                 if (item.children[i].title.indexOf(val) != -1 || (item.children[i].key && item.children[i].key.indexOf(val) != -1) || item.children[i].children)
-                 {
-                     children.push(item.children[i]);
-                 }
-             }
+            children = [];
+            for (var i = 0; i < item.children.length; i++)
+            {
+                item.children[i].children = filterChildren(item.children[i], val);
+                if (item.children[i].title.indexOf(val) != -1 || (item.children[i].key && item.children[i].key.indexOf(val) != -1) || item.children[i].children)
+                {
+                    children.push(item.children[i]);
+                }
+            }
         }
         return children;
     }
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index ddbf753f2e..c7bef4ad02 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -35,7 +35,7 @@
     <?php endforeach;?>
   </div>
 </div>
-<div class="flex gap-15">
+<div class="flex main-box">
   <?php if(in_array($type, $config->dev->navTypes)):?>
   <div class="menu-tree">
     <div class="input-control search-box has-icon-left has-icon-right search-example">
@@ -57,7 +57,7 @@
       </div>
       <div class="form-item-content">
         <?php foreach($originalLangs as $langKey => $originalLang):?>
-        <div itemid="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
+        <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
           <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
           <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
           <?php endif;?>
@@ -73,7 +73,7 @@
 
     <div class="bottom-btn">
       <?php echo html::submitButton(); ?>
-      <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&method={$method}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide ml-20'");?>
+      <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&method={$method}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide reset-btn'");?>
     </div>
   </form>
 </div>

From 1be6a534a8582488842a5ed00a7ce901730d617d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 23 Feb 2023 17:20:17 +0800
Subject: [PATCH 069/319] * Modify home btn title.

---
 module/common/model.php | 5 +++--
 module/dev/config.php   | 2 +-
 module/dev/control.php  | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 59e82e358c..fad0756413 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -912,9 +912,10 @@ class commonModel extends model
             if($tab == 'product') $currentMethod = 'all';
         }
 
-        $link = helper::createLink($currentModule, $currentMethod);
+        $link      = helper::createLink($currentModule, $currentMethod);
         $className = $tab == 'devops' ? 'btn num' : 'btn';
-        $html = $link ? html::a($link, "$icon {$lang->$tab->common}", '', "class='$className' style='padding-top: 2px'") : "$icon {$lang->$tab->common}";
+        $btnTitle  = isset($lang->db->custom['common']['mainNav'][$tab]) ? $lang->db->custom['common']['mainNav'][$tab] : $lang->$tab->common;
+        $html      = $link ? html::a($link, "$icon $btnTitle", '', "class='$className' style='padding-top: 2px'") : "$icon $btnTitle";
 
         echo "<div class='btn-group header-btn'>" . $html . '</div>';
     }
diff --git a/module/dev/config.php b/module/dev/config.php
index a12815a900..95a840e031 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -248,7 +248,7 @@ if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', '
 
 $config->dev->disableMainMenu = array('project', 'product', 'execution');
 $config->dev->projectMenus    = array('project', 'scrum', 'waterfall', 'kanbanProject');
-$config->dev->hideMainMenu    = array('admin');
+$config->dev->hideMainMenu    = array('admin', 'kanban');
 if($config->vision == 'lite')
 {
     $config->dev->projectMenus = array('project', 'kanbanProject');
diff --git a/module/dev/control.php b/module/dev/control.php
index a0a09a47bf..bd0cae09c3 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -118,8 +118,11 @@ class dev extends control
             $moduleName = $module . 'SubMenu';
         }
 
-        if($type == 'tag' and empty($module)) $module = 'my';
-        if($type == 'tag' and empty($method)) $method = 'todo';
+        if($type == 'tag')
+        {
+            if(empty($module)) $module = 'my';
+            if(empty($method)) $method = 'todo';
+        }
 
         if($this->server->request_method == 'POST')
         {

From aee71d22285a8995c3f53bd5395e38e3e600824e Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 24 Feb 2023 08:43:25 +0800
Subject: [PATCH 070/319]  * adjust for common lang.

---
 module/dev/config.php             |  3 +++
 module/dev/model.php              | 10 +++++-----
 module/dev/view/langitem.html.php | 21 ++++++++++++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index 95a840e031..978683f0a6 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -254,3 +254,6 @@ if($config->vision == 'lite')
     $config->dev->projectMenus = array('project', 'kanbanProject');
     $config->dev->hideMainMenu = array('execution', 'kanban', 'admin');
 }
+
+global $lang;
+$config->dev->commonLang = array('$URCOMMON' => $lang->URCommon, '$SRCOMMON' => $lang->SRCommon, '$PRODUCTCOMMON' => $lang->productCommon, '$PROJECTCOMMON' => $lang->projectCommon, '$EXECUTIONCOMMON' => $lang->executionCommon);
diff --git a/module/dev/model.php b/module/dev/model.php
index 89a498e65e..197d682801 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -513,11 +513,11 @@ class devModel extends model
         if(empty($langFilesToLoad)) return false;
 
         $lang = $module == 'common' ? new language() : $this->defaultLang;
-        $lang->URCommon        = $this->lang->URCommon;
-        $lang->SRCommon        = $this->lang->SRCommon;
-        $lang->productCommon   = $this->lang->productCommon;
-        $lang->projectCommon   = $this->lang->projectCommon;
-        $lang->executionCommon = $this->lang->executionCommon;
+        $lang->URCommon        = '$URCOMMON';
+        $lang->SRCommon        = '$SRCOMMON';
+        $lang->productCommon   = '$PRODUCTCOMMON';
+        $lang->projectCommon   = '$PROJECTCOMMON';
+        $lang->executionCommon = '$EXECUTIONCOMMON';
         $lang->hourCommon      = $this->lang->hourCommon;
         if(!isset($lang->common)) $lang->common = new stdclass();
 
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index c7bef4ad02..31a97ec3d3 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -56,15 +56,30 @@
         <div class="title"><?php echo $lang->dev->modifyValue?></div>
       </div>
       <div class="form-item-content">
+        <?php $isCurrentLang = str_replace('-', '_', $this->app->getClientLang()) == $language;?>
         <?php foreach($originalLangs as $langKey => $originalLang):?>
+        <?php
+        $defaultValue    = $originalLang;
+        $defaultValueBox = $originalLang;
+        foreach($config->dev->commonLang as $commonKey => $commonLang)
+        {
+            if(strpos($originalLang, $commonKey) !== false)
+            {
+                $defaultValue    = str_replace($commonKey, '', $defaultValue);
+                $defaultValueBox = str_replace($commonKey, "<span class='input-group-addon'>{$commonLang}</span>", $defaultValueBox);
+                $originalLang    = str_replace($commonKey, $commonLang, $originalLang);
+            }
+        }
+        $defaultValueBox = str_replace($defaultValue, '%s', $defaultValueBox);
+        ?>
         <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
-          <?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
+          <?php if(!$isCurrentLang):?>
           <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
           <?php endif;?>
           <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
           <i class="icon icon-angle-right text-primary"></i>
-          <div class="input-control">
-            <?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
+          <div class="input-group">
+            <?php printf($defaultValueBox, html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$defaultValue}'"));?>
           </div>
         </div>
         <?php endforeach;?>

From b6830e3d1a208aaf47f703b535852f7de07f308f Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 08:54:07 +0800
Subject: [PATCH 071/319] * Modify menu alias.

---
 module/dev/config.php | 2 ++
 module/dev/model.php  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/module/dev/config.php b/module/dev/config.php
index 978683f0a6..cc5ff3fdc1 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -257,3 +257,5 @@ if($config->vision == 'lite')
 
 global $lang;
 $config->dev->commonLang = array('$URCOMMON' => $lang->URCommon, '$SRCOMMON' => $lang->SRCommon, '$PRODUCTCOMMON' => $lang->productCommon, '$PROJECTCOMMON' => $lang->projectCommon, '$EXECUTIONCOMMON' => $lang->executionCommon);
+
+$config->dev->linkMethods['my']['my-calendar'] = array('my', 'todo');
diff --git a/module/dev/model.php b/module/dev/model.php
index 197d682801..b2f34b1d5c 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -612,6 +612,11 @@ class devModel extends model
                 if(strpos($link, '|') === false) continue;
                 list($label, $thisModule, $thisMethod) = explode('|', $link);
 
+                if(isset($this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"]))
+                {
+                    list($thisModule, $thisMethod) = $this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"];
+                }
+
                 $subMenu = new stdclass();
                 $subMenu->title    = $label;
                 $subMenu->key      = '';

From 83a64cb3cfdea6c7347183bd8d02045c036afda6 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 09:02:48 +0800
Subject: [PATCH 072/319] * Update home button text.

---
 module/common/model.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index fad0756413..095640bbb9 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -912,9 +912,12 @@ class commonModel extends model
             if($tab == 'product') $currentMethod = 'all';
         }
 
+        $btnTitle  = isset($lang->db->custom['common']['mainNav'][$tab]) ? $lang->db->custom['common']['mainNav'][$tab] : $lang->$tab->common;
+        $commonKey = $tab . 'Common';
+        if(isset($lang->$commonKey)) $btnTitle = $lang->$commonKey;
+
         $link      = helper::createLink($currentModule, $currentMethod);
         $className = $tab == 'devops' ? 'btn num' : 'btn';
-        $btnTitle  = isset($lang->db->custom['common']['mainNav'][$tab]) ? $lang->db->custom['common']['mainNav'][$tab] : $lang->$tab->common;
         $html      = $link ? html::a($link, "$icon $btnTitle", '', "class='$className' style='padding-top: 2px'") : "$icon $btnTitle";
 
         echo "<div class='btn-group header-btn'>" . $html . '</div>';

From 0729762ffadf91d018eed50d5f03da01fb61ae35 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 10:07:35 +0800
Subject: [PATCH 073/319] * Modify default lang data.

---
 module/dev/view/langitem.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 31a97ec3d3..b0eb9445b9 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -68,13 +68,14 @@
                 $defaultValue    = str_replace($commonKey, '', $defaultValue);
                 $defaultValueBox = str_replace($commonKey, "<span class='input-group-addon'>{$commonLang}</span>", $defaultValueBox);
                 $originalLang    = str_replace($commonKey, $commonLang, $originalLang);
+                if(!$isCurrentLang) $currentLangs[$langKey] = $originalLang;
             }
         }
         $defaultValueBox = str_replace($defaultValue, '%s', $defaultValueBox);
         ?>
         <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
           <?php if(!$isCurrentLang):?>
-          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
+          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $currentLangs[$langKey]?></div>
           <?php endif;?>
           <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
           <i class="icon icon-angle-right text-primary"></i>

From 3bb618093c5424ab8424f2e9b368601bcf40e1c9 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 10:41:31 +0800
Subject: [PATCH 074/319] * Add case of dev module.

---
 module/dev/model.php                |  6 ++--
 test/class/dev.class.php            | 16 +++++++++++
 test/model/dev/getmoduleextpath.php | 19 +++++++++++++
 test/model/dev/getnavlang.php       | 43 +++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 test/model/dev/getmoduleextpath.php
 create mode 100644 test/model/dev/getnavlang.php

diff --git a/module/dev/model.php b/module/dev/model.php
index b2f34b1d5c..d762e49751 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -305,7 +305,7 @@ class devModel extends model
      */
     public function getNavLang($type, $module, $method, $language = 'zh-cn', $defaultLang = null)
     {
-        if(empty($defaultLang)) $defaultLang = $this->loadDefaultLang();
+        if(empty($defaultLang)) $defaultLang = $this->loadDefaultLang($language);
 
         $menus = new stdclass();
         if($type == 'second')
@@ -339,7 +339,7 @@ class devModel extends model
         }
         else
         {
-           $menus = $type == 'third' ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
+           $menus = ($type == 'third' and isset($defaultLang->$module->menu->{$method}['subMenu'])) ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
         }
 
         return $menus;
@@ -505,7 +505,7 @@ class devModel extends model
     public function loadDefaultLang($language = 'zh-cn', $module = 'common')
     {
         $clientLang = $this->app->clientLang;
-        if($language != $clientLang) $this->app->clientLang = $language;
+        if($language and $language != $clientLang) $this->app->clientLang = $language;
 
         $langFilesToLoad = $this->app->getMainAndExtFiles($module);
         if($language != $clientLang) $this->app->clientLang = $clientLang;
diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 2795c672bd..75beb956bf 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -57,4 +57,20 @@ class devTest
         $result = $this->objectModel->getModules();
         return $result;
     }
+
+    /**
+     * Get nav lang.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $method
+     * @param  string $language
+     * @param  object $defaultLang
+     * @access public
+     * @return object
+     */
+    public function getNavLangTest($type, $module, $method, $language = 'zh-cn', $defaultLang = null)
+    {
+        return $this->objectModel->getNavLang($type, $module, $method, $language, $defaultLang);
+    }
 }
diff --git a/test/model/dev/getmoduleextpath.php b/test/model/dev/getmoduleextpath.php
new file mode 100644
index 0000000000..40b8c7031d
--- /dev/null
+++ b/test/model/dev/getmoduleextpath.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+
+/**
+
+title=测试 devModel::getModuleExtPath();
+cid=1
+pid=1
+
+获取扩展的模块路径 >> xuan
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+$extPath = $tester->dev->getModuleExtPath();
+
+r(key($extPath)) && p() && e('xuan'); // 获取扩展的模块路径
diff --git a/test/model/dev/getnavlang.php b/test/model/dev/getnavlang.php
new file mode 100644
index 0000000000..e713e80c71
--- /dev/null
+++ b/test/model/dev/getnavlang.php
@@ -0,0 +1,43 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getNavLang();
+cid=1
+pid=1
+
+检查传入空值时的情况 >> <i class='icon icon-menu-my'></i> 地盘|my|index|
+检查获取一级导航 >> <i class='icon icon-program'></i> 项目集|program|browse|
+检查获取地盘二级导航 >> 仪表盘|my|index
+检查获取敏捷项目二级英文导航 >> Dashboard|project|index|project=%s
+检查获取瀑布项目二级中文导航 >> 仪表盘|project|index|project=%s
+检查获取测试二级英文导航 >> Dashboard|qa|index
+检查获取三级导航 >> <i class='icon icon-menu-my'></i> 地盘|my|index|
+检查获取地盘待处理三级导航 >> 任务|my|work|mode=task
+检查获取项目设置三级导航 >> 概况|project|view|project=%s
+检查获取项目测试英文三级导航 >> Bug|project|bug|projectID=%s
+检查传入不存在的type >> <i class='icon icon-menu-my'></i> 地盘|my|index|
+
+*/
+
+
+$typeList     = array('', 'first', 'second', 'third', 'tag');
+$moduleList   = array('', 'my', 'scrum', 'waterfall', 'qa');
+$methodList   = array('', 'work', 'settings', 'qa', 'bug');
+$languageList = array('', 'zh-cn', 'en');
+
+$devTester = new devTest();
+r($devTester->getNavLangTest($typeList[0], $moduleList[0], $methodList[0], $languageList[0])) && p('my')              && e("<i class='icon icon-menu-my'></i> 地盘|my|index|");         // 检查传入空值时的情况
+r($devTester->getNavLangTest($typeList[1], $moduleList[0], $methodList[0], $languageList[1])) && p('program')         && e("<i class='icon icon-program'></i> 项目集|program|browse|"); // 检查获取一级导航
+r($devTester->getNavLangTest($typeList[2], $moduleList[1], $methodList[0], $languageList[1])) && p('menu_index:link') && e("仪表盘|my|index");                                          // 检查获取地盘二级导航
+r($devTester->getNavLangTest($typeList[2], $moduleList[2], $methodList[0], $languageList[2])) && p('menu_index:link') && e("Dashboard|project|index|project=%s");                       // 检查获取敏捷项目二级英文导航
+r($devTester->getNavLangTest($typeList[2], $moduleList[3], $methodList[0], $languageList[1])) && p('menu_index:link') && e("仪表盘|project|index|project=%s");                          // 检查获取瀑布项目二级中文导航
+r($devTester->getNavLangTest($typeList[2], $moduleList[4], $methodList[0], $languageList[2])) && p('menu_index:link') && e("Dashboard|qa|index");                                       // 检查获取测试二级英文导航
+r($devTester->getNavLangTest($typeList[3], $moduleList[0], $methodList[0], $languageList[0])) && p('my')              && e("<i class='icon icon-menu-my'></i> 地盘|my|index|");         // 检查获取三级导航
+r($devTester->getNavLangTest($typeList[3], $moduleList[1], $methodList[1], $languageList[0])) && p('task:link')       && e("任务|my|work|mode=task");                                   // 检查获取地盘待处理三级导航
+r($devTester->getNavLangTest($typeList[3], $moduleList[2], $methodList[2], $languageList[0])) && p('view:link')       && e("概况|project|view|project=%s");                             // 检查获取项目设置三级导航
+r($devTester->getNavLangTest($typeList[3], $moduleList[3], $methodList[3], $languageList[2])) && p('bug:link')        && e("Bug|project|bug|projectID=%s");                             // 检查获取项目测试英文三级导航
+r($devTester->getNavLangTest($typeList[4], $moduleList[0], $methodList[0], $languageList[0])) && p('my')              && e("<i class='icon icon-menu-my'></i> 地盘|my|index|");         // 检查传入不存在的type

From e746196b90daaed0fa7aabd4f3347531107b9845 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:12:12 +0800
Subject: [PATCH 075/319] * Adjust code for langitem .

---
 module/dev/css/langitem.css       | 10 +++++++---
 module/dev/js/langitem.js         | 11 +++++------
 module/dev/view/langitem.html.php |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index e863ba1a21..c0c6ef739a 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -23,10 +23,14 @@
 /* form-content */
 .form-item-content {padding-left: 44px;}
 .form-item-content > .form-item {gap: 20px; height: 56px; align-items: center; position: relative;}
-.form-item-content > .form-item >  .input-label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center;}
+.form-item-content > .form-item >  .label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor;}
 .form-item-content > .form-item >  .input-control > input {margin-left: 40px;}
-.form-item-content > .form-item.active > .icon {display: unset;}
-.form-item-content > .form-item> .icon {display: none; position: absolute; left: 180px; font-size: 25px;}
+.form-item-content > .form-item.active .icon {display: unset;}
+.form-item-content > .form-item .icon {display: none; position: absolute; left: 0; top: 2px; font-size: 25px;}
+.form-item-content.hover-color-primary > .form-item.active > .label {color: blue;}
+.form-item-content.hover-color-primary > .form-item.active .form-control {border-color: blue;}
+.form-item-content.border-color-primary > .form-item .form-control {border: 1px solid blue;}
+
 
 /* bottom-btn */
 .bottom-btn {display: flex; align-items: center; background: #fff; padding-left: 150px; padding-bottom: 20px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 6346febc34..59c2f3760c 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -9,7 +9,7 @@ $(function()
      */
     function addActive(id)
     {
-        $('[data-id=' + id + ']').addClass('text-primary active');
+        $('[data-id=' + id + ']').addClass('active');
     }
 
     /**
@@ -21,7 +21,7 @@ $(function()
      */
     function removeActive(id)
     {
-        $('[data-id=' + id + ']').removeClass('text-primary active');
+        $('[data-id=' + id + ']').removeClass('active');
     }
 
     /**
@@ -119,7 +119,6 @@ $(function()
                 }
             });
         }
-
         $('#menuTree').on('click', 'a', function(e)
         {
             var target = $(e.target);
@@ -141,12 +140,12 @@ $(function()
         handleClickItem($(this).data('id'));
     });
 
-    $(".form-item-content").on('mouseover', '.form-item', function()
+    $(".form-item-content").on('mouseover', '.form-item', function(e)
     {
-        $(this).addClass('text-primary');
+        $(this).addClass('hover');
     }).on('mouseout', '.form-item', function()
     {
-        $(this).removeClass('text-primary');
+        $(this).removeClass('hover');
     })
 
     initMenu();
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index b0eb9445b9..2a6314ee10 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -55,7 +55,7 @@
         <div class="title"><?php echo $lang->dev->defaultValue?></div>
         <div class="title"><?php echo $lang->dev->modifyValue?></div>
       </div>
-      <div class="form-item-content">
+      <div class="form-item-content form-active-primary">
         <?php $isCurrentLang = str_replace('-', '_', $this->app->getClientLang()) == $language;?>
         <?php foreach($originalLangs as $langKey => $originalLang):?>
         <?php

From 1933a32830e80331e39b9e9dd6e47ea6e6c1526e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:32:34 +0800
Subject: [PATCH 076/319] * Modify get modules test case.

---
 test/class/dev.class.php      |  1 +
 test/model/dev/getModules.php | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 75beb956bf..a8ff0174bc 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -55,6 +55,7 @@ class devTest
     public function getModulesTest()
     {
         $result = $this->objectModel->getModules();
+        foreach($result as $module => $group) $result[$module] = current($group);
         return $result;
     }
 
diff --git a/test/model/dev/getModules.php b/test/model/dev/getModules.php
index b1e5a8db2f..44876561c9 100755
--- a/test/model/dev/getModules.php
+++ b/test/model/dev/getModules.php
@@ -10,13 +10,11 @@ title=测试 devModel::getModules();
 cid=1
 pid=1
 
-获取所有模块的my分组第一个 >> index
-获取所有模块的product分组第三个 >> product
-获取所有模块的system分组第二个 >> file
+获取所有模块的admin分组第一个   >> action
+获取所有模块的product分组第一个 >> branch
 
 */
 
 $dev = new devTest();
-r($dev->getModulesTest()) && p('my:0')      && e('index');   //获取所有模块的my分组第一个
-r($dev->getModulesTest()) && p('product:2') && e('product'); //获取所有模块的product分组第三个
-r($dev->getModulesTest()) && p('system:1')  && e('file');    //获取所有模块的system分组第二个
\ No newline at end of file
+r($dev->getModulesTest()) && p('admin')   && e('action');  //获取所有模块的admin分组第一个
+r($dev->getModulesTest()) && p('product') && e('branch');  //获取所有模块的product分组第一个

From ec11839343aed10a6d026abc431af645bac79791 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:36:27 +0800
Subject: [PATCH 077/319] Adjust code for langitem.

---
 module/dev/css/langitem.css       | 5 +++--
 module/dev/js/langitem.js         | 2 +-
 module/dev/view/langitem.html.php | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index c0c6ef739a..54aabd914e 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -22,11 +22,12 @@
 
 /* form-content */
 .form-item-content {padding-left: 44px;}
-.form-item-content > .form-item {gap: 20px; height: 56px; align-items: center; position: relative;}
+.form-item-content > .form-item {gap: 64px; height: 56px; align-items: center; position: relative;}
 .form-item-content > .form-item >  .label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor;}
+.form-item-content > .form-item >  .input-group {margin-left: 20px;}
 .form-item-content > .form-item >  .input-control > input {margin-left: 40px;}
 .form-item-content > .form-item.active .icon {display: unset;}
-.form-item-content > .form-item .icon {display: none; position: absolute; left: 0; top: 2px; font-size: 25px;}
+.form-item-content > .form-item .icon {display: none; position: absolute; left: -50px; top: 2px; font-size: 25px;}
 .form-item-content.hover-color-primary > .form-item.active > .label {color: blue;}
 .form-item-content.hover-color-primary > .form-item.active .form-control {border-color: blue;}
 .form-item-content.border-color-primary > .form-item .form-control {border: 1px solid blue;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 59c2f3760c..16ddf2cecb 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -135,7 +135,7 @@ $(function()
         removeActive(e.target.id);
     });
 
-    $('.form-item-content > .form-item > .input-label').on('click', function()
+    $('.form-item-content > .form-item > .input-group').on('click', function()
     {
         handleClickItem($(this).data('id'));
     });
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 2a6314ee10..b973d767ec 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -75,11 +75,11 @@
         ?>
         <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
           <?php if(!$isCurrentLang):?>
-          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $currentLangs[$langKey]?></div>
+          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="label h-full"><?php echo $currentLangs[$langKey]?></div>
           <?php endif;?>
-          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
-          <i class="icon icon-angle-right text-primary"></i>
+          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="label h-full"><?php echo $originalLang?></div>
           <div class="input-group">
+            <i class="icon icon-angle-right text-primary"></i>
             <?php printf($defaultValueBox, html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$defaultValue}'"));?>
           </div>
         </div>

From c2e74ec237eb3b5afce4630d21a388a9d24c3bac Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:42:19 +0800
Subject: [PATCH 078/319] * Modify file name.

---
 test/model/dev/{getAPIs.php => getapis.php}       | 0
 test/model/dev/{getFields.php => getfields.php}   | 0
 test/model/dev/{getModules.php => getmodules.php} | 0
 test/model/dev/{getTables.php => gettables.php}   | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename test/model/dev/{getAPIs.php => getapis.php} (100%)
 rename test/model/dev/{getFields.php => getfields.php} (100%)
 rename test/model/dev/{getModules.php => getmodules.php} (100%)
 rename test/model/dev/{getTables.php => gettables.php} (100%)

diff --git a/test/model/dev/getAPIs.php b/test/model/dev/getapis.php
similarity index 100%
rename from test/model/dev/getAPIs.php
rename to test/model/dev/getapis.php
diff --git a/test/model/dev/getFields.php b/test/model/dev/getfields.php
similarity index 100%
rename from test/model/dev/getFields.php
rename to test/model/dev/getfields.php
diff --git a/test/model/dev/getModules.php b/test/model/dev/getmodules.php
similarity index 100%
rename from test/model/dev/getModules.php
rename to test/model/dev/getmodules.php
diff --git a/test/model/dev/getTables.php b/test/model/dev/gettables.php
similarity index 100%
rename from test/model/dev/getTables.php
rename to test/model/dev/gettables.php

From 220a047bc3498297027adf8a7dc2d3b0b626e1bf Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:43:29 +0800
Subject: [PATCH 079/319] * Adjust code.

---
 module/dev/model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index d762e49751..4cfea7f20d 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -360,9 +360,10 @@ class devModel extends model
         if(empty($language)) $language = $this->app->getClientLang();
         $originalLangs = array();
         $defaultLang   = $this->loadDefaultLang($language);
-        if($type == 'tag' and in_array($module, $this->config->dev->projectMenus)) $module = 'project';
         if($type == 'tag')
         {
+            if(in_array($module, $this->config->dev->projectMenus)) $module = 'project';
+
             $this->defaultLang = $defaultLang;
             $defaultLang       = $this->loadDefaultLang($language, $module);
         }
@@ -389,6 +390,7 @@ class devModel extends model
                 list($subMethod, $thirdMethod) = explode('_', $method);
                 $featureBars = $defaultLang->$module->featureBar[$subMethod][$thirdMethod];
             }
+
             foreach($featureBars as $feature => $featureName)
             {
                 $selectKey = $feature . 'Selects';

From a02f816f1d61d104f5e01afa061ab3e4d61cdace Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:50:51 +0800
Subject: [PATCH 080/319] * Add get link title test case.

---
 test/class/dev.class.php        |  6 ++++++
 test/model/dev/getlinktitle.php | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 test/model/dev/getlinktitle.php

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index a8ff0174bc..41c1e9254c 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -74,4 +74,10 @@ class devTest
     {
         return $this->objectModel->getNavLang($type, $module, $method, $language, $defaultLang);
     }
+
+    public function getLinkTitleTest()
+    {
+        $lang = $this->objectModel->lang->mainNav;
+        return $this->objectModel->getLinkTitle($lang);
+    }
 }
diff --git a/test/model/dev/getlinktitle.php b/test/model/dev/getlinktitle.php
new file mode 100644
index 0000000000..d83829e6e5
--- /dev/null
+++ b/test/model/dev/getlinktitle.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getLinkTitle();
+cid=1
+pid=1
+
+检查my模块的导航名称 >> 地盘
+
+*/
+
+$devTester = new devTest();
+r($devTester->getLinkTitleTest()) && p('my') && e("地盘"); // 检查my模块的导航名称

From 4c233276ec787eb1a7637c861dc8296f38cff73e Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Fri, 24 Feb 2023 13:57:21 +0800
Subject: [PATCH 081/319] * Adjust code for langitem.js.

---
 module/dev/js/langitem.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 16ddf2cecb..9296eb11bb 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -130,6 +130,8 @@ $(function()
     $(".form-item-content").on("click", 'input', function(e)
     {
         handleClickItem(e.target.id);
+    }).on("click", '.label', function(){
+        handleClickItem($(this).data('id'));
     }).on("blur", 'input', function(e)
     {
         removeActive(e.target.id);

From b3e9d521ac773f81bc3a00b45c206ea87d0adb7f Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 14:16:48 +0800
Subject: [PATCH 082/319] * Add test case.

---
 test/class/dev.class.php    | 16 ++++++++++++++++
 test/model/dev/setfield.php | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 test/model/dev/setfield.php

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 41c1e9254c..061692132f 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -33,6 +33,22 @@ class devTest
         return $result;
     }
 
+    /**
+     * Test set field method.
+     *
+     * @param  array  $type
+     * @access public
+     * @return array
+     */
+    public function setFieldTest($type)
+    {
+        $this->objectModel->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+        $sql = "DESC zt_product";
+        $rawFields = $this->objectModel->dbh->query($sql)->fetchAll();
+        return $this->objectModel->setField((array)$rawFields[1], (object)$rawFields[1], $type, 1);
+    }
+
+
     /**
      * Test get APIs of a module.
      *
diff --git a/test/model/dev/setfield.php b/test/model/dev/setfield.php
new file mode 100644
index 0000000000..78ca08266a
--- /dev/null
+++ b/test/model/dev/setfield.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::setField();
+cid=1
+pid=1
+
+设置字段类型为varchar >> varchar
+
+*/
+
+$devTester = new devTest();
+r($devTester->setFieldTest('varchar')) && p('type') && e("varchar"); // 设置字段类型为varchar

From cf2ba6e9c444a0aef2880a29d60bc68b9333e8aa Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 14:49:35 +0800
Subject: [PATCH 083/319] * Add test case.

---
 module/dev/model.php               |  2 ++
 test/class/dev.class.php           | 15 +++++++++++++
 test/model/dev/getoriginallang.php | 35 ++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 test/model/dev/getoriginallang.php

diff --git a/module/dev/model.php b/module/dev/model.php
index 4cfea7f20d..aa918b2e87 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -382,6 +382,8 @@ class devModel extends model
         }
         elseif($type == 'tag')
         {
+            if(!isset($defaultLang->$module->featureBar)) return $originalLangs;
+
             $langKey     = 'featureBar-' . $method . '_';
             $featureBars = zget($defaultLang->$module->featureBar, $method, array());
             if(strpos($method, '_') !== false)
diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 061692132f..7da3bc9f6b 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -75,6 +75,21 @@ class devTest
         return $result;
     }
 
+    /**
+     * Test get original lang method.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return int|array
+     */
+    public function getOriginalLangTest($type = 'common', $module = '', $method = '')
+    {
+        $result = $this->objectModel->getOriginalLang($type, $module, $method);
+        return empty($result) ? 0 : $result;
+    }
+
     /**
      * Get nav lang.
      *
diff --git a/test/model/dev/getoriginallang.php b/test/model/dev/getoriginallang.php
new file mode 100644
index 0000000000..cddb572dce
--- /dev/null
+++ b/test/model/dev/getoriginallang.php
@@ -0,0 +1,35 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getOriginalLang();
+cid=1
+pid=1
+
+错误的类型返回数据                         >> 地盘
+正确的类型返回数据                         >> 项目
+正确的类型，错误的模块返回数据             >> 0
+正确的类型，正确的模块返回数据             >> 项目
+正确的类型，正确的模块，错误的方法返回数据 >> 0
+正确的类型，正确的模块，正确的方法返回数据 >> 全部
+
+*/
+
+$failModule = 'module';
+$realModule = 'program';
+
+$failMethod = 'method';
+$realMethod = 'browse';
+
+$devTester = new devTest();
+r($devTester->getOriginalLangTest('test'))   && p('my')            && e("地盘"); // 错误的类型返回数据
+r($devTester->getOriginalLangTest('common')) && p('projectCommon') && e("项目"); // 正确的类型返回数据
+
+r($devTester->getOriginalLangTest('second', $failModule)) && p()               && e("0");    // 正确的类型，错误的模块返回数据
+r($devTester->getOriginalLangTest('second', $realModule)) && p('menu_project') && e("项目"); // 正确的类型，正确的模块返回数据
+
+r($devTester->getOriginalLangTest('tag', $realModule, $failMethod)) && p()                        && e("0");    // 正确的类型，正确的模块，错误的方法返回数据
+r($devTester->getOriginalLangTest('tag', $realModule, $realMethod)) && p('featureBar-browse_all') && e("全部"); // 正确的类型，正确的模块，正确的方法返回数据

From 7c241f25b32f3e5c7ca342e52f5806992593a886 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 24 Feb 2023 14:50:22 +0800
Subject: [PATCH 084/319] * Add case for dev module.

---
 test/class/dev.class.php       |  6 ++++++
 test/model/dev/getmenutree.php | 37 ++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 test/model/dev/getmenutree.php

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 41c1e9254c..e35899dd3b 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -75,6 +75,12 @@ class devTest
         return $this->objectModel->getNavLang($type, $module, $method, $language, $defaultLang);
     }
 
+    /**
+     * Get links title.
+     *
+     * @access public
+     * @return array
+     */
     public function getLinkTitleTest()
     {
         $lang = $this->objectModel->lang->mainNav;
diff --git a/test/model/dev/getmenutree.php b/test/model/dev/getmenutree.php
new file mode 100644
index 0000000000..decb696439
--- /dev/null
+++ b/test/model/dev/getmenutree.php
@@ -0,0 +1,37 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getMenuTree();
+cid=1
+pid=1
+
+检查传入空值时的情况 >> 0
+获取一级导航树 >> 0
+获取二级导航树 >> my
+获取二级导航树，并高亮地盘 >> my,1
+获取二级导航树，并高亮地盘 >> my
+获取二级导航树，并高亮敏捷项目 >> project
+获取三级导航树，并高亮地盘 >> my
+获取筛选标签树，并高亮地盘 >> my
+
+*/
+
+
+$typeList     = array('', 'first', 'second', 'third', 'tag');
+$moduleList   = array('', 'my', 'scrum', 'qa');
+$methodList   = array('', 'work');
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->getMenuTree($typeList[0], $moduleList[0], $methodList[0])) && p()                  && e('0');       // 检查传入空值时的情况
+r($tester->dev->getMenuTree($typeList[1], $moduleList[0], $methodList[0])) && p()                  && e('0');       // 获取一级导航树
+r($tester->dev->getMenuTree($typeList[2], $moduleList[0], $methodList[0])) && p('0:module')        && e('my');      // 获取二级导航树
+r($tester->dev->getMenuTree($typeList[2], $moduleList[1], $methodList[0])) && p('0:module,active') && e('my,1');    // 获取二级导航树，并高亮地盘
+r($tester->dev->getMenuTree($typeList[2], $moduleList[1], $methodList[1])) && p('0:module')        && e('my');      // 获取二级导航树，并高亮地盘
+r($tester->dev->getMenuTree($typeList[2], $moduleList[2], $methodList[0])) && p('3:module')        && e('project'); // 获取二级导航树，并高亮敏捷项目
+r($tester->dev->getMenuTree($typeList[3], $moduleList[1], $methodList[1])) && p('0:module')        && e('my');      // 获取三级导航树，并高亮地盘
+r($tester->dev->getMenuTree($typeList[4], $moduleList[1], $methodList[1])) && p('0:module')        && e('my');      // 获取筛选标签树，并高亮地盘

From a39c45baf732e78821e9a3893358614654ff6839 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 14:56:53 +0800
Subject: [PATCH 085/319] * Add test case.

---
 test/model/dev/trimspace.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 test/model/dev/trimspace.php

diff --git a/test/model/dev/trimspace.php b/test/model/dev/trimspace.php
new file mode 100644
index 0000000000..796f91d344
--- /dev/null
+++ b/test/model/dev/trimspace.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::trimSpace();
+cid=1
+pid=1
+
+获取去除空白字符的数据 >> test
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->trimSpace('* test ')) && p() && e('test'); //获取去除空白字符的数据

From 9c652d0d351563973be3202d4cb9c029706b52f6 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 15:33:08 +0800
Subject: [PATCH 086/319] * Modify module value.

---
 module/dev/control.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/dev/control.php b/module/dev/control.php
index bd0cae09c3..969c33de63 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -122,6 +122,8 @@ class dev extends control
         {
             if(empty($module)) $module = 'my';
             if(empty($method)) $method = 'todo';
+
+            $moduleName = $module;
         }
 
         if($this->server->request_method == 'POST')
@@ -141,6 +143,7 @@ class dev extends control
 
                 $this->custom->setItem("{$language}." . str_replace('_', '.', $langKey), $customedLang);
             }
+
             if($type == 'common' and $this->config->custom->URSR)
             {
                 $post  = $_POST;

From f6779df33b726a43a65929bba395e9b99bffa24e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 15:50:59 +0800
Subject: [PATCH 087/319] * Add test case.

---
 test/class/dev.class.php           | 15 ++++++++++
 test/model/dev/getcustomedlang.php | 46 ++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 test/model/dev/getcustomedlang.php

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index be20164f37..0c4243e929 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -90,6 +90,21 @@ class devTest
         return empty($result) ? 0 : $result;
     }
 
+    /**
+     * Test get customed lang method.
+     *
+     * @param  string $type
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return int|array
+     */
+    public function getCustomedLangTest($type = 'common', $module = '', $method = '')
+    {
+        $result = $this->objectModel->getCustomedLang($type, $module, $method);
+        return empty($result) ? 0 : $result;
+    }
+
     /**
      * Get nav lang.
      *
diff --git a/test/model/dev/getcustomedlang.php b/test/model/dev/getcustomedlang.php
new file mode 100644
index 0000000000..a4c73f8c3a
--- /dev/null
+++ b/test/model/dev/getcustomedlang.php
@@ -0,0 +1,46 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+su('admin');
+
+$ztLang = zdTable('lang');
+$ztLang->id->range('1-3');
+$ztLang->lang->range('zh-cn');
+$ztLang->module->range('common,myMenu,my');
+$ztLang->section->range('``,menu,featureBar-todo');
+$ztLang->key->range('productCommon,index,all');
+$ztLang->value->range('1-3')->prefix('测试');
+$ztLang->gen(3);
+
+/**
+
+title=测试 devModel::getCustomedLang();
+cid=1
+pid=1
+
+错误的类型返回数据                         >> 0
+正确的类型返回数据                         >> 测试1
+正确的类型，错误的模块返回数据             >> 0
+正确的类型，正确的模块返回数据             >> 测试2
+正确的类型，正确的模块，错误的方法返回数据 >> 0
+正确的类型，正确的模块，正确的方法返回数据 >> 测试3
+
+*/
+
+$failModule = 'module';
+$realModule = 'my';
+
+$failMethod = 'method';
+$realMethod = 'todo';
+
+$devTester = new devTest();
+r($devTester->getCustomedLangTest('test'))   && p()                && e("0");     // 错误的类型返回数据
+r($devTester->getCustomedLangTest('common')) && p('productCommon') && e("测试1"); // 正确的类型返回数据
+
+r($devTester->getCustomedLangTest('second', $failModule)) && p()             && e("0");     // 正确的类型，错误的模块返回数据
+r($devTester->getCustomedLangTest('second', $realModule)) && p('menu_index') && e("测试2"); // 正确的类型，正确的模块返回数据
+
+r($devTester->getCustomedLangTest('tag', $realModule, $failMethod)) && p()                      && e("0");     // 正确的类型，正确的模块，错误的方法返回数据
+r($devTester->getCustomedLangTest('tag', $realModule, $realMethod)) && p('featureBar-todo_all') && e("测试3"); // 正确的类型，正确的模块，正确的方法返回数据

From 6e8a929c2c3a97d51a1d2827052218225d711063 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Sat, 25 Feb 2023 09:09:28 +0800
Subject: [PATCH 088/319] * Add case for dev module.

---
 test/model/dev/gettagmenus.php   | 27 +++++++++++++++++++++++++++
 test/model/dev/getthirdmenus.php | 27 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 test/model/dev/gettagmenus.php
 create mode 100644 test/model/dev/getthirdmenus.php

diff --git a/test/model/dev/gettagmenus.php b/test/model/dev/gettagmenus.php
new file mode 100644
index 0000000000..160f97aa70
--- /dev/null
+++ b/test/model/dev/gettagmenus.php
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getTagMenus();
+cid=1
+pid=1
+
+检查传入空值时的情况 >> 0
+检查地盘高亮情况 >> 1
+检查项目高亮情况 >> 1
+
+*/
+
+
+$moduleList     = array('', 'my', 'scrum');
+$moduleNameList = array('', 'my', 'project');
+$methodList     = array('', 'todo', 'execution');
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->getTagMenus($moduleList[0], $moduleNameList[0], $methodList[0])) && p()                   && e('0'); // 检查传入空值时的情况
+r($tester->dev->getTagMenus($moduleList[1], $moduleNameList[1], $methodList[1])) && p('calendar:active')  && e('1'); // 检查地盘高亮情况
+r($tester->dev->getTagMenus($moduleList[2], $moduleNameList[2], $methodList[2])) && p('execution:active') && e('1'); // 检查项目高亮情况
diff --git a/test/model/dev/getthirdmenus.php b/test/model/dev/getthirdmenus.php
new file mode 100644
index 0000000000..7018ecbc6a
--- /dev/null
+++ b/test/model/dev/getthirdmenus.php
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getTagMenus();
+cid=1
+pid=1
+
+检查传入空值时的情况 >> 0
+检查获取地盘有三级的二级导航，并高亮待处理 >> work,1
+检查获取项目有三级的二级导航，并高亮测试 >> qa,1
+
+*/
+
+
+$moduleList     = array('', 'my', 'scrum');
+$moduleNameList = array('', 'my', 'scrum');
+$methodList     = array('', 'work', 'qa');
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->getThirdMenus($moduleList[0], $moduleNameList[0], $methodList[0])) && p()                  && e('0');      // 检查传入空值时的情况
+r($tester->dev->getThirdMenus($moduleList[1], $moduleNameList[1], $methodList[1])) && p('0:method,active') && e('work,1'); // 检查获取地盘有三级的二级导航，并高亮待处理
+r($tester->dev->getThirdMenus($moduleList[2], $moduleNameList[2], $methodList[2])) && p('0:method,active') && e('qa,1');   // 检查获取项目有三级的二级导航，并高亮测试

From 84efbac63fb231583b1e196e864f14eaf8b04a09 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Sat, 25 Feb 2023 12:10:08 +0800
Subject: [PATCH 089/319]  * code for custom menu lang.

---
 module/custom/config.php          |  3 +
 module/custom/model.php           | 10 +++-
 module/dev/config.php             |  3 -
 module/dev/control.php            | 51 +++++++---------
 module/dev/js/langitem.js         |  2 +-
 module/dev/model.php              | 97 +++++++++++++++++++++++++++++++
 module/dev/view/header.html.php   |  3 -
 module/dev/view/langitem.html.php | 49 +++++++++-------
 8 files changed, 160 insertions(+), 58 deletions(-)

diff --git a/module/custom/config.php b/module/custom/config.php
index dca615e25c..122ffa70d6 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -72,3 +72,6 @@ $config->custom->fieldList['user']['create']         = 'dept,role,email,commiter
 $config->custom->fieldList['user']['edit']           = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
 
 $config->custom->notSetMethods = array('required', 'browsestoryconcept', 'product', 'role', 'execution');
+
+global $lang;
+$config->custom->commonLang = array('$URCOMMON' => $lang->URCommon, '$SRCOMMON' => $lang->SRCommon, '$PRODUCTCOMMON' => $lang->productCommon, '$PROJECTCOMMON' => $lang->projectCommon, '$EXECUTIONCOMMON' => $lang->executionCommon);
diff --git a/module/custom/model.php b/module/custom/model.php
index 415e3f3843..4d965d2acb 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -27,7 +27,15 @@ class customModel extends model
             $stmt = $this->dbh->query($sql);
 
             $allCustomLang = array();
-            while($row = $stmt->fetch()) $allCustomLang[$row->id] = $row;
+            while($row = $stmt->fetch())
+            {
+                /* Replace common lang for menu. */
+                if(strpos($row->module, 'Menu') !== false or strpos($row->section, 'featureBar-') !== false or $row->section == 'mainNav')
+                {
+                    $row->value = strtr($row->value, $this->config->custom->commonLang);
+                }
+                $allCustomLang[$row->id] = $row;
+            }
         }
         catch(PDOException $e)
         {
diff --git a/module/dev/config.php b/module/dev/config.php
index cc5ff3fdc1..89fc7acf94 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -255,7 +255,4 @@ if($config->vision == 'lite')
     $config->dev->hideMainMenu = array('execution', 'kanban', 'admin');
 }
 
-global $lang;
-$config->dev->commonLang = array('$URCOMMON' => $lang->URCommon, '$SRCOMMON' => $lang->SRCommon, '$PRODUCTCOMMON' => $lang->productCommon, '$PROJECTCOMMON' => $lang->projectCommon, '$EXECUTIONCOMMON' => $lang->executionCommon);
-
 $config->dev->linkMethods['my']['my-calendar'] = array('my', 'todo');
diff --git a/module/dev/control.php b/module/dev/control.php
index 969c33de63..315881e84e 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -128,35 +128,26 @@ class dev extends control
 
         if($this->server->request_method == 'POST')
         {
-            $section = '';
-            if($type == 'common')  $section = '&section=';
-            if($type == 'first')   $section = '&section=mainNav';
-            if($type == 'feature') $section = str_replace('_', '-', "&section=featureBar-{$method}");
-            $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}");
-
-            $data = fixer::input('post')->get();
-            if($type == 'common') unset($data->common_SRCommon, $data->common_URCommon);
-            foreach($data as $langKey => $customedLang)
-            {
-                if(strpos($langKey, "{$moduleName}_") !== 0) continue;
-                if(empty($customedLang)) continue;
-
-                $this->custom->setItem("{$language}." . str_replace('_', '.', $langKey), $customedLang);
-            }
-
-            if($type == 'common' and $this->config->custom->URSR)
-            {
-                $post  = $_POST;
-                $_POST = array();
-                if(!empty($post['common_SRCommon'])) $_POST['SRName'] = $post['common_SRCommon'];
-                if(!empty($post['common_URCommon'])) $_POST['URName'] = $post['common_URCommon'];
-                $this->custom->updateURAndSR($this->config->custom->URSR, $language);
-            }
-
+            $this->dev->saveCustomedLang($common, $moduleName, $method, $language);
             return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
         }
 
-        if($clientLang != $language) $this->view->currentLangs = $this->dev->getOriginalLang($type, $module, $method, $clientLang);
+        if($clientLang != $language)
+        {
+            $currentCommonLang = $this->config->custom->commonLang;
+
+            $commonLang = $this->dev->getOriginalLang('common', '', '', $language);
+            $commonLang = array_merge($commonLang, $this->dev->getCustomedLang('common', '', '', $language));
+            foreach($commonLang as $commonKey => $langValue)
+            {
+                $upperKey = '$' . strtoupper($commonKey);
+                if(isset($this->config->custom->commonLang[$upperKey])) $this->config->custom->commonLang[$upperKey] = $langValue;
+            }
+
+            $this->view->currentLangs      = $this->dev->getOriginalLang($type, $module, $method, $clientLang);
+            $this->view->currentCommonLang = $currentCommonLang;
+        }
+
         $this->view->title         = $this->lang->langItem;
         $this->view->type          = $type;
         $this->view->originalLangs = $this->dev->getOriginalLang($type, $module, $method, $language);
@@ -172,7 +163,7 @@ class dev extends control
     /**
      * Reset customed menu lang.
      *
-     * @param  string $type       common|first|second|third|feature
+     * @param  string $type       common|first|second|third|tag
      * @param  string $module
      * @param  string $method
      * @param  string $language   zh_cn|en|fr|de|zh_tw
@@ -186,9 +177,9 @@ class dev extends control
 
         $language = str_replace('_', '-', $language);
         $section  = '';
-        if($type == 'common')  $section = '&section=';
-        if($type == 'first')   $section = '&section=mainNav';
-        if($type == 'feature') $section = str_replace('_', '-', "&section=featureBar-{$method}");
+        if($type == 'common') $section = '&section=';
+        if($type == 'first')  $section = '&section=mainNav';
+        if($type == 'tag')    $section = str_replace('_', '-', "&section=featureBar-{$method}");
         $this->loadModel('custom')->deleteItems("lang={$language}&module={$module}&vision={$this->config->vision}{$section}");
         if($type == 'common' and $this->config->custom->URSR)
         {
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 9296eb11bb..ff5961478d 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -123,7 +123,7 @@ $(function()
         {
             var target = $(e.target);
             if (target.attr('data-has-children') === 'true') return;
-            self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method'));
+            self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method') + '&language=' + language);
         })
     }
 
diff --git a/module/dev/model.php b/module/dev/model.php
index aa918b2e87..31d253e3ff 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -793,4 +793,101 @@ class devModel extends model
 
         return $linksTitle;
     }
+
+    /**
+     * Parse lang that with commonLang.
+     *
+     * @param  string $lang
+     * @access public
+     * @return string|array
+     */
+    public function parseCommonLang($lang)
+    {
+        if(empty($lang)) return $lang;
+
+        $reg = implode('|', str_replace('$', '\$', array_keys($this->config->custom->commonLang)));
+        if(!preg_match("/($reg)/", $lang)) return $lang;
+
+        $lang     = preg_replace("/($reg)/", '$$$1$$', $lang);
+        $subLangs = array_filter(explode('$$', $lang));
+
+        return $subLangs;
+    }
+
+    /**
+     * Check original lang changed.
+     *
+     * @param  string|array $defaultValue
+     * @param  string|array $customedLang
+     * @access public
+     * @return bool
+     */
+    public function isOriginalLangChanged($defaultValue, $customedLang)
+    {
+        if(empty($customedLang)) return false;
+        if(!is_array($defaultValue) and !is_array($customedLang)) return false;
+        if(!is_array($defaultValue) and is_array($customedLang)) return true;
+        if(!is_array($customedLang) or count($defaultValue) != count($customedLang)) return true;
+
+        $commonLang = $this->config->custom->commonLang;
+        foreach($defaultValue as $i => $subLang)
+        {
+            if(!isset($customedLang[$i])) return true;
+
+            $customedSubLang = $customedLang[$i];
+            if(!isset($commonLang[$subLang]) and isset($commonLang[$customedSubLang])) return true;
+            if(isset($commonLang[$subLang]) and !isset($commonLang[$customedSubLang])) return true;
+            if(isset($commonLang[$subLang]) and $subLang != $customedSubLang) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Save customed lang.
+     *
+     * @param  string    $type        common|first|second|third|tag
+     * @param  string    $moduleName
+     * @param  string    $method
+     * @param  string    $language    zh-cn|zh-tw|en|fr|de
+     * @access public
+     * @return void
+     */
+    public function saveCustomedLang($type, $moduleName, $method, $language)
+    {
+        $section = '';
+        if($type == 'common') $section = '&section=';
+        if($type == 'first')  $section = '&section=mainNav';
+        if($type == 'tag')    $section = str_replace('_', '-', "&section=featureBar-{$method}");
+        $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}");
+
+        $data = fixer::input('post')->get();
+        if($type == 'common') unset($data->common_SRCommon, $data->common_URCommon);
+        foreach($data as $langKey => $customedLang)
+        {
+            if(strpos($langKey, "{$moduleName}_") !== 0) continue;
+            if(is_array($customedLang))
+            {
+                $isCustomed = false;
+                foreach($customedLang as $subLang)
+                {
+                    if(!isset($this->config->custom->commonLang[$subLang]) and !empty($subLang)) $isCustomed = true;
+                }
+                $customedLang = $isCustomed ? implode(common::checkNotCN() ? ' ' : '', $customedLang) : '';
+            }
+            if(empty($customedLang)) continue;
+
+            $this->custom->setItem("{$language}." . str_replace('_', '.', $langKey), $customedLang);
+        }
+
+        if($type == 'common' and $this->config->custom->URSR)
+        {
+            $post  = $_POST;
+            $_POST = array();
+            if(!empty($post['common_SRCommon'])) $_POST['SRName'] = $post['common_SRCommon'];
+            if(!empty($post['common_URCommon'])) $_POST['URName'] = $post['common_URCommon'];
+            $this->custom->updateURAndSR($this->config->custom->URSR, $language);
+
+            $_POST = $post;
+        }
+    }
 }
diff --git a/module/dev/view/header.html.php b/module/dev/view/header.html.php
index bca5b7c33b..22553cad6e 100644
--- a/module/dev/view/header.html.php
+++ b/module/dev/view/header.html.php
@@ -1,7 +1,4 @@
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('dev');?></div>
-</div>
 <?php if(isset($tab)):?>
 <script>$('#mainMenu #<?php echo $tab;?>').addClass('btn-active-text')</script>
 <?php endif;?>
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index b973d767ec..2641cfcab0 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -10,12 +10,13 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php include 'header.html.php';?>
 <?php js::set('type', $type); ?>
 <?php js::set('navTypes', $config->dev->navTypes); ?>
 <?php js::set('menuTree', $menuTree)?>
-<?php include 'header.html.php';?>
+<?php js::set('language', $language)?>
 <div id='mainMenu' class='clearfix menu-secondary'>
-  <div class="btn-toolBar pull-left">
+  <div class="btn-toolbar pull-left">
     <div class="dropdown">
       <button class="btn" type="button" data-toggle="dropdown"><?php printf($lang->dev->language, $config->langs[str_replace('_', '-', $language)]);?> <span class="caret"></span></button>
       <ul class="dropdown-menu">
@@ -59,34 +60,42 @@
         <?php $isCurrentLang = str_replace('-', '_', $this->app->getClientLang()) == $language;?>
         <?php foreach($originalLangs as $langKey => $originalLang):?>
         <?php
-        $defaultValue    = $originalLang;
-        $defaultValueBox = $originalLang;
-        foreach($config->dev->commonLang as $commonKey => $commonLang)
-        {
-            if(strpos($originalLang, $commonKey) !== false)
-            {
-                $defaultValue    = str_replace($commonKey, '', $defaultValue);
-                $defaultValueBox = str_replace($commonKey, "<span class='input-group-addon'>{$commonLang}</span>", $defaultValueBox);
-                $originalLang    = str_replace($commonKey, $commonLang, $originalLang);
-                if(!$isCurrentLang) $currentLangs[$langKey] = $originalLang;
-            }
-        }
-        $defaultValueBox = str_replace($defaultValue, '%s', $defaultValueBox);
+        $itemKey = "{$moduleName}_{$langKey}";
+        if(!$isCurrentLang) $currentLangs[$langKey] = strtr($currentLangs[$langKey], $currentCommonLang);
+        $defaultValue = $this->dev->parseCommonLang($originalLang);
+        $customedLang = $this->dev->parseCommonLang(zget($customedLangs, $langKey, ''));
+        $originalLang = strtr($originalLang, $config->custom->commonLang);
         ?>
-        <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
+        <div data-id="<?php echo $itemKey?>" class="form-item flex">
           <?php if(!$isCurrentLang):?>
-          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="label h-full"><?php echo $currentLangs[$langKey]?></div>
+          <div data-id="<?php echo $itemKey?>" class="label h-full"><?php echo $currentLangs[$langKey]?></div>
           <?php endif;?>
-          <div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="label h-full"><?php echo $originalLang?></div>
+          <div data-id="<?php echo $itemKey?>" class="label h-full"><?php echo $originalLang?></div>
           <div class="input-group">
             <i class="icon icon-angle-right text-primary"></i>
-            <?php printf($defaultValueBox, html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$defaultValue}'"));?>
+            <?php $originalLangChanged = $this->dev->isOriginalLangChanged($defaultValue, $customedLang);?>
+            <?php if(($originalLangChanged and is_array($customedLang)) or (!$originalLangChanged and is_array($defaultValue))):?>
+            <?php $foreachLang = $originalLangChanged ? $customedLang : $defaultValue;?>
+            <?php foreach($foreachLang as $i => $subLang):?>
+            <?php if(isset($config->custom->commonLang[$subLang])):?>
+            <span class='input-group-addon'><?php echo $config->custom->commonLang[$subLang] . html::hidden("{$itemKey}[]", $subLang);?></span>
+            <?php else:?>
+            <?php
+            $placeholder     = $originalLangChanged ? '' : "placeholder='{$subLang}'";
+            $customedSubLang = $subLang;
+            if(!$originalLangChanged) $customedSubLang = empty($customedLang) ? '' : zget($customedLang, $i, '');
+            echo html::input("{$itemKey}[]", $customedSubLang, "class='form-control shadow-primary-hover' $placeholder");
+            ?>
+            <?php endif;?>
+            <?php endforeach;?>
+            <?php else:?>
+            <?php echo html::input($itemKey, $customedLang, "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
+            <?php endif;?>
           </div>
         </div>
         <?php endforeach;?>
       </div>
     </div>
-
     <div class="bottom-btn">
       <?php echo html::submitButton(); ?>
       <?php echo html::a(inlink('resetLang', "type={$type}&module={$moduleName}&method={$method}&language={$language}"), $lang->restore, 'hiddenwin', "id='reset' class='btn btn-wide reset-btn'");?>

From 9af02a22833e09c415b590105553477b08b5113c Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Sat, 25 Feb 2023 12:41:45 +0800
Subject: [PATCH 090/319]  * adjust style.

---
 module/dev/css/langitem.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index 54aabd914e..7238c018dd 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -24,7 +24,7 @@
 .form-item-content {padding-left: 44px;}
 .form-item-content > .form-item {gap: 64px; height: 56px; align-items: center; position: relative;}
 .form-item-content > .form-item >  .label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor;}
-.form-item-content > .form-item >  .input-group {margin-left: 20px;}
+.form-item-content > .form-item >  .input-group {margin-left: 20px; width:200px; height:32px;}
 .form-item-content > .form-item >  .input-control > input {margin-left: 40px;}
 .form-item-content > .form-item.active .icon {display: unset;}
 .form-item-content > .form-item .icon {display: none; position: absolute; left: -50px; top: 2px; font-size: 25px;}

From 487d6ad0eb8e7a897732d24bb06607b3475d9610 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 09:19:48 +0800
Subject: [PATCH 091/319] * Set main nav list.

---
 module/dev/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index 89fc7acf94..fb212e0540 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -246,7 +246,7 @@ $config->dev->navTypes = array('second', 'third', 'tag');
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
 
-$config->dev->disableMainMenu = array('project', 'product', 'execution');
+$config->dev->disableMainMenu = array('project', 'product');
 $config->dev->projectMenus    = array('project', 'scrum', 'waterfall', 'kanbanProject');
 $config->dev->hideMainMenu    = array('admin', 'kanban');
 if($config->vision == 'lite')

From aaac6a6d0ea8515b215b722b0d993cb2a55e4687 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 27 Feb 2023 13:42:15 +0800
Subject: [PATCH 092/319] * The tag output problem was rectified.

---
 module/custom/model.php      | 29 +++++++++++++++++++++++------
 module/my/view/todo.html.php |  2 +-
 module/todo/lang/de.php      |  1 +
 module/todo/lang/en.php      |  1 +
 module/todo/lang/fr.php      |  1 +
 module/todo/lang/zh-cn.php   |  1 +
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 4d965d2acb..b150b7d199 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -51,14 +51,31 @@ class customModel extends model
         $processedLang = array();
         foreach($allCustomLang as $id => $customLang)
         {
-            if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
+            if(isset($sectionLang[$customLang->module][$customLang->section]['all']) and isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) and $customLang->lang == 'all') continue;
 
-            $sections     = explode('-', $customLang->section);
-            $sectionIndex = count($sections) - 1;
-            $sectionArr   = array($customLang->key => $customLang->value);
-            for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
+            if(strpos($customLang->section, 'featureBar-') !== false)
+            {
+                $sections      = explode('-', $customLang->section);
+                $sectionIndex  = count($sections) - 1;
+                $sectionArr    = array($customLang->key => $customLang->value);
+                $oldSectionArr = empty($processedLang[$customLang->module]) ? array() : $processedLang[$customLang->module];
+                if(!empty($oldSectionArr))
+                {
+                    for($i = 0; $i <= $sectionIndex; $i ++)
+                    {
+                        $sectionKey    = $sections[$i];
+                        $oldSectionArr = $oldSectionArr[$sectionKey];
+                    }
+                    $sectionArr = array_merge($oldSectionArr, $sectionArr);
+                }
 
-            $processedLang[$customLang->module] = $sectionArr;
+                for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
+                $processedLang[$customLang->module] = $sectionArr;
+            }
+            else
+            {
+                $processedLang[$customLang->module][$customLang->section][$customLang->key] = $customLang->value;
+            }
         }
 
         return $processedLang;
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 3f13469623..04fb88c2e6 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -123,7 +123,7 @@ $doingCount = 0;
           </td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-width='80%' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
-          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->featureBar['todo']['future'] : $todo->date;?></td>
+          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->future : $todo->date;?></td>
           <td class="c-status"><span class="status-todo status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <?php if($type == 'assignedToOther'):?>
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 238f36745c..1f5dd607bf 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
+$lang->todo->future       = 'TBD';
 
 $lang->todo->reasonList['story'] = "Story übertragen";
 $lang->todo->reasonList['task']  = "Aufgabe übertragen";
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 09ff40e167..778cd46492 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
+$lang->todo->future       = 'TBD';
 
 $lang->todo->reasonList['story'] = "Convert to Story";
 $lang->todo->reasonList['task']  = "Convert to Task";
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 8d58bef8e0..814933e949 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "Project";
 $lang->todo->product      = "Product";
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
+$lang->todo->future       = 'TBD';
 
 $lang->todo->reasonList['story'] = "Convertir en Story";
 $lang->todo->reasonList['task']  = "Convertir en Tâche";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 563487a90c..ebd1d81af0 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -36,6 +36,7 @@ $lang->todo->project      = "所属项目";
 $lang->todo->product      = "所属产品";
 $lang->todo->execution    = "所属{$lang->execution->common}";
 $lang->todo->changeDate   = "修改日期";
+$lang->todo->future       = '待定';
 
 $lang->todo->reasonList['story'] = "转{$lang->SRCommon}";
 $lang->todo->reasonList['task']  = "转任务";

From 725b434d4384835aee9bd26f2ab1a8156384c146 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Mon, 27 Feb 2023 13:52:16 +0800
Subject: [PATCH 093/319] * Adjust code for module langitem.

---
 module/dev/css/langitem.css       | 8 ++++++--
 module/dev/js/langitem.js         | 7 +------
 module/dev/view/langitem.html.php | 8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index 7238c018dd..e7387a17dd 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -3,8 +3,9 @@
 .align-center {align-items: center;}
 .justify-center {justify-content: center;}
 .reset-btn {margin-left: 20px;}
-.title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; text-align: center;}
+.title {font-size: 13px; color: #313C52; font-weight: 700; height: 40px; padding-left: 40px;}
 .h-full {height: 100%;}
+.flex-center {display: flex; justify-content: center; align-items: center;}
 
 /* menu-tree */
 .menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;}
@@ -19,12 +20,15 @@
 /* title-content */
 .title-content {gap: 20px;}
 .title-content > .title {margin-left: 44px; width: 160px;}
+.title-content > .title.title-input {padding-left: unset; text-align: center; width: 220px;}
 
 /* form-content */
 .form-item-content {padding-left: 44px;}
-.form-item-content > .form-item {gap: 64px; height: 56px; align-items: center; position: relative;}
+.form-item-content > .form-item {gap: 64px; height: 56px; align-items: center; position: relative; width: 500px;}
+.form-item-content > .form-item.w-expand {width: 700px;}
 .form-item-content > .form-item >  .label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor;}
 .form-item-content > .form-item >  .input-group {margin-left: 20px; width:200px; height:32px;}
+.form-item-content > .form-item >  .input-group > .input-group-addon {flex: 1 1 30%; border-left: 1px solid #dcdcdc;}
 .form-item-content > .form-item >  .input-control > input {margin-left: 40px;}
 .form-item-content > .form-item.active .icon {display: unset;}
 .form-item-content > .form-item .icon {display: none; position: absolute; left: -50px; top: 2px; font-size: 25px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index ff5961478d..9b94ba3d02 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -127,14 +127,9 @@ $(function()
         })
     }
 
-    $(".form-item-content").on("click", 'input', function(e)
+    $(".form-item-content").on("click", '.form-item', function(e)
     {
-        handleClickItem(e.target.id);
-    }).on("click", '.label', function(){
         handleClickItem($(this).data('id'));
-    }).on("blur", 'input', function(e)
-    {
-        removeActive(e.target.id);
     });
 
     $('.form-item-content > .form-item > .input-group').on('click', function()
diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 2641cfcab0..0b159de9ef 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -54,7 +54,7 @@
           <div class="title"><?php echo $lang->dev->currentLang;?> </div>
         <?php endif;?>
         <div class="title"><?php echo $lang->dev->defaultValue?></div>
-        <div class="title"><?php echo $lang->dev->modifyValue?></div>
+        <div class="title title-input"><?php echo $lang->dev->modifyValue?></div>
       </div>
       <div class="form-item-content form-active-primary">
         <?php $isCurrentLang = str_replace('-', '_', $this->app->getClientLang()) == $language;?>
@@ -66,19 +66,19 @@
         $customedLang = $this->dev->parseCommonLang(zget($customedLangs, $langKey, ''));
         $originalLang = strtr($originalLang, $config->custom->commonLang);
         ?>
-        <div data-id="<?php echo $itemKey?>" class="form-item flex">
+        <div data-id="<?php echo $itemKey?>" class="form-item flex <?php if(!$isCurrentLang):?>w-expand<?php endif;?>">
           <?php if(!$isCurrentLang):?>
           <div data-id="<?php echo $itemKey?>" class="label h-full"><?php echo $currentLangs[$langKey]?></div>
           <?php endif;?>
           <div data-id="<?php echo $itemKey?>" class="label h-full"><?php echo $originalLang?></div>
-          <div class="input-group">
+          <div class="input-group flex">
             <i class="icon icon-angle-right text-primary"></i>
             <?php $originalLangChanged = $this->dev->isOriginalLangChanged($defaultValue, $customedLang);?>
             <?php if(($originalLangChanged and is_array($customedLang)) or (!$originalLangChanged and is_array($defaultValue))):?>
             <?php $foreachLang = $originalLangChanged ? $customedLang : $defaultValue;?>
             <?php foreach($foreachLang as $i => $subLang):?>
             <?php if(isset($config->custom->commonLang[$subLang])):?>
-            <span class='input-group-addon'><?php echo $config->custom->commonLang[$subLang] . html::hidden("{$itemKey}[]", $subLang);?></span>
+            <span class='input-group-addon flex-center'><?php echo $config->custom->commonLang[$subLang] . html::hidden("{$itemKey}[]", $subLang);?></span>
             <?php else:?>
             <?php
             $placeholder     = $originalLangChanged ? '' : "placeholder='{$subLang}'";

From 20b129e8c44b164d60359bed62e2c34f6fd4588b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 27 Feb 2023 14:11:40 +0800
Subject: [PATCH 094/319] * Code for finish task #85504.

---
 module/story/lang/de.php    |  1 +
 module/story/lang/en.php    |  1 +
 module/story/lang/fr.php    |  1 +
 module/story/lang/zh-cn.php |  1 +
 module/story/model.php      | 11 ++++++++---
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 0fc7259a0a..921c2b99d4 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -33,6 +33,7 @@ $lang->story->edit               = "Bearbeiten";
 $lang->story->editDraft          = "Entwurf bearbeiten";
 $lang->story->batchEdit          = "Mehere bearbeiten";
 $lang->story->subdivide          = 'Aufteilen';
+$lang->story->subdivideSR        = $lang->SRCommon . 'Aufteilen';
 $lang->story->link               = 'Link';
 $lang->story->unlink             = 'Unlink';
 $lang->story->track              = 'Track';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 8df89bc064..ba4ef0b228 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -33,6 +33,7 @@ $lang->story->edit               = "Edit Story";
 $lang->story->editDraft          = "Edit Draft";
 $lang->story->batchEdit          = "Batch Edit";
 $lang->story->subdivide          = 'Decompose';
+$lang->story->subdivideSR        = $lang->SRCommon . 'Decompose';
 $lang->story->link               = 'Link';
 $lang->story->unlink             = 'Unlink';
 $lang->story->track              = 'Track';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 61cd091ec8..7d7e31d5c5 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -33,6 +33,7 @@ $lang->story->edit               = "Editer Story";
 $lang->story->editDraft          = "Modifier le projet";
 $lang->story->batchEdit          = "Editer par Lot";
 $lang->story->subdivide          = 'Décomposer';
+$lang->story->subdivideSR        = $lang->SRCommon . 'Dé composer';
 $lang->story->link               = 'Link';
 $lang->story->unlink             = 'Unlink';
 $lang->story->track              = 'Track';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 3a03f7a475..fd8c7b2a54 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -33,6 +33,7 @@ $lang->story->edit               = "编辑";
 $lang->story->editDraft          = "编辑草稿";
 $lang->story->batchEdit          = "批量编辑";
 $lang->story->subdivide          = '细分';
+$lang->story->subdivideSR        = $lang->SRCommon . '细分';
 $lang->story->link               = '关联';
 $lang->story->unlink             = '移除';
 $lang->story->track              = '跟踪矩阵';
diff --git a/module/story/model.php b/module/story/model.php
index 3323d09ee6..7655c8d5ca 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4596,7 +4596,7 @@ class storyModel extends model
                 if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite' OR $shadow)
                 {
                     $isClick = $this->isClickable($story, 'batchcreate');
-                    $title   = $this->lang->story->subdivide;
+                    $title   = $story->type == 'story' ? $this->lang->story->subdivideSR : $this->lang->story->subdivide;
                     if(!$isClick and $story->status != 'closed')
                     {
                         if($story->parent > 0)
@@ -4650,7 +4650,12 @@ class storyModel extends model
             $menu .= $this->buildMenu('story', 'review', $params . "&from={$this->app->tab}&storyType=$story->type", $story, $type, 'search', '', 'showinonlybody');
 
             $executionID = empty($execution) ? 0 : $execution->id;
-            if(!isonlybody()) $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&$params&executionID=$executionID&plan=0&storyType=story", $story, $type, 'split', '', 'divideStory', true, "data-toggle='modal' data-type='iframe' data-width='95%'", $this->lang->story->subdivide);
+            if(!isonlybody())
+            {
+                $subdivideTitle = $story->type == 'story' ? $this->lang->story->subdivideSR : $this->lang->story->subdivide;
+                $menu          .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&$params&executionID=$executionID&plan=0&storyType=story", $story, $type, 'split', '', 'divideStory', true, "data-toggle='modal' data-type='iframe' data-width='95%'", $subdivideTitle);
+
+            }
 
             $menu .= $this->buildMenu('story', 'assignTo', $params . "&kanbanGroup=default&from=&storyType=$story->type", $story, $type, '', '', 'iframe showinonlybody', true);
             $menu .= $this->buildMenu('story', 'close',    $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe showinonlybody', true);
@@ -4780,7 +4785,7 @@ class storyModel extends model
                 if(common::hasPriv('story', 'batchCreate') and !$execution->multiple and !$execution->hasProduct)
                 {
                     $isClick = $this->isClickable($story, 'batchcreate');
-                    $title   = $this->lang->story->subdivide;
+                    $title   = $story->type == 'story' ? $this->lang->story->subdivideSR : $this->lang->story->subdivide;
                     if(!$isClick and $story->status != 'closed')
                     {
                         if($story->parent > 0)

From 1e9fc7667621ffdf55a3ef59470f0c48b1279592 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 27 Feb 2023 14:26:18 +0800
Subject: [PATCH 095/319]  * add unit test for dev.

---
 module/custom/model.php                  |  6 +--
 module/dev/model.php                     | 10 ++--
 test/class/dev.class.php                 | 50 ++++++++++++++++++++
 test/model/dev/isoriginallangchanged.php | 55 ++++++++++++++++++++++
 test/model/dev/parsecommonlang.php       | 29 ++++++++++++
 test/model/dev/savecustomedlang.php      | 60 ++++++++++++++++++++++++
 6 files changed, 204 insertions(+), 6 deletions(-)
 create mode 100644 test/model/dev/isoriginallangchanged.php
 create mode 100644 test/model/dev/parsecommonlang.php
 create mode 100644 test/model/dev/savecustomedlang.php

diff --git a/module/custom/model.php b/module/custom/model.php
index 4d965d2acb..651bdbcf18 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -802,16 +802,16 @@ class customModel extends model
         if(empty($lang)) $lang = $this->app->getClientLang();
         $data = fixer::input('post')->get();
 
-        if(!$data->SRName || !$data->URName) return false;
+        if(empty($data->SRName) || empty($data->URName)) return false;
 
         $oldValue = $this->dao->select('*')->from(TABLE_LANG)->where('`key`')->eq($key)->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($lang)->andWhere('module')->eq('custom')->fetch('value');
         $oldValue = json_decode($oldValue);
 
         $URSRList = new stdclass();
-        $URSRList->SRName        = $data->SRName;
-        $URSRList->URName        = $data->URName;
         $URSRList->defaultSRName = zget($oldValue, 'defaultSRName', $oldValue->SRName);
         $URSRList->defaultURName = zget($oldValue, 'defaultURName', $oldValue->URName);
+        $URSRList->SRName        = empty($data->SRName) ? $URSRList->defaultSRName : $data->SRName;
+        $URSRList->URName        = empty($data->URName) ? $URSRList->defaultURName : $data->URName;
 
         $value = json_encode($URSRList);
         $this->dao->update(TABLE_LANG)->set('value')->eq($value)
diff --git a/module/dev/model.php b/module/dev/model.php
index 31d253e3ff..2468fa040e 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -811,7 +811,7 @@ class devModel extends model
         $lang     = preg_replace("/($reg)/", '$$$1$$', $lang);
         $subLangs = array_filter(explode('$$', $lang));
 
-        return $subLangs;
+        return array_values($subLangs);
     }
 
     /**
@@ -883,8 +883,12 @@ class devModel extends model
         {
             $post  = $_POST;
             $_POST = array();
-            if(!empty($post['common_SRCommon'])) $_POST['SRName'] = $post['common_SRCommon'];
-            if(!empty($post['common_URCommon'])) $_POST['URName'] = $post['common_URCommon'];
+
+            $oldValue = $this->dao->select('*')->from(TABLE_LANG)->where('`key`')->eq($this->config->custom->URSR)->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($language)->andWhere('module')->eq('custom')->fetch('value');
+            $oldValue = json_decode($oldValue);
+
+            $_POST['SRName'] = !empty($post['common_SRCommon']) ? $post['common_SRCommon'] : zget($oldValue, 'defaultSRName', $oldValue->SRName);
+            $_POST['URName'] = !empty($post['common_URCommon']) ? $post['common_URCommon'] : zget($oldValue, 'defaultURName', $oldValue->URName);
             $this->custom->updateURAndSR($this->config->custom->URSR, $language);
 
             $_POST = $post;
diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 0c4243e929..2d3fa39954 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -132,4 +132,54 @@ class devTest
         $lang = $this->objectModel->lang->mainNav;
         return $this->objectModel->getLinkTitle($lang);
     }
+
+    /**
+     * Test parse common lang.
+     *
+     * @param  string    $lang
+     * @access public
+     * @return string
+     */
+    public function parseCommonLangTest($lang)
+    {
+        $lang = $this->objectModel->parseCommonLang($lang);
+        return empty($lang) ? 'null' : $lang;
+    }
+
+    /**
+     * Test is original lang changed.
+     *
+     * @param  array|string    $defaultValue
+     * @param  array|string    $customedLang
+     * @access public
+     * @return string
+     */
+    public function isOriginalLangChangedTest($defaultValue, $customedLang)
+    {
+        $isOriginalLangChanged = $this->objectModel->isOriginalLangChanged($defaultValue, $customedLang);
+        return $isOriginalLangChanged ? 'TRUE' : 'FALSE';
+    }
+
+    /**
+     * Test save customed lang.
+     *
+     * @param  string    $type
+     * @param  string    $module
+     * @param  string    $method
+     * @param  string    $language
+     * @access public
+     * @return string
+     */
+    public function saveCustomedLangTest($type, $module, $method, $language)
+    {
+        $moduleName = $module;
+        if($type == 'common' or $type == 'first') $moduleName = 'common';
+        if($type == 'second') $moduleName = $module . 'Menu';
+        if($type == 'third')  $moduleName = $module . 'SubMenu';
+
+        $this->objectModel->config->custom->URSR = $this->objectModel->dao->select('*')->from(TABLE_LANG)->where('section')->eq('URSRList')->andWhere('module')->eq('custom')->andWhere('lang')->eq($language)->orderBy('id')->limit(1)->fetch('key');
+        $this->objectModel->saveCustomedLang($type, $moduleName, $method, $language);
+        $customedLang = $this->objectModel->getCustomedLang($type, $module, $method, $language);
+        return empty($customedLang) ? 'null' : implode('|', $customedLang);
+    }
 }
diff --git a/test/model/dev/isoriginallangchanged.php b/test/model/dev/isoriginallangchanged.php
new file mode 100644
index 0000000000..841a1c6816
--- /dev/null
+++ b/test/model/dev/isoriginallangchanged.php
@@ -0,0 +1,55 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::isOriginalLangChanged();
+cid=1
+pid=1
+
+
+检查没有自定义语言的情况 >> FALSE
+检查原始语言和自定义语言都没有公共语言项的情况 >> FALSE
+检查原始语言没有公共语言，自定义语言有公共语言的情况 >> TRUE
+检查原始语言有公共语言，自定义语言没有公共语言的情况 >> TRUE
+检查原始语言有公共语言，自定义语言有公共语言，公共语言是一样的情况 >> FALSE
+检查原始语言有一个公共语言，自定义语言有多个公共语言的情况 >> TRUE
+检查原始语言有一个公共语言，自定义语言有一个公共语言，但两个公共语言不一样情况 >> TRUE
+检查原始语言有一个公共语言，自定义语言有一个公共语言，但两个公共语言位置不一样情况 >> TRUE
+检查原始语言有一个公共语言，自定义语言有一个公共语言，但两个公共语言位置不一样情况 >> TRUE
+
+*/
+
+$devTester = new devTest();
+
+$defaultValue = '产品列表';
+$customedLang = '';
+
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("FALSE");    // 检查没有自定义语言的情况
+
+$customedLang = '产品列表';
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("FALSE");    // 检查原始语言和自定义语言都没有公共语言项的情况
+$customedLang = array('$PRODUCTCOMMON', '列表');
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("TRUE");     // 检查原始语言没有公共语言，自定义语言有公共语言的情况
+
+$defaultValue = array('$PRODUCTCOMMON', '列表');
+$customedLang = '产品列表';
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("TRUE");     // 检查原始语言有公共语言，自定义语言没有公共语言的情况
+
+$customedLang = array('$PRODUCTCOMMON', '列表');
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("FALSE");    // 检查原始语言有公共语言，自定义语言有公共语言的情况
+
+$customedLang = array('$PRODUCTCOMMON', '列表', '$PROJECTCOMMON');
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("TRUE");     // 检查原始语言有一个公共语言，自定义语言有多个公共语言的情况
+
+$customedLang = array('$PROJECTCOMMON', '列表');
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("TRUE");     // 检查原始语言有一个公共语言，自定义语言有一个公共语言，但两个公共语言不一样情况
+
+$customedLang = array('列表', '$PROJECTCOMMON');
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("TRUE");     // 检查原始语言有一个公共语言，自定义语言有一个公共语言，但两个公共语言位置不一样情况
+
+$defaultValue = array('列表', '$PRODUCTCOMMON');
+$customedLang = array('$PRODUCTCOMMON', '列表');
+r($devTester->isOriginalLangChangedTest($defaultValue, $customedLang)) && p()  && e("TRUE");     // 检查原始语言有一个公共语言，自定义语言有一个公共语言，但两个公共语言位置不一样情况
diff --git a/test/model/dev/parsecommonlang.php b/test/model/dev/parsecommonlang.php
new file mode 100644
index 0000000000..73f28d18b5
--- /dev/null
+++ b/test/model/dev/parsecommonlang.php
@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::parseCommonLang();
+cid=1
+pid=1
+
+解析空字符串 >> null
+解析产品列表字符串 >> 产品列表
+解析$PRODUCTCOMMON列表字符串 >> 列表
+解析$PROJECTCOMMON列表字符串 >> 列表
+解析$EXECUTIONCOMMON列表字符串 >> 列表
+解析$URCOMMON列表字符串 >> 列表
+解析$SRCOMMON列表字符串 >> 列表
+
+*/
+
+$devTester = new devTest();
+r($devTester->parseCommonLangTest(''))                     && p()  && e("null");     // 解析空字符串
+r($devTester->parseCommonLangTest('产品列表'))             && p()  && e("产品列表"); // 解析产品列表字符串
+r($devTester->parseCommonLangTest('$PRODUCTCOMMON列表'))   && p(1) && e('列表');     // 解析$PRODUCTCOMMON列表字符串
+r($devTester->parseCommonLangTest('$PROJECTCOMMON列表'))   && p(1) && e('列表');     // 解析$PROJECTCOMMON列表字符串
+r($devTester->parseCommonLangTest('$EXECUTIONCOMMON列表')) && p(1) && e('列表');     // 解析$EXECUTIONCOMMON列表字符串
+r($devTester->parseCommonLangTest('$URCOMMON列表'))        && p(1) && e('列表');     // 解析$URCOMMON列表字符串
+r($devTester->parseCommonLangTest('$SRCOMMON列表'))        && p(1) && e('列表');     // 解析$SRCOMMON列表字符串
diff --git a/test/model/dev/savecustomedlang.php b/test/model/dev/savecustomedlang.php
new file mode 100644
index 0000000000..d9013ac5ee
--- /dev/null
+++ b/test/model/dev/savecustomedlang.php
@@ -0,0 +1,60 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel']']saveCustomedLang();
+cid=1
+pid=1
+
+自定义公共语言项 >> 产品2|项目2|迭代2|用需2|软需2
+自定义一级菜单语言项 >> 我的地盘
+重置一级导航语言项 >> null
+自定义二级导航语言项 >> 仪表盘
+重置二级导航语言项 >> null
+自定义三级导航语言项 >> 任务
+重置三级导航语言项 >> null
+自定义检索标签语言项 >> 所有
+重置检索标签语言项 >> null
+
+*/
+
+$devTester = new devTest();
+
+$_POST = array();
+$_POST['common_productCommon']   = '产品2';
+$_POST['common_projectCommon']   = '项目2';
+$_POST['common_executionCommon'] = '迭代2';
+$_POST['common_URCommon']        = '用需2';
+$_POST['common_SRCommon']        = '软需2';
+r($devTester->saveCustomedLangTest('common', 'common', '', 'zh-cn')) && p()  && e("产品2|项目2|迭代2|用需2|软需2");    // 自定义公共语言项
+
+$_POST = array();
+$_POST['common_mainNav_my'] = '我的地盘';
+r($devTester->saveCustomedLangTest('first', 'common', '', 'zh-cn')) && p()  && e("我的地盘");    // 自定义一级菜单语言项
+
+$_POST['common_mainNav_my'] = '';
+r($devTester->saveCustomedLangTest('first', 'common', '', 'zh-cn')) && p()  && e("null");        // 重置一级导航语言项
+
+$_POST = array();
+$_POST['myMenu_menu_index'] = '仪表盘';
+r($devTester->saveCustomedLangTest('second', 'my', '', 'zh-cn')) && p()  && e("仪表盘");         // 自定义二级导航语言项
+
+$_POST['myMenu_menu_index'] = '';
+r($devTester->saveCustomedLangTest('second', 'my', '', 'zh-cn')) && p()  && e("null");           // 重置二级导航语言项
+
+$_POST = array();
+$_POST['mySubMenu_work_task'] = '任务';
+r($devTester->saveCustomedLangTest('third', 'my', 'work', 'zh-cn')) && p()  && e("任务");        // 自定义三级导航语言项
+
+$_POST['mySubMenu_work_task'] = '';
+r($devTester->saveCustomedLangTest('third', 'my', 'work', 'zh-cn')) && p()  && e("null");        // 重置三级导航语言项
+
+$_POST = array();
+$_POST['my_featureBar-todo_all'] = '所有';
+r($devTester->saveCustomedLangTest('tag', 'my', 'todo', 'zh-cn')) && p()  && e("所有");          // 自定义检索标签语言项
+
+$_POST['my_featureBar-todo_all'] = '';
+r($devTester->saveCustomedLangTest('tag', 'my', 'todo', 'zh-cn')) && p()  && e("null");          // 重置检索标签语言项

From 4912b2004efa741486e54750be4753c577eaf6ae Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 06:54:39 +0000
Subject: [PATCH 096/319] * Finish task #85630.

---
 module/admin/config.php             |  2 +-
 module/admin/lang/menu.php          |  2 ++
 module/common/lang/de.php           |  1 +
 module/common/lang/en.php           |  1 +
 module/common/lang/fr.php           |  1 +
 module/common/lang/zh-cn.php        |  1 +
 module/custom/control.php           | 19 +++++++++++++
 module/custom/css/percent.css       |  3 +++
 module/custom/lang/de.php           |  3 +++
 module/custom/lang/en.php           |  3 +++
 module/custom/lang/fr.php           |  3 +++
 module/custom/lang/zh-cn.php        |  3 +++
 module/custom/view/percent.html.php | 42 +++++++++++++++++++++++++++++
 module/group/lang/resource.php      |  2 ++
 14 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 module/custom/css/percent.css
 create mode 100644 module/custom/view/percent.html.php

diff --git a/module/admin/config.php b/module/admin/config.php
index 6739ff17f1..6db2ea5444 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -10,7 +10,7 @@ if(!isset($config->safe->weak)) $config->safe->weak = '123456,password,12345,123
 $config->admin->menuGroup['system']    = array('custom|mode', 'backup', 'cron', 'action|trash', 'admin|xuanxuan', 'setting|xuanxuan', 'admin|license', 'admin|checkweak', 'admin|resetpwdsetting', 'admin|safe', 'custom|timezone', 'search|buildindex', 'admin|tableengine', 'ldap', 'custom|libreoffice', 'conference', 'client');
 $config->admin->menuGroup['user']      = array('dept', 'company', 'user', 'group');
 $config->admin->menuGroup['switch']    = array('admin|setmodule');
-$config->admin->menuGroup['model']     = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|estimate', 'custom|hours', 'subject', 'process', 'activity', 'zoutput', 'classify', 'holiday', 'reviewsetting');
+$config->admin->menuGroup['model']     = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'process', 'activity', 'zoutput', 'classify', 'holiday', 'reviewsetting');
 $config->admin->menuGroup['feature']   = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report');
 $config->admin->menuGroup['template']  = array('custom|set', 'baseline');
 $config->admin->menuGroup['message']   = array('mail', 'webhook', 'sms', 'message');
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 4bbbd8b777..e71cbb1706 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -89,6 +89,7 @@ $lang->admin->menuList->model['tabMenu']['common']['stage']        = array('link
 $lang->admin->menuList->model['tabMenu']['common']['build']        = array('link' => "{$lang->build->common}|custom|required|module=build", 'alias' => 'set', 'exclude' => 'custom');
 $lang->admin->menuList->model['tabMenu']['common']['flow']         = array('link' => "{$lang->custom->flow}|custom|flow|", 'divider' => true);
 $lang->admin->menuList->model['tabMenu']['common']['code']         = array('link' => "{$lang->code}|custom|code|");
+$lang->admin->menuList->model['tabMenu']['common']['percent']      = array('link' => "{$lang->stage->percent}|custom|percent|");
 $lang->admin->menuList->model['tabMenu']['common']['hours']        = array('link' => "{$lang->workingHour}|custom|hours|", 'subModule' => 'holiday', 'links' => array('holiday|browse|'));
 $lang->admin->menuList->model['tabMenu']['waterfall']['stage']     = array('link' => "{$lang->stage->common}|stage|browse|", 'subModule' => 'stage', 'exclude' => 'stage-plusbrowse');
 $lang->admin->menuList->model['tabMenu']['waterfallplus']['stage'] = array('link' => "{$lang->stage->common}|stage|plusbrowse|", 'subModule' => 'stage', 'exclude' => 'stage-browse');
@@ -97,6 +98,7 @@ $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['7']        = 's
 $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['10']       = 'build';
 $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['35']       = 'flow';
 $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['40']       = 'code';
+$lang->admin->menuList->model['tabMenu']['menuOrder']['common']['43']       = 'percent';
 $lang->admin->menuList->model['tabMenu']['menuOrder']['common']['45']       = 'hours';
 $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfall']['5']     = 'stage';
 $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfallplus']['5'] = 'stage';
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 4810af6d36..1ab1b5ea48 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -203,6 +203,7 @@ $lang->design->DBDS       = 'DBDS';
 $lang->design->ADS        = 'ADS';
 $lang->stage->common      = 'Stage';
 $lang->stage->list        = 'Stage List';
+$lang->stage->percent     = 'Workload Ratio';
 $lang->execution->list    = "{$lang->executionCommon} List";
 $lang->kanban->common     = 'Kanban';
 $lang->backup->common     = 'Backup';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 7e772786e2..ad77a8cefd 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -203,6 +203,7 @@ $lang->design->DBDS       = 'Database Design';
 $lang->design->ADS        = 'Interface Design';
 $lang->stage->common      = 'Stage';
 $lang->stage->list        = 'Stage List';
+$lang->stage->percent     = 'Workload Ratio';
 $lang->execution->list    = "{$lang->executionCommon} List";
 $lang->kanban->common     = 'Kanban';
 $lang->backup->common     = 'Backup';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index f366dd685b..7a7151bfbd 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -203,6 +203,7 @@ $lang->design->DBDS       = 'DBDS';
 $lang->design->ADS        = 'ADS';
 $lang->stage->common      = 'Stage';
 $lang->stage->list        = 'Stage List';
+$lang->stage->percent     = 'Workload Ratio';
 $lang->execution->list    = "{$lang->executionCommon} List";
 $lang->kanban->common     = 'Kanban';
 $lang->backup->common     = 'Backup';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 5cd8b557c0..c947d2f92b 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -203,6 +203,7 @@ $lang->design->DBDS       = '数据库设计';
 $lang->design->ADS        = '接口设计';
 $lang->stage->common      = '阶段';
 $lang->stage->list        = '阶段列表';
+$lang->stage->percent     = '工作量占比';
 $lang->execution->list    = "{$lang->executionCommon}列表";
 $lang->kanban->common     = '看板';
 $lang->backup->common     = '备份';
diff --git a/module/custom/control.php b/module/custom/control.php
index 1a1f8e835b..8ef684b846 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -862,6 +862,25 @@ class custom extends control
         $this->display();
     }
 
+    /**
+     * Set stage percent.
+     *
+     * @access public
+     * @return void
+     */
+    public function percent()
+    {
+        if($_POST)
+        {
+            $this->loadModel('setting')->setItem('system.common.setPercent', $this->post->percent);
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
+        }
+
+        $this->view->title = $this->lang->stage->percent;
+
+        $this->display();
+    }
+
     /**
      * Set hours and weekend
      *
diff --git a/module/custom/css/percent.css b/module/custom/css/percent.css
new file mode 100644
index 0000000000..f29730761e
--- /dev/null
+++ b/module/custom/css/percent.css
@@ -0,0 +1,3 @@
+.table-form>tbody>tr>th.c-setPercent {width: 135px;}
+#readOnlyOfPercent {font-size: 13px; color: #5e626d; display: flex; width: 200%;}
+#readOnlyOfPercent i {font-size: 14px; color: #0075ff; margin-right: 3px;}
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index b3140f2c89..dd6b01ad86 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -58,6 +58,8 @@ $lang->custom->executionCommon      = 'Execution';
 $lang->custom->selectDefaultProgram = 'Please select default program';
 $lang->custom->defaultProgram       = 'Default program';
 $lang->custom->modeManagement       = 'Mode Management';
+$lang->custom->percent              = $lang->stage->percent;
+$lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
@@ -198,6 +200,7 @@ $lang->custom->notice->storyReviewTip      = 'After selecting by individual, pos
 $lang->custom->notice->selectAllTip        = 'After selecting all people, the reviewers will be emptied and grayed out while hiding their positions and departments.';
 $lang->custom->notice->repeatKey           = 'Repeat Key %s';
 $lang->custom->notice->readOnlyOfCode      = 'A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of product, project, and execution in the system will be displayed in the creation, editing, detail, and list pages.';
+$lang->custom->notice->readOnlyOfPercent   = 'The "Workload Ratio" is used to divide the workload of a project into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the "Workload Ratio", users have to fill in the ratio fields when setting up the stages in the Waterfall project and Waterfall Plus project management models.';
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to go to Product Homepage?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to go to Project Homepage?";
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 8f2e139a8d..79cb3893e7 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -58,6 +58,8 @@ $lang->custom->executionCommon      = 'Execution';
 $lang->custom->selectDefaultProgram = 'Please select default program';
 $lang->custom->defaultProgram       = 'Default program';
 $lang->custom->modeManagement       = 'Mode Management';
+$lang->custom->percent              = $lang->stage->percent;
+$lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
@@ -198,6 +200,7 @@ $lang->custom->notice->storyReviewTip      = 'After selecting by individual, pos
 $lang->custom->notice->selectAllTip        = 'After selecting all people, the reviewers will be emptied and grayed out while hiding their positions and departments.';
 $lang->custom->notice->repeatKey           = 'Repeat Key %s';
 $lang->custom->notice->readOnlyOfCode      = 'A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of product, project, and execution in the system will be displayed in the creation, editing, detail, and list pages.';
+$lang->custom->notice->readOnlyOfPercent   = 'The "Workload Ratio" is used to divide the workload of a project into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the "Workload Ratio", users have to fill in the ratio fields when setting up the stages in the Waterfall project and Waterfall Plus project management models.';
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home?";
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 2e43227781..d937dc876e 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -58,6 +58,8 @@ $lang->custom->executionCommon      = 'Execution';
 $lang->custom->selectDefaultProgram = 'Please select default program';
 $lang->custom->defaultProgram       = 'Default program';
 $lang->custom->modeManagement       = 'Mode Management';
+$lang->custom->percent              = $lang->stage->percent;
+$lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
@@ -198,6 +200,7 @@ $lang->custom->notice->storyReviewTip      = 'After selecting by individual, pos
 $lang->custom->notice->selectAllTip        = 'After selecting all people, the reviewers will be emptied and grayed out while hiding their positions and departments.';
 $lang->custom->notice->repeatKey           = 'Repeat Key %s';
 $lang->custom->notice->readOnlyOfCode      = "Le code est un terme de gestion utilisé pour la confidentialité ou comme alias. Lorsque la gestion du code est activée, le produit, le projet et l'exécution dans le système afficheront les informations de code sur les pages de création, de modification, de détails et de liste.";
+$lang->custom->notice->readOnlyOfPercent   = 'The "Workload Ratio" is used to divide the workload of a project into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the "Workload Ratio", users have to fill in the ratio fields when setting up the stages in the Waterfall project and Waterfall Plus project management models.';
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ possède une page d'accueil. Voulez-vous consulter la page d'accueil du produit ?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ possède une page d'accueil. Voulez-vous consulter la page d'accueil du produit ?";
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 8ed08ff52c..5c5c23350f 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -58,6 +58,8 @@ $lang->custom->executionCommon      = '执行';
 $lang->custom->selectDefaultProgram = '请选择一个默认项目集';
 $lang->custom->defaultProgram       = '默认项目集';
 $lang->custom->modeManagement       = '模式管理';
+$lang->custom->percent              = $lang->stage->percent;
+$lang->custom->setPercent           = "是否启用{$lang->stage->percent}";
 
 $lang->custom->unitList['efficiency'] = '工时/';
 $lang->custom->unitList['manhour']    = '人时/';
@@ -198,6 +200,7 @@ $lang->custom->notice->storyReviewTip      = '按人员、职位、部门勾选
 $lang->custom->notice->selectAllTip        = '勾选所有人员后，会清空并置灰评审人员，同时隐藏职位、部门。';
 $lang->custom->notice->repeatKey           = '%s键重复';
 $lang->custom->notice->readOnlyOfCode      = '代号是一种管理话术，主要便于保密或作为别名存在。启用代号管理后，系统中的产品、项目、执行在创建、编辑、详情、列表等页面均会展示代号信息。';
+$lang->custom->notice->readOnlyOfPercent   = '工作量占比用于划分项目中存在多个阶段时的工作量的占比，同一级阶段的百分比之和最高为100%。启用工作量占比后，系统中的瀑布项目和融合瀑布项目模型中设置阶段时需要维护阶段的工作量占比。';
 
 $lang->custom->notice->indexPage['product'] = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
 $lang->custom->notice->indexPage['project'] = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
diff --git a/module/custom/view/percent.html.php b/module/custom/view/percent.html.php
new file mode 100644
index 0000000000..25ecf9ddd0
--- /dev/null
+++ b/module/custom/view/percent.html.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * The percent view file of custom module of ZenTaoPMS.
+ * @copyright   Copyright 2009-2022 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Shujie Tian <tianshujie@cnezsoft.com>
+ * @package     custom
+ * @version     $Id$
+ * @link        https://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
+<div id='mainContent' class='main-content'>
+  <form class="load-indicator main-form form-ajax" method='post'>
+    <table class='table table-form'>
+      <tr>
+        <th class='c-setPercent'><?php echo $lang->custom->setPercent;?></th>
+        <td class='c-percent text-left'>
+          <?php $checkedKey = isset($config->setPercent) ? $config->setPercent : 0;?>
+          <?php foreach($lang->custom->conceptOptions->URAndSR as $key => $value):?>
+          <label class="radio-inline"><input type="radio" name="percent" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="percent<?php echo $key;?>"><?php echo $value;?></label>
+          <?php endforeach;?>
+        </td>
+        <td></td>
+      </tr>
+      <tr>
+        <th></th>
+        <td colspan="2" id="readOnlyOfPercent">
+          <div class="inline-block"><i class="icon-exclamation-sign"></i>&nbsp;</div>
+          <div class="inline-block"><?php echo $lang->custom->notice->readOnlyOfPercent;?></div>
+        </td>
+      </tr>
+      <tr>
+        <th></th>
+        <td class='form-actions'>
+          <?php echo html::submitButton();?>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index c70d06f828..91b7e12faa 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1444,6 +1444,7 @@ $lang->resource->custom->setDefaultConcept  = 'setDefaultConcept';
 $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
 $lang->resource->custom->kanban             = 'kanban';
 $lang->resource->custom->code               = 'code';
+$lang->resource->custom->percent            = 'percent';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
@@ -1461,6 +1462,7 @@ $lang->custom->methodOrder[65] = 'setDefaultConcept';
 $lang->custom->methodOrder[70] = 'deleteStoryConcept';
 $lang->custom->methodOrder[75] = 'kanban';
 $lang->custom->methodOrder[80] = 'code';
+$lang->custom->methodOrder[85] = 'percent';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';

From cf4c9931e2e66f4e7027ef5e594b10ae67f84597 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 27 Feb 2023 15:29:02 +0800
Subject: [PATCH 097/319] * Code for finish task #84527.

---
 module/block/view/reviewblock.html.php   | 2 +-
 module/execution/view/grouptask.html.php | 2 +-
 module/execution/view/testcase.html.php  | 2 +-
 module/my/view/audit.html.php            | 2 +-
 module/testtask/view/report.html.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/block/view/reviewblock.html.php b/module/block/view/reviewblock.html.php
index 7ea1d6454b..6ade6c5873 100644
--- a/module/block/view/reviewblock.html.php
+++ b/module/block/view/reviewblock.html.php
@@ -33,7 +33,7 @@
 
       $typeName = '';
       if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
-      if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
+      if($type == 'story') $typeName = $lang->SRCommon;
       if($review->type == 'projectreview') $typeName = $lang->project->common;
       if(isset($flows[$review->type])) $typeName = $flows[$review->type];
 
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 5633b05d66..9b029f1f13 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -33,7 +33,7 @@
     <?php echo html::a(inlink('grouptask', "executionID=$executionID&groupBy=$groupBy&filter=$filterKey"), $name, '', "class='btn btn-link $active'");?>
     <?php endforeach;?>
     <?php else:?>
-    <?php echo html::a(inlink('grouptask', "executionID=$executionID&groupBy=$groupBy"), "<span class='text'>{$lang->execution->featureBar['task']['all']}</span> <span class='label label-light label-badge'>{$allCount}</span>", '', "class='btn btn-link btn-active-text'");?>
+    <?php echo html::a(inlink('grouptask', "executionID=$executionID&groupBy=$groupBy"), "<span class='text'>{$lang->all}</span> <span class='label label-light label-badge'>{$allCount}</span>", '', "class='btn btn-link btn-active-text'");?>
     <?php endif;?>
   </div>
   <div class="btn-toolbar pull-right">
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index d965862231..a6cff28246 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -13,7 +13,7 @@
     </div>
   </div>
   <div class="btn-toolbar pull-left">
-    <?php echo html::a(inlink('testcase', "executionID=$executionID&productID=$productID&branchID=$branchID&type=$type&moduleID=$moduleID&orderBy=$orderBy"), "<span class='text'>{$lang->execution->featureBar['all']['all']}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
+    <?php echo html::a(inlink('testcase', "executionID=$executionID&productID=$productID&branchID=$branchID&type=$type&moduleID=$moduleID&orderBy=$orderBy"), "<span class='text'>{$lang->all}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('execution', $execution)) echo html::a(helper::createLink('testcase', 'create', "productID=$productID&branch=0&moduleID=0&from=execution&param=$execution->id", '', '', '', true), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary' data-app='{$this->app->tab}'");?>
diff --git a/module/my/view/audit.html.php b/module/my/view/audit.html.php
index 59172a19cd..20b6198d42 100644
--- a/module/my/view/audit.html.php
+++ b/module/my/view/audit.html.php
@@ -57,7 +57,7 @@
 
       $typeName = '';
       if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
-      if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
+      if($type == 'story') $typeName = $lang->SRCommon;
       if($review->type == 'projectreview') $typeName = $lang->project->common;
       if(isset($flows[$review->type])) $typeName = $flows[$review->type];
 
diff --git a/module/testtask/view/report.html.php b/module/testtask/view/report.html.php
index 0c4734bf67..26e9eab345 100644
--- a/module/testtask/view/report.html.php
+++ b/module/testtask/view/report.html.php
@@ -47,7 +47,7 @@
         <?php endforeach;?>
       </div>
       <?php $this->app->loadLang('testcase');?>
-      <div class='text-muted' style='padding-top:5px'><?php echo str_replace('%tab%', $lang->testcase->featureBar['browse']['wait'] . $lang->testcase->common, $lang->report->notice->help);?></div>
+      <div class='text-muted' style='padding-top:5px'><?php echo str_replace('%tab%', $lang->testtask->wait . $lang->testcase->common, $lang->report->notice->help);?></div>
       <?php foreach($charts as $chartType => $chartOption):?>
       <div class='table-row chart-row'>
         <div class='main-col'>

From fd282324870f6ef0611c9bc87a50ec4f632c490e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 08:05:14 +0000
Subject: [PATCH 098/319] * Finish task #85630.

---
 db/update18.2.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/update18.2.sql

diff --git a/db/update18.2.sql b/db/update18.2.sql
new file mode 100644
index 0000000000..1d3adf53f9
--- /dev/null
+++ b/db/update18.2.sql
@@ -0,0 +1 @@
+REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','common','','setPercent','1');

From 226f798470d2470e825b81327615506b3a0b50d9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 08:08:07 +0000
Subject: [PATCH 099/319] * Finish task #85631.

---
 module/execution/model.php             |  6 ++--
 module/execution/view/create.html.php  |  2 +-
 module/execution/view/edit.html.php    |  2 +-
 module/programplan/config.php          | 34 +++++++++++++++-----
 module/programplan/control.php         |  1 +
 module/programplan/model.php           | 44 ++++++++++++++++----------
 module/programplan/view/edit.html.php  |  2 ++
 module/stage/config.php                | 14 ++++++--
 module/stage/model.php                 | 28 ++++++++++------
 module/stage/view/batchcreate.html.php |  4 +++
 module/stage/view/browse.html.php      |  4 +++
 module/stage/view/create.html.php      |  4 ++-
 module/stage/view/edit.html.php        |  4 ++-
 13 files changed, 104 insertions(+), 45 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 3b5386d02f..9ba46a87ca 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -383,7 +383,7 @@ class executionModel extends model
         $type    = 'sprint';
         if($project) $type = zget($this->config->execution->modelList, $project->model, 'sprint');
 
-        if($project->model == 'waterfall')
+        if($project->model == 'waterfall' and isset($this->config->setPercent) and $this->config->setPercent == 1)
         {
             $this->checkWorkload('create', $_POST['percent'], $project);
             if(dao::isError()) return false;
@@ -432,7 +432,7 @@ class executionModel extends model
         }
 
         /* Check the workload format and total. */
-        if(!empty($sprint->percent)) $this->checkWorkload('create', $sprint->percent, $sprint->project);
+        if(!empty($sprint->percent) and isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('create', $sprint->percent, $sprint->project);
 
         /* Set planDuration and realDuration. */
         if($this->config->edition == 'max')
@@ -621,7 +621,7 @@ class executionModel extends model
         $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->edit['id'], $this->post->uid);
 
         /* Check the workload format and total. */
-        if(!empty($execution->percent)) $this->checkWorkload('update', $execution->percent, $oldExecution);
+        if(!empty($execution->percent) and isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('update', $execution->percent, $oldExecution);
 
         /* Set planDuration and realDuration. */
         if($this->config->edition == 'max')
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index dab4ad2d55..a1c6f81724 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -124,7 +124,7 @@
           <td class='muted' colspan='2'><div id='lifeTimeTips'><?php echo $lang->execution->typeDesc;?></div></td>
         </tr>
         <?php endif;?>
-        <?php if($isStage):?>
+        <?php if($isStage and isset($config->setPercent) and $config->setPercent == 1):?>
         <tr>
           <th><?php echo $lang->stage->percent;?></th>
           <td class='required'>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 18123bcfed..1c9a55e90b 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -144,7 +144,7 @@
             </div>
           </td>
         </tr>
-        <?php if($execution->type == 'stage'):?>
+        <?php if($execution->type == 'stage' and isset($config->setPercent) and $config->setPercent == 1):?>
         <tr>
           <th><?php echo $lang->stage->percent;?></th>
           <td>
diff --git a/module/programplan/config.php b/module/programplan/config.php
index 3136c4559d..e5745773c6 100644
--- a/module/programplan/config.php
+++ b/module/programplan/config.php
@@ -5,7 +5,14 @@ $config->programplan->create->requiredFields = 'name,begin,end';
 $config->programplan->edit->requiredFields   = 'name,begin,end';
 
 $config->programplan->datatable = new stdclass();
-$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'begin', 'end', 'realBegan', 'realEnd', 'actions');
+if(isset($config->setPercent) and $config->setPercent == 1)
+{
+    $config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'begin', 'end', 'realBegan', 'realEnd', 'actions');
+}
+else
+{
+    $config->programplan->datatable->defaultField = array('id', 'name', 'attribute', 'begin', 'end', 'realBegan', 'realEnd', 'actions');
+}
 
 $config->programplan->datatable->fieldList['id']['title']    = 'idAB';
 $config->programplan->datatable->fieldList['id']['fixed']    = 'left';
@@ -17,10 +24,13 @@ $config->programplan->datatable->fieldList['name']['fixed']    = 'left';
 $config->programplan->datatable->fieldList['name']['width']    = 'auto';
 $config->programplan->datatable->fieldList['name']['required'] = 'yes';
 
-$config->programplan->datatable->fieldList['percent']['title']    = 'percent';
-$config->programplan->datatable->fieldList['percent']['fixed']    = 'no';
-$config->programplan->datatable->fieldList['percent']['width']    = '100';
-$config->programplan->datatable->fieldList['percent']['required'] = 'no';
+if(isset($config->setPercent) and $config->setPercent == 1)
+{
+    $config->programplan->datatable->fieldList['percent']['title']    = 'percent';
+    $config->programplan->datatable->fieldList['percent']['fixed']    = 'no';
+    $config->programplan->datatable->fieldList['percent']['width']    = '100';
+    $config->programplan->datatable->fieldList['percent']['required'] = 'no';
+}
 
 $config->programplan->datatable->fieldList['attribute']['title']    = 'attribute';
 $config->programplan->datatable->fieldList['attribute']['fixed']    = 'no';
@@ -53,10 +63,18 @@ $config->programplan->datatable->fieldList['actions']['width']    = '150';
 $config->programplan->datatable->fieldList['actions']['required'] = 'yes';
 $config->programplan->datatable->fieldList['actions']['sort']     = 'no';
 
-$config->programplan->customCreateFields = 'PM,percent,attribute,acl,milestone,realBegan,realEnd';
-
 $config->programplan->custom = new stdclass();
-$config->programplan->custom->createFields = 'PM,percent,attribute,acl,milestone';
+
+if(isset($config->setPercent) and $config->setPercent == 1)
+{
+    $config->programplan->custom->createFields = 'PM,percent,attribute,acl,milestone';
+    $config->programplan->customCreateFields   = 'PM,percent,attribute,acl,milestone,realBegan,realEnd';
+}
+else
+{
+    $config->programplan->custom->createFields = 'PM,attribute,acl,milestone';
+    $config->programplan->customCreateFields   = 'PM,attribute,acl,milestone,realBegan,realEnd';
+}
 
 $config->programplan->customAgilePlusCreateFields = 'PM,milestone,acl,desc,attribute';
 
diff --git a/module/programplan/control.php b/module/programplan/control.php
index ccf3baa0a5..83f280143f 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -205,6 +205,7 @@ class programplan extends control
                 if(strpos(",{$this->config->programplan->$customCreateFields},", ",{$field},") !== false) $visibleFields[$field] = '';
             }
         }
+        if(empty($this->config->setPercent)) unset($visibleFields['percent'], $requiredFields['percent']);
 
         if($executionType != 'stage') unset($this->lang->execution->typeList[''], $this->lang->execution->typeList['stage']);
 
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 5bd2ca475f..c46b69ee02 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -201,7 +201,7 @@ class programplanModel extends model
             $data->type          = 'plan';
             $data->text          = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
             $data->name          = $plan->name;
-            $data->percent       = $plan->percent;
+            if(isset($this->config->setPercent) and $this->config->setPercent == 1) $data->percent = $plan->percent;
             $data->attribute     = zget($this->lang->stage->typeList, $plan->attribute);
             $data->milestone     = zget($this->lang->programplan->milestoneList, $plan->milestone);
             $data->owner_id      = $plan->PM;
@@ -717,6 +717,7 @@ class programplanModel extends model
         $setCode   = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
         $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '');
 
+        $setPercent = (isset($this->config->setPercent) and $this->config->setPercent == 1) ? true : false;
         $datas = array();
         foreach($names as $key => $name)
         {
@@ -728,8 +729,8 @@ class programplanModel extends model
             $plan->project    = $projectID;
             $plan->parent     = $parentID ? $parentID : $projectID;
             $plan->name       = $names[$key];
-            if($setCode) $plan->code = $codes[$key];
-            $plan->percent    = $percents[$key];
+            if($setCode)    $plan->code    = $codes[$key];
+            if($setPercent) $plan->percent = $percents[$key];
             $plan->attribute  = (empty($parentID) or $parentAttribute == 'mix') ? $attributes[$key] : $parentAttribute;
             $plan->milestone  = $milestone[$key];
             $plan->begin      = empty($begin[$key]) ? '0000-00-00' : $begin[$key];
@@ -753,7 +754,7 @@ class programplanModel extends model
             if(!empty($sameNames) and in_array($plan->name, $sameNames)) dao::$errors[$index]['name'] = empty($type) ? $this->lang->programplan->error->sameName : str_replace($this->lang->execution->stage, '', $this->lang->programplan->error->sameName);
             if($setCode and $sameCodes !== true and !empty($sameCodes) and in_array($plan->code, $sameCodes)) dao::$errors[$index]['code'] = sprintf($this->lang->error->repeat, $plan->type == 'stage' ? $this->lang->execution->code : $this->lang->code, $plan->code);
 
-            if($plan->percent and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $plan->percent))
+            if($setPercent and $plan->percent and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $plan->percent))
             {
                 dao::$errors[$index]['percent'] = $this->lang->programplan->error->percentNumber;
             }
@@ -806,13 +807,16 @@ class programplanModel extends model
                 }
             }
 
-            $plan->percent = (float)$plan->percent;
-            $totalPercent += $plan->percent;
+            if($setPercent)
+            {
+                $plan->percent = (float)$plan->percent;
+                $totalPercent += $plan->percent;
+            }
 
             if($plan->milestone) $milestone = 1;
         }
 
-        if($totalPercent > 100) dao::$errors['percent'] = $this->lang->programplan->error->percentOver;
+        if($setPercent and $totalPercent > 100) dao::$errors['percent'] = $this->lang->programplan->error->percentOver;
         if(dao::isError()) return false;
 
         $this->loadModel('action');
@@ -877,7 +881,7 @@ class programplanModel extends model
                 $this->dao->update(TABLE_PROJECT)->data($data)
                     ->autoCheck()
                     ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
-                    ->checkIF($plan->percent != '', 'percent', 'float')
+                    ->checkIF($plan->percent != '' and $setPercent, 'percent', 'float')
                     ->where('id')->eq($stageID)
                     ->exec();
 
@@ -934,7 +938,7 @@ class programplanModel extends model
                 $this->dao->insert(TABLE_PROJECT)->data($data)
                     ->autoCheck()
                     ->batchCheck($this->config->programplan->create->requiredFields, 'notempty')
-                    ->checkIF($plan->percent != '', 'percent', 'float')
+                    ->checkIF($plan->percent != '' and $setPercent, 'percent', 'float')
                     ->exec();
 
                 if(!dao::isError())
@@ -1084,15 +1088,18 @@ class programplanModel extends model
 
         $planChanged = ($oldPlan->name != $plan->name || $oldPlan->milestone != $plan->milestone || $oldPlan->begin != $plan->begin || $oldPlan->end != $plan->end);
 
+        $setPercent = isset($this->config->setPercent) and $this->config->setPercent == 1 ? true : false;
         if($plan->parent > 0)
         {
             $plan->attribute = $parentStage->attribute == 'mix' ? $plan->attribute : $parentStage->attribute;
             $plan->acl       = $parentStage->acl;
-            $parentPercent   = $parentStage->percent;
-
-            $childrenTotalPercent = $this->getTotalPercent($parentStage, true);
-            $childrenTotalPercent = $plan->parent == $oldPlan->parent ? ($childrenTotalPercent - $oldPlan->percent + $plan->percent) : ($childrenTotalPercent + $plan->percent);
-            if($childrenTotalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
+            if($setPercent)
+            {
+                $parentPercent        = $parentStage->percent;
+                $childrenTotalPercent = $this->getTotalPercent($parentStage, true);
+                $childrenTotalPercent = $plan->parent == $oldPlan->parent ? ($childrenTotalPercent - $oldPlan->percent + $plan->percent) : ($childrenTotalPercent + $plan->percent);
+                if($childrenTotalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
+            }
 
             /* If child plan has milestone, update parent plan set milestone eq 0 . */
             if($plan->milestone and $parentStage->milestone) $this->dao->update(TABLE_PROJECT)->set('milestone')->eq(0)->where('id')->eq($oldPlan->parent)->exec();
@@ -1105,9 +1112,12 @@ class programplanModel extends model
 
             /* The workload of the parent plan cannot exceed 100%. */
             $oldPlan->parent = $plan->parent;
-            $totalPercent    = $this->getTotalPercent($oldPlan);
-            $totalPercent    = $totalPercent + $plan->percent;
-            if($totalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
+            if($setPercent)
+            {
+                $totalPercent    = $this->getTotalPercent($oldPlan);
+                $totalPercent    = $totalPercent + $plan->percent;
+                if($totalPercent > 100) return dao::$errors['percent'][] = $this->lang->programplan->error->percentOver;
+            }
         }
 
         /* Set planDuration and realDuration. */
diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php
index 73ae92b6c7..83e047eeda 100644
--- a/module/programplan/view/edit.html.php
+++ b/module/programplan/view/edit.html.php
@@ -46,6 +46,7 @@
             <th><?php echo $lang->programplan->PM;?> </th>
             <td colspan='2'><?php echo html::select('PM', $PMUsers, '', "class='form-control picker-select'");?></td>
           </tr>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <tr>
             <th><?php echo $lang->programplan->percent;?> </th>
             <td colspan='2'>
@@ -55,6 +56,7 @@
               </div>
             </td>
           </tr>
+          <?php endif;?>
           <tr id="attributeType">
             <th><?php echo $lang->programplan->attribute;?></th>
             <td colspan='2'>
diff --git a/module/stage/config.php b/module/stage/config.php
index f77eb68cd9..1e76c319bd 100644
--- a/module/stage/config.php
+++ b/module/stage/config.php
@@ -1,5 +1,13 @@
-<?php 
+<?php
 $config->stage->create = new stdclass();
 $config->stage->edit   = new stdclass();
-$config->stage->create->requiredFields = 'name,percent,type';
-$config->stage->edit->requiredFields   = 'name,percent,type';
+if(isset($config->setPercent) and $config->setPercent == 1)
+{
+    $config->stage->create->requiredFields = 'name,percent,type';
+    $config->stage->edit->requiredFields   = 'name,percent,type';
+}
+else
+{
+    $config->stage->create->requiredFields = 'name,type';
+    $config->stage->edit->requiredFields   = 'name,type';
+}
diff --git a/module/stage/model.php b/module/stage/model.php
index c475e5e196..5303d6d651 100644
--- a/module/stage/model.php
+++ b/module/stage/model.php
@@ -27,10 +27,13 @@ class stageModel extends model
             ->add('createdDate', helper::today())
             ->get();
 
-        $totalPercent = $this->getTotalPercent($type);
+        if(isset($this->config->setPercent) and $this->config->setPercent == 1)
+        {
+            $totalPercent = $this->getTotalPercent($type);
 
-        if(!is_numeric($stage->percent)) return dao::$errors['message'][] = $this->lang->stage->error->notNum;
-        if(round($totalPercent + $stage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
+            if(!is_numeric($stage->percent)) return dao::$errors['message'][] = $this->lang->stage->error->notNum;
+            if(round($totalPercent + $stage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
+        }
 
         $this->dao->insert(TABLE_STAGE)
             ->data($stage)
@@ -53,9 +56,12 @@ class stageModel extends model
     {
         $data = fixer::input('post')->get();
 
-        $totalPercent = $this->getTotalPercent($type);
-
-        if(round($totalPercent + array_sum($data->percent)) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
+        $setPercent = (isset($this->config->setPercent) and $this->config->setPercent == 1) ? true : false;
+        if($setPercent)
+        {
+            $totalPercent = $this->getTotalPercent($type);
+            if(round($totalPercent + array_sum($data->percent)) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
+        }
 
         $this->loadModel('action');
         foreach($data->name as $i => $name)
@@ -64,7 +70,7 @@ class stageModel extends model
 
             $stage = new stdclass();
             $stage->name        = $name;
-            $stage->percent     = $data->percent[$i];
+            if($setPercent) $stage->percent = $data->percent[$i];
             $stage->type        = $data->type[$i];
             $stage->projectType = $type;
             $stage->createdBy   = $this->app->user->account;
@@ -100,9 +106,11 @@ class stageModel extends model
             ->add('editedDate', helper::today())
             ->get();
 
-        $totalPercent = $this->getTotalPercent($oldStage->projectType);
-
-        if(round($totalPercent + $stage->percent - $oldStage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
+        if(isset($this->config->setPercent) and $this->config->setPercent == 1)
+        {
+            $totalPercent = $this->getTotalPercent($oldStage->projectType);
+            if(round($totalPercent + $stage->percent - $oldStage->percent) > 100) return dao::$errors['message'][] = $this->lang->stage->error->percentOver;
+        }
 
         $this->dao->update(TABLE_STAGE)
             ->data($stage)
diff --git a/module/stage/view/batchcreate.html.php b/module/stage/view/batchcreate.html.php
index 6184ee3eaf..8043dcf55b 100644
--- a/module/stage/view/batchcreate.html.php
+++ b/module/stage/view/batchcreate.html.php
@@ -22,7 +22,9 @@
         <tr>
           <th class='c-id'><?php echo $lang->stage->id;?></th>
           <th class='required'><?php echo $lang->stage->name;?></th>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <th class='c-percent required'><?php echo $lang->stage->percent;?></th>
+          <?php endif;?>
           <th class='c-type required'><?php echo $lang->stage->type;?></th>
         </tr>
       </thead>
@@ -31,7 +33,9 @@
         <tr>
           <td><?php echo $i;?></td>
           <td><?php echo html::input("name[$i]", '',  "class='form-control'");?></td>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <td><?php echo html::input("percent[$i]", '',  "class='form-control'");?></td>
+          <?php endif;?>
           <td><?php echo html::select("type[$i]", array('' => '') + $lang->stage->typeList, '',  "class='form-control chosen'");?></td>
         </tr>
         <?php endfor;?>
diff --git a/module/stage/view/browse.html.php b/module/stage/view/browse.html.php
index 32d8a50a9c..e5abf7647f 100644
--- a/module/stage/view/browse.html.php
+++ b/module/stage/view/browse.html.php
@@ -38,7 +38,9 @@
         <tr>
         <th class='text-left w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->stage->id);?></th>
           <th class='text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->stage->name);?></th>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <th class='w-100px'><?php common::printOrderLink('percent', $orderBy, $vars, $lang->stage->percent);?></th>
+          <?php endif;?>
           <th class='w-120px'><?php common::printOrderLink('type', $orderBy, $vars, $lang->stage->type);?></th>
           <th class='c-actions-2'><?php echo $lang->actions;?></th>
         </tr>
@@ -48,7 +50,9 @@
         <tr>
           <td><?php echo $stage->id;?></td>
           <td><?php echo $stage->name;?></td>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <td class='text-center'><?php echo $stage->percent;?></td>
+          <?php endif;?>
           <td><?php echo zget($lang->stage->typeList, $stage->type);?></td>
           <td class="c-actions">
             <?php
diff --git a/module/stage/view/create.html.php b/module/stage/view/create.html.php
index 5e47a980e2..23d83d06b3 100644
--- a/module/stage/view/create.html.php
+++ b/module/stage/view/create.html.php
@@ -25,15 +25,17 @@
             <td></td>
             <td></td>
           </tr>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <tr>
             <th><?php echo $lang->stage->percent;?></th>
             <td>
               <div class='input-group'>
                 <?php echo html::input('percent', '', "class='form-control'");?>
-                <span class='input-group-addon'>%</span> 
+                <span class='input-group-addon'>%</span>
               </div>
             </td>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->stage->type;?></th>
             <td><?php echo html::select('type', $lang->stage->typeList, '',  "class='form-control chosen'");?></td>
diff --git a/module/stage/view/edit.html.php b/module/stage/view/edit.html.php
index 4a258ee822..f23abace37 100644
--- a/module/stage/view/edit.html.php
+++ b/module/stage/view/edit.html.php
@@ -25,15 +25,17 @@
             <td></td>
             <td></td>
           </tr>
+          <?php if(isset($config->setPercent) and $config->setPercent == 1):?>
           <tr>
             <th><?php echo $lang->stage->percent;?></th>
             <td>
               <div class='input-group'>
                 <?php echo html::input('percent', $stage->percent, "class='form-control'");?>
-                <span class='input-group-addon'>%</span> 
+                <span class='input-group-addon'>%</span>
               </div>
             </td>
           </tr>
+          <?php endif;?>
           <tr>
             <th><?php echo $lang->stage->type;?></th>
             <td><?php echo html::select('type', $lang->stage->typeList, $stage->type,  "class='form-control chosen'");?></td>

From fc99d01af94df79e3fedf363b4e4f9735a0a9d5e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 27 Feb 2023 16:09:06 +0800
Subject: [PATCH 100/319] * Fixed Save labels clearing other labels.

---
 module/custom/model.php | 2 +-
 module/dev/control.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 1e273478a5..79b0de8cc0 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -64,7 +64,7 @@ class customModel extends model
                     for($i = 0; $i <= $sectionIndex; $i ++)
                     {
                         $sectionKey    = $sections[$i];
-                        $oldSectionArr = $oldSectionArr[$sectionKey];
+                        $oldSectionArr = isset($oldSectionArr[$sectionKey]) ? $oldSectionArr[$sectionKey] : array();
                     }
                     $sectionArr = array_merge($oldSectionArr, $sectionArr);
                 }
diff --git a/module/dev/control.php b/module/dev/control.php
index 315881e84e..74b3091f51 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -128,7 +128,7 @@ class dev extends control
 
         if($this->server->request_method == 'POST')
         {
-            $this->dev->saveCustomedLang($common, $moduleName, $method, $language);
+            $this->dev->saveCustomedLang($type, $moduleName, $method, $language);
             return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
         }
 

From 1753a65dc3dc484ad0b912ce3aa4520fe8571383 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 16:10:53 +0800
Subject: [PATCH 101/319] * Modify page reload.

---
 module/dev/control.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 74b3091f51..96b0d1fd1c 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -129,7 +129,7 @@ class dev extends control
         if($this->server->request_method == 'POST')
         {
             $this->dev->saveCustomedLang($type, $moduleName, $method, $language);
-            return $this->send(array('result' => 'success', 'locate' => 'reload', 'message' => $this->lang->saveSuccess));
+            return $this->send(array('result' => 'success', 'locate' => 'top', 'message' => $this->lang->saveSuccess));
         }
 
         if($clientLang != $language)
@@ -194,6 +194,6 @@ class dev extends control
             }
         }
 
-        return print(js::reload('parent'));
+        return print(js::reload('parent.parent'));
     }
 }

From f20d64e70b0c03749b6e151659b4642703cd103d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 16:23:11 +0800
Subject: [PATCH 102/319] * Update test case.

---
 test/model/custom/getalllang.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/model/custom/getalllang.php b/test/model/custom/getalllang.php
index 64c63eb325..e1122d0185 100755
--- a/test/model/custom/getalllang.php
+++ b/test/model/custom/getalllang.php
@@ -4,16 +4,25 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/custom.class.php';
 su('admin');
 
+$ztLang = zdTable('lang');
+$ztLang->id->range('1-3');
+$ztLang->lang->range('zh-cn');
+$ztLang->module->range('common,myMenu,my');
+$ztLang->section->range('``,menu,featureBar-todo');
+$ztLang->key->range('productCommon,index,all');
+$ztLang->value->range('1-3')->prefix('测试');
+$ztLang->gen(3);
+
 /**
 
 title=测试 customModel->getAllLang();
 cid=1
 pid=1
 
-测试正常查询 >> 2
+测试正常查询 >> 3
 
 */
 
 $custom = new customTest();
 
-r($custom->getAllLangTest()) && p() && e('2');  //测试正常查询
\ No newline at end of file
+r($custom->getAllLangTest()) && p() && e('3');  //测试正常查询

From 2c557b79009378cffdc97bfa4add36018b5debd5 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 27 Feb 2023 08:51:12 +0000
Subject: [PATCH 103/319] * Finish task #85651.

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

diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index cf797124b2..b19671ee3c 100755
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -205,7 +205,7 @@ $(function()
               <div class='col-7'>
                 <div class='progress progress-text-left'>
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->executions[0]->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->executions[0]->hours->progress;?>%">
-                    <span class='progress-text'><?php echo $project->executions[0]->hours->progress . '%';?></span>
+                    <span class='progress-text'><?php echo !empty($project->executions[0]->hours->progress) ? $project->executions[0]->hours->progress . '%' : '0%';?></span>
                   </div>
                 </div>
               </div>

From 2a003865f4b9f745ff949c295133a7534d9c4393 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 28 Feb 2023 09:09:16 +0800
Subject: [PATCH 104/319] * Code for finish task #84526.

---
 module/common/lang/de.php    |  8 ++++----
 module/common/lang/en.php    |  8 ++++----
 module/common/lang/fr.php    |  8 ++++----
 module/common/lang/menu.php  | 10 +++++-----
 module/common/lang/zh-cn.php |  8 ++++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index eca0fd20b9..93cc996087 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -265,8 +265,8 @@ $lang->calendar        = 'Calendar';
 
 $lang->my->work = 'Work';
 
-$lang->project->list   = 'Project List';
-$lang->project->kanban = 'Project Kanban';
+$lang->project->list   = $lang->projectCommon . ' List';
+$lang->project->kanban = $lang->projectCommon . ' Kanban';
 
 $lang->execution->executionKanban = "{$lang->execution->common} Kanban";
 $lang->execution->all             = "{$lang->execution->common} List";
@@ -274,8 +274,8 @@ $lang->execution->all             = "{$lang->execution->common} List";
 $lang->doc->recent    = 'Recent';
 $lang->doc->my        = 'My';
 $lang->doc->favorite  = 'Favorite';
-$lang->doc->product   = 'Product';
-$lang->doc->project   = 'Project';
+$lang->doc->product   = $lang->productCommon;
+$lang->doc->project   = $lang->projectCommon;
 $lang->doc->api       = 'API';
 $lang->doc->execution = $lang->execution->common;
 $lang->doc->custom    = 'Custom';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 19be481dd7..6996899900 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -265,8 +265,8 @@ $lang->calendar        = 'Calendar';
 
 $lang->my->work = 'Work';
 
-$lang->project->list   = 'Project List';
-$lang->project->kanban = 'Project Kanban';
+$lang->project->list   = $lang->projectCommon . ' List';
+$lang->project->kanban = $lang->projectCommon . ' Kanban';
 
 $lang->execution->executionKanban = "{$lang->execution->common} Kanban";
 $lang->execution->all             = "{$lang->execution->common} List";
@@ -274,8 +274,8 @@ $lang->execution->all             = "{$lang->execution->common} List";
 $lang->doc->recent    = 'Recent';
 $lang->doc->my        = 'My';
 $lang->doc->favorite  = 'Favorite';
-$lang->doc->product   = 'Product';
-$lang->doc->project   = 'Project';
+$lang->doc->product   = $lang->productCommon;
+$lang->doc->project   = $lang->projectCommon;
 $lang->doc->api       = 'API';
 $lang->doc->execution = $lang->execution->common;
 $lang->doc->custom    = 'Custom';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 09e796c036..72fa5dcce1 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -265,8 +265,8 @@ $lang->calendar        = 'Calendar';
 
 $lang->my->work = 'Work';
 
-$lang->project->list   = 'Project List';
-$lang->project->kanban = 'Project Kanban';
+$lang->project->list   = $lang->projectCommon . ' List';
+$lang->project->kanban = $lang->projectCommon . ' Kanban';
 
 $lang->execution->executionKanban = "{$lang->execution->common} Kanban";
 $lang->execution->all             = "{$lang->execution->common} List";
@@ -274,8 +274,8 @@ $lang->execution->all             = "{$lang->execution->common} List";
 $lang->doc->recent    = 'Recent';
 $lang->doc->my        = 'My';
 $lang->doc->favorite  = 'Favorite';
-$lang->doc->product   = 'Product';
-$lang->doc->project   = 'Project';
+$lang->doc->product   = $lang->productCommon;
+$lang->doc->project   = $lang->projectCommon;
 $lang->doc->api       = 'API';
 $lang->doc->execution = $lang->execution->common;
 $lang->doc->custom    = 'Custom';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index ef6839e1a6..9c7ef9c564 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -137,8 +137,8 @@ $lang->program->homeMenu->browse = array('link' => "{$lang->program->list}|progr
 $lang->program->homeMenu->kanban = array('link' => "{$lang->program->kanban}|program|kanban|");
 
 $lang->program->menu = new stdclass();
-$lang->program->menu->product     = array('link' => "{$lang->product->common}|program|product|programID=%s", 'alias' => 'view');
-$lang->program->menu->project     = array('link' => "{$lang->project->common}|program|project|programID=%s");
+$lang->program->menu->product     = array('link' => "{$lang->productCommon}|program|product|programID=%s", 'alias' => 'view');
+$lang->program->menu->project     = array('link' => "{$lang->projectCommon}|program|project|programID=%s");
 $lang->program->menu->personnel   = array('link' => "{$lang->personnel->common}|personnel|invest|programID=%s");
 $lang->program->menu->stakeholder = array('link' => "{$lang->stakeholder->common}|program|stakeholder|programID=%s", 'alias' => 'createstakeholder');
 
@@ -163,7 +163,7 @@ $lang->product->menu              = new stdclass();
 $lang->product->menu->dashboard   = array('link' => "{$lang->dashboard}|product|dashboard|productID=%s");
 $lang->product->menu->story       = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
 $lang->product->menu->plan        = array('link' => "{$lang->productplan->shortCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan,bug');
-$lang->product->menu->project     = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s");
+$lang->product->menu->project     = array('link' => "{$lang->projectCommon}|product|project|status=all&productID=%s");
 $lang->product->menu->release     = array('link' => "{$lang->release->common}|release|browse|productID=%s", 'subModule' => 'release');
 $lang->product->menu->roadmap     = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
 $lang->product->menu->requirement = array('link' => "{$lang->URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
@@ -248,7 +248,7 @@ $lang->scrum->menu->qa['subMenu']->testreport = array('link' => "{$lang->testrep
 
 $lang->scrum->menu->settings['subMenu']              = new stdclass();
 $lang->scrum->menu->settings['subMenu']->view        = array('link' => "$lang->overview|project|view|project=%s", 'alias' => 'edit');
-$lang->scrum->menu->settings['subMenu']->products    = array('link' => "{$lang->product->common}|project|manageProducts|project=%s", 'alias' => 'manageproducts');
+$lang->scrum->menu->settings['subMenu']->products    = array('link' => "{$lang->productCommon}|project|manageProducts|project=%s", 'alias' => 'manageproducts');
 $lang->scrum->menu->settings['subMenu']->members     = array('link' => "{$lang->team->common}|project|team|project=%s", 'alias' => 'managemembers,team');
 $lang->scrum->menu->settings['subMenu']->whitelist   = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel');
 $lang->scrum->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder');
@@ -324,7 +324,7 @@ $lang->kanbanProject->menuOrder[15] = 'settings';
 
 $lang->kanbanProject->menu->settings['subMenu']            = new stdclass();
 $lang->kanbanProject->menu->settings['subMenu']->view      = array('link' => "$lang->overview|project|view|project=%s", 'alias' => 'edit');
-$lang->kanbanProject->menu->settings['subMenu']->products  = array('link' => "{$lang->product->common}|project|manageProducts|project=%s", 'alias' => 'manageproducts');
+$lang->kanbanProject->menu->settings['subMenu']->products  = array('link' => "{$lang->productCommon}|project|manageProducts|project=%s", 'alias' => 'manageproducts');
 $lang->kanbanProject->menu->settings['subMenu']->members   = array('link' => "{$lang->team->common}|project|team|project=%s", 'alias' => 'managemembers,team');
 $lang->kanbanProject->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel');
 $lang->kanbanProject->menu->settings['subMenu']->module    = array('link' => "{$lang->module}|tree|browse|product=%s&view=story");
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index ef7806bb23..30b486fb0f 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -265,8 +265,8 @@ $lang->calendar        = '日程';
 
 $lang->my->work = '待处理';
 
-$lang->project->list   = '项目列表';
-$lang->project->kanban = '项目看板';
+$lang->project->list   = $lang->projectCommon . '列表';
+$lang->project->kanban = $lang->projectCommon . '看板';
 
 $lang->execution->executionKanban = "{$lang->execution->common}看板";
 $lang->execution->all             = "{$lang->execution->common}列表";
@@ -274,8 +274,8 @@ $lang->execution->all             = "{$lang->execution->common}列表";
 $lang->doc->recent    = '最近文档';
 $lang->doc->my        = '我的文档';
 $lang->doc->favorite  = '我的收藏';
-$lang->doc->product   = '产品库';
-$lang->doc->project   = '项目库';
+$lang->doc->product   = $lang->productCommon . '库';
+$lang->doc->project   = $lang->projectCommon . '库';
 $lang->doc->api       = '接口库';
 $lang->doc->execution = "{$lang->execution->common}库";
 $lang->doc->custom    = '自定义库';

From 93b01c65423c84a1f192cde851ca1b2e5ad7bf04 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 01:12:35 +0000
Subject: [PATCH 105/319] * Finish task #85641.

---
 module/upgrade/model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 19e6f4cd63..d21a35b499 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -590,6 +590,9 @@ class upgradeModel extends model
             case '18_1':
                 $this->addMixStage();
                 break;
+            case '18_2':
+                $this->loadModel('setting')->setSN();
+                break;
         }
 
         $this->deletePatch();

From 9ba8629107ef15eab5c19a87cc8586ab0457caa3 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 28 Feb 2023 09:36:22 +0800
Subject: [PATCH 106/319] * Skip repetitive navigation.

---
 module/dev/config.php | 4 +++-
 module/dev/model.php  | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index fb212e0540..06714e0100 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -246,7 +246,6 @@ $config->dev->navTypes = array('second', 'third', 'tag');
 $config->disableFeature = array();
 if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis');
 
-$config->dev->disableMainMenu = array('project', 'product');
 $config->dev->projectMenus    = array('project', 'scrum', 'waterfall', 'kanbanProject');
 $config->dev->hideMainMenu    = array('admin', 'kanban');
 if($config->vision == 'lite')
@@ -256,3 +255,6 @@ if($config->vision == 'lite')
 }
 
 $config->dev->linkMethods['my']['my-calendar'] = array('my', 'todo');
+
+$config->dev->skipMenus['first']  = array('project', 'product');
+$config->dev->skipMenus['second'] = array('menu_storyGroup', 'menu_story');
diff --git a/module/dev/model.php b/module/dev/model.php
index 2468fa040e..2e125314a6 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -412,7 +412,10 @@ class devModel extends model
             $menus = $this->getLinkTitle($lang);
             foreach($menus as $linkKey => $menu)
             {
-                if($type == 'first' and in_array($linkKey, $this->config->dev->disableMainMenu)) continue;
+                foreach($this->config->dev->skipMenus as $menuType => $skipMenus)
+                {
+                    if($type == $menuType and in_array($linkKey, $skipMenus)) continue 2;
+                }
 
                 $originalLangs[$langKey . $linkKey] = $menu;
             }

From 8d6459f66faffadd2500297c6f3038f420407390 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 09:57:03 +0800
Subject: [PATCH 107/319] * Modify branch name.

---
 module/admin/config.php | 8 ++++----
 module/dev/model.php    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index 6739ff17f1..e72cfcd223 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -75,11 +75,11 @@ $config->admin->videoAPIURL    = $config->admin->apiSite . 'publicclass.json';
 $config->admin->liteMenuList   = array('system', 'user', 'feature', 'message', 'extension', 'dev');
 
 $config->admin->helpURL['system']    = 'https://www.zentao.net/book/zentaopms/538.html';
-$config->admin->helpURL['user']      = 'https://www.zentao.net/book/zentaopms/538.html';
-$config->admin->helpURL['switch']    = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['user']      = 'https://www.zentao.net/book/zentaopms/38.html';
+$config->admin->helpURL['switch']    = 'https://www.zentao.net/book/zentaopms/38.html';
 $config->admin->helpURL['model']     = 'https://www.zentao.net/book/zentaopms/533.html';
-$config->admin->helpURL['feature']   = 'https://www.zentao.net/book/zentaopms/538.html';
-$config->admin->helpURL['template']  = 'https://www.zentao.net/book/zentaopms/538.html';
+$config->admin->helpURL['feature']   = 'https://www.zentao.net/book/zentaopms/38.html';
+$config->admin->helpURL['template']  = 'https://www.zentao.net/book/zentaopms/38.html';
 $config->admin->helpURL['message']   = 'https://www.zentao.net/book/zentaopms/email-notification-541.html';
 $config->admin->helpURL['extension'] = 'https://www.zentao.net/book/zentaopms/536.html';
 $config->admin->helpURL['dev']       = 'https://www.zentao.net/book/zentaopms/537.html';
diff --git a/module/dev/model.php b/module/dev/model.php
index 2e125314a6..12f19a617b 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -417,6 +417,7 @@ class devModel extends model
                     if($type == $menuType and in_array($linkKey, $skipMenus)) continue 2;
                 }
 
+                if($menu == '@branch@') $menu = $this->lang->dev->branch;
                 $originalLangs[$langKey . $linkKey] = $menu;
             }
         }

From 9500e3cf829afd94afb309f65fac71573149c68f Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Tue, 28 Feb 2023 02:58:48 +0000
Subject: [PATCH 108/319] * Finish task #85628.

---
 module/story/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index 3323d09ee6..b02ad60dcc 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4688,7 +4688,7 @@ class storyModel extends model
                 $menu .= "</ul></div>";
             }
 
-            if($this->app->tab == 'execution' and $story->status == 'active') $menu .= $this->buildMenu('task', 'create', "execution={$this->session->execution}&{$params}&moduleID=$story->module", $story, $type, 'plus', '', 'showinonlybody');
+            if(($this->app->tab == 'execution' || $execution->multiple == 0) and $story->status == 'active') $menu .= $this->buildMenu('task', 'create', "execution={$this->session->execution}&{$params}&moduleID=$story->module", $story, $type, 'plus', '', 'showinonlybody');
 
             $menu .= "<div class='divider'></div>";
             $menu .= $this->buildFlowMenu('story', $story, $type, 'direct');

From 2ddb027efe228722cd2b0e47dadcc7309c1e9e6f Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Tue, 28 Feb 2023 05:09:55 +0000
Subject: [PATCH 109/319] * Finish task #85628.

---
 module/story/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index b02ad60dcc..6bae7bbe42 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4688,7 +4688,7 @@ class storyModel extends model
                 $menu .= "</ul></div>";
             }
 
-            if(($this->app->tab == 'execution' || $execution->multiple == 0) and $story->status == 'active') $menu .= $this->buildMenu('task', 'create', "execution={$this->session->execution}&{$params}&moduleID=$story->module", $story, $type, 'plus', '', 'showinonlybody');
+            if(($this->app->tab == 'execution' || $execution->multiple === '0') and $story->status == 'active') $menu .= $this->buildMenu('task', 'create', "execution={$this->session->execution}&{$params}&moduleID=$story->module", $story, $type, 'plus', '', 'showinonlybody');
 
             $menu .= "<div class='divider'></div>";
             $menu .= $this->buildFlowMenu('story', $story, $type, 'direct');

From d1f27008124fd5cb8e8912bc9540001b207267ce Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Tue, 28 Feb 2023 05:14:02 +0000
Subject: [PATCH 110/319] * Finish task #85629.

---
 .../lite/story/ext/view/batchcreate.html.php  |   2 +-
 module/custom/config.php                      |   4 +-
 module/kanban/js/view.js                      |   1 -
 module/story/control.php                      |  28 +--
 module/story/css/batchcreate.css              |   2 +
 module/story/js/common.js                     |  11 ++
 module/story/model.php                        | 166 +++++++++---------
 module/story/view/batchcreate.html.php        |   2 +-
 module/story/view/change.html.php             |   2 +-
 9 files changed, 114 insertions(+), 104 deletions(-)

diff --git a/extension/lite/story/ext/view/batchcreate.html.php b/extension/lite/story/ext/view/batchcreate.html.php
index 0dd9d87f52..17effdc417 100644
--- a/extension/lite/story/ext/view/batchcreate.html.php
+++ b/extension/lite/story/ext/view/batchcreate.html.php
@@ -36,7 +36,7 @@
   }
   unset($visibleFields['module']);
   ?>
-  <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+  <form method='post' class='load-indicator main-form form-ajax' enctype='multipart/form-data' id="batchCreateForm">
     <div class="table-responsive">
       <table class="table table-form">
         <thead>
diff --git a/module/custom/config.php b/module/custom/config.php
index dca615e25c..6d1b7729cf 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -43,8 +43,8 @@ $config->custom->fieldList['project']['create']      = 'budget,PM,desc';
 $config->custom->fieldList['project']['edit']        = 'budget,PM,desc';
 $config->custom->fieldList['product']['create']      = 'PO,QD,RD,type,desc';
 $config->custom->fieldList['product']['edit']        = 'PO,QD,RD,type,desc,status';
-$config->custom->fieldList['story']['create']        = 'module,plan,source,pri,estimate,keywords,spec';
-$config->custom->fieldList['story']['change']        = 'comment,spec';
+$config->custom->fieldList['story']['create']        = 'module,plan,source,pri,estimate,keywords,spec,verify';
+$config->custom->fieldList['story']['change']        = 'comment,spec,verify';
 $config->custom->fieldList['story']['close']         = 'comment';
 $config->custom->fieldList['story']['review']        = 'reviewedDate,comment';
 $config->custom->fieldList['productplan']            = 'begin,end,desc';
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 25e8edf42f..b2ead23b73 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -472,7 +472,6 @@ function renderExecutionItem(item, $item)
     ].join('')).appendTo($item);
 
     var $titleBox = $header.children('.executionName');
-    debugger
     if(!$titleBox.length) $titleBox = $(
     [
         '<div class="executionName">',
diff --git a/module/story/control.php b/module/story/control.php
index d380938315..6233cbde13 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -576,7 +576,7 @@ class story extends control
         if(!empty($_POST))
         {
             $mails = $this->story->batchCreate($productID, $branch, $storyType);
-            if(dao::isError()) return print(js::error(dao::getError()));
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             $stories = array();
             foreach($mails as $mail) $stories[] = $mail->storyID;
@@ -600,7 +600,7 @@ class story extends control
             if($storyID and !empty($mails))
             {
                 $this->story->subdivide($storyID, $stories);
-                if(dao::isError()) return print(js::error(dao::getError()));
+                if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             }
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $stories));
@@ -619,7 +619,7 @@ class story extends control
                         $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                         $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
                         $kanbanData    = json_encode($kanbanData);
-                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.updateKanban($kanbanData)"));
                     }
                     else
                     {
@@ -628,12 +628,12 @@ class story extends control
                         $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
                         $kanbanData      = $kanbanData[$kanbanType];
                         $kanbanData      = json_encode($kanbanData);
-                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
                 else
                 {
-                    return print(js::reload('parent.parent'));
+                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'reloadByAjaxForm()'));
                 }
             }
 
@@ -641,24 +641,26 @@ class story extends control
             {
                 if($this->app->tab == 'product')
                 {
-                    return print(js::locate(inlink('view', "storyID=$storyID&version=0&param=0&storyType=$storyType"), 'parent'));
+                    $locateLink = $this->inlink('view', "storyID=$storyID&version=0&param=0&storyType=$storyType");
+                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
                 }
                 else
                 {
+                    /* Lite. */
                     $locateLink = $this->session->storyList ? $this->session->storyList : $this->createLink('projectstory', 'view', "storyID=$storyID");
-                    return print(js::locate($locateLink, 'parent'));
+                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
                 }
             }
             elseif($executionID)
             {
                 setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
-                return print(js::locate($this->session->storyList, 'parent'));
+                return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->session->storyList));
             }
             else
             {
                 setcookie('storyModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
                 $locateLink = $this->session->storyList ? $this->session->storyList : $this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=unclosed&queryID=0&storyType=$storyType");
-                return print(js::locate($locateLink, 'parent'));
+                return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
             }
         }
 
@@ -1211,7 +1213,7 @@ class story extends control
             if(dao::isError())
             {
                 if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => dao::getError()));
-                return print(js::error(dao::getError()));
+                return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             }
 
             if($this->post->comment != '' or !empty($changes))
@@ -1241,7 +1243,7 @@ class story extends control
                         $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                         $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
                         $kanbanData    = json_encode($kanbanData);
-                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.updateKanban($kanbanData)"));
                     }
                     if($from == 'taskkanban')
                     {
@@ -1250,12 +1252,12 @@ class story extends control
                         $kanbanType      = $execLaneType == 'all' ? 'story' : key($kanbanData);
                         $kanbanData      = $kanbanData[$kanbanType];
                         $kanbanData      = json_encode($kanbanData);
-                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.updateKanban(\"story\", $kanbanData)"));
                     }
                 }
                 else
                 {
-                    return print(js::reload('parent.parent'));
+                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'reloadByAjaxForm()'));
                 }
             }
 
diff --git a/module/story/css/batchcreate.css b/module/story/css/batchcreate.css
index 0cae942aed..fad4522720 100644
--- a/module/story/css/batchcreate.css
+++ b/module/story/css/batchcreate.css
@@ -11,3 +11,5 @@
 #batchCreateForm .c-keywords {width: 140px;}
 .body-modal .main-header > h2 {max-width: 80%;}
 #batchCreateForm .reviewBox{width: 200px !important;}
+
+.table tbody>tr>td {vertical-align: top;}
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 3edd5daa0e..001e955db7 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -153,3 +153,14 @@ function popoverCancel(index)
 
     $('[data-id="' + index + '"]').addClass('hide');
 }
+
+/**
+ * Reload parent window When operating in a pop-up window.
+ *
+ * @access public
+ * @return void
+ */
+function reloadByAjaxForm()
+{
+    parent.location.reload();
+}
diff --git a/module/story/model.php b/module/story/model.php
index 6bae7bbe42..aebce8b6bc 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -541,8 +541,7 @@ class storyModel extends model
         {
             if(empty($title) and $this->common->checkValidRow('story', $stories, $i))
             {
-                dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->story->title);
-                return false;
+                dao::$errors["title$i"][] = sprintf($this->lang->error->notempty, $this->lang->story->title);
             }
 
             $module = $stories->module[$i] == 'ditto' ? $module : $stories->module[$i];
@@ -571,8 +570,7 @@ class storyModel extends model
             $_POST['reviewer'][$i] = $reviewers;
             if(empty($stories->reviewer[$i]) and $forceReview)
             {
-                dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
-                return false;
+                dao::$errors["reviewer$i"][] = $this->lang->story->errorEmptyReviewedBy;
             }
 
             $story = new stdclass();
@@ -587,6 +585,7 @@ class storyModel extends model
             $story->pri        = $stories->pri[$i];
             $story->estimate   = $stories->estimate[$i];
             $story->spec       = $stories->spec[$i];
+            $story->verify     = $stories->verify[$i];
             $story->status     = $saveDraft ? 'draft' : ((empty($stories->reviewer[$i]) and !$forceReview) ? 'active' : 'reviewing');
             $story->stage      = ($this->app->tab == 'project' or $this->app->tab == 'execution') ? 'projected' : 'wait';
             $story->keywords   = $stories->keywords[$i];
@@ -605,8 +604,7 @@ class storyModel extends model
                 $story->{$extendField->field} = htmlSpecialString($story->{$extendField->field});
                 if(empty($story->{$extendField->field}))
                 {
-                    dao::$errors[] = sprintf($this->lang->error->notempty, $extendField->name);
-                    return false;
+                    dao::$errors["{$extendField->field}$i"][] = sprintf($this->lang->error->notempty, $extendField->name);
                 }
             }
 
@@ -620,8 +618,7 @@ class storyModel extends model
                 if(!empty($story->$field)) continue;
                 if($field == 'estimate' and strlen(trim($story->estimate)) != 0) continue;
 
-                dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->story->$field);
-                return false;
+                dao::$errors["{$field}$i"][] = sprintf($this->lang->error->notempty, $this->lang->story->$field);
             }
             $data[$i] = $story;
         }
@@ -629,96 +626,95 @@ class storyModel extends model
         $link2Plans = array();
         foreach($data as $i => $story)
         {
-            $this->dao->insert(TABLE_STORY)->data($story, 'spec')->autoCheck()->checkFlow()->exec();
-            if(dao::isError())
+            $this->dao->insert(TABLE_STORY)->data($story, 'spec,verify')->autoCheck()->checkFlow()->exec();
+            if(!dao::isError())
             {
-                echo js::error(dao::getError());
-                return print(js::reload('parent'));
-            }
+                $storyID = $this->dao->lastInsertID();
+                $this->setStage($storyID);
 
-            $storyID = $this->dao->lastInsertID();
-            $this->setStage($storyID);
-
-            /* Update product plan stories order. */
-            if($story->plan)
-            {
-                $this->updateStoryOrderOfPlan($storyID, $story->plan);
-                $link2Plans[$story->plan] = empty($link2Plans[$story->plan]) ? $storyID : "{$link2Plans[$story->plan]},$storyID";
-            }
-
-            $specData = new stdclass();
-            $specData->story   = $storyID;
-            $specData->version = 1;
-            $specData->title   = $stories->title[$i];
-            $specData->spec    = '';
-            $specData->verify  = '';
-            if(!empty($stories->spec[$i]))  $specData->spec   = nl2br($stories->spec[$i]);
-            if(!empty($stories->verify[$i]))$specData->verify = nl2br($stories->verify[$i]);
-
-            if(!empty($stories->uploadImage[$i]))
-            {
-                $fileName = $stories->uploadImage[$i];
-                $file     = $this->session->storyImagesFile[$fileName];
-
-                $realPath = $file['realpath'];
-                unset($file['realpath']);
-
-                if(!is_dir($this->file->savePath)) mkdir($this->file->savePath, 0777, true);
-                if($realPath and rename($realPath, $this->file->savePath . $this->file->getSaveName($file['pathname'])))
+                /* Update product plan stories order. */
+                if($story->plan)
                 {
-                    $file['addedBy']    = $this->app->user->account;
-                    $file['addedDate']  = $now;
-                    $file['objectType'] = 'story';
-                    $file['objectID']   = $storyID;
-                    if(in_array($file['extension'], $this->config->file->imageExtensions))
-                    {
-                        $file['extra'] = 'editor';
-                        $this->dao->insert(TABLE_FILE)->data($file)->exec();
+                    $this->updateStoryOrderOfPlan($storyID, $story->plan);
+                    $link2Plans[$story->plan] = empty($link2Plans[$story->plan]) ? $storyID : "{$link2Plans[$story->plan]},$storyID";
+                }
 
-                        $fileID = $this->dao->lastInsertID();
-                        $specData->spec .= '<img src="{' . $fileID . '.' . $file['extension'] . '}" alt="" />';
-                    }
-                    else
+                $specData = new stdclass();
+                $specData->story   = $storyID;
+                $specData->version = 1;
+                $specData->title   = $stories->title[$i];
+                $specData->spec    = '';
+                $specData->verify  = '';
+                if(!empty($stories->spec[$i]))  $specData->spec   = nl2br($stories->spec[$i]);
+                if(!empty($stories->verify[$i]))$specData->verify = nl2br($stories->verify[$i]);
+
+                if(!empty($stories->uploadImage[$i]) and $stories->uploadImage[$i] !== 'undefined')
+                {
+                    $fileName = $stories->uploadImage[$i];
+                    $file     = $this->session->storyImagesFile[$fileName];
+
+                    $realPath = $file['realpath'];
+                    unset($file['realpath']);
+
+                    if(!is_dir($this->file->savePath)) mkdir($this->file->savePath, 0777, true);
+                    if($realPath and rename($realPath, $this->file->savePath . $this->file->getSaveName($file['pathname'])))
                     {
-                        $this->dao->insert(TABLE_FILE)->data($file)->exec();
+                        $file['addedBy']    = $this->app->user->account;
+                        $file['addedDate']  = $now;
+                        $file['objectType'] = 'story';
+                        $file['objectID']   = $storyID;
+                        if(in_array($file['extension'], $this->config->file->imageExtensions))
+                        {
+                            $file['extra'] = 'editor';
+                            $this->dao->insert(TABLE_FILE)->data($file)->exec();
+
+                            $fileID = $this->dao->lastInsertID();
+                            $specData->spec .= '<img src="{' . $fileID . '.' . $file['extension'] . '}" alt="" />';
+                        }
+                        else
+                        {
+                            $this->dao->insert(TABLE_FILE)->data($file)->exec();
+                        }
                     }
                 }
+
+                $this->dao->insert(TABLE_STORYSPEC)->data($specData)->exec();
+
+                /* Save the story reviewer to storyreview table. */
+                foreach($_POST['reviewer'][$i] as $reviewer)
+                {
+                    if(empty($reviewer)) continue;
+
+                    $reviewData = new stdclass();
+                    $reviewData->story    = $storyID;
+                    $reviewData->version  = 1;
+                    $reviewData->reviewer = $reviewer;
+                    $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
+                }
+
+                $this->executeHooks($storyID);
+
+                $actionID = $this->action->create('story', $storyID, 'Opened', '');
+                if(!dao::isError()) $this->loadModel('score')->create('story', 'create',$storyID);
+                $mails[$i] = new stdclass();
+                $mails[$i]->storyID  = $storyID;
+                $mails[$i]->actionID = $actionID;
             }
 
-            $this->dao->insert(TABLE_STORYSPEC)->data($specData)->exec();
-
-            /* Save the story reviewer to storyreview table. */
-            foreach($_POST['reviewer'][$i] as $reviewer)
-            {
-                if(empty($reviewer)) continue;
-
-                $reviewData = new stdclass();
-                $reviewData->story    = $storyID;
-                $reviewData->version  = 1;
-                $reviewData->reviewer = $reviewer;
-                $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
-            }
-
-            $this->executeHooks($storyID);
-
-            $actionID = $this->action->create('story', $storyID, 'Opened', '');
-            if(!dao::isError()) $this->loadModel('score')->create('story', 'create',$storyID);
-            $mails[$i] = new stdclass();
-            $mails[$i]->storyID  = $storyID;
-            $mails[$i]->actionID = $actionID;
         }
 
-        /* Remove upload image file and session. */
-        if(!empty($stories->uploadImage) and $this->session->storyImagesFile)
-        {
-            $classFile = $this->app->loadClass('zfile');
-            $file = current($_SESSION['storyImagesFile']);
-            $realPath = dirname($file['realpath']);
-            if(is_dir($realPath)) $classFile->removeDir($realPath);
-            unset($_SESSION['storyImagesFile']);
-        }
         if(!dao::isError())
         {
+            /* Remove upload image file and session. */
+            if(!empty($stories->uploadImage) and $this->session->storyImagesFile)
+            {
+                $classFile = $this->app->loadClass('zfile');
+                $file = current($_SESSION['storyImagesFile']);
+                $realPath = dirname($file['realpath']);
+                if(is_dir($realPath)) $classFile->removeDir($realPath);
+                unset($_SESSION['storyImagesFile']);
+            }
+
             $this->loadModel('score')->create('ajax', 'batchCreate');
             foreach($link2Plans as $planID => $stories) $this->action->create('productplan', $planID, 'linkstory', '', $stories);
         }
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index df03cbafa5..c1e848640c 100755
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -46,7 +46,7 @@
   }
   unset($visibleFields['module']);
   ?>
-  <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+  <form method='post' class='load-indicator main-form form-ajax' enctype='multipart/form-data' id="batchCreateForm">
     <div class="table-responsive">
       <table class="table table-form">
         <thead>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index df9ed6da77..64aaca6944 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -21,7 +21,7 @@
         <small><?php echo $lang->arrow . ' ' . $lang->story->change;?></small>
       </h2>
     </div>
-    <form class="main-form" method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
+    <form class="main-form form-ajax" method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>

From c38ea2b672f49d4fe937f6b57ec8e708e5507051 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 13:45:42 +0800
Subject: [PATCH 111/319] * Add test case.

---
 test/model/dev/getsecondmenus.php | 25 +++++++++++++++++++++++++
 test/model/dev/getthirdmenus.php  |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/model/dev/getsecondmenus.php

diff --git a/test/model/dev/getsecondmenus.php b/test/model/dev/getsecondmenus.php
new file mode 100644
index 0000000000..583440dbc8
--- /dev/null
+++ b/test/model/dev/getsecondmenus.php
@@ -0,0 +1,25 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getSecondMenus();
+cid=1
+pid=1
+
+检查传入空值时的情况   >> 0
+检查没有二级菜单的模块 >> 0
+检查有二级菜单的模块   >> 项目通用,0
+
+*/
+
+
+$moduleList     = array('', 'my', 'project');
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->getSecondMenus($moduleList[0])) && p()                 && e('0');          // 检查传入空值时的情况
+r($tester->dev->getSecondMenus($moduleList[1])) && p()                 && e('0');          // 检查没有二级菜单的模块
+r($tester->dev->getSecondMenus($moduleList[2])) && p('0:title,active') && e('项目通用,0'); // 检查有二级菜单的模块
diff --git a/test/model/dev/getthirdmenus.php b/test/model/dev/getthirdmenus.php
index 7018ecbc6a..d585843acd 100644
--- a/test/model/dev/getthirdmenus.php
+++ b/test/model/dev/getthirdmenus.php
@@ -5,7 +5,7 @@ include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
 
 /**
 
-title=测试 devModel::getTagMenus();
+title=测试 devModel::getThirdMenus();
 cid=1
 pid=1
 

From c4d19c37354441e8514bb68c8f9b7ce0d84befee Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 14:05:00 +0800
Subject: [PATCH 112/319] * Add test case.

---
 module/dev/model.php               |  4 ++++
 test/model/dev/loaddefaultlang.php | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 test/model/dev/loaddefaultlang.php

diff --git a/module/dev/model.php b/module/dev/model.php
index 12f19a617b..07dd8e0cf2 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -512,6 +512,10 @@ class devModel extends model
      */
     public function loadDefaultLang($language = 'zh-cn', $module = 'common')
     {
+        if(empty($language)) $language = 'zh-cn';
+        if(empty($module))   $module = 'common';
+        if($module != 'common' and !isset($this->defaultLang)) return null;
+
         $clientLang = $this->app->clientLang;
         if($language and $language != $clientLang) $this->app->clientLang = $language;
 
diff --git a/test/model/dev/loaddefaultlang.php b/test/model/dev/loaddefaultlang.php
new file mode 100644
index 0000000000..7beb64f721
--- /dev/null
+++ b/test/model/dev/loaddefaultlang.php
@@ -0,0 +1,25 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::loadDefaultLang();
+cid=1
+pid=1
+
+检查没有传值的情况    >> $URCOMMON
+检查传入common的情况  >> $PRODUCTCOMMON
+检查传入project的情况 >> 0
+
+*/
+
+
+$moduleList     = array('common', 'project');
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->loadDefaultLang())                        && p('URCommon')      && e('$URCOMMON');      // 检查没有传值的情况
+r($tester->dev->loadDefaultLang('zh-cn', $moduleList[0])) && p('productCommon') && e('$PRODUCTCOMMON'); // 检查传入common的情况
+r($tester->dev->loadDefaultLang('zh-cn', $moduleList[1])) && p()                && e('0');              // 检查传入project的情况

From 676d99cc92e98d59f14257aeeb839e1ebeb5ee76 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 14:08:37 +0800
Subject: [PATCH 113/319] * Modify test case result.

---
 test/model/dev/getoriginallang.php  | 6 +++---
 test/model/dev/savecustomedlang.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/model/dev/getoriginallang.php b/test/model/dev/getoriginallang.php
index cddb572dce..03f9d6f533 100644
--- a/test/model/dev/getoriginallang.php
+++ b/test/model/dev/getoriginallang.php
@@ -12,7 +12,7 @@ pid=1
 错误的类型返回数据                         >> 地盘
 正确的类型返回数据                         >> 项目
 正确的类型，错误的模块返回数据             >> 0
-正确的类型，正确的模块返回数据             >> 项目
+正确的类型，正确的模块返回数据             >> 人员
 正确的类型，正确的模块，错误的方法返回数据 >> 0
 正确的类型，正确的模块，正确的方法返回数据 >> 全部
 
@@ -28,8 +28,8 @@ $devTester = new devTest();
 r($devTester->getOriginalLangTest('test'))   && p('my')            && e("地盘"); // 错误的类型返回数据
 r($devTester->getOriginalLangTest('common')) && p('projectCommon') && e("项目"); // 正确的类型返回数据
 
-r($devTester->getOriginalLangTest('second', $failModule)) && p()               && e("0");    // 正确的类型，错误的模块返回数据
-r($devTester->getOriginalLangTest('second', $realModule)) && p('menu_project') && e("项目"); // 正确的类型，正确的模块返回数据
+r($devTester->getOriginalLangTest('second', $failModule)) && p()                 && e("0");    // 正确的类型，错误的模块返回数据
+r($devTester->getOriginalLangTest('second', $realModule)) && p('menu_personnel') && e("人员"); // 正确的类型，正确的模块返回数据
 
 r($devTester->getOriginalLangTest('tag', $realModule, $failMethod)) && p()                        && e("0");    // 正确的类型，正确的模块，错误的方法返回数据
 r($devTester->getOriginalLangTest('tag', $realModule, $realMethod)) && p('featureBar-browse_all') && e("全部"); // 正确的类型，正确的模块，正确的方法返回数据
diff --git a/test/model/dev/savecustomedlang.php b/test/model/dev/savecustomedlang.php
index d9013ac5ee..8ee8f86358 100644
--- a/test/model/dev/savecustomedlang.php
+++ b/test/model/dev/savecustomedlang.php
@@ -9,7 +9,7 @@ title=测试 devModel']']saveCustomedLang();
 cid=1
 pid=1
 
-自定义公共语言项 >> 产品2|项目2|迭代2|用需2|软需2
+自定义公共语言项 >> 产品2|项目2|迭代2
 自定义一级菜单语言项 >> 我的地盘
 重置一级导航语言项 >> null
 自定义二级导航语言项 >> 仪表盘
@@ -29,7 +29,7 @@ $_POST['common_projectCommon']   = '项目2';
 $_POST['common_executionCommon'] = '迭代2';
 $_POST['common_URCommon']        = '用需2';
 $_POST['common_SRCommon']        = '软需2';
-r($devTester->saveCustomedLangTest('common', 'common', '', 'zh-cn')) && p()  && e("产品2|项目2|迭代2|用需2|软需2");    // 自定义公共语言项
+r($devTester->saveCustomedLangTest('common', 'common', '', 'zh-cn')) && p()  && e("产品2|项目2|迭代2");    // 自定义公共语言项
 
 $_POST = array();
 $_POST['common_mainNav_my'] = '我的地盘';

From 3f135ebc251b39523a99aab54adb8caac84a2ae9 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 28 Feb 2023 14:41:24 +0800
Subject: [PATCH 114/319] * Change the order of the custom navigation.

---
 module/dev/model.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/module/dev/model.php b/module/dev/model.php
index 07dd8e0cf2..b48be083ad 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -340,11 +340,33 @@ class devModel extends model
         else
         {
            $menus = ($type == 'third' and isset($defaultLang->$module->menu->{$method}['subMenu'])) ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
+           $menus = $this->sortMenus($menus);
         }
 
         return $menus;
     }
 
+    /**
+     * Sort menus.
+     *
+     * @param  array|object $menus
+     * @access public
+     * @return array
+     */
+    public function sortMenus($menus)
+    {
+        if(!is_array($menus)) $menus = (array)$menus;
+        if(!isset($menus['menuOrder'])) return $menus;
+        $sortedMenus = array();
+        $menuOrders  = $menus['menuOrder'];
+        ksort($menuOrders);
+        foreach($menuOrders as $menuKey)
+        {
+            if(isset($menus[$menuKey])) $sortedMenus[$menuKey] = $menus[$menuKey];
+        }
+        return $sortedMenus;
+    }
+
     /**
      * Get original lang.
      *
@@ -789,6 +811,7 @@ class devModel extends model
     public function getLinkTitle($menus)
     {
         $linksTitle = array();
+        $menus      = $this->sortMenus($menus);
         foreach($menus as $menuKey => $menu)
         {
             if(is_array($menu) and !isset($menu['link'])) continue;

From eef2c1c3565a8c79849b8cf078fa67779f84cb58 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 28 Feb 2023 15:36:04 +0800
Subject: [PATCH 115/319] * Change the order of the custom navigation.

---
 module/common/lang/menu.php |  4 ++--
 module/dev/model.php        | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 9c7ef9c564..5ccf325b59 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -234,8 +234,8 @@ $lang->scrum->menuOrder[25] = 'devops';
 $lang->scrum->menuOrder[30] = 'doc';
 $lang->scrum->menuOrder[35] = 'build';
 $lang->scrum->menuOrder[40] = 'release';
-$lang->scrum->menuOrder[48] = 'dynamic';
-$lang->scrum->menuOrder[50] = 'settings';
+$lang->scrum->menuOrder[45] = 'dynamic';
+$lang->scrum->menuOrder[55] = 'settings';
 
 $lang->scrum->menu->doc['subMenu'] = new stdclass();
 
diff --git a/module/dev/model.php b/module/dev/model.php
index b48be083ad..1354d55a9c 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -321,7 +321,10 @@ class devModel extends model
 
             if(isset($defaultLang->$module->menu))
             {
-                foreach($defaultLang->$module->menu as $menuKey => $menu)
+                $menuList = $defaultLang->$module->menu;
+                if(isset($defaultLang->$module->menuOrder)) $menuList->menuOrder = $defaultLang->$module->menuOrder;
+                $menuList = $this->sortMenus($menuList);
+                foreach($menuList as $menuKey => $menu)
                 {
                     if(is_array($menu) and !isset($menu['link'])) continue;
 
@@ -340,6 +343,7 @@ class devModel extends model
         else
         {
            $menus = ($type == 'third' and isset($defaultLang->$module->menu->{$method}['subMenu'])) ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
+           if(isset($defaultLang->$module->menu->{$method}['menuOrder'])) $menus->menuOrder = $defaultLang->$module->menu->{$method}['menuOrder'];
            $menus = $this->sortMenus($menus);
         }
 
@@ -639,7 +643,14 @@ class devModel extends model
         foreach(array('homeMenu', 'menu') as $menu)
         {
             if(!isset($this->lang->$module->$menu)) continue;
-            foreach($this->lang->$module->$menu as $menuKey => $menuValue)
+            $menuList = $this->lang->$module->$menu;
+            if($menu == 'menu' and isset($this->lang->$module->menuOrder))
+            {
+                $menuList->menuOrder = $this->lang->$module->menuOrder;
+                $menuList = $this->sortMenus($menuList);
+            }
+
+            foreach($menuList as $menuKey => $menuValue)
             {
                 if(is_array($menuValue) and !isset($menuValue['link'])) continue;
                 $link = is_array($menuValue) ? $menuValue['link'] : $menuValue;
@@ -668,6 +679,11 @@ class devModel extends model
                     foreach(array('subMenu', 'dropMenu') as $menu)
                     {
                         if(!isset($menuValue[$menu])) continue;
+                        if($menu == 'subMenu' and isset($menuValue['menuOrder']))
+                        {
+                            $menuValue[$menu]->menuOrder = $menuValue['menuOrder'];
+                            $menuValue[$menu] = $this->sortMenus($menuValue[$menu]);
+                        }
                         foreach($menuValue[$menu] as $subMenuKey => $subMenuValue)
                         {
                             if(is_array($subMenuValue) and !isset($subMenuValue['link'])) continue;

From 7c8a122266e2cb4a157e8d4891b5c30d3e7e9c2e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 28 Feb 2023 15:59:06 +0800
Subject: [PATCH 116/319] * Add case for dev module.

---
 test/class/dev.class.php     | 18 ++++++++++++++++++
 test/model/dev/sortmenus.php | 26 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 test/model/dev/sortmenus.php

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index 2d3fa39954..e688b84a07 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -182,4 +182,22 @@ class devTest
         $customedLang = $this->objectModel->getCustomedLang($type, $module, $method, $language);
         return empty($customedLang) ? 'null' : implode('|', $customedLang);
     }
+
+    /**
+     * Sort menus.
+     *
+     * @param  object|array $menus
+     * @access public
+     * @return string
+     */
+    public function sortMenusTest($menus)
+    {
+        $result = '';
+        $menus  = $this->objectModel->sortMenus($menus);
+        foreach($menus as $key => $value)
+        {
+            $result .= $key . ',';
+        }
+        return $result;
+    }
 }
diff --git a/test/model/dev/sortmenus.php b/test/model/dev/sortmenus.php
new file mode 100644
index 0000000000..56f82f37ea
--- /dev/null
+++ b/test/model/dev/sortmenus.php
@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+$ztLang = zdTable('lang');
+$ztLang->id->range('1');
+$ztLang->gen(0);
+
+/**
+
+title=测试 devModel::sortMenus();
+cid=1
+pid=1
+
+检查传入空值时的情况 >> 0
+检查传入地盘导航顺序 >> index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,
+
+*/
+
+global $tester;
+$menuList[0] = array();
+$menuList[1] = $tester->lang->my->menu;
+
+$devTester = new devTest();
+r($devTester->sortMenusTest($menuList[0])) && p() && e('0');                                                                              // 检查传入空值时的情况
+r($devTester->sortMenusTest($menuList[1])) && p() && e('index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,'); // 检查传入地盘导航顺序

From 75106e3db5c497366273388a516c1d9c4faab550 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 28 Feb 2023 16:00:03 +0800
Subject: [PATCH 117/319] * Delete extra empty lines.

---
 test/class/dev.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/class/dev.class.php b/test/class/dev.class.php
index e688b84a07..93a6c272c5 100644
--- a/test/class/dev.class.php
+++ b/test/class/dev.class.php
@@ -194,10 +194,8 @@ class devTest
     {
         $result = '';
         $menus  = $this->objectModel->sortMenus($menus);
-        foreach($menus as $key => $value)
-        {
-            $result .= $key . ',';
-        }
+        foreach($menus as $key => $value) $result .= $key . ',';
+
         return $result;
     }
 }

From 9ac8891af85cd15e18fd4799d5add48b45b8de8a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 16:32:25 +0800
Subject: [PATCH 118/319] * Modify lite vision tree menu.

---
 module/dev/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/dev/model.php b/module/dev/model.php
index 1354d55a9c..c07be59a2b 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -784,6 +784,7 @@ class devModel extends model
             }
             else
             {
+                if($this->config->vision == 'lite' and $menuKey == 'project') $menuKey = 'kanbanProject';
                 $menuItem->children = $this->$childFunc($menuKey, $module, $method);
             }
             $menuItem->children = array_values($menuItem->children);

From 3a67994a5e685f3211006dfdeee1ae26fe2f84a2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 28 Feb 2023 16:46:36 +0800
Subject: [PATCH 119/319] * Modify third menu tree data.

---
 module/dev/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index c07be59a2b..e5ddf4304c 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -607,6 +607,7 @@ class devModel extends model
     public function getThirdMenus($menu, $module = '', $method = '')
     {
         $menus = array();
+        if($this->config->vision == 'lite' and $menu == 'project') $menu = 'kanbanProject';
         if(!isset($this->lang->$menu->menu)) return $menus;
 
         $menuLang    = $this->getLinkTitle($this->lang->$menu->menu);
@@ -784,7 +785,6 @@ class devModel extends model
             }
             else
             {
-                if($this->config->vision == 'lite' and $menuKey == 'project') $menuKey = 'kanbanProject';
                 $menuItem->children = $this->$childFunc($menuKey, $module, $method);
             }
             $menuItem->children = array_values($menuItem->children);

From 1a352410a6402c3a13c5f87de47ddffba5e147c9 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Mar 2023 08:49:44 +0800
Subject: [PATCH 120/319]  * code for task #85503.

---
 module/admin/config.php                       |   2 +-
 module/admin/lang/menu.php                    |   2 +-
 module/admin/model.php                        |  20 +-
 module/common/lang/common.php                 |   1 +
 module/common/lang/de.php                     |   2 +-
 module/common/lang/en.php                     |   2 +-
 module/common/lang/fr.php                     |   2 +-
 module/common/lang/menu.php                   |   1 +
 module/common/lang/zh-cn.php                  |   2 +-
 module/dev/config.php                         |   1 +
 module/dev/lang/de.php                        |   1 +
 module/dev/lang/en.php                        |   1 +
 module/dev/lang/fr.php                        |   1 +
 module/dev/lang/zh-cn.php                     |   6 +-
 module/dev/view/editor.html.php               |   7 +-
 module/editor/config.php                      |  16 +
 module/editor/control.php                     | 182 ++++++
 module/editor/css/edit.css                    |   2 +
 module/editor/css/extend.css                  |   5 +
 module/editor/css/index.css                   |   7 +
 module/editor/js/edit.js                      |   1 +
 module/editor/js/index.js                     |  12 +
 module/editor/lang/de.php                     |  76 +++
 module/editor/lang/en.php                     |  77 +++
 module/editor/lang/fr.php                     |  76 +++
 module/editor/lang/vi.php                     |  76 +++
 module/editor/lang/zh-cn.php                  |  78 +++
 module/editor/lang/zh-tw.php                  |  76 +++
 module/editor/model.php                       | 539 ++++++++++++++++++
 module/editor/view/deny.html.php              |  23 +
 module/editor/view/edit.html.php              | 141 +++++
 module/editor/view/extend.html.php            |  42 ++
 module/editor/view/index.html.php             |  59 ++
 module/editor/view/newpage.html.php           |  37 ++
 module/group/lang/resource.php                |  34 +-
 .../repo/view/ajaxgeteditorcontent.html.php   |   4 +-
 36 files changed, 1585 insertions(+), 29 deletions(-)
 create mode 100644 module/editor/config.php
 create mode 100644 module/editor/control.php
 create mode 100644 module/editor/css/edit.css
 create mode 100644 module/editor/css/extend.css
 create mode 100644 module/editor/css/index.css
 create mode 100644 module/editor/js/edit.js
 create mode 100644 module/editor/js/index.js
 create mode 100644 module/editor/lang/de.php
 create mode 100644 module/editor/lang/en.php
 create mode 100644 module/editor/lang/fr.php
 create mode 100644 module/editor/lang/vi.php
 create mode 100644 module/editor/lang/zh-cn.php
 create mode 100644 module/editor/lang/zh-tw.php
 create mode 100644 module/editor/model.php
 create mode 100644 module/editor/view/deny.html.php
 create mode 100644 module/editor/view/edit.html.php
 create mode 100644 module/editor/view/extend.html.php
 create mode 100644 module/editor/view/index.html.php
 create mode 100644 module/editor/view/newpage.html.php

diff --git a/module/admin/config.php b/module/admin/config.php
index 6739ff17f1..692c530beb 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -14,7 +14,7 @@ $config->admin->menuGroup['model']     = array('auditcl', 'stage', 'design', 'cm
 $config->admin->menuGroup['feature']   = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report');
 $config->admin->menuGroup['template']  = array('custom|set', 'baseline');
 $config->admin->menuGroup['message']   = array('mail', 'webhook', 'sms', 'message');
-$config->admin->menuGroup['dev']       = array('dev', 'entry');
+$config->admin->menuGroup['dev']       = array('dev', 'entry', 'editor');
 $config->admin->menuGroup['extension'] = array('extension');
 $config->admin->menuGroup['convert']   = array('convert');
 
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index d7ff4fa7c8..4d4f4c81c1 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -165,7 +165,7 @@ $lang->admin->menuList->message['menuOrder']['25'] = 'setting';
 $lang->admin->menuList->dev['subMenu']['api']      = array('link' => "{$lang->api->doc}|dev|api|module=index");
 $lang->admin->menuList->dev['subMenu']['db']       = array('link' => "{$lang->database}|dev|db|table=" . trim(TABLE_EFFORT, '`'));
 $lang->admin->menuList->dev['subMenu']['langItem'] = array('link' => "{$lang->langItem}|dev|langitem|");
-$lang->admin->menuList->dev['subMenu']['editor']   = array('link' => "{$lang->editor}|dev|editor|");
+$lang->admin->menuList->dev['subMenu']['editor']   = array('link' => "{$lang->editor->common}|dev|editor|", 'subModule' => 'editor');
 $lang->admin->menuList->dev['subMenu']['entry']    = array('link' => "{$lang->admin->entry}|entry|browse|", 'subModule' => 'entry');
 
 $lang->admin->menuList->dev['menuOrder']['5']  = 'api';
diff --git a/module/admin/model.php b/module/admin/model.php
index c23ea0103c..3d6d92951e 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -333,6 +333,13 @@ class adminModel extends model
                 /* Check sub menu priv. */
                 foreach($subMenuList as $subMenuKey => $subMenu)
                 {
+                    if($menuKey == 'message' and $subMenuKey == 'mail')
+                    {
+                        $this->loadModel('mail');
+                        if(!$this->config->mail->turnon and !$this->session->mailConfig) $subMenu['link'] = $this->lang->mail->common . '|mail|detect|';
+                    }
+                    if($menuKey == 'dev' and $subMenuKey == 'editor' and $this->config->global->editor) $subMenu['link'] = $this->lang->editor->common . '|editor|index|';
+
                     $link = array();
                     if(isset($menu['tabMenu'][$subMenuKey]))
                     {
@@ -362,12 +369,6 @@ class adminModel extends model
                     }
                     else
                     {
-                        if($menuKey == 'message' and $subMenuKey == 'mail')
-                        {
-                            $this->loadModel('mail');
-                            if(!$this->config->mail->turnon and !$this->session->mailConfig) $subMenu['link'] = $this->lang->mail->common . '|mail|detect|';
-                        }
-
                         $link = $this->getHasPrivLink($subMenu);
                     }
 
@@ -640,17 +641,18 @@ class adminModel extends model
      */
     public function checkInternet()
     {
+        $timeoutMS = 500;
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->config->admin->apiSite);
-        curl_setopt($curl, CURLOPT_TIMEOUT_MS, 1000);
-        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, 1000);
+        curl_setopt($curl, CURLOPT_TIMEOUT_MS, $timeoutMS);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, $timeoutMS);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
         $connected = curl_exec($curl);
         curl_close($curl);
 
-        return (bool)$connected;
+        return $connected ? true : false;
     }
 
     /**
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 5ed798f09b..cfeeb76a0d 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -65,6 +65,7 @@ $lang->custom      = new stdclass();
 $lang->mail        = new stdclass();
 $lang->cron        = new stdclass();
 $lang->dev         = new stdclass();
+$lang->editor      = new stdclass();
 $lang->entry       = new stdclass();
 $lang->webhook     = new stdclass();
 $lang->message     = new stdclass();
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index eca0fd20b9..35d6242fad 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -194,6 +194,7 @@ $lang->extension->common  = 'Extension';
 $lang->company->common    = 'Company';
 $lang->dept->common       = 'Dept';
 $lang->upgrade->common    = 'Update';
+$lang->editor->common     = 'Editor';
 $lang->program->list      = 'Program List';
 $lang->program->kanban    = 'Program Kanban';
 $lang->design->common     = 'Design';
@@ -258,7 +259,6 @@ $lang->db              = 'Database';
 $lang->langItem        = 'Lang Item';
 $lang->api->doc        = 'API Document';
 $lang->database        = 'Data Dictionary';
-$lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
 $lang->calendar        = 'Calendar';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 19be481dd7..73719622d0 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -194,6 +194,7 @@ $lang->extension->common  = 'Extension';
 $lang->company->common    = 'Company';
 $lang->dept->common       = 'Dept';
 $lang->upgrade->common    = 'Update';
+$lang->editor->common     = 'Editor';
 $lang->program->list      = 'Program List';
 $lang->program->kanban    = 'Program Kanban';
 $lang->design->common     = 'Design';
@@ -258,7 +259,6 @@ $lang->db              = 'Database';
 $lang->langItem        = 'Lang Item';
 $lang->api->doc        = 'API Document';
 $lang->database        = 'Data Dictionary';
-$lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
 $lang->calendar        = 'Calendar';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 09e796c036..c25d7e0ddd 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -194,6 +194,7 @@ $lang->extension->common  = 'Extension';
 $lang->company->common    = 'Company';
 $lang->dept->common       = 'Dept';
 $lang->upgrade->common    = 'Update';
+$lang->editor->common     = 'Editor';
 $lang->program->list      = 'Program List';
 $lang->program->kanban    = 'Program Kanban';
 $lang->design->common     = 'Design';
@@ -258,7 +259,6 @@ $lang->db              = 'Database';
 $lang->langItem        = 'Lang Item';
 $lang->api->doc        = 'API Document';
 $lang->database        = 'Data Dictionary';
-$lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
 $lang->calendar        = 'Calendar';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index ef6839e1a6..b6b7f811de 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -693,6 +693,7 @@ $lang->navGroup->cron      = 'admin';
 $lang->navGroup->backup    = 'admin';
 $lang->navGroup->mail      = 'admin';
 $lang->navGroup->dev       = 'admin';
+$lang->navGroup->editor    = 'admin';
 $lang->navGroup->entry     = 'admin';
 $lang->navGroup->extension = 'admin';
 $lang->navGroup->action    = 'admin';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index ef7806bb23..d4e637f84b 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -194,6 +194,7 @@ $lang->extension->common  = '插件';
 $lang->company->common    = '公司';
 $lang->dept->common       = '部门';
 $lang->upgrade->common    = '升级';
+$lang->editor->common     = '编辑器';
 $lang->program->list      = '项目集列表';
 $lang->program->kanban    = '项目集看板';
 $lang->design->common     = '设计';
@@ -258,7 +259,6 @@ $lang->db              = '数据库';
 $lang->langItem        = '语言项';
 $lang->api->doc        = '接口文档';
 $lang->database        = '数据字典';
-$lang->editor          = '编辑器';
 $lang->timezone        = '时区';
 $lang->security        = '安全';
 $lang->calendar        = '日程';
diff --git a/module/dev/config.php b/module/dev/config.php
index fb212e0540..d45a2f2ddc 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -87,6 +87,7 @@ $config->dev->group['mail']            = 'admin';
 $config->dev->group['backup']          = 'admin';
 $config->dev->group['cron']            = 'admin';
 $config->dev->group['dev']             = 'admin';
+$config->dev->group['editor']          = 'admin';
 $config->dev->group['custom']          = 'admin';
 $config->dev->group['score']           = 'admin';
 $config->dev->group['config']          = 'admin';
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index fb484cc2d7..2bffeedf42 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -90,6 +90,7 @@ $lang->dev->tableList['backup']                = 'Backup';
 $lang->dev->tableList['common']                = 'Common';
 $lang->dev->tableList['convert']               = 'Konvertieren';
 $lang->dev->tableList['dev']                   = 'Entwickeln';
+$lang->dev->tableList['editor']                = 'Editor';
 $lang->dev->tableList['git']                   = 'GIT';
 $lang->dev->tableList['index']                 = 'Home';
 $lang->dev->tableList['install']               = 'Installation';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index d385377cdb..59eff282a3 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -90,6 +90,7 @@ $lang->dev->tableList['backup']                = 'Backup';
 $lang->dev->tableList['common']                = 'Common';
 $lang->dev->tableList['convert']               = 'Convert';
 $lang->dev->tableList['dev']                   = 'Develop';
+$lang->dev->tableList['editor']                = 'Editor';
 $lang->dev->tableList['git']                   = 'GIT';
 $lang->dev->tableList['index']                 = 'Home';
 $lang->dev->tableList['install']               = 'Install';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index d385377cdb..59eff282a3 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -90,6 +90,7 @@ $lang->dev->tableList['backup']                = 'Backup';
 $lang->dev->tableList['common']                = 'Common';
 $lang->dev->tableList['convert']               = 'Convert';
 $lang->dev->tableList['dev']                   = 'Develop';
+$lang->dev->tableList['editor']                = 'Editor';
 $lang->dev->tableList['git']                   = 'GIT';
 $lang->dev->tableList['index']                 = 'Home';
 $lang->dev->tableList['install']               = 'Install';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 7929aff2f1..64292ec0cd 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -18,7 +18,7 @@ $lang->dev->paramRange     = '取值范围：%s';
 $lang->dev->paramDate      = '日期格式：YY-mm-dd，如：2019-01-01';
 $lang->dev->paramColor     = '颜色格式：#RGB，如：#3da7f5';
 $lang->dev->paramMailto    = "填写帐号，多个账号用','分隔。";
-$lang->dev->noteEditor     = "编辑器功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-150.html' target='_blank'>扩展编辑器</a> 插件。";
+$lang->dev->noteEditor     = "编辑器功能存在部分安全问题，如需使用该功能，可在此开启。";
 $lang->dev->noteTranslate  = "翻译功能因为安全原因被禁用。使用该功能，请到官网下载安装 <a href='https://www.zentao.net/extension-viewExt-151.html' target='_blank'>翻译</a> 插件。";
 $lang->dev->confirmRestore = '是否要恢复默认？';
 
@@ -38,6 +38,9 @@ $lang->dev->fields['type']   = '类型';
 $lang->dev->fields['length'] = '长度';
 $lang->dev->fields['null']   = '是否可空';
 
+$lang->dev->switchList['1'] = '开启';
+$lang->dev->switchList['0'] = '关闭';
+
 $lang->dev->tableList = array();
 $lang->dev->tableList['action']                = '系统日志';
 $lang->dev->tableList['bug']                   = 'Bug';
@@ -90,6 +93,7 @@ $lang->dev->tableList['backup']                = '备份';
 $lang->dev->tableList['common']                = '公有模块';
 $lang->dev->tableList['convert']               = '导入';
 $lang->dev->tableList['dev']                   = '二次开发';
+$lang->dev->tableList['editor']                = '编辑器';
 $lang->dev->tableList['git']                   = 'GIT';
 $lang->dev->tableList['index']                 = '首页';
 $lang->dev->tableList['install']               = '安装';
diff --git a/module/dev/view/editor.html.php b/module/dev/view/editor.html.php
index 31a05c3ff1..d0710305f0 100644
--- a/module/dev/view/editor.html.php
+++ b/module/dev/view/editor.html.php
@@ -12,6 +12,11 @@
 ?>
 <?php include 'header.html.php';?>
 <div id='mainContent' class='main-content'>
-    <div class='alert alert-danger'><?php echo $lang->dev->noteEditor;?></div>
+  <div class='text-center'>
+    <?php
+    echo $lang->dev->noteEditor;
+    if(common::hasPriv('editor', 'switch')) echo html::a($this->createLink('editor', 'switch', 'status=1'), $lang->dev->switchList[1], 'hiddenwin', "class='btn btn-primary'");
+    ?>
+  </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/editor/config.php b/module/editor/config.php
new file mode 100644
index 0000000000..2f67d55773
--- /dev/null
+++ b/module/editor/config.php
@@ -0,0 +1,16 @@
+<?php
+$config->editor->sort[] = 'model.php';
+$config->editor->sort[] = 'control.php';
+$config->editor->sort[] = 'view';
+$config->editor->sort[] = 'lang';
+$config->editor->sort[] = 'config.php';
+$config->editor->sort[] = 'js';
+$config->editor->sort[] = 'css';
+
+$config->editor->extSort[] = 'model';
+$config->editor->extSort[] = 'control';
+$config->editor->extSort[] = 'view';
+$config->editor->extSort[] = 'lang';
+$config->editor->extSort[] = 'js';
+$config->editor->extSort[] = 'css';
+$config->editor->extSort[] = 'config';
diff --git a/module/editor/control.php b/module/editor/control.php
new file mode 100644
index 0000000000..d67e302959
--- /dev/null
+++ b/module/editor/control.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * The control file of editor of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+class editor extends control
+{
+    /**
+     * Show module files and edit them.
+     *
+     * @access public
+     * @return void
+     */
+    public function index($type = 'editor')
+    {
+        $this->app->loadLang('dev');
+        $this->view->title      = $this->lang->editor->common;
+        $this->view->position[] = $this->lang->editor->common;
+        $this->view->modules    = $this->loadModel('dev')->getModules();
+        $this->view->tab        = $type;
+        $this->display();
+    }
+
+    /**
+     * Show files and methods of the module.
+     *
+     * @param  string $moduleDir
+     * @access public
+     * @return void
+     */
+    public function extend($moduleDir = '')
+    {
+        $moduleFiles = $this->editor->getModuleFiles($moduleDir);
+        $this->view->module = $moduleDir;
+        $this->view->tree = $this->editor->printTree($moduleFiles);
+        $this->display();
+    }
+
+    /**
+     * Edit extend.
+     *
+     * @param  string $filePath
+     * @param  string $action
+     * @param  string $isExtends
+     * @access public
+     * @return void
+     */
+    public function edit($filePath = '', $action = '', $isExtends = '')
+    {
+        $this->view->safeFilePath = $filePath;
+        $fileContent  = '';
+        if($filePath)
+        {
+            $filePath = helper::safe64Decode($filePath);
+            if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) die($this->lang->editor->editFileError);
+            if($action == 'extendOther' and file_exists($filePath))
+            {
+                $this->view->showContent = file_get_contents($filePath);
+            }
+            if($action == 'edit' or $action == 'override')
+            {
+                if(file_exists($filePath))
+                {
+                    $fileContent = file_get_contents($filePath);
+                    if($action == 'override')
+                    {
+                        $fileContent = str_replace("'../../", '$this->app->getModuleRoot() . \'', $fileContent);
+                        $fileContent = str_replace(array('\'./', '"./'), array('\'../../view/', '"../../view'), $fileContent);
+                    }
+                }
+                else
+                {
+                    $filePath = '';
+                }
+            }
+            elseif($action == 'extendModel')
+            {
+                $fileContent = $this->editor->extendModel($filePath);
+            }
+            elseif($action == 'extendControl')
+            {
+                $okUrl = $this->editor->getExtendLink($filePath, 'extendControl', 'yes');
+                $cancelUrl = $this->editor->getExtendLink($filePath, 'extendControl', 'no');
+                if(!$isExtends) die(js::confirm($this->lang->editor->extendConfirm, $okUrl, $cancelUrl));
+                $fileContent = $this->editor->extendControl($filePath, $isExtends);
+            }
+            elseif($action == 'newPage')
+            {
+                $fileContent = $this->editor->newControl($filePath);
+            }
+            elseif(strrpos(basename($filePath), '.php') !== false and empty($fileContent))
+            {
+                $fileContent = "<?php\n";
+            }
+        }
+        $this->view->fileContent = $fileContent;
+        $this->view->filePath    = $filePath;
+        $this->view->action      = $action;
+        $this->display();
+    }
+
+    /**
+     * Set Page name.
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return void
+     */
+    public function newPage($filePath)
+    {
+        $filePath = helper::safe64Decode($filePath);
+        if($_POST)
+        {
+            $saveFilePath = $this->editor->getSavePath($filePath, 'newMethod');
+            $extendLink   = $this->editor->getExtendLink($saveFilePath, 'newPage');
+            if(file_exists($saveFilePath) and !$this->post->override) die(js::confirm($this->lang->editor->repeatPage, $extendLink, '', 'parent'));
+            die(js::locate($extendLink, 'parent'));
+        }
+        $this->view->filePath    = $filePath;
+        $this->display();
+    }
+
+    /**
+     * Save file to extension.
+     *
+     * @param  string $filePath
+     * @access public
+     * @return void
+     */
+    public function save($filePath = '', $action = '')
+    {
+        $statusFile = $this->loadModel('common')->checkSafeFile();
+        if($statusFile)
+        {
+            die(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
+        }
+        if($filePath and $_POST)
+        {
+            $filePath = helper::safe64Decode($filePath);
+            if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) die($this->lang->editor->editFileError);
+            if($action != 'edit' and $action != 'newPage') $filePath = $this->editor->getSavePath($filePath, $action);
+            if($action != 'edit' and $action != 'newPage' and file_exists($filePath) and !$this->post->override) die(js::error($this->lang->editor->repeatFile));
+            $this->editor->save($filePath);
+            echo js::reload('parent.parent.extendWin');
+            die(js::locate(inlink('edit', "filePath=" . helper::safe64Encode($filePath) . "&action=edit"), 'parent'));
+        }
+    }
+
+    /**
+     * Delete extension file.
+     *
+     * @param  string $filePath
+     * @param  string $confirm
+     * @access public
+     * @return void
+     */
+    public function delete($filePath = '', $confirm = 'no')
+    {
+        if($confirm == 'no')
+        {
+            die(js::confirm($this->lang->editor->deleteConfirm, inlink('delete', "filePath=$filePath&confirm=yes")));
+        }
+        $filePath = helper::safe64Decode($filePath);
+        if(file_exists($filePath) and unlink($filePath)) die(js::reload('parent'));
+        die(js::alert($this->lang->editor->notDelete));
+
+    }
+
+    public function switch($status)
+    {
+        $this->loadModel('setting')->setItem('system.common.global.editor', $status);
+
+        $link = empty($status) ? $this->createLink('dev', 'editor') : $this->createLink('editor', 'index');
+        return print(js::locate($link, 'parent'));
+    }
+}
diff --git a/module/editor/css/edit.css b/module/editor/css/edit.css
new file mode 100644
index 0000000000..93e062ed52
--- /dev/null
+++ b/module/editor/css/edit.css
@@ -0,0 +1,2 @@
+body{padding-bottom:0px;background-color:#fff;}
+#showContentEditor, #fileContentEditor {border:1px solid #ddd;}
diff --git a/module/editor/css/extend.css b/module/editor/css/extend.css
new file mode 100644
index 0000000000..e019a90efa
--- /dev/null
+++ b/module/editor/css/extend.css
@@ -0,0 +1,5 @@
+body{padding-bottom:0px;background-color:#fff;}
+.expandable > ul {display: none!important}
+.collapsable > ul {display: block!important}
+.tree li:before {margin-right: 4px;}
+.tree li>a{display:inline;}
diff --git a/module/editor/css/index.css b/module/editor/css/index.css
new file mode 100644
index 0000000000..4e5c35a06b
--- /dev/null
+++ b/module/editor/css/index.css
@@ -0,0 +1,7 @@
+table td {padding: 0 10px; vertical-align: top;}
+table tr > td:first-child {padding-left: 0;}
+table tr > td:last-child {padding-right: 0;}
+.modulegroup {font-weight:bold; padding-top:8px; border-top:1px solid #ddd;}
+td.w-200px a:hover {font-weight:bold;}
+.w-350px{width:350px;}
+.module-col{padding-bottom:30px;}
diff --git a/module/editor/js/edit.js b/module/editor/js/edit.js
new file mode 100644
index 0000000000..6e853d71c2
--- /dev/null
+++ b/module/editor/js/edit.js
@@ -0,0 +1 @@
+$(function(){ })
diff --git a/module/editor/js/index.js b/module/editor/js/index.js
new file mode 100644
index 0000000000..c2b1ddc184
--- /dev/null
+++ b/module/editor/js/index.js
@@ -0,0 +1,12 @@
+$(function()
+{
+   var showHeight = $('#main').height() - $('#mainMenu').height() - 40;
+   $('#editWin').height(showHeight);
+   $('#extendWin').height(showHeight);
+
+   $('.side-col a').click(function()
+   {
+       $('.side-col a.active').removeClass('active');
+       $(this).addClass('active');
+   });
+});
diff --git a/module/editor/lang/de.php b/module/editor/lang/de.php
new file mode 100644
index 0000000000..624035bbe1
--- /dev/null
+++ b/module/editor/lang/de.php
@@ -0,0 +1,76 @@
+<?php
+$lang->editor->common    = 'Editor';
+$lang->editor->api       = 'API';
+$lang->editor->index     = 'Home';
+$lang->editor->newMethod = 'Neue Methode';
+$lang->editor->extend    = 'Erweiterung';
+$lang->editor->api       = 'API';
+$lang->editor->newLang   = 'Neue Sprache';
+$lang->editor->newConfig = 'Neue Konfiguration';
+$lang->editor->newHook   = 'Neuer Hook';
+$lang->editor->newExtend = 'Neue Erweiterung';
+$lang->editor->newPage   = 'Neue Seite';
+$lang->editor->override  = 'Überschreiben';
+$lang->editor->edit      = 'Erweiterung bearbeiten';
+$lang->editor->save      = 'Seite speichern';
+$lang->editor->delete    = 'Seite löschen';
+
+$lang->editor->moduleList   = 'Module';
+$lang->editor->filePath     = "Erweiterung:";
+$lang->editor->sourceFile   = 'Source Datei:';
+$lang->editor->fileName     = "Dateiname:";
+$lang->editor->isOverride   = "Dublette überschrieben";
+$lang->editor->exampleHook  = "(z.B. ***.html.hook.php)";
+$lang->editor->exampleJs    = "(z.B. ***.js)";
+$lang->editor->exampleCss   = "(z.B. ***.css)";
+$lang->editor->examplePHP   = "(z.B. ***.php)";
+$lang->editor->pageName     = "Seitenname:";
+
+$lang->editor->deleteConfirm = 'Möchten Sie das löschen?';
+$lang->editor->extendConfirm = 'Möchten Sie den Originalcode verwenden?';
+$lang->editor->repeatFile    = 'Datei existiert bereits';
+$lang->editor->repeatPage    = 'Seite existiert bereits. Möchten Sie die Seite überschreiben?';
+$lang->editor->noticeOkFile  = 'Aus Sicherheitsgründen muss Ihr Adminkonto bestätigt werden. \n Bitte melden Sie sich an und erstellen Sie die Datei %s File.\n Hinweis:\n 1. Die Datei ist leer.\n 2. Wenn die Datei bereits existiert, löschen Sie sie und erstellen Sie eine neue Datei.';
+$lang->editor->editFileError = 'Sie können nur ZenTao Dateien verändern!';
+
+$lang->editor->notWritable    = "Nicht beschreibbar. Berechtigung erforderlich. Bitte versuchen Sie chmod 777 -R ";
+$lang->editor->notDelete      = 'Kann nicht gelöscht werden. Bitte prüfen Sie Ihre Berechtigungen!';
+$lang->editor->emptyFileName  = 'Bitte geben Sie einen Dateinamen an!';
+$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Help</a>";
+
+$lang->editor->translate['config.php']  = 'config';
+$lang->editor->translate['control.php'] = 'control';
+$lang->editor->translate['model.php']   = 'model';
+
+$lang->editor->modules['action']      = 'System Log';
+$lang->editor->modules['admin']       = 'Admin';
+$lang->editor->modules['api']         = 'API';
+$lang->editor->modules['bug']         = 'Bug';
+$lang->editor->modules['build']       = 'Build';
+$lang->editor->modules['common']      = 'Bekannte Module';
+$lang->editor->modules['company']     = 'Unternehmen';
+$lang->editor->modules['convert']     = 'Konvertieren';
+$lang->editor->modules['dept']        = 'Abteilung';
+$lang->editor->modules['doc']         = 'Dok';
+$lang->editor->modules['extension']   = 'Erweiterung';
+$lang->editor->modules['file']        = 'Datei';
+$lang->editor->modules['group']       = 'Gruppe';
+$lang->editor->modules['index']       = 'Homepage';
+$lang->editor->modules['install']     = 'Installieren';
+$lang->editor->modules['misc']        = 'Sonstiges';
+$lang->editor->modules['my']          = 'Dashboard';
+$lang->editor->modules['product']     = $lang->productCommon;
+$lang->editor->modules['productplan'] = 'Plan';
+$lang->editor->modules['project']     = $lang->projectCommon;
+$lang->editor->modules['qa']          = 'QA';
+$lang->editor->modules['release']     = 'Release';
+$lang->editor->modules['report']      = 'Berichte';
+$lang->editor->modules['search']      = 'Suche';
+$lang->editor->modules['story']       = 'Story';
+$lang->editor->modules['task']        = 'Aufgaben';
+$lang->editor->modules['testcase']    = 'Fälle';
+$lang->editor->modules['testtask']    = 'Testaufgaben';
+$lang->editor->modules['todo']        = 'Todos';
+$lang->editor->modules['tree']        = 'Module';
+$lang->editor->modules['upgrade']     = 'Upgrade';
+$lang->editor->modules['user']        = 'Benutzer';
diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php
new file mode 100644
index 0000000000..5dfb681829
--- /dev/null
+++ b/module/editor/lang/en.php
@@ -0,0 +1,77 @@
+<?php
+$lang->editor->common    = 'Editor';
+$lang->editor->api       = 'API';
+$lang->editor->index     = 'Home';
+$lang->editor->newMethod = 'New Method';
+$lang->editor->extend    = 'Extension';
+$lang->editor->api       = 'API';
+$lang->editor->newLang   = 'New Language';
+$lang->editor->newConfig = 'New Config';
+$lang->editor->newHook   = 'New Hook';
+$lang->editor->newExtend = 'New Extension';
+$lang->editor->newPage   = 'New Page';
+$lang->editor->override  = 'Overwrite';
+$lang->editor->edit      = 'Edit Extension';
+$lang->editor->save      = 'Save Page';
+$lang->editor->delete    = 'Delete Page';
+
+$lang->editor->moduleList   = 'Module';
+$lang->editor->filePath     = "Extension:";
+$lang->editor->sourceFile   = 'Source File:';
+$lang->editor->fileName     = "File Name:";
+$lang->editor->isOverride   = "Override Duplicated File";
+$lang->editor->exampleHook  = "(e.g. ***.html.hook.php)";
+$lang->editor->exampleJs    = "(e.g. ***.js)";
+$lang->editor->exampleCss   = "(e.g. ***.css)";
+$lang->editor->examplePHP   = "(e.g. ***.php)";
+$lang->editor->pageName     = "Page Name:";
+
+$lang->editor->deleteConfirm = 'Do you want to delete it?';
+$lang->editor->extendConfirm = 'Do you want to use original code?';
+$lang->editor->repeatFile    = 'File Name Duplicated';
+$lang->editor->repeatPage    = 'This page exists. Do you want to overwrite it?';
+$lang->editor->noticeOkFile  = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
+$lang->editor->editFileError = 'You can only modify ZenTao files!';
+
+$lang->editor->notWritable    = "Not wirtable. Permission is required. Please try chmod 777 -R ";
+$lang->editor->notDelete      = 'Cannot be deleted. Please check your permissions!';
+$lang->editor->emptyFileName  = 'Please enter a File Name!';
+$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1 for security. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Help</a>";
+
+$lang->editor->translate['config.php']  = 'config';
+$lang->editor->translate['control.php'] = 'control';
+$lang->editor->translate['model.php']   = 'model';
+
+$lang->editor->modules['action']      = 'System Log';
+$lang->editor->modules['admin']       = 'Admin';
+$lang->editor->modules['api']         = 'API';
+$lang->editor->modules['bug']         = 'Bug';
+$lang->editor->modules['build']       = 'Build';
+$lang->editor->modules['common']      = 'Common Module';
+$lang->editor->modules['company']     = 'Company';
+$lang->editor->modules['convert']     = 'Convert';
+$lang->editor->modules['dept']        = 'Department';
+$lang->editor->modules['doc']         = 'Doc';
+$lang->editor->modules['extension']   = 'Extension';
+$lang->editor->modules['file']        = 'File';
+$lang->editor->modules['group']       = 'Group';
+$lang->editor->modules['index']       = 'Homepage';
+$lang->editor->modules['install']     = 'Install';
+$lang->editor->modules['misc']        = 'Misc';
+$lang->editor->modules['my']          = 'Dashboard';
+$lang->editor->modules['product']     = $lang->productCommon;
+$lang->editor->modules['productplan'] = 'Plan';
+$lang->editor->modules['project']     = $lang->projectCommon;
+$lang->editor->modules['execution']   = $lang->executionCommon;
+$lang->editor->modules['qa']          = 'QA';
+$lang->editor->modules['release']     = 'Release';
+$lang->editor->modules['report']      = 'Report';
+$lang->editor->modules['search']      = 'Search';
+$lang->editor->modules['story']       = $lang->URCommon;
+$lang->editor->modules['task']        = 'Task';
+$lang->editor->modules['testcase']    = 'Case';
+$lang->editor->modules['testtask']    = 'Request';
+$lang->editor->modules['todo']        = 'Todo';
+$lang->editor->modules['tree']        = 'Module Maintenance';
+$lang->editor->modules['upgrade']     = 'Upgrade';
+$lang->editor->modules['user']        = 'User';
diff --git a/module/editor/lang/fr.php b/module/editor/lang/fr.php
new file mode 100644
index 0000000000..d483fce164
--- /dev/null
+++ b/module/editor/lang/fr.php
@@ -0,0 +1,76 @@
+<?php
+$lang->editor->common    = 'Editeur';
+$lang->editor->api       = 'API';
+$lang->editor->index     = 'Accueil';
+$lang->editor->newMethod = 'New M�thode';
+$lang->editor->extend    = 'Extension';
+$lang->editor->api       = 'API';
+$lang->editor->newLang   = 'New Language';
+$lang->editor->newConfig = 'New Config';
+$lang->editor->newHook   = 'New Hook';
+$lang->editor->newExtend = 'New Extension';
+$lang->editor->newPage   = 'New Page';
+$lang->editor->override  = 'Ecraser';
+$lang->editor->edit      = 'Editer Extension';
+$lang->editor->save      = 'Sauver Page';
+$lang->editor->delete    = 'Supprimer Page';
+
+$lang->editor->moduleList   = 'Module';
+$lang->editor->filePath     = "Extension:";
+$lang->editor->sourceFile   = 'Fichier Source :';
+$lang->editor->fileName     = "Nom Fichier :";
+$lang->editor->isOverride   = "Override Duplicated File";
+$lang->editor->exampleHook  = "(e.g. ***.html.hook.php)";
+$lang->editor->exampleJs    = "(e.g. ***.js)";
+$lang->editor->exampleCss   = "(e.g. ***.css)";
+$lang->editor->examplePHP   = "(e.g. ***.php)";
+$lang->editor->pageName     = "Nom Page :";
+
+$lang->editor->deleteConfirm = 'Voulez-vous le supprimer ?';
+$lang->editor->extendConfirm = 'Voulez-vous utiliser le code original ?';
+$lang->editor->repeatFile    = 'Doublon';
+$lang->editor->repeatPage    = "Cette page existe. Voulez-vous l'�craser ?";
+$lang->editor->noticeOkFile  = 'Pour des raisons de s�curit�, votre compte administrateur doit �tre confirm�. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
+$lang->editor->editFileError = 'Vous pouvez seulement modifier les fichiers ZenTao !';
+
+$lang->editor->notWritable    = "Non inscriptible. Permission requise. Essayez chmod 777 -R ";
+$lang->editor->notDelete      = 'Ne peut pas �tre supprim�. V�rifiez les permissions !';
+$lang->editor->emptyFileName  = 'Entrez un nom de fichier !';
+$lang->editor->onlyLocalVisit = "Cette fonctionnalit� ne fonctionne que pour une IP 127.0.0.1. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Aide</a>";
+
+$lang->editor->translate['config.php']  = 'config';
+$lang->editor->translate['control.php'] = 'contr�le';
+$lang->editor->translate['model.php']   = 'mod�le';
+
+$lang->editor->modules['action']      = 'System Log';
+$lang->editor->modules['admin']       = 'Admin';
+$lang->editor->modules['api']         = 'API';
+$lang->editor->modules['bug']         = 'Bug';
+$lang->editor->modules['build']       = 'Build';
+$lang->editor->modules['common']      = 'Module Commun';
+$lang->editor->modules['company']     = 'Entreprise';
+$lang->editor->modules['convert']     = 'Convertir';
+$lang->editor->modules['dept']        = 'Compartiment';
+$lang->editor->modules['doc']         = 'Doc';
+$lang->editor->modules['extension']   = 'Extension';
+$lang->editor->modules['file']        = 'Fichier';
+$lang->editor->modules['group']       = 'Groupe';
+$lang->editor->modules['index']       = 'Accueil';
+$lang->editor->modules['install']     = 'Installer';
+$lang->editor->modules['misc']        = 'Divers';
+$lang->editor->modules['my']          = 'Dashboard';
+$lang->editor->modules['product']     = $lang->productCommon;
+$lang->editor->modules['productplan'] = 'Plan';
+$lang->editor->modules['project']     = $lang->projectCommon;
+$lang->editor->modules['qa']          = 'QA';
+$lang->editor->modules['release']     = 'Release';
+$lang->editor->modules['report']      = 'Rapport';
+$lang->editor->modules['search']      = 'Recherche';
+$lang->editor->modules['story']       = 'Story';
+$lang->editor->modules['task']        = 'T�che';
+$lang->editor->modules['testcase']    = 'CasTest';
+$lang->editor->modules['testtask']    = 'Recette';
+$lang->editor->modules['todo']        = 'Agenda';
+$lang->editor->modules['tree']        = 'Module Maintenance';
+$lang->editor->modules['upgrade']     = 'Upgrade';
+$lang->editor->modules['user']        = 'User';
diff --git a/module/editor/lang/vi.php b/module/editor/lang/vi.php
new file mode 100644
index 0000000000..80b792e7a7
--- /dev/null
+++ b/module/editor/lang/vi.php
@@ -0,0 +1,76 @@
+<?php
+$lang->editor->common = 'Editor';
+$lang->editor->api    = 'API';
+$lang->editor->index  = 'Home';
+$lang->editor->newMethod = 'New Method';
+$lang->editor->extend = 'Extension';
+$lang->editor->api    = 'API';
+$lang->editor->newLang   = 'Ngôn ngữ mới';
+$lang->editor->newConfig = 'Cấu hình mới';
+$lang->editor->newHook   = 'New Hook';
+$lang->editor->newExtend = 'New Extension';
+$lang->editor->newPage   = 'Trang mới';
+$lang->editor->override  = 'Ghi đè';
+$lang->editor->edit   = 'Edit Extension';
+$lang->editor->save   = 'Save Page';
+$lang->editor->delete = 'Delete Page';
+
+$lang->editor->moduleList   = 'Module';
+$lang->editor->filePath  = "Extension:";
+$lang->editor->sourceFile   = 'Nguồn File:';
+$lang->editor->fileName  = "File Name:";
+$lang->editor->isOverride   = "Override Duplicated File";
+$lang->editor->exampleHook  = "(ví dụ:  ***.html.hook.php)";
+$lang->editor->exampleJs = "(ví dụ:  ***.js)";
+$lang->editor->exampleCss   = "(ví dụ:  ***.css)";
+$lang->editor->examplePHP   = "(ví dụ:  ***.php)";
+$lang->editor->pageName  = "Tên trang:";
+
+$lang->editor->deleteConfirm = 'Bạn có muốn xóa nó?';
+$lang->editor->extendConfirm = 'Do you want to use original code?';
+$lang->editor->repeatFile = 'File Name Duplicated';
+$lang->editor->repeatPage = 'This page exists. Do you want to overwrite it?';
+$lang->editor->noticeOkFile  = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
+$lang->editor->editFileError = 'Bạn có thể only modify ZenTao files!';
+
+$lang->editor->notWritable = "Not wirtable. Permission là bắt buộc. Please try chmod 777 -R ";
+$lang->editor->notDelete   = 'Không thể be deleted. Please check your permissions!';
+$lang->editor->emptyFileName  = 'Please enter a File Name!';
+$lang->editor->onlyLocalVisit = "This feature only works when the IP is 127.0.0.1 for security. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Giúp</a>";
+
+$lang->editor->translate['config.php']  = 'config';
+$lang->editor->translate['control.php'] = 'control';
+$lang->editor->translate['model.php']   = 'model';
+
+$lang->editor->modules['action']   = 'Nhật ký hệ thống';
+$lang->editor->modules['admin']    = 'Quản trị';
+$lang->editor->modules['api']   = 'API';
+$lang->editor->modules['bug']   = 'Bug';
+$lang->editor->modules['build']    = 'Bản dựng';
+$lang->editor->modules['common']   = 'Module chung';
+$lang->editor->modules['company']  = 'Doanh nghiệp';
+$lang->editor->modules['convert']  = 'Chuyển đổi';
+$lang->editor->modules['dept']  = 'Phòng/Ban';
+$lang->editor->modules['doc']   = 'Tài liệu';
+$lang->editor->modules['extension']   = 'Extension';
+$lang->editor->modules['file']  = 'File';
+$lang->editor->modules['group']    = 'Nhóm';
+$lang->editor->modules['index']    = 'Homepage';
+$lang->editor->modules['install']  = 'Cài đặt';
+$lang->editor->modules['misc']  = 'Khác';
+$lang->editor->modules['my']    = 'Dashboard';
+$lang->editor->modules['product']  = $lang->productCommon;
+$lang->editor->modules['productplan'] = 'Kế hoạch';
+$lang->editor->modules['project']  = $lang->projectCommon;
+$lang->editor->modules['qa']    = 'QA';
+$lang->editor->modules['release']  = 'Phát hành';
+$lang->editor->modules['report']   = 'Báo cáo';
+$lang->editor->modules['search']   = 'Tìm kiếm';
+$lang->editor->modules['story']    = 'Câu chuyện';
+$lang->editor->modules['task']  = 'Nhiệm vụ';
+$lang->editor->modules['testcase'] = 'Tình huống';
+$lang->editor->modules['testtask'] = 'Yêu cầu';
+$lang->editor->modules['todo']  = 'Việc làm';
+$lang->editor->modules['tree']  = 'Bảo trì';
+$lang->editor->modules['upgrade']  = 'Nâng cấp';
+$lang->editor->modules['user']  = 'Người dùng';
diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php
new file mode 100644
index 0000000000..82898da78e
--- /dev/null
+++ b/module/editor/lang/zh-cn.php
@@ -0,0 +1,78 @@
+<?php
+$lang->editor->common    = '编辑器';
+$lang->editor->api       = 'API';
+$lang->editor->index     = '首页';
+$lang->editor->newMethod = '新增方法';
+$lang->editor->extend    = '扩展';
+$lang->editor->api       = 'API';
+$lang->editor->newLang   = '新增语言';
+$lang->editor->newConfig = '新增配置';
+$lang->editor->newHook   = '新增钩子';
+$lang->editor->newExtend = '新增扩展';
+$lang->editor->newPage   = '新增页面';
+$lang->editor->override  = '覆盖';
+$lang->editor->edit      = '编辑扩展';
+$lang->editor->save      = '保存页面';
+$lang->editor->delete    = '删除页面';
+
+$lang->editor->moduleList   = '模块列表';
+$lang->editor->filePath     = "扩展：";
+$lang->editor->sourceFile   = '源文件：';
+$lang->editor->fileName     = "文件名：";
+$lang->editor->isOverride   = "覆盖重复文件";
+$lang->editor->exampleHook  = "(例如：***.html.hook.php)";
+$lang->editor->exampleJs    = "(例如：***.js)";
+$lang->editor->exampleCss   = "(例如：***.css)";
+$lang->editor->examplePHP   = "(例如：***.php)";
+$lang->editor->pageName     = "页面名称：";
+
+$lang->editor->deleteConfirm = '是否要删除？';
+$lang->editor->extendConfirm = '是否要重用原来代码？';
+$lang->editor->repeatFile    = '文件名重复';
+$lang->editor->repeatPage    = '已经有此页面。是否覆盖？';
+$lang->editor->noticeOkFile  = '为了安全起见，系统需要确认您的管理员身份。\n 请登录禅道所在的服务器，创建%s文件。\n 注意：\n 1. 文件内容为空。\n 2. 如果之前文件存在，删除之后重新创建。';
+$lang->editor->editFileError = '只能修改禅道文件！';
+$lang->editor->turnOff       = '如不使用编辑器功能，可在此关闭。';
+
+$lang->editor->notWritable    = "无法写入，可能没有权限。请尝试执行 chmod 777 -R ";
+$lang->editor->notDelete      = '无法删除，请检查权限！';
+$lang->editor->emptyFileName  = '请写入一个文件名！';
+$lang->editor->onlyLocalVisit = "该功能只能在IP：127.0.0.1下访问。<a href='https://api.zentao.net/goto.php?item=howtodevelop' target='_blank'>说明文档</a>";
+
+$lang->editor->translate['config.php']  = 'config';
+$lang->editor->translate['control.php'] = 'control';
+$lang->editor->translate['model.php']   = 'model';
+
+$lang->editor->modules['action']      = '系统日志';
+$lang->editor->modules['admin']       = '后台管理';
+$lang->editor->modules['api']         = 'API接口';
+$lang->editor->modules['bug']         = 'Bug管理';
+$lang->editor->modules['build']       = 'Build';
+$lang->editor->modules['common']      = '公有模块';
+$lang->editor->modules['company']     = '组织视图';
+$lang->editor->modules['convert']     = '从其他系统导入';
+$lang->editor->modules['dept']        = '部门结构';
+$lang->editor->modules['doc']         = '文档视图';
+$lang->editor->modules['extension']   = '插件管理';
+$lang->editor->modules['file']        = '附件';
+$lang->editor->modules['group']       = '权限分组';
+$lang->editor->modules['index']       = '首页';
+$lang->editor->modules['install']     = '安装';
+$lang->editor->modules['misc']        = '杂项';
+$lang->editor->modules['my']          = '我的地盘';
+$lang->editor->modules['product']     = $lang->productCommon . '视图';
+$lang->editor->modules['productplan'] = '计划';
+$lang->editor->modules['project']     = '项目视图';
+$lang->editor->modules['execution']   = $lang->executionCommon . '视图';
+$lang->editor->modules['qa']          = '测试视图';
+$lang->editor->modules['release']     = '发布';
+$lang->editor->modules['report']      = '报表';
+$lang->editor->modules['search']      = '搜索';
+$lang->editor->modules['story']       = $lang->URCommon;
+$lang->editor->modules['task']        = '任务';
+$lang->editor->modules['testcase']    = '用例管理';
+$lang->editor->modules['testtask']    = '测试单';
+$lang->editor->modules['todo']        = '待办';
+$lang->editor->modules['tree']        = '模块维护';
+$lang->editor->modules['upgrade']     = '升级';
+$lang->editor->modules['user']        = '用户';
diff --git a/module/editor/lang/zh-tw.php b/module/editor/lang/zh-tw.php
new file mode 100644
index 0000000000..b1308fe75b
--- /dev/null
+++ b/module/editor/lang/zh-tw.php
@@ -0,0 +1,76 @@
+<?php
+$lang->editor->common    = '編輯器';
+$lang->editor->api       = 'API';
+$lang->editor->index     = '首頁';
+$lang->editor->newMethod = '新增方法';
+$lang->editor->extend    = '擴展';
+$lang->editor->api       = 'API';
+$lang->editor->newLang   = '新增語言';
+$lang->editor->newConfig = '新增配置';
+$lang->editor->newHook   = '新增鈎子';
+$lang->editor->newExtend = '新增擴展';
+$lang->editor->newPage   = '新增頁面';
+$lang->editor->override  = '覆蓋';
+$lang->editor->edit      = '編輯擴展';
+$lang->editor->save      = '保存頁面';
+$lang->editor->delete    = '刪除頁面';
+
+$lang->editor->moduleList   = '模組列表';
+$lang->editor->filePath     = "擴展：";
+$lang->editor->sourceFile   = '源檔案：';
+$lang->editor->fileName     = "檔案名：";
+$lang->editor->isOverride   = "覆蓋重複檔案";
+$lang->editor->exampleHook  = "(例如：***.html.hook.php)";
+$lang->editor->exampleJs    = "(例如：***.js)";
+$lang->editor->exampleCss   = "(例如：***.css)";
+$lang->editor->examplePHP   = "(例如：***.php)";
+$lang->editor->pageName     = "頁面名稱：";
+
+$lang->editor->deleteConfirm = '是否要刪除？';
+$lang->editor->extendConfirm = '是否要重用原來代碼？';
+$lang->editor->repeatFile    = '檔案名重複';
+$lang->editor->repeatPage    = '已經有此頁面。是否覆蓋？';
+$lang->editor->noticeOkFile  = '為了安全起見，系統需要確認您的管理員身份。\n 請登錄禪道所在的伺服器，創建%s檔案。\n 注意：\n 1. 檔案內容為空。\n 2. 如果之前檔案存在，刪除之後重新創建。';
+$lang->editor->editFileError = '只能修改禪道檔案！';
+
+$lang->editor->notWritable    = "無法寫入，可能沒有權限。請嘗試執行 chmod 777 -R ";
+$lang->editor->notDelete      = '無法刪除，請檢查權限！';
+$lang->editor->emptyFileName  = '請寫入一個檔案名！';
+$lang->editor->onlyLocalVisit = "該功能只能在IP：127.0.0.1下訪問。<a href='https://api.zentao.net/goto.php?item=howtodevelop' target='_blank'>說明文檔</a>";
+
+$lang->editor->translate['config.php']  = 'config';
+$lang->editor->translate['control.php'] = 'control';
+$lang->editor->translate['model.php']   = 'model';
+
+$lang->editor->modules['action']      = '系統日誌';
+$lang->editor->modules['admin']       = '後台管理';
+$lang->editor->modules['api']         = 'API介面';
+$lang->editor->modules['bug']         = 'Bug管理';
+$lang->editor->modules['build']       = 'Build';
+$lang->editor->modules['common']      = '公有模組';
+$lang->editor->modules['company']     = '組織視圖';
+$lang->editor->modules['convert']     = '從其他系統導入';
+$lang->editor->modules['dept']        = '部門結構';
+$lang->editor->modules['doc']         = '文檔視圖';
+$lang->editor->modules['extension']   = '插件管理';
+$lang->editor->modules['file']        = '附件';
+$lang->editor->modules['group']       = '權限分組';
+$lang->editor->modules['index']       = '首頁';
+$lang->editor->modules['install']     = '安裝';
+$lang->editor->modules['misc']        = '雜項';
+$lang->editor->modules['my']          = '我的地盤';
+$lang->editor->modules['product']     = $lang->productCommon . '視圖';
+$lang->editor->modules['productplan'] = '計劃';
+$lang->editor->modules['project']     = $lang->projectCommon . '視圖';
+$lang->editor->modules['qa']          = '測試視圖';
+$lang->editor->modules['release']     = '發佈';
+$lang->editor->modules['report']      = '報表';
+$lang->editor->modules['search']      = '搜索';
+$lang->editor->modules['story']       = $lang->storyCommon;
+$lang->editor->modules['task']        = '任務';
+$lang->editor->modules['testcase']    = '用例管理';
+$lang->editor->modules['testtask']    = '測試單';
+$lang->editor->modules['todo']        = '待辦';
+$lang->editor->modules['tree']        = '模組維護';
+$lang->editor->modules['upgrade']     = '升級';
+$lang->editor->modules['user']        = '用戶';
diff --git a/module/editor/model.php b/module/editor/model.php
new file mode 100644
index 0000000000..9caf1e4ce1
--- /dev/null
+++ b/module/editor/model.php
@@ -0,0 +1,539 @@
+<?php
+/**
+ * The model file of editor module of ZenTaoCMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+class editorModel extends model
+{
+    /**
+     * Get all modules
+     *
+     * @access public
+     * @return string
+     */
+    public function getModules()
+    {
+        $modules = glob($this->app->getModuleRoot() . '*');
+        $moduleList  = "<div class='list-group'>";
+        foreach($modules as $module)
+        {
+            $module = basename($module);
+            if($module == 'editor' or $module == 'help' or $module == 'setting') continue;
+            $moduleName  = !empty($this->lang->editor->modules[$module]) ? $this->lang->editor->modules[$module] : $module;
+            $moduleList .= html::a(inlink('extend', "moduleDir=$module"),  $moduleName, 'extendWin', "class='list-group-item'");
+        }
+        $moduleList .= '</div>';
+        return $moduleList;
+    }
+
+    /**
+     * Get module files, contain control's methods and model's method but except ext.
+     *
+     * @access public
+     * @return array
+     */
+    public function getModuleFiles($moduleName)
+    {
+        $allModules = array();
+        $modulePath = $this->app->getModulePath('', $moduleName);
+        foreach($this->config->editor->sort as $name)
+        {
+            $moduleFullFile = $modulePath . $name;
+            if($name == 'control.php' or $name == 'model.php')
+            {
+                $allModules[$modulePath][$moduleFullFile] = $this->analysis($moduleFullFile);
+            }
+            elseif(is_dir($moduleFullFile))
+            {
+                $ext = ($name == 'js' or $name == 'css') ? $name : 'php';
+                foreach(glob($moduleFullFile . DS . "*.$ext") as $fileName) $allModules[$modulePath][$moduleFullFile][$fileName] = basename($fileName);
+            }
+            else
+            {
+                $allModules[$modulePath][$moduleFullFile] = $name;
+            }
+        }
+        $allModules += $this->getExtensionFiles($moduleName);
+        return $allModules;
+    }
+
+    /**
+     * Get extension files.
+     *
+     * @param  int    $extPath
+     * @access public
+     * @return void
+     */
+    public function getExtensionFiles($moduleName)
+    {
+        $extensionList = array();
+        foreach($this->config->editor->extSort as $ext)
+        {
+            $extModulePaths = $this->app->getModuleExtPath('', $moduleName, $ext);
+            foreach($extModulePaths as $extensionFullDir)
+            {
+                if(!is_dir($extensionFullDir)) continue;
+
+                if($ext == 'lang' or $ext == 'js' or $ext == 'css')
+                {
+                    $extensionList[$extensionFullDir] = $this->getTwoGradeFiles($extensionFullDir);
+                    continue;
+                }
+                foreach(glob($extensionFullDir . '*') as $extensionFullFile) $extensionList[$extensionFullDir][$extensionFullFile] = basename($extensionFullFile);
+            }
+        }
+        return $extensionList;
+    }
+
+    /**
+     * if a directory has  two grage, this method will get files
+     *
+     * @param  string    $extensionFullDir
+     * @access public
+     * @return string
+     */
+    public function getTwoGradeFiles($extensionFullDir)
+    {
+        $fileList = array();
+        $langDirs = scandir($extensionFullDir);
+        foreach($langDirs as $langDir)
+        {
+            if($langDir == '.' or $langDir == '..' or $langDir == '.svn') continue;
+            $langFullDir = $extensionFullDir . DS . $langDir;
+            $fileList[$langFullDir] = array();
+            if(is_dir($langFullDir))
+            {
+                $langFiles = scandir($langFullDir);
+                foreach($langFiles as $langFile)
+                {
+                    if($langFile == '.' or $langFile == '..' or $langFile == '.svn') continue;
+                    $langFullFile = $langFullDir . DS . $langFile;
+                    $fileList[$langFullDir][$langFullFile] = $langFile;
+                }
+            }
+        }
+        return $fileList;
+    }
+
+    /**
+     * Analysis methods of control and model.
+     *
+     * @param  string    $fileName
+     * @access public
+     * @return array
+     */
+    public function analysis($fileName)
+    {
+        $classMethod = array();
+        $class = strstr($fileName, DS . 'module' . DS);
+        if(empty($class))
+        {
+            $class = strstr($fileName, DS . 'extension' . DS);
+            $class = str_replace(DS . 'extension' . DS, '', $class);
+            $class = ltrim(strstr($class, DS), DS);
+        }
+        else
+        {
+            $class = str_replace(DS . 'module' . DS, '', $class);
+        }
+
+        $class = dirname($class);
+        if(strpos($fileName, 'model.php') !== false) $class .= 'Model';
+        if(!class_exists($class)) include $fileName;
+        $reflection = new ReflectionClass($class);
+        foreach($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method)
+        {
+            $methodName = $method->name;
+            if($method->getFileName() != $fileName) continue;
+            if($methodName == '__construct') continue;
+            $classMethod[$fileName . DS . $methodName] = $methodName;
+        }
+        return $classMethod;
+    }
+
+    /**
+     * Print tree from module files.
+     *
+     * @param  int    $files
+     * @access public
+     * @return void
+     */
+    public function printTree($files, $isRoot = true)
+    {
+        if(empty($files) or !is_array($files)) return false;
+        $tree = $isRoot ? "<ul id='extendTree' class='tree tree-lines' data-ride='tree'>\n" : "<ul>\n";
+        if($isRoot)
+        {
+            $module = basename(dirname(key($files)));
+
+            $langFile = dirname(key($files)) . DS . 'lang' . DS . $this->cookie->lang. '.php';
+            if(file_exists($langFile))
+            {
+                if(!isset($lang)) $lang = $this->lang;
+                if(!isset($lang->$module)) $lang->$module = new stdclass();
+                include_once $langFile;
+            }
+
+            if(isset($lang->$module))
+            {
+                $this->module = $lang->$module;
+            }
+            elseif(isset($this->lang->$module))
+            {
+                $this->module = $this->lang->$module;
+            }
+            else
+            {
+                $this->module = '';
+            }
+        }
+        foreach($files as $key => $file)
+        {
+            $tree .= "<li>\n";
+            if(is_array($file))
+            {
+                $tree .= $this->addLink4Dir($key);
+                $tree .= $this->printTree($file, false);
+            }
+            else
+            {
+                $tree .= $this->addLink4File($key, $file);
+            }
+            $tree .= "</li>\n";
+        }
+        $tree .= "</ul>\n";
+        return $tree;
+    }
+
+    /**
+     * Add link for directory or has children grade
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return string
+     */
+    public function addLink4Dir($filePath)
+    {
+        $tree = '';
+        $fileName = basename($filePath);
+        if(isset($this->lang->editor->modules[$fileName]))
+        {
+            $file = "<span title='$fileName'>" . $this->lang->editor->modules[$fileName] . '</span>';
+        }
+        elseif(isset($this->lang->editor->translate[$fileName]))
+        {
+           $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
+        }
+        else
+        {
+            $file = "<span title='$fileName'>$fileName</span>";
+        }
+        if(strpos($filePath, DS . 'ext' . DS) !== false)
+        {
+            switch($fileName)
+            {
+            case 'lang': $tree .= $file; break;
+            case 'js':   $tree .= "$file " . html::a($this->getExtendLink($filePath, "newJS"), $this->lang->editor->newExtend, 'editWin'); break;
+            case 'css':  $tree .= "$file " . html::a($this->getExtendLink($filePath, "newCSS"), $this->lang->editor->newExtend, 'editWin'); break;
+            default:     $tree .= "$file " . html::a($this->getExtendLink($filePath, "newExtend"), $this->lang->editor->newExtend, 'editWin');
+            }
+        }
+        elseif($fileName == 'model.php')
+        {
+            $tree .= "$file " . html::a($this->getExtendLink($filePath, 'newMethod'), $this->lang->editor->newMethod, 'editWin');
+        }
+        elseif($fileName == 'control.php')
+        {
+            $tree .= "$file " . html::a(inlink('newPage', "filePath=" . helper::safe64Encode($filePath)), $this->lang->editor->newPage, 'editWin');
+        }
+        else
+        {
+            $tree .= $file;
+        }
+        return $tree;
+    }
+
+    /**
+     * Add link for file
+     *
+     * @param  string    $filePath
+     * @param  string    $file
+     * @access public
+     * @return string
+     */
+    public function addLink4File($filePath, $file)
+    {
+        $tree = '';
+        $file = "<span title='$file'>$file</span>";
+        if(strpos($filePath, DS . 'ext' . DS) !== false)
+        {
+            $tree .= "$file " . html::a($this->getExtendLink($filePath, "edit"), $this->lang->edit, 'editWin');
+            $tree .= html::a(inlink('delete', 'path=' . helper::safe64Encode($filePath)), $this->lang->delete, 'hiddenwin') . "\n";
+        }
+        elseif(basename(dirname($filePath))== 'view')
+        {
+            $tree .= "$file " . html::a($this->getExtendLink($filePath, "override"), $this->lang->editor->override, 'editWin');
+            $tree .= html::a($this->getExtendLink($filePath, "newHook"), $this->lang->editor->newHook, 'editWin') . "\n";
+        }
+        else
+        {
+            $parentDir = basename(dirname($filePath));
+            $action = 'extendOther';
+            if($parentDir == 'control.php') $action = 'extendControl';
+            if($parentDir == 'model.php')   $action = 'extendModel';
+
+            $tree .= "$file " . html::a($this->getExtendLink($filePath, $action), $this->lang->editor->extend, 'editWin');
+            if($action != 'extendOther') $tree .= html::a($this->getAPILink($filePath, $action), $this->lang->editor->api, 'editWin');
+            if($parentDir == 'lang')     $tree .= html::a($this->getExtendLink($filePath, "new" . str_replace('-', '_', basename($filePath, '.php'))), $this->lang->editor->newLang, 'editWin');
+            if(basename($filePath) == 'config.php') $tree .= html::a($this->getExtendLink($filePath, "newConfig"), $this->lang->editor->newConfig, 'editWin');
+        }
+        return $tree;
+    }
+
+    /**
+     * Get extend link
+     *
+     * @param  string    $filePath
+     * @param  string    $action
+     * @param  string    $isExtends
+     * @access public
+     * @return string
+     */
+    public function getExtendLink($filePath, $action, $isExtends = '')
+    {
+        return inlink('edit', "filePath=" . helper::safe64Encode($filePath) . "&action=$action&isExtends=$isExtends");
+    }
+
+    /**
+     * Get api link.
+     *
+     * @param  int    $filePath
+     * @param  int    $action
+     * @param  string $type
+     * @access public
+     * @return string
+     */
+    public function getAPILink($filePath, $action)
+    {
+        return helper::createLink('api', 'debug', "filePath=" . helper::safe64Encode($filePath) . "&action=$action");
+    }
+
+    /**
+     * Save file to extension.
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return void
+     */
+    public function save($filePath)
+    {
+        $statusFile = $this->loadModel('common')->checkSafeFile();
+        if($statusFile) die(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
+
+        $dirPath = dirname($filePath);
+        $extFilePath = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS) + 4);
+        if(!is_dir($dirPath) and is_writable($extFilePath)) mkdir($dirPath, 0777, true);
+        if(!is_dir($dirPath) or !is_writable($dirPath)) die(js::alert($this->lang->editor->notWritable . $extFilePath));
+        if(strpos(strtolower(realpath($dirPath)), strtolower($this->app->getBasePath())) !== 0) die(js::alert($this->lang->editor->editFileError));
+
+        $fileContent = $this->post->fileContent;
+        $evils       = array('eval', 'exec', 'passthru', 'proc_open', 'shell_exec', 'system', '$$', 'include', 'require', 'assert', 'javascript', 'onclick');
+        $gibbedEvils = array('e v a l', 'e x e c', ' p a s s t h r u', ' p r o c _ o p e n', 's h e l l _ e x e c', 's y s t e m', '$ $', 'i n c l u d e', 'r e q u i r e', 'a s s e r t', 'j a v a s c r i p t', 'o n c l i c k');
+        $fileContent = str_ireplace($gibbedEvils, $evils, $fileContent);
+        if(get_magic_quotes_gpc()) $fileContent = stripslashes($fileContent);
+
+        file_put_contents($filePath, $fileContent);
+    }
+
+    /**
+     * Extend model.php and get file content.
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return string
+     */
+    public function extendModel($filePath)
+    {
+        $className = basename(dirname(dirname($filePath)));
+        if(!class_exists($className)) helper::import(dirname($filePath));
+        $methodName = basename($filePath);
+        $methodParam = $this->getParam($className, $methodName, 'Model');
+        return $fileContent = <<<EOD
+<?php
+public function $methodName($methodParam)
+{
+    return parent::$methodName($methodParam);
+}
+EOD;
+    }
+
+    /**
+     * Extend control.php and get file content.
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return string
+     */
+    public function extendControl($filePath, $isExtends)
+    {
+        $className = basename(dirname(dirname($filePath)));
+        if(!class_exists($className)) helper::import(dirname($filePath));
+        $methodName = basename($filePath);
+        if($isExtends == 'yes')
+        {
+            $methodParam = $this->getParam($className, $methodName);
+            return $fileContent = <<<EOD
+<?php
+helper::importControl('$className');
+class my$className extends $className
+{
+    public function $methodName($methodParam)
+    {
+        return parent::$methodName($methodParam);
+    }
+}
+EOD;
+        }
+        else
+        {
+            $methodCode = $this->getMethodCode($className, $methodName);
+            return $fileContent = <<<EOD
+<?php
+class $className extends control
+{
+$methodCode
+}
+EOD;
+       }
+    }
+
+    /**
+     * Add a control method.
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return string
+     */
+    public function newControl($filePath)
+    {
+        $className = strstr($filePath, DS . 'module' . DS);
+        $className = substr($className, 0, strpos($className, DS, 9));
+        $className = basename($className);
+        $methodName = basename($filePath, '.php');
+        return $fileContent = <<<EOD
+<?php
+class $className extends control
+{
+    public function $methodName()
+    {
+    }
+}
+EOD;
+    }
+
+    /**
+     * Get method's parameters.
+     *
+     * @param  string    $className
+     * @param  string    $methodName
+     * @param  string    $ext
+     * @access public
+     * @return string
+     */
+    public function getParam($className, $methodName, $ext = '')
+    {
+        $method = new ReflectionMethod($className . $ext, $methodName);
+        $methodParam = '';
+        foreach ($method->getParameters() as $param)
+        {
+            $methodParam .= '$' . $param->getName();
+            if($param->isOptional())
+            {
+                $defaultParam = $param->getDefaultValue();
+                if(is_string($defaultParam)) $methodParam .= "='$defaultParam', ";
+                else $methodParam .= "=$defaultParam, ";
+            }
+            else
+            {
+                $methodParam .= ', ';
+            }
+        }
+        $methodParam = rtrim($methodParam, ', ');
+        return $methodParam;
+    }
+
+    /**
+     * Get method code.
+     *
+     * @param  string    $className
+     * @param  string    $methodName
+     * @param  string    $ext  value may be Model
+     * @access public
+     * @return string
+     */
+    public function getMethodCode($className, $methodName, $ext = '')
+    {
+        $method    = new ReflectionMethod($className . $ext, $methodName);
+        $fileName  = $method->getFileName();
+        $startLine = $method->getStartLine();
+        $endLine   = $method->getEndLine();
+        $file = file($fileName);
+        $code = '';
+        for($i = $startLine - 1; $i <= $endLine; $i++)
+        {
+            $code .= $file[$i];
+        }
+        return $code;
+    }
+
+    /**
+     * Get save path.
+     *
+     * @param  string    $filePath
+     * @param  string    $action
+     * @access public
+     * @return string
+     */
+    public function getSavePath($filePath, $action)
+    {
+        $fileName   = empty($_POST['fileName']) ? '' : trim($this->post->fileName);
+        $moduleName = strstr($filePath, DS . 'module' . DS);
+        $moduleName = substr($moduleName, 0, strpos($moduleName, DS, 9));
+        $moduleName = basename($moduleName);
+        $extPath    = $this->app->getExtensionRoot() . 'custom' . DS . $moduleName . DS . 'ext' . DS;
+        switch($action)
+        {
+        case 'extendModel':
+            $fileName = empty($fileName) ? strtolower(basename($filePath)) . '.php' : $fileName;
+            return $extPath . 'model' . DS . $fileName;
+        case 'extendControl':
+            $fileName = strtolower(basename($filePath)) . '.php';
+            return $extPath . 'control' . DS . $fileName;
+        case 'override':
+            $fileName = basename($filePath);
+            return $extPath . 'view' . DS . $fileName;
+        case 'extendOther':
+            $editName = basename($filePath);
+            $fileName = empty($fileName) ? $editName: $fileName;
+            if($editName == 'config.php') return $extPath . 'config' .DS . $fileName;
+            elseif(strpos($editName, '.php') !== false) return $extPath . 'lang' . DS . str_replace('.php', '', $editName) . DS . $fileName;
+            else return $extPath . substr($editName, strrpos($editName, '.') + 1) . DS . substr($editName, 0, strrpos($editName, '.')) . DS . $fileName;
+        default:
+            if(empty($fileName)) die(js::error($this->lang->editor->emptyFileName));
+            $action = strtolower(str_replace('new', '', $action));
+            if($action == 'hook') return $extPath . 'view' . DS . $fileName;
+            elseif($action == 'method') return $extPath . basename($filePath, '.php') . DS . $fileName;
+            elseif($action == 'extend') return $filePath . DS . $fileName;
+            elseif($action == 'config') return $extPath . 'config' . DS . $fileName;
+            elseif($action == 'js') return $extPath . 'js' . DS . substr($fileName, 0, strrpos($fileName, '.')) . DS . $fileName;
+            elseif($action == 'css') return $extPath . 'css' . DS . substr($fileName, 0, strrpos($fileName, '.')) . DS . $fileName;
+            else return $extPath . 'lang' . DS . str_replace('_', '-', $action) . DS . $fileName;
+        }
+    }
+}
diff --git a/module/editor/view/deny.html.php b/module/editor/view/deny.html.php
new file mode 100644
index 0000000000..8b836b6715
--- /dev/null
+++ b/module/editor/view/deny.html.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * The deny view file of editor module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<style>
+html{height:100%}
+body{height:100%;padding-bottom:0px;}
+#mainContent{height:100%}
+</style>
+<div id='mainContent' class='main-content'>
+  <div class='alert alert-warning'><?php echo $this->lang->editor->onlyLocalVisit;?></div>
+</div>
+<?php include $app->getModuleRoot() . 'common/view/footer.lite.html.php';?>
+
diff --git a/module/editor/view/edit.html.php b/module/editor/view/edit.html.php
new file mode 100644
index 0000000000..ae61933d82
--- /dev/null
+++ b/module/editor/view/edit.html.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * The editor view file of dir module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<?php
+js::set('jsRoot', $jsRoot);
+js::set('clientLang', $app->clientLang);
+js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
+?>
+<div class='main-header'>
+  <div class='heading'>
+    <i class='icon-edit'></i>
+    <?php if($filePath):?>
+    <strong><?php echo $lang->editor->filePath;?></strong>
+    <code><?php echo $filePath?></code>
+    <?php endif?>
+  </div>
+</div>
+<form method='post' target='hiddenwin' action='<?php echo inlink('save', "filePath=$safeFilePath&action=$action")?>'>
+  <div class='main-content'>
+    <table class='table table-form'>
+      <?php if(!empty($showContent)):?>
+      <tr>
+        <td>
+          <?php echo "<span class='strong'>" . $lang->editor->sourceFile . '</span>'?><br />
+          <div id='showContentEditor'></div>
+        </td>
+      </tr>
+      <?php endif?>
+      <tr>
+        <td>
+          <div id='fileContentEditor'></div>
+          <?php echo html::hidden('fileContent');?>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <?php if($action and $action != 'edit' and $action != 'newPage' and $action != 'override' and $action != 'extendControl'):?>
+          <div class='form-group'>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->editor->fileName;?></span>
+              <?php echo html::input('fileName', '', "class='form-control'");?>
+              <span class='input-group-addon'>
+                <?php
+                if($action == 'newHook')
+                {
+                    echo $lang->editor->exampleHook;
+                }
+                elseif($action and $action == 'extendOther' and strpos(basename($filePath), '.js') !== false or $action == 'newJS')
+                {
+                    echo $lang->editor->exampleJs;
+                }
+                elseif($action and $action == 'extendOther' and strpos(basename($filePath), '.css') !== false or $action == 'newCSS')
+                {
+                    echo $lang->editor->exampleCss;
+                }
+                else
+                {
+                    echo $lang->editor->examplePHP;
+                }
+                ?>
+              </span>
+            </div>
+          </div>
+          <?php endif;?>
+          <?php if($action and $action != 'edit' and $action != 'newPage'):?>
+          <div class='checkbox-primary'>
+            <input type='checkbox' name='override' id='override' />
+            <label for='override'><?php echo $lang->editor->isOverride?></span>
+          </div>
+          <?php endif;?>
+        </td>
+      </tr>
+      <tr><td align='center'><?php echo html::submitButton()?></td></tr>
+    </table>
+  </div>
+</form>
+<?php if(!empty($showContent)) js::set('showContent', $showContent);?>
+<?php js::set('fileContent', $fileContent);?>
+<script>
+$(function()
+{
+    var lang = 'php';
+    fileContentEditor = showContentEditor = null;
+    require.config({
+        paths: {vs: jsRoot + 'monaco-editor/min/vs'},
+        'vs/nls': {
+            availableLanguages:{'*': clientLang}
+        }
+    });
+    require(['vs/editor/editor.main'], function ()
+    {
+        <?php if(!empty($showContent)):?>
+        showContentEditor = monaco.editor.create(document.getElementById('showContentEditor'),
+        {
+            value:                showContent.toString(),
+            language:             lang,
+            readOnly:             true,
+            autoIndent:           true,
+            contextmenu:          true,
+            automaticLayout:      true,
+            EditorMinimapOptions: {enabled: false}
+        });
+        <?php endif;?>
+        fileContentEditor = monaco.editor.create(document.getElementById('fileContentEditor'),
+        {
+            value:                fileContent.toString(),
+            language:             lang,
+            readOnly:             false,
+            autoIndent:           true,
+            contextmenu:          true,
+            automaticLayout:      true,
+            EditorMinimapOptions: {enabled: false}
+        });
+        <?php if(!empty($showContent)):?>
+        contentHeight = showContentEditor.getContentHeight();
+        if(contentHeight > 300) contentHeight = 300;
+        if(contentHeight < 200) contentHeight = 200;
+        $('#showContentEditor').height(contentHeight);
+        <?php endif;?>
+        contentHeight = fileContentEditor.getContentHeight();
+        if(contentHeight > 450) contentHeight = 450;
+        if(contentHeight < 100) contentHeight = 100;
+        $('#fileContentEditor').height(contentHeight);
+    });
+    $('#submit').click(function()
+    {
+        $('#fileContent').val(fileContentEditor.getValue());
+    })
+})
+</script>
+<?php include $app->getModuleRoot() . 'common/view/footer.lite.html.php';?>
diff --git a/module/editor/view/extend.html.php b/module/editor/view/extend.html.php
new file mode 100644
index 0000000000..14f5b4d178
--- /dev/null
+++ b/module/editor/view/extend.html.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * The editor view file of dir module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<div class='main-header'>
+  <div class='heading'><i class='icon-list-ul'></i> <strong><?php echo isset($lang->editor->modules[$module])? $lang->editor->modules[$module] : $module;?></strong></div>
+</div>
+<div class='main-content'>
+  <?php echo $tree?>
+</div>
+<script>
+$(function()
+{
+    $('.hitarea').click(function()
+    {
+        var $this  = $(this);
+        var parent = $this.parent();
+        if(parent.hasClass('expandable'))
+        {
+            parent.removeClass('expandable').addClass('collapsable');
+            $this.removeClass('expandable-hitarea').addClass('collapsable-hitarea');
+        }
+        else
+        {
+            parent.addClass('expandable').removeClass('collapsable');
+            $this.addClass('expandable-hitarea').removeClass('collapsable-hitarea');
+        }
+    });
+});
+</script>
+<iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='hidden'></iframe>
+<body>
+</html>
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
new file mode 100644
index 0000000000..52ad67d1a1
--- /dev/null
+++ b/module/editor/view/index.html.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * The editor view file of dir module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'dev/view/header.html.php';?>
+<?php if(common::hasPriv('editor', 'switch')):?>
+<div id='mainMenu' class='clearfix menu-secondary'>
+  <div class="pull-left">
+    <?php
+    echo $lang->editor->turnOff;
+    echo html::a($this->createLink('editor', 'switch', 'status=0'), $lang->dev->switchList['0'], 'hiddenwin', "class='btn btn-sm'");
+    ?>
+  </div>
+</div>
+<?php endif;?>
+<div id='mainContent' class='main-row'>
+  <div class='side-col' id='sidebar'>
+    <div class='cell'>
+      <div class='panel panel-sm with-list'>
+        <div class='panel-heading'><i class='icon-list'></i> <strong><?php echo $lang->editor->moduleList?></strong></div>
+        <?php foreach($lang->dev->groupList as $group => $groupName):?>
+        <?php if(!empty($modules[$group])):?>
+        <div class='modulegroup'><?php echo $groupName?></div>
+        <?php foreach($modules[$group] as $module):?>
+        <?php $moduleName = zget($lang->dev->tableList, $module, $module);?>
+        <?php echo html::a(inlink('extend', "moduleDir=$module"), $moduleName, 'extendWin');?>
+        <?php endforeach;?>
+        <?php endif;?>
+        <?php endforeach;?>
+        <?php foreach($lang->dev->endGroupList as $group => $groupName):?>
+        <?php if(!empty($modules[$group])):?>
+        <div class='modulegroup'><?php echo $groupName?></div>
+        <?php foreach($modules[$group] as $module):?>
+        <?php $moduleName = zget($lang->dev->tableList, $module, $module);?>
+        <?php echo html::a(inlink('extend', "moduleDir=$module"), $moduleName, 'extendWin');?>
+        <?php endforeach;?>
+        <?php endif;?>
+        <?php endforeach;?>
+      </div>
+    </div>
+  </div>
+  <div class='side-col w-350px'>
+    <div class='cell module-col'>
+      <iframe frameborder='0' name='extendWin' id='extendWin' width='100%'></iframe>
+    </div>
+  </div>
+  <div class='main-col main-content'>
+    <iframe frameborder='0' name='editWin' id='editWin' width='100%'></iframe>
+  </div>
+</div>
+<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
diff --git a/module/editor/view/newpage.html.php b/module/editor/view/newpage.html.php
new file mode 100644
index 0000000000..413ff8d9f9
--- /dev/null
+++ b/module/editor/view/newpage.html.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * The editor view file of dir module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     editor
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<style>body{padding-bottom:0px;background-color:#fff;}</style>
+<div class='main-header'>
+  <div class='heading'><i class='icon-plus'></i> <strong><?php echo $lang->editor->newPage?></strong></div>
+</div>
+<form method='post' target='hiddenwin'>
+  <div class='main-content'>
+    <table class='table table-form'>
+      <tr>
+        <th class='w-80px'><?php echo $lang->editor->filePath?></th>
+        <td><code><?php echo $filePath?></code></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->editor->pageName?></th>
+        <td>
+          <?php
+          echo html::input('fileName', '', "class='form-control' placeholder='{$lang->editor->examplePHP}'");
+          ?>
+        </td>
+      </tr>
+      <tr><td colspan='2' align='center'><?php echo html::submitButton()?></td></tr>
+    </table>
+  </div>
+</form>
+<?php include $app->getModuleRoot() . 'common/view/footer.lite.html.php';?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index d89215cffd..d8f435e528 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -69,13 +69,14 @@ $lang->moduleOrder[195] = 'misc';
 $lang->moduleOrder[200] = 'backup';
 $lang->moduleOrder[205] = 'cron';
 $lang->moduleOrder[210] = 'dev';
-$lang->moduleOrder[215] = 'message';
-$lang->moduleOrder[220] = 'gitlab';
-$lang->moduleOrder[225] = 'mr';
-$lang->moduleOrder[230] = 'app';
-$lang->moduleOrder[235] = 'gogs';
-$lang->moduleOrder[240] = 'gitea';
-$lang->moduleOrder[245] = 'holiday';
+$lang->moduleOrder[215] = 'editor';
+$lang->moduleOrder[220] = 'message';
+$lang->moduleOrder[225] = 'gitlab';
+$lang->moduleOrder[230] = 'mr';
+$lang->moduleOrder[235] = 'app';
+$lang->moduleOrder[240] = 'gogs';
+$lang->moduleOrder[245] = 'gitea';
+$lang->moduleOrder[250] = 'holiday';
 
 $lang->resource = new stdclass();
 
@@ -1996,13 +1997,26 @@ $lang->cron->methodOrder[35] = 'openProcess';
 $lang->resource->dev = new stdclass();
 $lang->resource->dev->api       = 'api';
 $lang->resource->dev->db        = 'db';
-$lang->resource->dev->editor    = 'editor';
 $lang->resource->dev->translate = 'translate';
 
 $lang->dev->methodOrder[5]  = 'api';
 $lang->dev->methodOrder[10] = 'db';
-$lang->dev->methodOrder[15] = 'editor';
-$lang->dev->methodOrder[20] = 'translate';
+$lang->dev->methodOrder[15] = 'translate';
+
+$lang->resource->editor = new stdclass();
+$lang->resource->editor->index   = 'index';
+$lang->resource->editor->extend  = 'extend';
+$lang->resource->editor->edit    = 'edit';
+$lang->resource->editor->newPage = 'newPage';
+$lang->resource->editor->save    = 'save';
+$lang->resource->editor->delete  = 'delete';
+
+$lang->editor->methodOrder[5]  = 'index';
+$lang->editor->methodOrder[10] = 'extend';
+$lang->editor->methodOrder[15] = 'edit';
+$lang->editor->methodOrder[20] = 'newPage';
+$lang->editor->methodOrder[25] = 'save';
+$lang->editor->methodOrder[30] = 'delete';
 
 global $config;
 $inUpgrade = (defined('IN_UPGRADE') and IN_UPGRADE);
diff --git a/module/repo/view/ajaxgeteditorcontent.html.php b/module/repo/view/ajaxgeteditorcontent.html.php
index 96ad4aba5e..30952362b1 100644
--- a/module/repo/view/ajaxgeteditorcontent.html.php
+++ b/module/repo/view/ajaxgeteditorcontent.html.php
@@ -32,7 +32,7 @@ js::set('revision', $revision);
 js::set('sourceRevision', $oldRevision);
 js::set('encodePath', $this->repo->encodePath($entry));
 if($showEditor) js::set('codeContent', $content);
-js::import($jsRoot  . '/zui/tabs/tabs.min.js');
+js::import($jsRoot  . 'zui/tabs/tabs.min.js');
 js::import($jsRoot  . 'monaco-editor/min/vs/loader.js');
 ?>
 <div id="monacoEditor" class='repoCode'>
@@ -338,7 +338,7 @@ $(function()
         parent.loadLinkPage(link);
     });
 
-    $('#relationTabs').on('click', '.unlinks',function()
+    $('#relationTabs').on('click', '.unlinks', function()
     {
         var link = $(this).attr('data-link');
         $.post(link, function(data)

From a1c9148a6b65611c3bf58816fd964ead0ab875d9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 02:03:03 +0000
Subject: [PATCH 121/319] * Finish task #85640.

---
 module/build/control.php     | 7 ++++---
 module/custom/lang/de.php    | 2 +-
 module/custom/lang/en.php    | 2 +-
 module/custom/lang/fr.php    | 2 +-
 module/custom/lang/zh-cn.php | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 8d4f0ff13c..6d90768215 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -66,6 +66,7 @@ class build extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID") . "#app={$this->app->tab}"));
         }
 
+        $status = empty($this->config->CRProduct) ? 'noclosed' : '';
         $this->loadModel('product');
         $this->loadModel('project');
         /* Set menu. */
@@ -74,7 +75,7 @@ class build extends control
             $this->project->setMenu($projectID);
             $executions    = $this->execution->getPairs($projectID, 'all', 'stagefilter|leaf|order_asc');
             $executionID   = empty($executionID) ? key($executions) : $executionID;
-            $productGroups = $executionID ? $this->product->getProducts($executionID) : array();
+            $productGroups = $executionID ? $this->product->getProducts($executionID, $status) : array();
             $branchGroups  = $executionID ? $this->project->getBranchesByProject($executionID) : array();
             $this->session->set('project', $projectID);
         }
@@ -83,7 +84,7 @@ class build extends control
             $execution     = $this->execution->getByID($executionID);
             $executions    = $this->execution->getPairs($execution->project, 'all', 'stagefilter|leaf|order_asc');
             $projectID     = $execution->project;
-            $productGroups = $this->product->getProducts($executionID);
+            $productGroups = $this->product->getProducts($executionID, $status);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
             $this->execution->setMenu($executionID);
             $this->session->set('project', $execution->project);
@@ -93,7 +94,7 @@ class build extends control
             $execution     = $this->execution->getByID($executionID);
             $projectID     = $execution ? $execution->project : 0;
             $executions    = $this->execution->getPairs($projectID, 'all', 'stagefilter|leaf');
-            $productGroups = $this->product->getProducts($executionID);
+            $productGroups = $this->product->getProducts($executionID, $status);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
         }
 
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index dd6b01ad86..0430858a98 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -189,7 +189,7 @@ $lang->custom->notice->noClosedBlock       = 'You have no blocks that are closed
 $lang->custom->notice->required            = 'The selected field is required.';
 $lang->custom->notice->conceptResult       = 'According to your preference, <b> %s-%s </b> is set for you. Use <b>%s</b> + <b> %s</b>。';
 $lang->custom->notice->conceptPath         = 'Go to Admin -> Custom -> Concept to set it.';
-$lang->custom->notice->readOnlyOfProduct   = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
+$lang->custom->notice->readOnlyOfProduct   = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases, plans and builds of the closed product is also forbidden.';
 $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
 $lang->custom->notice->readOnlyOfKanban    = "If Change Forbidden, any change on kanban card and related operations of {$lang->custom->kanban} is also forbidden.";
 $lang->custom->notice->URSREmpty           = 'Custom requirement name can not be empty!';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 79cb3893e7..1289f2820d 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -189,7 +189,7 @@ $lang->custom->notice->noClosedBlock       = 'You have no blocks that are closed
 $lang->custom->notice->required            = 'The selected field is required.';
 $lang->custom->notice->conceptResult       = 'According to your preference, <b> %s-%s </b> is set for you. Use <b>%s</b> + <b> %s</b>.';
 $lang->custom->notice->conceptPath         = 'Go to Admin -> Custom -> Concept to set it.';
-$lang->custom->notice->readOnlyOfProduct   = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
+$lang->custom->notice->readOnlyOfProduct   = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases, plans and builds of the closed product is also forbidden.';
 $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
 $lang->custom->notice->readOnlyOfKanban    = "If Change Forbidden, any change on kanban card and related operations of {$lang->custom->kanban} is also forbidden.";
 $lang->custom->notice->URSREmpty           = 'Custom requirement name can not be empty!';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index d937dc876e..dec05ac0a4 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -189,7 +189,7 @@ $lang->custom->notice->noClosedBlock       = "Vous n'avez aucun bloc fermé déf
 $lang->custom->notice->required            = 'Le champ sélectionné est obligatoire.';
 $lang->custom->notice->conceptResult       = 'Selon votre préférence, <b> %s-%s </b> peut être fixé pour vous. Utilisez <b>%s</b> + <b> %s</b>。';
 $lang->custom->notice->conceptPath         = 'Allez à Admin -> Custom -> Concept pour le paramétrer.';
-$lang->custom->notice->readOnlyOfProduct   = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases and plans of the closed product is also forbidden.';
+$lang->custom->notice->readOnlyOfProduct   = 'If Change Forbidden, any change on stories, bugs, cases, efforts, releases, plans and builds of the closed product is also forbidden.';
 $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
 $lang->custom->notice->readOnlyOfKanban    = "If Change Forbidden, any change on kanban card and related operations of {$lang->custom->kanban} is also forbidden.";
 $lang->custom->notice->URSREmpty           = 'Custom requirement name can not be empty!';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 5c5c23350f..65beaf1af0 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -189,7 +189,7 @@ $lang->custom->notice->noClosedBlock       = '没有永久关闭的区块';
 $lang->custom->notice->required            = '页面提交时，选中的字段必填';
 $lang->custom->notice->conceptResult       = '我们已经根据您的选择为您设置了<b> %s-%s </b>模式，使用<b>%s</b> + <b> %s</b>。';
 $lang->custom->notice->conceptPath         = '您可以在：后台 -> 自定义 -> 流程页面修改。';
-$lang->custom->notice->readOnlyOfProduct   = '禁止修改后，已关闭' . $lang->productCommon . '下的' . $lang->SRCommon . '、Bug、用例、日志、发布、计划都禁止修改。';
+$lang->custom->notice->readOnlyOfProduct   = '禁止修改后，已关闭' . $lang->productCommon . '下的' . $lang->SRCommon . '、Bug、用例、日志、发布、计划、版本都禁止修改。';
 $lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->executionCommon}下的任务、版本、日志以及关联需求都禁止修改。";
 $lang->custom->notice->readOnlyOfKanban    = "禁止修改后，已关闭{$lang->custom->kanban}下的卡片以及相关设置都禁止修改。";
 $lang->custom->notice->URSREmpty           = '自定义需求名称不能为空！';

From 1b6f5422ec39d0222c6e16f9ad82d86b9c21b588 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 02:04:33 +0000
Subject: [PATCH 122/319] * Finish task #85640.

---
 module/build/control.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 6d90768215..0acef7732c 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -172,14 +172,15 @@ class build extends control
         if($this->app->tab == 'execution') $this->execution->setMenu($build->execution);
 
         $builds = array();
+        $status = empty($this->config->CRProduct) ? 'noclosed' : '';
         if($build->execution)
         {
-            $productGroups = $this->product->getProducts($build->execution);
+            $productGroups = $this->product->getProducts($build->execution, $status);
             $branches      = $this->loadModel('branch')->getList($build->product, $build->execution, 'all');
         }
         else
         {
-            $productGroups = $this->product->getProducts($build->project);
+            $productGroups = $this->product->getProducts($build->project, $status);
             $branches      = $this->loadModel('branch')->getList($build->product, $build->project, 'all');
             $builds        = $this->build->getBuildPairs($build->product, 'all', 'noempty,notrunk,singled,separate', $build->project, 'project', $build->builds, false);
         }

From b0b5babbd4b6b33f38b5baf7e85c77ed612ff5a9 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 10:25:17 +0800
Subject: [PATCH 123/319] * Added the determination that the editor
 configuration item does not exist.

---
 module/admin/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index 3d6d92951e..c318f06727 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -338,7 +338,7 @@ class adminModel extends model
                         $this->loadModel('mail');
                         if(!$this->config->mail->turnon and !$this->session->mailConfig) $subMenu['link'] = $this->lang->mail->common . '|mail|detect|';
                     }
-                    if($menuKey == 'dev' and $subMenuKey == 'editor' and $this->config->global->editor) $subMenu['link'] = $this->lang->editor->common . '|editor|index|';
+                    if($menuKey == 'dev' and $subMenuKey == 'editor' and !empty($this->config->global->editor)) $subMenu['link'] = $this->lang->editor->common . '|editor|index|';
 
                     $link = array();
                     if(isset($menu['tabMenu'][$subMenuKey]))

From 2a8ef84795a9f1bb36e4f59ffe3b83664d04b71f Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 02:33:48 +0000
Subject: [PATCH 124/319] * Finish task #85644.

---
 module/story/model.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index aebce8b6bc..e223b62e68 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4074,12 +4074,6 @@ class storyModel extends model
                 $property = '';
             }
             $storyPairs[$story->id] = $story->id . ':' . $story->title . ' ' . $property;
-
-            if($limit > 0 && ++$i > $limit)
-            {
-                $storyPairs['showmore'] = $this->lang->more . $this->lang->ellipsis;
-                break;
-            }
         }
         return $storyPairs;
     }
@@ -4684,7 +4678,7 @@ class storyModel extends model
                 $menu .= "</ul></div>";
             }
 
-            if(($this->app->tab == 'execution' || $execution->multiple === '0') and $story->status == 'active') $menu .= $this->buildMenu('task', 'create', "execution={$this->session->execution}&{$params}&moduleID=$story->module", $story, $type, 'plus', '', 'showinonlybody');
+            if(($this->app->tab == 'execution' || (!empty($execution) and $execution->multiple === '0')) and $story->status == 'active') $menu .= $this->buildMenu('task', 'create', "execution={$this->session->execution}&{$params}&moduleID=$story->module", $story, $type, 'plus', '', 'showinonlybody');
 
             $menu .= "<div class='divider'></div>";
             $menu .= $this->buildFlowMenu('story', $story, $type, 'direct');

From 6529c78e32e71a07b76f80bcbedf05645a7f9d62 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 02:52:05 +0000
Subject: [PATCH 125/319] * Finish task #85646.

---
 module/project/js/edit.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index c1353908a1..fdc708019d 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -62,6 +62,13 @@ $(function()
                 bootbox.alert(unLinkProductTip.replace("%s", allProducts[last]));
             }
         }
+        var chosenProducts = 0;
+        $(".productsBox select[name^='products']").each(function()
+          {
+            if($(this).val() > 0) chosenProducts ++;
+          });
+        if(chosenProducts > 1)  $('.division').removeClass('hide');
+        if(chosenProducts <= 1) $('.division').addClass('hide');
     });
 
     $(document).on('change', '[name*=branch]', function()
@@ -198,7 +205,7 @@ function loadBranches(product)
         }
     });
 
-    (chosenProducts.length > 1 && model == 'waterfall') ? $('.division').removeClass('hide') : $('.division').addClass('hide');
+    (chosenProducts.length > 1 && model == 'waterfall' && model == 'waterfallplus') ? $('.division').removeClass('hide') : $('.division').addClass('hide');
 
     var $tableRow = $(product).closest('.table-row');
     var index     = $tableRow.find('select:first').attr('id').replace('products' , '');
@@ -255,15 +262,15 @@ function loadPlans(product, branch)
 
 /**
  * Add new line for link product.
- * 
- * @param  obj $obj 
+ *
+ * @param  obj $obj
  * @access public
  * @return void
  */
 function addNewLine(obj)
 {
     var newLine = $(obj).closest('tr').clone();
-    var index   = 0; 
+    var index   = 0;
     $(".productsBox select[name^='products']").each(function()
     {
         var id = $(this).attr('id').replace('products' , '');
@@ -294,5 +301,5 @@ function removeLine(obj)
 {
     $(obj).closest('tr').remove();
     disableSelectedProduct();
-    if($("select[name^='products']").length < 2) $('.division').addClass('hide'); 
+    if($("select[name^='products']").length < 2) $('.division').addClass('hide');
 }

From 200af8e045be8752bc385aed3a3fdfc56b8154d9 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 1 Mar 2023 03:16:04 +0000
Subject: [PATCH 126/319] * Fix bug #32476.

---
 module/programplan/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 02c097829d..8b089a80a5 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -1153,7 +1153,7 @@ class programplanModel extends model
         $this->updateSubStageAttr($planID, $plan->attribute);
         if($plan->acl != 'open')
         {
-            $planIdList = $this->dao->select('id')->from(TABLE_EXECUTION)->where('path')->like("%,$planID,%")->andWhere('type')->eq('stage')->fetchAll('id');
+            $planIdList = $this->dao->select('id')->from(TABLE_EXECUTION)->where('path')->like("%,$planID,%")->andWhere('type')->ne('project')->fetchAll('id');
             $this->loadModel('user')->updateUserView(array_keys($planIdList), 'sprint');
         }
 

From 745151425c6ebbd082484e305bcbfb410d8ce1b2 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 11:17:30 +0800
Subject: [PATCH 127/319] * Code for fix bug #32528.

---
 module/story/js/common.js | 47 +++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/module/story/js/common.js b/module/story/js/common.js
index 3edd5daa0e..a8f643a86e 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -20,10 +20,12 @@ $(function()
         $('#navbar .nav>li[data-id=story]>a').html($('#navbar .nav li.active [data-id=' + storyType + ']').text() + '<span class="caret"></span>');
     }
 
-    $('#saveButton').on('click', function(e)
+    var $saveButton      = $('#saveButton');
+    var $saveDraftButton = $('#saveDraftButton');
+    $saveButton.on('click', function(e)
     {
-        $('#saveButton').attr('type', 'submit').attr('disabled', true);
-        $('#saveDraftButton').attr('disabled', true);
+        $saveButton.attr('type', 'submit').attr('disabled', true);
+        $saveDraftButton.attr('disabled', true);
 
         var storyStatus = !$('#reviewer').val() || $('#needNotReview').is(':checked') ? 'active' : 'reviewing';
         $('<input />').attr('type', 'hidden').attr('name', 'status').attr('value', storyStatus).appendTo('#dataform');
@@ -32,15 +34,26 @@ $(function()
 
         setTimeout(function()
         {
-            $('#saveButton').attr('type', 'button').removeAttr('disabled');
-            $('#saveDraftButton').removeAttr('disabled');
-        }, 10000);
+            if($saveButton.attr('disabled') == 'disabled')
+            {
+                setTimeout(function()
+                {
+                    console.log(11);
+                    $saveButton.attr('type', 'button').removeAttr('disabled');
+                    $saveDraftButton.removeAttr('disabled');
+                }, 10000);
+            }
+            else
+            {
+                $saveDraftButton.removeAttr('disabled');
+            }
+        }, 100);
     });
 
-    $('#saveDraftButton').on('click', function(e)
+    $saveDraftButton.on('click', function(e)
     {
-        $('#saveButton').attr('disabled', true);
-        $('#saveDraftButton').attr('type', 'submit').attr('disabled', true);
+        $saveButton.attr('disabled', true);
+        $saveDraftButton.attr('type', 'submit').attr('disabled', true);
 
         storyStatus = 'draft';
         if(typeof(page) != 'undefined' && page == 'change') storyStatus = 'changing';
@@ -51,9 +64,19 @@ $(function()
 
         setTimeout(function()
         {
-            $('#saveButton').removeAttr('disabled');
-            $('#saveDraftButton').attr('type', 'button').removeAttr('disabled');
-        }, 10000);
+            if($saveDraftButton.attr('disabled') == 'disabled')
+            {
+                setTimeout(function()
+                {
+                    $saveButton.removeAttr('disabled');
+                    $saveDraftButton.attr('type', 'button').removeAttr('disabled');
+                }, 10000);
+            }
+            else
+            {
+                $saveButton.removeAttr('disabled');
+            }
+        }, 100);
     });
 })
 

From 4357e448f7f884d6cd01a07f765fef726469892d Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 1 Mar 2023 03:32:53 +0000
Subject: [PATCH 128/319] * Fix bug #32426.

---
 module/programplan/js/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/js/edit.js b/module/programplan/js/edit.js
index e552fb8cc9..fd3a453708 100644
--- a/module/programplan/js/edit.js
+++ b/module/programplan/js/edit.js
@@ -2,7 +2,7 @@ function changeParentStage(stageID)
 {
     $.get(createLink('programplan', 'ajaxGetAttribute', 'stageID=' + stageID + '&attribute=' + plan.attribute), function(attribute)
     {
-        $('#attributeType td').html(attribute);
+        $('#attributeType th + td').html(attribute);
         $("#attribute" + "_chosen").remove();
         $("#attribute").next('.picker').remove();
         $("#attribute").chosen();

From 951e4a09e1d2e2c0038718fccd6825387b7a19ae Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 05:06:42 +0000
Subject: [PATCH 129/319] * Fix bug #32513.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 8b64447770..9ee9bb889c 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1556,7 +1556,7 @@ class executionModel extends model
                 ->andWhere('t2.type')->eq('stage')
                 ->andWhere('t2.grade')->eq(1)
                 ->andWhere('t2.deleted')->eq(0)
-                ->andWhere('t2.parent')->eq($oldExecution->id)
+                ->andWhere('t2.parent')->eq($oldExecution->parent)
                 ->fetch('total');
 
             if(!$oldPercentTotal) $oldPercentTotal = 0;

From 4536dd931d76ee1a0389e1388c0c6d04dd6bfb3e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 05:22:27 +0000
Subject: [PATCH 130/319] * Finish task #85648.

---
 module/bug/control.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 5981d7067e..ac5b503f84 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1165,6 +1165,9 @@ class bug extends control
         $productBugs = $this->bug->getProductBugPairs($productID, $branch);
         unset($productBugs[$bugID]);
 
+        $executions = array(0 => '') + $this->product->getExecutionPairsByProduct($bug->product, $bug->branch, 'id_desc', $bug->project);
+        if(!empty($bug->execution) and empty($executions[$bug->execution])) $executions[$execution->id] = $execution->name;
+
         if($product->shadow) $this->view->project = $this->loadModel('project')->getByShadowProduct($bug->product);
 
         $this->view->bug                   = $bug;
@@ -1177,7 +1180,7 @@ class bug extends control
         $this->view->projectExecutionPairs = $this->loadModel('project')->getProjectExecutionPairs();
         $this->view->moduleOptionMenu      = $moduleOptionMenu;
         $this->view->currentModuleID       = $currentModuleID;
-        $this->view->executions            = array(0 => '') + $this->product->getExecutionPairsByProduct($bug->product, $bug->branch, 'id_desc', $bug->project);
+        $this->view->executions            = $executions;
         $this->view->stories               = $bug->execution ? $this->story->getExecutionStoryPairs($bug->execution) : $this->story->getProductStoryPairs($bug->product, $bug->branch, 0, 'all', 'id_desc', 0, 'full', 'story', false);
         $this->view->branchOption          = $branchOption;
         $this->view->branchTagOption       = $branchTagOption;

From c262a060bd97ebf4d459ff760d6558a865f6f1b9 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 1 Mar 2023 05:32:58 +0000
Subject: [PATCH 131/319] * Fix bug #32533.

---
 module/execution/config.php | 2 +-
 module/execution/model.php  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/execution/config.php b/module/execution/config.php
index 89311d721e..fe54586d73 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -223,7 +223,7 @@ $config->execution->datatable->fieldList['status']['required'] = 'no';
 $config->execution->datatable->fieldList['status']['fixed']    = 'no';
 
 $config->execution->datatable->fieldList['PM']['title']    = 'owner';
-$config->execution->datatable->fieldList['PM']['width']    = '70';
+$config->execution->datatable->fieldList['PM']['width']    = '90';
 $config->execution->datatable->fieldList['PM']['required'] = 'no';
 $config->execution->datatable->fieldList['PM']['fixed']    = 'no';
 
diff --git a/module/execution/model.php b/module/execution/model.php
index 4902912395..f218048dcf 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5541,7 +5541,8 @@ class executionModel extends model
 
         foreach($fieldList as $field => $items)
         {
-            $title = zget($this->lang->execution, $items['title'], zget($this->lang, $items['title'], $items['title']));
+            $fieldKey = in_array($field, array('name', 'code', 'type', 'PM', 'status')) ? 'exec' . ucfirst($field) : $field;
+            $title    = $field == 'id' ? 'ID' : zget($this->lang->execution, $fieldKey, zget($this->lang, $field, $field));
             $fieldList[$field]['title'] = $title;
         }
 

From 0233152d1ef5d3f37fa770fef85246a21d2e1f43 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 13:45:52 +0800
Subject: [PATCH 132/319] * Change the project to a variable.

---
 module/execution/lang/de.php    | 49 ++++++++++++++++---------------
 module/execution/lang/en.php    | 49 ++++++++++++++++---------------
 module/execution/lang/fr.php    | 45 ++++++++++++++---------------
 module/execution/lang/zh-cn.php | 51 ++++++++++++++++-----------------
 4 files changed, 95 insertions(+), 99 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index a699a51e09..faffb7fa8d 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -16,17 +16,17 @@ $lang->execution->id                  = $lang->executionCommon . ' ID';
 $lang->execution->type                = 'Typ';
 $lang->execution->name                = 'Name';
 $lang->execution->code                = 'Alias';
-$lang->execution->projectName         = 'Project';
-$lang->execution->project             = 'Project';
+$lang->execution->projectName         = $lang->projectCommon;
+$lang->execution->project             = $lang->projectCommon;
 $lang->execution->execId              = "{$lang->execution->common} ID";
 $lang->execution->execName            = 'Execution Name';
 $lang->execution->execCode            = 'Execution Code';
 $lang->execution->execType            = 'Execution Type';
-$lang->execution->lifetime            = 'Project Cycle';
+$lang->execution->lifetime            = $lang->projectCommon . ' Cycle';
 $lang->execution->attribute           = 'Stage Type';
 $lang->execution->percent             = 'Workload %';
 $lang->execution->milestone           = 'Milestone';
-$lang->execution->parent              = 'Project';
+$lang->execution->parent              = $lang->projectCommon;
 $lang->execution->path                = 'Path';
 $lang->execution->grade               = 'Grade';
 $lang->execution->output              = 'Output';
@@ -128,7 +128,7 @@ $lang->execution->recent              = 'Recent visits: ';
 $lang->execution->copyNoExecution     = 'There are no ' . $lang->executionCommon . 'available to copy.';
 $lang->execution->noTeam              = 'No team members at the moment';
 $lang->execution->or                  = ' or ';
-$lang->execution->selectProject       = 'Please select project';
+$lang->execution->selectProject       = 'Please select ' . $lang->projectCommon;
 $lang->execution->unfoldClosed        = 'Unfold Closed';
 $lang->execution->editName            = 'Edit Name';
 $lang->execution->setWIP              = 'WIP Settings';
@@ -148,12 +148,12 @@ $lang->execution->estimate = 'estimate';
 $lang->execution->consumed = 'consumed';
 $lang->execution->left     = 'Left';
 
-$lang->execution->copyTeamTip        = "copy Project/project team members";
+$lang->execution->copyTeamTip        = "copy {$lang->projectCommon}/{$lang->execution->common} team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
-$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->agileplusMethodTip = "When creating executions in an Agile Plus {$lang->projectCommon}, both Iteration and Kanban management methods are supported.";
 $lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
-$lang->execution->waterfallTip       = 'In the Waterfall project or in the Waterfall + project,';
+$lang->execution->waterfallTip       = "In the Waterfall {$lang->projectCommon} or in the Waterfall + {$lang->projectCommon},";
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Aktivieren';
@@ -201,11 +201,11 @@ $lang->execution->statusList['suspended'] = 'Ausgesetzt';
 $lang->execution->statusList['closed']    = 'Geschlossen';
 
 global $config;
-$lang->execution->aclList['private'] = 'Private (for team members and project stakeholders)';
-$lang->execution->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
+$lang->execution->aclList['private'] = "Private (for team members and {$lang->projectCommon} stakeholders)";
+$lang->execution->aclList['open']    = "Inherited {$lang->projectCommon} ACL (for who can access the current {$lang->projectCommon})";
 
 $lang->execution->kanbanAclList['private'] = 'Private';
-$lang->execution->kanbanAclList['open']    = 'Inherited Project';
+$lang->execution->kanbanAclList['open']    = "Inherited {$lang->projectCommon}";
 
 $lang->execution->storyPoint = 'Story Point';
 
@@ -355,7 +355,7 @@ $lang->execution->wbs                  = "Aufgaben aufteilen";
 $lang->execution->batchWBS             = "Mehrere aufteilen";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='Wie wird der Burndown Chart aktualisiert?' class='btn btn-link'>Hilfe <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->executionCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
-$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
+$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} and make sure it has been reviewed.";
 $lang->execution->productStories       = "{$lang->executionCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte <a href='%s'> Story verknüpfen</a>。";
 $lang->execution->haveBranchDraft      = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
 $lang->execution->haveDraft            = "There are %s draft stories with this {$lang->executionCommon} can't be linked.";
@@ -376,27 +376,26 @@ $lang->execution->noExecutions         = "No {$lang->execution->common}.";
 $lang->execution->noPrintData          = "No data can be printed.";
 $lang->execution->noMembers            = 'Keine Mitglieder. ';
 $lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current product is: %s";
-// $lang->execution->linkProjectStoryTip  = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
-$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the project, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
 $lang->execution->copyTeamTitle        = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
 /* Interactive prompts. */
 $lang->execution->confirmDelete                = "Möchten Sie {$lang->executionCommon}[%s] löschen?";
 $lang->execution->confirmUnlinkMember          = "Möchten Sie den Benutzer vom {$lang->executionCommon} entfernen?";
 $lang->execution->confirmUnlinkStory           = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSync                  = "After modifying the project, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new project. Please know.";
-$lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the project?";
-$lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the project. Remove it from the {$lang->executionCommon}, then try again.";
+$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
+$lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the {$lang->projectCommon}?";
+$lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the {$lang->projectCommon}. Remove it from the {$lang->executionCommon}, then try again.";
 $lang->execution->notAllowRemoveProducts       = "The story of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
 $lang->execution->errorNoLinkedProducts        = "Kein verknüpftes {$lang->productCommon} in {$lang->executionCommon} gefunden. Sie werden auf die {$lang->productCommon} Seite geleitet.";
 $lang->execution->errorSameProducts            = "{$lang->executionCommon} Kann nicht mit mehreren identischen {$lang->productCommon} verknüpft werden";
 $lang->execution->errorSameBranches            = "{$lang->executionCommon} cannot be linked to the same branch twice";
-$lang->execution->errorBegin                   = "The start time of {$lang->executionCommon} cannot be less than the start time of the project %s.";
-$lang->execution->errorEnd                     = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the project.";
-$lang->execution->errorLetterProject           = "The start time of {$lang->executionCommon} cannot be less than the start time of the project %s.";
-$lang->execution->errorGreaterProject          = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the project.";
-$lang->execution->errorCommonBegin             = 'The start date of ' . $lang->executionCommon . ' should be ≥ the start date of project : %s.';
-$lang->execution->errorCommonEnd               = 'The deadline of ' . $lang->executionCommon .  ' should be ≤ the deadline of project : %s.';
+$lang->execution->errorBegin                   = "The start time of {$lang->executionCommon} cannot be less than the start time of the {$lang->projectCommon} %s.";
+$lang->execution->errorEnd                     = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the {$lang->projectCommon}.";
+$lang->execution->errorLetterProject           = "The start time of {$lang->executionCommon} cannot be less than the start time of the {$lang->projectCommon} %s.";
+$lang->execution->errorGreaterProject          = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the {$lang->projectCommon}.";
+$lang->execution->errorCommonBegin             = "The start date of ' . $lang->executionCommon . ' should be ≥ the start date of {$lang->projectCommon} : %s.";
+$lang->execution->errorCommonEnd               = "The deadline of ' . $lang->executionCommon .  ' should be ≤ the deadline of {$lang->projectCommon} : %s.";
 $lang->execution->errorLetterParent            = 'The begin cannot be less than the begin of the parent stage to which it belongs: %s.';
 $lang->execution->errorGreaterParent           = 'The end cannot be greater than the end of the parent stage to which it belongs：%s.';
 $lang->execution->errorNameRepeat              = "Child %s of the same parent stage cannot have the same name.";
@@ -419,7 +418,7 @@ $lang->execution->fixFirstWithLeft             = 'Modify the left';
 $lang->execution->unfinishedExecution          = "This {$lang->executionCommon} has ";
 $lang->execution->unfinishedTask               = "[%s] unfinished tasks. ";
 $lang->execution->unresolvedBug                = "[%s] unresolved bugs. ";
-$lang->execution->projectNotEmpty              = 'Project cannot be empty.';
+$lang->execution->projectNotEmpty              = "{$lang->projectCommon} cannot be empty.";
 $lang->execution->confirmStoryToTask           = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
 $lang->execution->ge                           = "『%s』should be >= actual begin『%s』.";
 $lang->execution->storyDragError               = "The {$lang->SRCommon} is not active. Please activate and drag again.";
@@ -540,7 +539,7 @@ $lang->execution->featureBar['bug']['unresolved'] = 'Active';
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = 'Ich bin beteiligt.';
-$lang->execution->doingProject = 'Laufende Projekte';
+$lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
 $lang->execution->kanbanColType['wait']      = $lang->execution->statusList['wait']     . ' ' . $lang->execution->common;
 $lang->execution->kanbanColType['doing']     = $lang->execution->statusList['doing']    . ' ' . $lang->execution->common;
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 4f3977f7cb..29cc89a90f 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -16,17 +16,17 @@ $lang->execution->id                  = $lang->executionCommon . ' ID';
 $lang->execution->type                = $lang->executionCommon . ' Type';
 $lang->execution->name                = "{$lang->executionCommon} Name";
 $lang->execution->code                = "{$lang->executionCommon} Code";
-$lang->execution->projectName         = 'Project';
-$lang->execution->project             = 'Project';
+$lang->execution->projectName         = $lang->projectCommon;
+$lang->execution->project             = $lang->projectCommon;
 $lang->execution->execId              = "{$lang->execution->common} ID";
 $lang->execution->execName            = "{$lang->execution->common} Name";
 $lang->execution->execCode            = "{$lang->execution->common} Code";
 $lang->execution->execType            = 'Execution Type';
-$lang->execution->lifetime            = 'Project Cycle';
+$lang->execution->lifetime            = $lang->projectCommon . ' Cycle';
 $lang->execution->attribute           = 'Stage Type';
 $lang->execution->percent             = 'Workload %';
 $lang->execution->milestone           = 'Milestone';
-$lang->execution->parent              = 'Project';
+$lang->execution->parent              = $lang->projectCommon;
 $lang->execution->path                = 'Path';
 $lang->execution->grade               = 'Grade';
 $lang->execution->output              = 'Output';
@@ -128,7 +128,7 @@ $lang->execution->recent              = 'Recent visits: ';
 $lang->execution->copyNoExecution     = 'There are no ' . $lang->executionCommon . 'available to copy.';
 $lang->execution->noTeam              = 'No team members at the moment';
 $lang->execution->or                  = ' or ';
-$lang->execution->selectProject       = 'Please select project';
+$lang->execution->selectProject       = 'Please select ' . $lang->projectCommon;
 $lang->execution->unfoldClosed        = 'Unfold Closed';
 $lang->execution->editName            = 'Edit Name';
 $lang->execution->setWIP              = 'WIP Settings';
@@ -148,12 +148,12 @@ $lang->execution->estimate = 'Estimate';
 $lang->execution->consumed = 'Consumed';
 $lang->execution->left     = 'Left';
 
-$lang->execution->copyTeamTip        = "copy Project/project team members";
+$lang->execution->copyTeamTip        = "copy {$lang->projectCommon}/{$lang->execution->common} team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
-$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->agileplusMethodTip = "When creating executions in an Agile Plus {$lang->projectCommon}, both Iteration and Kanban management methods are supported.";
 $lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
-$lang->execution->waterfallTip       = 'In the Waterfall project or in the Waterfall + project,';
+$lang->execution->waterfallTip       = "In the Waterfall {$lang->projectCommon} or in the Waterfall + {$lang->projectCommon},";
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Activate';
@@ -201,11 +201,11 @@ $lang->execution->statusList['suspended'] = 'Suspended';
 $lang->execution->statusList['closed']    = 'Closed';
 
 global $config;
-$lang->execution->aclList['private'] = 'Private (for team members and project stakeholders)';
-$lang->execution->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
+$lang->execution->aclList['private'] = "Private (for team members and {$lang->projectCommon} stakeholders)";
+$lang->execution->aclList['open']    = "Inherited {$lang->projectCommon} ACL (for who can access the current {$lang->projectCommon})";
 
 $lang->execution->kanbanAclList['private'] = 'Private';
-$lang->execution->kanbanAclList['open']    = 'Inherited Project';
+$lang->execution->kanbanAclList['open']    = "Inherited {$lang->projectCommon}";
 
 $lang->execution->storyPoint = 'Story Point';
 
@@ -355,7 +355,7 @@ $lang->execution->wbs                  = "Create Task";
 $lang->execution->batchWBS             = "Batch Create Tasks";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
+$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} and make sure it has been reviewed.";
 $lang->execution->productStories       = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. <a href='%s'> Link Stories</a> now.";
 $lang->execution->haveBranchDraft      = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
 $lang->execution->haveDraft            = "There are %s draft stories with this {$lang->executionCommon} can't be linked.";
@@ -376,27 +376,26 @@ $lang->execution->noExecutions         = "No {$lang->execution->common}.";
 $lang->execution->noPrintData          = "No data can be printed.";
 $lang->execution->noMembers            = 'No team members yet. ';
 $lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current product is: %s";
-// $lang->execution->linkProjectStoryTip  = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
-$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the execution, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
 $lang->execution->copyTeamTitle        = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
 /* Interactive prompts. */
 $lang->execution->confirmDelete                = "Do you want to delete the {$lang->executionCommon}[%s]?";
 $lang->execution->confirmUnlinkMember          = "Do you want to unlink this User from {$lang->executionCommon}?";
 $lang->execution->confirmUnlinkStory           = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSync                  = "After modifying the project, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new project. Please know.";
-$lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the execution?";
-$lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the execution. Remove it from the {$lang->executionCommon}, then try again.";
+$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
+$lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the {$lang->projectCommon}?";
+$lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the {$lang->projectCommon}. Remove it from the {$lang->executionCommon}, then try again.";
 $lang->execution->notAllowRemoveProducts       = "The story %s of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
 $lang->execution->errorNoLinkedProducts        = "No {$lang->productCommon} is linked to {$lang->executionCommon}. You will be directed to {$lang->productCommon} page to link one.";
 $lang->execution->errorSameProducts            = "{$lang->executionCommon} cannot be linked to the same {$lang->productCommon} twice.";
 $lang->execution->errorSameBranches            = "{$lang->executionCommon} cannot be linked to the same branch twice";
-$lang->execution->errorBegin                   = "The start time of {$lang->executionCommon} cannot be less than the start time of the project %s.";
-$lang->execution->errorEnd                     = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the project.";
-$lang->execution->errorLetterProject           = "The start time of {$lang->executionCommon} cannot be less than the start time of the project %s.";
-$lang->execution->errorGreaterProject          = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the project.";
-$lang->execution->errorCommonBegin             = 'The start date of ' . $lang->executionCommon . ' should be ≥ the start date of project : %s.';
-$lang->execution->errorCommonEnd               = 'The deadline of ' . $lang->executionCommon .  ' should be ≤ the deadline of project : %s.';
+$lang->execution->errorBegin                   = "The start time of {$lang->executionCommon} cannot be less than the start time of the {$lang->projectCommon} %s.";
+$lang->execution->errorEnd                     = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the {$lang->projectCommon}.";
+$lang->execution->errorLetterProject           = "The start time of {$lang->executionCommon} cannot be less than the start time of the {$lang->projectCommon} %s.";
+$lang->execution->errorGreaterProject          = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the {$lang->projectCommon}.";
+$lang->execution->errorCommonBegin             = "The start date of ' . $lang->executionCommon . ' should be ≥ the start date of {$lang->projectCommon} : %s.";
+$lang->execution->errorCommonEnd               = "The deadline of ' . $lang->executionCommon .  ' should be ≤ the deadline of {$lang->projectCommon} : %s.";
 $lang->execution->errorLetterParent            = 'The begin cannot be less than the begin of the parent stage to which it belongs: %s.';
 $lang->execution->errorGreaterParent           = 'The end cannot be greater than the end of the parent stage to which it belongs：%s.';
 $lang->execution->errorNameRepeat              = "Child %s of the same parent stage cannot have the same name.";
@@ -419,7 +418,7 @@ $lang->execution->fixFirstWithLeft             = 'Update hours left too';
 $lang->execution->unfinishedExecution          = "This {$lang->executionCommon} has ";
 $lang->execution->unfinishedTask               = "[%s] unfinished tasks. ";
 $lang->execution->unresolvedBug                = "[%s] unresolved bugs. ";
-$lang->execution->projectNotEmpty              = 'Project cannot be empty.';
+$lang->execution->projectNotEmpty              = "{$lang->projectCommon} cannot be empty.";
 $lang->execution->confirmStoryToTask           = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
 $lang->execution->ge                           = "『%s』should be >= actual begin『%s』.";
 $lang->execution->storyDragError               = "The {$lang->SRCommon} is not active. Please activate and drag again.";
@@ -540,7 +539,7 @@ $lang->execution->featureBar['bug']['unresolved'] = 'Active';
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = 'Mine';
-$lang->execution->doingProject = 'Ongoing Projects';
+$lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
 $lang->execution->kanbanColType['wait']      = $lang->execution->statusList['wait']      . ' ' . $lang->execution->common;
 $lang->execution->kanbanColType['doing']     = $lang->execution->statusList['doing']     . ' ' . $lang->execution->common;
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index c12fa9ea50..45a067d107 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -22,11 +22,11 @@ $lang->execution->execId              = "{$lang->execution->common} ID";
 $lang->execution->execName            = 'Execution Name';
 $lang->execution->execCode            = 'Execution Code';
 $lang->execution->execType            = 'Execution Type';
-$lang->execution->lifetime            = 'Project Cycle';
+$lang->execution->lifetime            = $lang->projectCommon . ' Cycle';
 $lang->execution->attribute           = 'Stage Type';
 $lang->execution->percent             = 'Workload %';
 $lang->execution->milestone           = 'Milestone';
-$lang->execution->parent              = 'Project';
+$lang->execution->parent              = $lang->projectCommon;
 $lang->execution->path                = 'Path';
 $lang->execution->grade               = 'Grade';
 $lang->execution->output              = 'Output';
@@ -128,7 +128,7 @@ $lang->execution->recent              = 'Recent visits: ';
 $lang->execution->copyNoExecution     = 'There are no ' . $lang->executionCommon . 'available to copy.';
 $lang->execution->noTeam              = 'No team members at the moment';
 $lang->execution->or                  = ' or ';
-$lang->execution->selectProject       = 'Please select project';
+$lang->execution->selectProject       = 'Please select ' . $lang->projectCommon;
 $lang->execution->unfoldClosed        = 'Unfold Closed';
 $lang->execution->editName            = 'Edit Name';
 $lang->execution->setWIP              = 'WIP Settings';
@@ -148,12 +148,12 @@ $lang->execution->estimate = 'estimate';
 $lang->execution->consumed = 'consumed';
 $lang->execution->left     = 'Left';
 
-$lang->execution->copyTeamTip        = "copy Project/project team members";
+$lang->execution->copyTeamTip        = "copy {$lang->projectCommon}/{$lang->execution->common} team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
-$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.';
+$lang->execution->agileplusMethodTip = "When creating executions in an Agile Plus {$lang->projectCommon}, both Iteration and Kanban management methods are supported.";
 $lang->execution->typeTip            = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent.";
-$lang->execution->waterfallTip       = 'In the Waterfall project or in the Waterfall + project,';
+$lang->execution->waterfallTip       = "In the Waterfall {$lang->projectCommon} or in the Waterfall + {$lang->projectCommon},";
 
 $lang->execution->start    = 'Démarrer';
 $lang->execution->activate = 'Activer';
@@ -201,11 +201,11 @@ $lang->execution->statusList['suspended'] = 'Suspendu';
 $lang->execution->statusList['closed']    = 'Fermé';
 
 global $config;
-$lang->execution->aclList['private'] = 'Private (for team members and project stakeholders)';
-$lang->execution->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
+$lang->execution->aclList['private'] = "Private (for team members and {$lang->projectCommon} stakeholders)";
+$lang->execution->aclList['open']    = "Inherited {$lang->projectCommon} ACL (for who can access the current {$lang->projectCommon})";
 
 $lang->execution->kanbanAclList['private'] = 'Private';
-$lang->execution->kanbanAclList['open']    = 'Inherited Project';
+$lang->execution->kanbanAclList['open']    = "Inherited {$lang->projectCommon}";
 
 $lang->execution->storyPoint = 'Story Point';
 
@@ -355,7 +355,7 @@ $lang->execution->wbs                  = "Créer Tâche";
 $lang->execution->batchWBS             = "Créer Tâche en lot";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='Comment mettre à jour le Graphe d´atterrissage ?' class='btn btn-link'>Mise à jour <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
-$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
+$lang->execution->projectNoStories     = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} and make sure it has been reviewed.";
 $lang->execution->productStories       = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. <a href='%s'> Associer Stories</a> maintenant.";
 $lang->execution->haveBranchDraft      = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
 $lang->execution->haveDraft            = "There are %s draft stories with this {$lang->executionCommon} can't be linked.";
@@ -376,27 +376,26 @@ $lang->execution->noExecutions         = "Aucun {$lang->execution->common}.";
 $lang->execution->noPrintData          = "No data can be printed.";
 $lang->execution->noMembers            = "Actuellement il n'y a aucun membre dans l'équipe. On ne va pas aller loin... ";
 $lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current product is: %s";
-// $lang->execution->linkProjectStoryTip  = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
-$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the project, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
 $lang->execution->copyTeamTitle        = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
 /* Interactive prompts. */
 $lang->execution->confirmDelete                = "Voulez-vous réellement supprimer le {$lang->executionCommon}[%s] ?";
 $lang->execution->confirmUnlinkMember          = "Voulez-vous retirer cet utilisateur du {$lang->executionCommon} ?";
 $lang->execution->confirmUnlinkStory           = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSync                  = "After modifying the project, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new project. Please know.";
-$lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the project?";
-$lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the project. Remove it from the {$lang->executionCommon}, then try again.";
+$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
+$lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the {$lang->projectCommon}?";
+$lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the {$lang->projectCommon}. Remove it from the {$lang->executionCommon}, then try again.";
 $lang->execution->notAllowRemoveProducts       = "The story of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
 $lang->execution->errorNoLinkedProducts        = "Aucun {$lang->productCommon} n'est associé à ce {$lang->executionCommon}. Vous allez être redirigé vers la page {$lang->productCommon} pour en associer un.";
 $lang->execution->errorSameProducts            = "Ce {$lang->executionCommon} ne peut pas être associé deux fois au même {$lang->productCommon}. Imaginez un peu les résultats !";
 $lang->execution->errorSameBranches            = "{$lang->executionCommon} cannot be linked to the same branch twice";
-$lang->execution->errorBegin                   = "The start time of {$lang->executionCommon} cannot be less than the start time of the project %s.";
-$lang->execution->errorEnd                     = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the project.";
-$lang->execution->errorLetterProject           = "The start time of {$lang->executionCommon} cannot be less than the start time of the project %s.";
-$lang->execution->errorGreaterProject          = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the project.";
-$lang->execution->errorCommonBegin             = 'The start date of ' . $lang->executionCommon . ' should be ≥ the start date of project : %s.';
-$lang->execution->errorCommonEnd               = 'The deadline of ' . $lang->executionCommon .  ' should be ≤ the deadline of project : %s.';
+$lang->execution->errorBegin                   = "The start time of {$lang->executionCommon} cannot be less than the start time of the {$lang->projectCommon} %s.";
+$lang->execution->errorEnd                     = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the {$lang->projectCommon}.";
+$lang->execution->errorLetterProject           = "The start time of {$lang->executionCommon} cannot be less than the start time of the {$lang->projectCommon} %s.";
+$lang->execution->errorGreaterProject          = "The end time of {$lang->executionCommon} cannot be greater than the end time %s of the {$lang->projectCommon}.";
+$lang->execution->errorCommonBegin             = "The start date of ' . $lang->executionCommon . ' should be ≥ the start date of {$lang->projectCommon} : %s.";
+$lang->execution->errorCommonEnd               = "The deadline of ' . $lang->executionCommon .  ' should be ≤ the deadline of {$lang->projectCommon} : %s.";
 $lang->execution->errorLetterParent            = 'The begin cannot be less than the begin of the parent stage to which it belongs: %s.';
 $lang->execution->errorGreaterParent           = 'The end cannot be greater than the end of the parent stage to which it belongs：%s.';
 $lang->execution->errorNameRepeat              = "Child %s of the same parent stage cannot have the same name.";
@@ -419,7 +418,7 @@ $lang->execution->fixFirstWithLeft             = 'Mettre à jour les heures éga
 $lang->execution->unfinishedExecution          = "This {$lang->executionCommon} has ";
 $lang->execution->unfinishedTask               = "[%s] unfinished tasks. ";
 $lang->execution->unresolvedBug                = "[%s] unresolved bugs. ";
-$lang->execution->projectNotEmpty              = 'Project cannot be empty.';
+$lang->execution->projectNotEmpty              = "{$lang->projectCommon} cannot be empty.";
 $lang->execution->confirmStoryToTask           = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
 $lang->execution->ge                           = "『%s』should be >= actual begin『%s』.";
 $lang->execution->storyDragError               = "The {$lang->SRCommon} is not active. Please activate and drag again.";
@@ -540,7 +539,7 @@ $lang->execution->featureBar['bug']['unresolved'] = 'Active';
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
 $lang->execution->myExecutions = "J'étais impliqué";
-$lang->execution->doingProject = 'Projets en cours';
+$lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
 $lang->execution->kanbanColType['wait']      = $lang->execution->statusList['wait']      . ' ' . $lang->execution->common;
 $lang->execution->kanbanColType['doing']     = $lang->execution->statusList['doing']     . ' ' . $lang->execution->common;
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 61efb2c0cb..af29250198 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -16,17 +16,17 @@ $lang->execution->id                  = $lang->executionCommon . '编号';
 $lang->execution->type                = $lang->executionCommon . '类型';
 $lang->execution->name                = $lang->executionCommon . '名称';
 $lang->execution->code                = $lang->executionCommon . '代号';
-$lang->execution->projectName         = '所属项目';
-$lang->execution->project             = '所属项目';
+$lang->execution->projectName         = '所属' . $lang->projectCommon;
+$lang->execution->project             = '所属' . $lang->projectCommon;
 $lang->execution->execId              = "{$lang->execution->common}编号";
 $lang->execution->execName            = "{$lang->execution->common}名称";
 $lang->execution->execCode            = "{$lang->execution->common}代号";
 $lang->execution->execType            = "{$lang->execution->common}类型";
-$lang->execution->lifetime            = '项目周期';
+$lang->execution->lifetime            = $lang->projectCommon . '周期';
 $lang->execution->attribute           = '阶段类型';
 $lang->execution->percent             = '工作量占比';
 $lang->execution->milestone           = '里程碑';
-$lang->execution->parent              = '所属项目';
+$lang->execution->parent              = '所属' . $lang->projectCommon;
 $lang->execution->path                = '路径';
 $lang->execution->grade               = '层级';
 $lang->execution->output              = '输出';
@@ -128,7 +128,7 @@ $lang->execution->recent              = '近期访问：';
 $lang->execution->copyNoExecution     = '没有可用的' . $lang->executionCommon . '来复制';
 $lang->execution->noTeam              = '暂时没有团队成员';
 $lang->execution->or                  = '或';
-$lang->execution->selectProject       = '请选择项目';
+$lang->execution->selectProject       = '请选择' . $lang->projectCommon;
 $lang->execution->unfoldClosed        = '展开已结束';
 $lang->execution->editName            = '编辑名称';
 $lang->execution->setWIP              = '在制品数量设置（WIP）';
@@ -138,7 +138,7 @@ $lang->execution->batchCreateTask     = '批量建任务';
 $lang->execution->kanbanNoLinkProduct = "看板没有关联{$lang->productCommon}";
 $lang->execution->myTask              = "我的任务";
 $lang->execution->list                = '列表';
-$lang->execution->allProject          = '全部项目';
+$lang->execution->allProject          = '全部' . $lang->projectCommon;
 $lang->execution->method              = '管理方法';
 $lang->execution->sameAsParent        = "同父阶段";
 
@@ -148,12 +148,12 @@ $lang->execution->estimate = '预计';
 $lang->execution->consumed = '消耗';
 $lang->execution->left     = '剩余';
 
-$lang->execution->copyTeamTip        = "可以选择复制项目或{$lang->execution->common}团队的成员";
+$lang->execution->copyTeamTip        = "可以选择复制{$lang->projectCommon}或{$lang->execution->common}团队的成员";
 $lang->execution->daysGreaterProject = '可用工日不能大于执行的可用工日『%s』';
 $lang->execution->errorHours         = '可用工时/天不能大于『24』';
-$lang->execution->agileplusMethodTip = '融合敏捷项目创建执行时，支持迭代和看板两种管理方法。';
+$lang->execution->agileplusMethodTip = "融合敏捷{$lang->projectCommon}创建执行时，支持迭代和看板两种管理方法。";
 $lang->execution->typeTip            = '“综合”类型的父阶段可以创建其它类型的子级，其它父子层级的类型均一致。';
-$lang->execution->waterfallTip       = '瀑布项目和融合瀑布项目中，';
+$lang->execution->waterfallTip       = "瀑布{$lang->projectCommon}和融合瀑布{$lang->projectCommon}中，";
 
 $lang->execution->start    = "开始";
 $lang->execution->activate = "激活";
@@ -201,11 +201,11 @@ $lang->execution->statusList['suspended'] = '已挂起';
 $lang->execution->statusList['closed']    = '已关闭';
 
 global $config;
-$lang->execution->aclList['private'] = "私有（团队成员和项目负责人、干系人可访问）";
-$lang->execution->aclList['open']    = "继承项目访问权限（能访问当前项目，即可访问）";
+$lang->execution->aclList['private'] = "私有（团队成员和{$lang->projectCommon}负责人、干系人可访问）";
+$lang->execution->aclList['open']    = "继承{$lang->projectCommon}访问权限（能访问当前{$lang->projectCommon}，即可访问）";
 
 $lang->execution->kanbanAclList['private'] = '私有';
-$lang->execution->kanbanAclList['open']    = '继承项目';
+$lang->execution->kanbanAclList['open']    = "继承{$lang->projectCommon}";
 
 $lang->execution->storyPoint = '故事点';
 
@@ -355,7 +355,7 @@ $lang->execution->wbs                  = "分解任务";
 $lang->execution->batchWBS             = "批量分解";
 $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
 $lang->execution->whyNoStories         = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
-$lang->execution->projectNoStories     = "看起来没有{$lang->SRCommon}可以关联。请检查下项目中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
+$lang->execution->projectNoStories     = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->projectCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->productStories       = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
 $lang->execution->haveBranchDraft      = "导入完成！有%s条非激活状态或不是{$lang->executionCommon}关联分支的{$lang->SRCommon}无法导入";
 $lang->execution->haveDraft            = "导入完成！有%s条非激活状态的{$lang->SRCommon}无法导入";
@@ -376,27 +376,26 @@ $lang->execution->noExecutions         = "暂时没有{$lang->execution->common}
 $lang->execution->noPrintData          = "暂无数据可打印";
 $lang->execution->noMembers            = '暂时没有团队成员。';
 $lang->execution->workloadTotal        = "工作量占比累计不应当超过100%s, 当前产品下的工作量之和为%s";
-// $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
-$lang->execution->linkAllStoryTip      = "(项目下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
+$lang->execution->linkAllStoryTip      = "({$lang->projectCommon}下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
 $lang->execution->copyTeamTitle        = "选择一个{$lang->project->common}或{$lang->execution->common}团队";
 
 /* 交互提示。*/
 $lang->execution->confirmDelete                = "您确定删除{$lang->executionCommon}[%s]吗？";
 $lang->execution->confirmUnlinkMember          = "您确定从该{$lang->executionCommon}中移除该用户吗？";
 $lang->execution->confirmUnlinkStory           = "移除该{$lang->SRCommon}后，该{$lang->SRCommon}关联的用例将被移除，该{$lang->SRCommon}关联的任务将被取消，请确认。";
-$lang->execution->confirmSync                  = "修改所属项目后,为了保持数据的一致性，该执行所关联的产品、需求、团队和白名单数据将会同步到新的项目中，请知悉。";
-$lang->execution->confirmUnlinkExecutionStory  = "您确定从该项目中移除该{$lang->SRCommon}吗？";
-$lang->execution->notAllowedUnlinkStory        = "该{$lang->SRCommon}已经与项目下{$lang->executionCommon}相关联，请从{$lang->executionCommon}中移除后再操作。";
+$lang->execution->confirmSync                  = "修改所属{$lang->projectCommon}后,为了保持数据的一致性，该执行所关联的产品、需求、团队和白名单数据将会同步到新的{$lang->projectCommon}中，请知悉。";
+$lang->execution->confirmUnlinkExecutionStory  = "您确定从该{$lang->projectCommon}中移除该{$lang->SRCommon}吗？";
+$lang->execution->notAllowedUnlinkStory        = "该{$lang->SRCommon}已经与{$lang->projectCommon}下{$lang->executionCommon}相关联，请从{$lang->executionCommon}中移除后再操作。";
 $lang->execution->notAllowRemoveProducts       = "该{$lang->productCommon}中的{$lang->SRCommon}%s已与该{$lang->executionCommon}进行了关联，请取消关联后再操作。";
 $lang->execution->errorNoLinkedProducts        = "该{$lang->executionCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
 $lang->execution->errorSameProducts            = "{$lang->executionCommon}不能关联多个相同的{$lang->productCommon}。";
 $lang->execution->errorSameBranches            = "{$lang->executionCommon}不能关联多个相同的分支。";
-$lang->execution->errorBegin                   = "{$lang->executionCommon}的开始时间不能小于所属项目的开始时间%s。";
-$lang->execution->errorEnd                     = "{$lang->executionCommon}的截止时间不能大于所属项目的结束时间%s。";
-$lang->execution->errorLetterProject           = "{$lang->executionCommon}的计划开始时间不能小于所属项目的计划开始时间%s。";
-$lang->execution->errorGreaterProject          = "{$lang->executionCommon}的计划完成时间不能大于所属项目的计划完成时间%s。";
-$lang->execution->errorCommonBegin             = $lang->executionCommon . '开始日期应大于等于项目的开始日期：%s。';
-$lang->execution->errorCommonEnd               = $lang->executionCommon . '截止日期应小于等于项目的截止日期：%s。';
+$lang->execution->errorBegin                   = "{$lang->executionCommon}的开始时间不能小于所属{$lang->projectCommon}的开始时间%s。";
+$lang->execution->errorEnd                     = "{$lang->executionCommon}的截止时间不能大于所属{$lang->projectCommon}的结束时间%s。";
+$lang->execution->errorLetterProject           = "{$lang->executionCommon}的计划开始时间不能小于所属{$lang->projectCommon}的计划开始时间%s。";
+$lang->execution->errorGreaterProject          = "{$lang->executionCommon}的计划完成时间不能大于所属{$lang->projectCommon}的计划完成时间%s。";
+$lang->execution->errorCommonBegin             = $lang->executionCommon . '开始日期应大于等于{$lang->projectCommon}的开始日期：%s。';
+$lang->execution->errorCommonEnd               = $lang->executionCommon . '截止日期应小于等于{$lang->projectCommon}的截止日期：%s。';
 $lang->execution->errorLetterParent            = '计划开始时间不能小于所属父阶段的计划开始时间：%s。';
 $lang->execution->errorGreaterParent           = '计划完成时间不能大于所属父阶段的计划完成时间：%s。';
 $lang->execution->errorNameRepeat              = "相同父阶段的子%s名称不能相同";
@@ -419,7 +418,7 @@ $lang->execution->fixFirstWithLeft             = '修改剩余工时';
 $lang->execution->unfinishedExecution          = "该{$lang->executionCommon}下还有";
 $lang->execution->unfinishedTask               = "[%s]个未完成的任务，";
 $lang->execution->unresolvedBug                = "[%s]个未解决的bug，";
-$lang->execution->projectNotEmpty              = '所属项目不能为空。';
+$lang->execution->projectNotEmpty              = "所属{$lang->projectCommon}不能为空。";
 $lang->execution->confirmStoryToTask           = '%s' . $lang->SRCommon . '已经在当前' . $lang->execution->common . '中转了任务，请确认是否重复转任务。';
 $lang->execution->ge                           = "『%s』应当不小于实际开始时间『%s』。";
 $lang->execution->storyDragError               = "该{$lang->SRCommon}不是激活状态，请激活后再拖动";
@@ -540,7 +539,7 @@ $lang->execution->featureBar['bug']['unresolved'] = '未解决';
 $lang->execution->featureBar['build']['all'] = '全部版本';
 
 $lang->execution->myExecutions = '我参与的';
-$lang->execution->doingProject = '进行中的项目';
+$lang->execution->doingProject = "进行中的{$lang->projectCommon}";
 
 $lang->execution->kanbanColType['wait']      = $lang->execution->statusList['wait']      . '的' . $lang->execution->common;
 $lang->execution->kanbanColType['doing']     = $lang->execution->statusList['doing']     . '的' . $lang->execution->common;

From 68e10e515e3bc685faa0df4a98e6d8d488a1164b Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 1 Mar 2023 13:54:45 +0800
Subject: [PATCH 133/319] * Code for task #85502

---
 lib/base/front/front.class.php |  26 +++++--
 module/common/lang/zh-cn.php   |   2 +
 www/js/my.full.js              | 120 +++++++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 www/js/my.full.js

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index 8462d2faee..19988c4acc 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -1196,10 +1196,28 @@ EOT;
         if($config->tabSession and helper::isWithTID()) $jsConfig->tid = zget($_GET, 'tid', '');
 
         $jsLang = new stdclass();
-        $jsLang->submitting = isset($lang->loading) ? $lang->loading : '';
-        $jsLang->save       = $jsConfig->save;
-        $jsLang->expand     = isset($lang->expand)  ? $lang->expand  : '';
-        $jsLang->timeout    = isset($lang->timeout) ? $lang->timeout : '';
+        $jsLang->submitting   = isset($lang->loading) ? $lang->loading : '';
+        $jsLang->save         = $jsConfig->save;
+        $jsLang->expand       = isset($lang->expand)  ? $lang->expand  : '';
+        $jsLang->timeout      = isset($lang->timeout) ? $lang->timeout : '';
+        $jsLang->confirmDraft = isset($lang->confirmDraft) ? $lang->confirmDraft : '';
+        $jsLang->resume       = isset($lang->resume)  ? $lang->resume  : '';
+        $jsLang->program      = isset($lang->program->common) ? $lang->program->common : '';
+        $jsLang->project      = isset($lang->project->common) ? $lang->project->common : '';
+        $jsLang->product      = isset($lang->product->common) ? $lang->product->common : '';
+        $jsLang->task         = isset($lang->task->common) ? $lang->task->common : '';
+        $jsLang->story        = isset($lang->story->common) ? $lang->story->common : '';
+        $jsLang->bug          = isset($lang->bug->common) ? $lang->bug->common : '';
+        $jsLang->testcase     = isset($lang->testcase->common) ? $lang->testcase->common : '';
+        $jsLang->testsuite    = isset($lang->testsuite->common) ? $lang->testsuite->common : '';
+        $jsLang->zahost       = isset($lang->zahost->common) ? $lang->zahost->common : '';
+        $jsLang->zanode       = isset($lang->zanode->common) ? $lang->zanode->common : '';
+        $jsLang->gitlab       = isset($lang->gitlab->common) ? $lang->gitlab->common : '';
+        $jsLang->gogs         = isset($lang->gogs->common) ? $lang->gogs->common : '';
+        $jsLang->gitea        = isset($lang->gitea->common) ? $lang->gitea->common : '';
+        $jsLang->jenkins      = isset($lang->jenkins->common) ? $lang->jenkins->common : '';
+        $jsLang->sonarqube    = isset($lang->sonarqube->common) ? $lang->sonarqube->common : '';
+        $jsLang->repo         = isset($lang->repo->common) ? $lang->repo->common : '';
 
         $js  = static::start(false);
         $js .= 'window.config=' . json_encode($jsConfig) . ";\n";
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 8c3ac6d270..d3ce94cce8 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -90,6 +90,8 @@ $lang->viewDetails        = '查看详情';
 
 $lang->actions         = '操作';
 $lang->restore         = '恢复默认';
+$lang->confirmDraft    = '有未保存的%s%表单，是否恢复？';
+$lang->resume          = '恢复';
 $lang->comment         = '备注';
 $lang->history         = '历史记录';
 $lang->attatch         = '附件';
diff --git a/www/js/my.full.js b/www/js/my.full.js
old mode 100644
new mode 100755
index ca19375a73..935811cb02
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -3,6 +3,125 @@
 {
     if(!config.tabSession) return;
 
+    /**
+     * Handle the logic save form draft.
+     *
+     * @access public
+     * @return void
+     */
+    function handleSaveFormDraft()
+    {
+        if (config.currentMethod === 'login') return;
+        setTimeout(() => {
+            var form = $('.table-form').parent();
+            if(form.length)
+            {
+                var formDataID     = config.currentMethod + '-' + config.currentModule + '-' + $(form).attr("id");
+                var formDataStored = $.zui.store.get(formDataID);
+                if(formDataStored)
+                {
+                    var message = lang.confirmDraft.replace('%s%', lang[config.currentModule] || '');
+                    new $.zui.Messager(message, {
+                        type: 'success',
+                        close: true,
+                        placement: 'center',
+                        time: 0,
+                        actions: [
+                            {
+                                name: 'undo',
+                                icon: 'undo',
+                                text: lang.resume,
+                                action: function() {
+                                    var valueMultiple = {};
+                                    for(var i = 0; i < formDataStored.length; i++)
+                                    {
+                                        var item = formDataStored[i];
+
+                                        /* formItem === checkbox || formItem === multipleSelect */
+                                        if(item.name.indexOf('[]') != -1)
+                                        {
+                                            var formItem = $('[name^=' + item.name.replace('[]', '') + ']');
+                                        }
+                                        else if((item.name.indexOf(']') != -1) && (item.name.indexOf('[') != -1))
+                                        {
+                                             var formItem = $('[id^=' + item.name.replace('[', '').replace(']', '') + ']');
+                                        }
+                                        else 
+                                        {
+                                            /* var formItem = $('#' + item.name);*/
+                                             var formItem = $('[id^=' + item.name + ']');
+                                        }
+
+                                        var tagName = formItem.prop('tagName');
+                                        if(tagName === 'SELECT')
+                                        {
+                                             formItem.val(item.value);
+                                             if($(formItem).hasClass('chosen'))
+                                             {
+                                                 $(formItem).trigger('chosen:updated');
+                                             }   
+                                             else if($(formItem).hasClass('picker-select'))
+                                             {
+                                                 if($(formItem).attr('multiple'))
+                                                 {
+                                                     var value = [];
+                                                     if (!valueMultiple[item.name])
+                                                     {
+                                                         valueMultiple[item.name] = [];
+                                                     }   
+                                                     valueMultiple[item.name].push(item.value);
+                                                     $(formItem).data('zui.picker').setValue(valueMultiple[item.name]);
+                                                 }   
+                                                 else
+                                                 {
+                                                     $(formItem).data('zui.picker').setValue(item.value);
+                                                 }   
+                                             }   
+                                         }   
+                                         else if(tagName === 'INPUT')
+                                         {
+                                             if($(formItem).attr('type') === 'checkbox')
+                                             {
+                                                 $(formItem).prop('checked', true).trigger('change');
+                                             }   
+                                             else if($(formItem).attr('type') === 'radio')
+                                             {
+                                                 $('#' + item.name + item.value).prop('checked', true).trigger('change');
+                                             }
+                                             else
+                                             {
+                                                 formItem.val(item.value);
+                                             }
+                                         }
+                                         else if(tagName === 'TEXTAREA' && $(formItem).hasClass('kindeditor'))
+                                         {
+                                             KindEditor.remove('#' + item.name);
+                                             formItem.val(item.value);
+                                             $(formItem).kindeditor();
+                                         }
+                                     }
+                                 }
+                             }
+                         ]
+                     }).show();
+                 }
+                 form.on('input', function()
+                 {   
+                     $.zui.store.set(formDataID, $(form).serializeArray());
+
+                 }).on('change', function()
+                 {
+                     $.zui.store.set(formDataID, $(form).serializeArray());
+                     console.log($(form).serializeArray());
+                 }).on('success.form.zui', function(event, res)
+                 {
+                     if (res.result === 'fail' || res.status === 'fail') return
+                     $.zui.store.remove(formDataID);
+                 })  
+             }   
+         }, 500);
+     }  
+
     /** Store current tab id */
     var _tid = '';
 
@@ -31,6 +150,7 @@
         return $.createLink(link);
     }
 
+
     /** Init */
     function init()
     {

From 25b910bef378b455d7e68a7456dea6fa5e6ea16c Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 1 Mar 2023 13:57:57 +0800
Subject: [PATCH 134/319] * Code for adjust space.

---
 www/js/my.full.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 935811cb02..a3b0502d53 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -150,7 +150,6 @@
         return $.createLink(link);
     }
 
-
     /** Init */
     function init()
     {

From afd1f051592c642ac9459a0fafa9838cb2aa9a1e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 06:03:02 +0000
Subject: [PATCH 135/319] * Fix bug #32423.

---
 module/programplan/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 02c097829d..0dd25acddd 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -1507,6 +1507,8 @@ class programplanModel extends model
             $startTasks  = $this->dao->select('count(1) as count')->from(TABLE_TASK)->where('deleted')->eq(0)->andWhere('execution')->in($allChildren)->andWhere('consumed')->ne(0)->fetch('count');
             foreach($children as $childID => $childExecution) $statusCount[$childExecution->status] = empty($statusCount[$childExecution->status]) ? 1 : $statusCount[$childExecution->status] ++;
 
+            if(empty($statusCount)) continue;
+
             if(isset($statusCount['wait']) and count($statusCount) == 1 and helper::isZeroDate($parent->realBegan) and $startTasks == 0)
             {
                 if($parent->status != 'wait')

From cdd411c4eb5b3722039f53197ada1698e6873105 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 1 Mar 2023 14:09:14 +0800
Subject: [PATCH 136/319] * Code for func saveDraft refactors .

---
 www/js/my.full.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index a3b0502d53..fffa853be9 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1,8 +1,6 @@
 /* Tab session */
 (function($)
 {
-    if(!config.tabSession) return;
-
     /**
      * Handle the logic save form draft.
      *
@@ -121,7 +119,9 @@
              }   
          }, 500);
      }  
+    handleSaveFormDraft();
 
+    if(!config.tabSession) return;
     /** Store current tab id */
     var _tid = '';
 

From 01cfe5655b42a705e54a88993fb08549ad5ffffa Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 1 Mar 2023 06:16:25 +0000
Subject: [PATCH 137/319] * Finish task #85658.

---
 module/execution/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index b620b81181..b61cddddc6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1035,7 +1035,8 @@ class execution extends control
         $execution   = $this->commonAction($executionID);
         $project     = $this->loadModel('project')->getByID($execution->project);
         $executionID = $execution->id;
-        $products    = $this->product->getProducts($execution->id);
+	$products    = $this->product->getProducts($execution->id);
+	if(count($products) === 1) $productID = current($products)->id;
 
         if($execution->hasProduct)
         {

From 9c840db309855a9c911b780cf35203c6614b538d Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 1 Mar 2023 06:16:25 +0000
Subject: [PATCH 138/319] * Fix bug #85658.

---
 module/execution/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 649664c636..8f1b2d3db6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1036,7 +1036,8 @@ class execution extends control
         $execution   = $this->commonAction($executionID);
         $project     = $this->loadModel('project')->getByID($execution->project);
         $executionID = $execution->id;
-        $products    = $this->product->getProducts($execution->id);
+	$products    = $this->product->getProducts($execution->id);
+	if(count($products) === 1) $productID = current($products)->id;
 
         if($execution->hasProduct)
         {

From 1a7b1c0401936bf45d559faba43ddc8340748b01 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 14:29:23 +0800
Subject: [PATCH 139/319] * Compatible with PHP5.3.

---
 module/dev/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index e5ddf4304c..c2c7e6aae2 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -343,7 +343,7 @@ class devModel extends model
         else
         {
            $menus = ($type == 'third' and isset($defaultLang->$module->menu->{$method}['subMenu'])) ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
-           if(isset($defaultLang->$module->menu->{$method}['menuOrder'])) $menus->menuOrder = $defaultLang->$module->menu->{$method}['menuOrder'];
+           if(!empty($module) and isset($defaultLang->$module->menu->{$method}['menuOrder'])) $menus->menuOrder = $defaultLang->$module->menu->{$method}['menuOrder'];
            $menus = $this->sortMenus($menus);
         }
 
@@ -614,7 +614,7 @@ class devModel extends model
         $menusPinYin = common::convert2Pinyin($menuLang);
         foreach($menuLang as $menuKey => $menuName)
         {
-            if(!isset($this->lang->$menu->menu->{$menuKey}['subMenu']) or !get_object_vars($this->lang->$menu->menu->{$menuKey}['subMenu'])) continue;
+            if(!isset($this->lang->$menu->menu->{$menuKey}['subMenu']) or (is_object($this->lang->$menu->menu->{$menuKey}['subMenu']) and !get_object_vars($this->lang->$menu->menu->{$menuKey}['subMenu']))) continue;
 
             $subMenu = new stdClass();
             $subMenu->title  = $menuName;

From 7f121ebdf7259d1dd6463c35129427fdc6d60881 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 14:29:57 +0800
Subject: [PATCH 140/319] * Code for fix bug #32487.

---
 db/update18.1.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/update18.1.sql b/db/update18.1.sql
index a169ff3604..8f24ad812c 100644
--- a/db/update18.1.sql
+++ b/db/update18.1.sql
@@ -65,3 +65,5 @@ REPLACE INTO `zt_process` (`model`, `name`, `type`, `abbr`, `desc`, `assignedTo`
 
 UPDATE `zt_chart` SET `sql` = 'SELECT tt.join as `year`, count(1) as number, tt.name from (\r\nselect \r\nt2.name, YEAR(t1.join) as `join`\r\nfrom zt_team t1 \r\nRIGHT JOIN zt_project t2 on t2.id = t1.root\r\nRIGHT JOIN zt_user t3 on t3.account = t1.account\r\nWHERE t1.type = \'project\'\r\nAND t2.deleted = \'0\'\r\n) tt\r\nGROUP BY tt.`name`, tt.join\r\nORDER BY tt.join, number desc, tt.name' WHERE `id` = '1097';
 UPDATE `zt_chart` SET `sql` = 'SELECT tt.join as `year`, count(1) as number, tt.setName from (\r\nselect \r\nYEAR(t1.join) as `join`, t4.name as setName \r\nfrom zt_team t1 \r\nRIGHT JOIN zt_project t2 on t2.id = t1.root\r\nLEFT JOIN zt_project t4 on FIND_IN_SET(t4.id,t2.path) and t4.grade = 1\r\nRIGHT JOIN zt_user t3 on t3.account = t1.account\r\nWHERE t1.type = \'project\'\r\nAND t2.deleted = \'0\'\r\nAND t3.deleted = \'0\'\r\n) tt\r\nGROUP BY tt.setName, tt.join\r\nORDER BY tt.join, number desc, tt.setName' WHERE `id` = '1086';
+
+INSERT IGNORE INTO `zt_config` (`vision`, `owner`, `module`, `key`, `value`) VALUES ('', 'system', 'common', 'setCode', '1');

From 6fb473eeea9c31bf3c8f2463d730266349355b4b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 14:31:40 +0800
Subject: [PATCH 141/319] * Fix bug #32549.

---
 module/admin/model.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index c23ea0103c..ab203c223a 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -521,11 +521,14 @@ class adminModel extends model
             $searchType = $type == 'plugin' ? 'byUpdatedTime,offcial' : 'byModule';
             $param      = $type == 'plugin' ? '' : 'MTIxOA==';
             $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
-            $plugins    = isset($extensions->extensions) ? (array)$extensions->extensions : array();
-            foreach($plugins as $id => $plugin)
+            $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
+            $plugins    = array();
+            foreach($extensions as $extension)
             {
-                $plugin->viewLink = str_replace(array('info', 'client'), '', $plugin->viewLink);
-                if($type == 'patch' and !isset($plugin->compatibleRelease)) unset($plugins[$id]);
+                if($type == 'patch' and !isset($extension->compatibleRelease)) continue;
+
+                $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink);
+                $plugins[] = $extension;
             }
         }
         else

From 455e030e23388ade106f88843d969c73cb192dd8 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Mar 2023 14:23:09 +0800
Subject: [PATCH 142/319]  * adjst for monaco editor.

---
 module/editor/control.php        | 15 +++++++----
 module/editor/css/edit.css       |  3 +++
 module/editor/view/edit.html.php | 46 +++++++++++++++++---------------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/module/editor/control.php b/module/editor/control.php
index d67e302959..b8d01dce4b 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -38,7 +38,7 @@ class editor extends control
     {
         $moduleFiles = $this->editor->getModuleFiles($moduleDir);
         $this->view->module = $moduleDir;
-        $this->view->tree = $this->editor->printTree($moduleFiles);
+        $this->view->tree   = $this->editor->printTree($moduleFiles);
         $this->display();
     }
 
@@ -54,7 +54,8 @@ class editor extends control
     public function edit($filePath = '', $action = '', $isExtends = '')
     {
         $this->view->safeFilePath = $filePath;
-        $fileContent  = '';
+        $fileContent = '';
+        $extension   = 'php';
         if($filePath)
         {
             $filePath = helper::safe64Decode($filePath);
@@ -98,10 +99,14 @@ class editor extends control
             {
                 $fileContent = "<?php\n";
             }
+
+            $fileName  = basename($filePath);
+            if(strpos($fileName, '.') !== false) $extension = substr($fileName, strpos($fileName, '.') + 1);
         }
-        $this->view->fileContent = $fileContent;
-        $this->view->filePath    = $filePath;
-        $this->view->action      = $action;
+        $this->view->fileContent   = $fileContent;
+        $this->view->filePath      = $filePath;
+        $this->view->fileExtension = $extension;
+        $this->view->action        = $action;
         $this->display();
     }
 
diff --git a/module/editor/css/edit.css b/module/editor/css/edit.css
index 93e062ed52..a4b9b13cee 100644
--- a/module/editor/css/edit.css
+++ b/module/editor/css/edit.css
@@ -1,2 +1,5 @@
 body{padding-bottom:0px;background-color:#fff;}
 #showContentEditor, #fileContentEditor {border:1px solid #ddd;}
+.main-content {padding:0px;}
+.checkbox-primary {display:inline-block; padding-left:12px;}
+.checkbox-primary label {padding-left:12px;}
diff --git a/module/editor/view/edit.html.php b/module/editor/view/edit.html.php
index ae61933d82..b53615b56b 100644
--- a/module/editor/view/edit.html.php
+++ b/module/editor/view/edit.html.php
@@ -26,7 +26,6 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
   </div>
 </div>
 <form method='post' target='hiddenwin' action='<?php echo inlink('save', "filePath=$safeFilePath&action=$action")?>'>
-  <div class='main-content'>
     <table class='table table-form'>
       <?php if(!empty($showContent)):?>
       <tr>
@@ -72,6 +71,11 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
             </div>
           </div>
           <?php endif;?>
+        </td>
+      </tr>
+      <tr>
+        <td class='text-center'>
+          <?php echo html::submitButton()?>
           <?php if($action and $action != 'edit' and $action != 'newPage'):?>
           <div class='checkbox-primary'>
             <input type='checkbox' name='override' id='override' />
@@ -80,16 +84,14 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
           <?php endif;?>
         </td>
       </tr>
-      <tr><td align='center'><?php echo html::submitButton()?></td></tr>
     </table>
-  </div>
 </form>
 <?php if(!empty($showContent)) js::set('showContent', $showContent);?>
 <?php js::set('fileContent', $fileContent);?>
+<?php js::set('language', $fileExtension == 'js' ? 'javascript' : $fileExtension);?>
 <script>
 $(function()
 {
-    var lang = 'php';
     fileContentEditor = showContentEditor = null;
     require.config({
         paths: {vs: jsRoot + 'monaco-editor/min/vs'},
@@ -102,35 +104,35 @@ $(function()
         <?php if(!empty($showContent)):?>
         showContentEditor = monaco.editor.create(document.getElementById('showContentEditor'),
         {
-            value:                showContent.toString(),
-            language:             lang,
-            readOnly:             true,
-            autoIndent:           true,
-            contextmenu:          true,
-            automaticLayout:      true,
-            EditorMinimapOptions: {enabled: false}
+            value:           showContent.toString(),
+            language:        language,
+            readOnly:        true,
+            autoIndent:      true,
+            contextmenu:     true,
+            automaticLayout: true,
+            minimap:         {enabled: false}
         });
         <?php endif;?>
         fileContentEditor = monaco.editor.create(document.getElementById('fileContentEditor'),
         {
-            value:                fileContent.toString(),
-            language:             lang,
-            readOnly:             false,
-            autoIndent:           true,
-            contextmenu:          true,
-            automaticLayout:      true,
-            EditorMinimapOptions: {enabled: false}
+            value:           fileContent.toString(),
+            language:        language,
+            readOnly:        false,
+            autoIndent:      true,
+            contextmenu:     true,
+            automaticLayout: true,
+            minimap:         {enabled: false}
         });
+        var codeHeight = top.window.innerHeight - 300;
         <?php if(!empty($showContent)):?>
         contentHeight = showContentEditor.getContentHeight();
         if(contentHeight > 300) contentHeight = 300;
         if(contentHeight < 200) contentHeight = 200;
         $('#showContentEditor').height(contentHeight);
+        codeHeight -= contentHeight + 30;
+        if(codeHeight < 300) codeHeight = 300;
         <?php endif;?>
-        contentHeight = fileContentEditor.getContentHeight();
-        if(contentHeight > 450) contentHeight = 450;
-        if(contentHeight < 100) contentHeight = 100;
-        $('#fileContentEditor').height(contentHeight);
+        $('#fileContentEditor').height(codeHeight);
     });
     $('#submit').click(function()
     {

From 2bcf84cf2ad621e3ac28f53938ba55a49f829715 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 06:40:51 +0000
Subject: [PATCH 143/319] * Fix bug #32540.

---
 module/execution/model.php        | 12 ++++++++++--
 module/programplan/lang/de.php    |  3 ++-
 module/programplan/lang/en.php    |  3 ++-
 module/programplan/lang/fr.php    |  3 ++-
 module/programplan/lang/zh-cn.php |  3 ++-
 module/programplan/model.php      | 18 +++++++++++++-----
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 4902912395..3f2e40567f 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -613,7 +613,7 @@ class executionModel extends model
 
         if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);
 
-        if(empty($execution->project) or $execution->project == $oldExecution->project) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end);
+        if(empty($execution->project) or $execution->project == $oldExecution->project) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end, $execution);
         if(dao::isError()) return false;
 
         /* Child stage inherits parent stage permissions. */
@@ -1506,16 +1506,24 @@ class executionModel extends model
      * @param  int    $projectID
      * @param  string $begin
      * @param  string $end
+     * @param  object $execution
      * @access public
      * @return void
      */
-    public function checkBeginAndEndDate($projectID, $begin, $end)
+    public function checkBeginAndEndDate($projectID, $begin, $end, $execution = null)
     {
         $project = $this->loadModel('project')->getByID($projectID);
         if(empty($project)) return;
 
         if($begin < $project->begin) dao::$errors['begin'] = sprintf($this->lang->execution->errorCommonBegin, $project->begin);
         if($end > $project->end)     dao::$errors['end']   = sprintf($this->lang->execution->errorCommonEnd, $project->end);
+        if(($project->model == 'waterfall' or $project->model == 'waterfallplus') and isset($execution) and $execution->parent != $projectID)
+        {
+            $this->app->loadLang('programplan');
+            $parent = $this->getByID($execution->parent);
+            if($begin < $parent->begin) dao::$errors['begin'] = sprintf($this->lang->programplan->error->letterParent, $parent->begin);
+            if($end > $parent->end)     dao::$errors['end']   = sprintf($this->lang->programplan->error->greaterParent, $parent->end);
+        }
     }
 
     /*
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index 806306f413..05e042641b 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -115,7 +115,8 @@ $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begi
 $lang->programplan->error->percentOver     = 'The sum of "Workload %" cannot exceed 100% of one stage.';
 $lang->programplan->error->createdTask     = 'The task has been decomposed. Sub phases cannot be added.';
 $lang->programplan->error->parentWorkload  = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
-$lang->programplan->error->parentDuration  = 'The planned start and planned completion of the child phase cannot exceed the parent phase.';
+$lang->programplan->error->letterParent    = "The planned start of the child stage cannot be less than the begin of parent stage: %s.";
+$lang->programplan->error->greaterParent   = "The planned end of the child stage cannot be greater the end of parent stage: %s";
 $lang->programplan->error->sameName        = 'Stage name cannot be the same!';
 $lang->programplan->error->sameCode        = 'Stage code cannot be the same!';
 $lang->programplan->error->taskDrag        = 'The %s task cannot be dragged';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index d520967530..2b5367be28 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -115,7 +115,8 @@ $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begi
 $lang->programplan->error->percentOver     = 'The sum of "Workload %" cannot exceed 100% of one stage.';
 $lang->programplan->error->createdTask     = 'The task is decomposed. Sub stages cannot be added.';
 $lang->programplan->error->parentWorkload  = 'The sum of the workload in the sub stage cannot be > that in the parent stage: %s.';
-$lang->programplan->error->parentDuration  = 'The planned start and planned completion of the child phase cannot exceed the parent phase.';
+$lang->programplan->error->letterParent    = "The planned start of the child stage cannot be less than the begin of parent stage: %s.";
+$lang->programplan->error->greaterParent   = "The planned end of the child stage cannot be greater the end of parent stage: %s";
 $lang->programplan->error->sameName        = 'Stage name cannot be the same!';
 $lang->programplan->error->sameCode        = 'Stage code cannot be the same!';
 $lang->programplan->error->taskDrag        = 'The %s task cannot be dragged';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index 806306f413..05e042641b 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -115,7 +115,8 @@ $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begi
 $lang->programplan->error->percentOver     = 'The sum of "Workload %" cannot exceed 100% of one stage.';
 $lang->programplan->error->createdTask     = 'The task has been decomposed. Sub phases cannot be added.';
 $lang->programplan->error->parentWorkload  = 'The sum of the workload of the child phase cannot be greater than that of the parent phase: %s.';
-$lang->programplan->error->parentDuration  = 'The planned start and planned completion of the child phase cannot exceed the parent phase.';
+$lang->programplan->error->letterParent    = "The planned start of the child stage cannot be less than the begin of parent stage: %s.";
+$lang->programplan->error->greaterParent   = "The planned end of the child stage cannot be greater the end of parent stage: %s";
 $lang->programplan->error->sameName        = 'Stage name cannot be the same!';
 $lang->programplan->error->sameCode        = 'Stage code cannot be the same!';
 $lang->programplan->error->taskDrag        = 'The %s task cannot be dragged';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index 4a84a16991..535813cf86 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -115,7 +115,8 @@ $lang->programplan->error->planFinishSmall = '"计划完成时间"必须大于"
 $lang->programplan->error->percentOver     = '相同父阶段的子阶段工作量占比之和不超过100%';
 $lang->programplan->error->createdTask     = '已分解任务，不可添加子阶段';
 $lang->programplan->error->parentWorkload  = '子阶段的工作量之和不能大于父阶段的工作量:%s';
-$lang->programplan->error->parentDuration  = '子阶段计划开始、计划完成不能超过父阶段';
+$lang->programplan->error->letterParent    = "子阶段计划开始不能超过父阶段的计划开始时间 %s";
+$lang->programplan->error->greaterParent   = "子阶段计划完成不能超过父阶段的计划完成时间 %s";
 $lang->programplan->error->sameName        = '阶段名称不能相同！';
 $lang->programplan->error->sameCode        = '阶段代号不能相同！';
 $lang->programplan->error->taskDrag        = '%s的任务不可以拖动';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 0dd25acddd..88db39867e 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -777,10 +777,13 @@ class programplanModel extends model
             {
                 dao::$errors[$index]['end'] = $this->lang->programplan->error->planFinishSmall;
             }
-            if(isset($parentStage) and ($plan->end > $parentStage->end || $plan->begin < $parentStage->begin))
+            if(isset($parentStage) and $plan->begin < $parentStage->begin)
             {
-                if($plan->begin < $parentStage->begin and empty(dao::$errors[$index]['begin'])) dao::$errors[$index]['begin'] = $this->lang->programplan->error->parentDuration;
-                if($plan->end > $parentStage->end and empty(dao::$errors[$index]['end']))       dao::$errors[$index]['end']   = $this->lang->programplan->error->parentDuration;
+                 dao::$errors[$index]['begin'] = sprintf($this->lang->programplan->error->letterParent, $parentStage->begin);
+            }
+            if(isset($parentStage) and $plan->end > $parentStage->end)
+            {
+                 dao::$errors[$index]['end']   = sprintf($this->lang->programplan->error->greaterParent, $parentStage->end);
             }
             if($plan->begin < $project->begin and empty(dao::$errors[$index]['begin']))
             {
@@ -1075,9 +1078,14 @@ class programplanModel extends model
         if(dao::isError()) return false;
 
         if($plan->parent) $parentStage = $this->getByID($plan->parent);
-        if(isset($parentStage) and ($plan->end > $parentStage->end || $plan->begin < $parentStage->begin))
+        if(isset($parentStage) and $plan->begin < $parentStage->begin)
         {
-            dao::$errors['message'][] = $this->lang->programplan->error->parentDuration;
+            dao::$errors['begin'] = sprintf($this->lang->programplan->error->letterParent, $parentStage->begin);
+            return false;
+        }
+        if(isset($parentStage) and $plan->end > $parentStage->end)
+        {
+            dao::$errors['end']   = sprintf($this->lang->programplan->error->greaterParent, $parentStage->end);
             return false;
         }
 

From 97c421c5b462012caa6ee7d83ad1a371a6b9f4ba Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Wed, 1 Mar 2023 14:48:12 +0800
Subject: [PATCH 144/319] * Fix bug #32374.

---
 module/execution/model.php | 8 +++++++-
 module/project/model.php   | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 4902912395..59e767e243 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -3675,7 +3675,13 @@ class executionModel extends model
         if($changedAccounts)
         {
             $this->loadModel('user')->updateUserView($projectID, $projectType, $changedAccounts);
-            $linkedProducts = $this->loadModel('product')->getProductPairsByProject($projectID);
+            $linkedProducts = $this->dao->select("t2.id")->from(TABLE_PROJECTPRODUCT)->alias('t1')
+                ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
+                ->where('t2.deleted')->eq(0)
+                ->andWhere('t1.project')->eq($projectID)
+                ->andWhere('t2.vision')->eq($this->config->vision)
+                ->fetchPairs();
+
             if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', $changedAccounts);
         }
     }
diff --git a/module/project/model.php b/module/project/model.php
index 10db9ccdc2..e089889aaf 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2204,7 +2204,12 @@ class projectModel extends model
         $changedAccounts = array_unique($changedAccounts);
 
         $childSprints   = $this->dao->select('id')->from(TABLE_PROJECT)->where('project')->eq($projectID)->andWhere('type')->in('stage,sprint')->andWhere('deleted')->eq('0')->fetchPairs();
-        $linkedProducts = $this->loadModel('product')->getProductPairsByProject($projectID);
+        $linkedProducts = $this->dao->select("t2.id")->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
+            ->where('t2.deleted')->eq(0)
+            ->andWhere('t1.project')->eq($projectID)
+            ->andWhere('t2.vision')->eq($this->config->vision)
+            ->fetchPairs();
 
         $this->loadModel('user')->updateUserView(array($projectID), 'project', $changedAccounts);
         if(!empty($childSprints))   $this->user->updateUserView($childSprints, 'sprint', $changedAccounts);

From ba064c9aa82cd10680376a20dddb935917b563bb Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 07:05:35 +0000
Subject: [PATCH 145/319] * Fix bug #32559.

---
 module/execution/js/edit.js         | 8 +-------
 module/execution/view/edit.html.php | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index e650a2138f..ba9a203b05 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -115,14 +115,8 @@ $(function()
 
     $('[data-toggle="popover"]').popover();
 
-    if(isStage)
+    if(isWaterfall)
     {
-        $('#attribute').change(function()
-        {
-            var attribute = $(this).val();
-            hidePlanBox(attribute);
-        })
-
         hidePlanBox(executionAttr);
     }
 })
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 3f98b17402..ba55e9b799 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<?php js::set('isStage', $execution->type == 'stage');?>
+<?php js::set('isWaterfall', (isset($project) and ($project->model == 'waterfall' or $project->model == 'waterfallplus')));?>
 <?php js::set('executionAttr', $execution->attribute);?>
 <?php js::set('manageProductsLang', $lang->project->manageProducts);?>
 <?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>

From 1290b01c853a6cc046d198d49b5f38a6e416689a Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Mar 2023 15:11:02 +0800
Subject: [PATCH 146/319]  * adjust extension api for admin.

---
 module/admin/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index c23ea0103c..ab4b229f6c 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -518,7 +518,7 @@ class adminModel extends model
     {
         if($hasInternet)
         {
-            $searchType = $type == 'plugin' ? 'byUpdatedTime,offcial' : 'byModule';
+            $searchType = $type == 'plugin' ? 'byModule,offcial' : 'byModule';
             $param      = $type == 'plugin' ? '' : 'MTIxOA==';
             $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
             $plugins    = isset($extensions->extensions) ? (array)$extensions->extensions : array();

From aac54b6978e93a932a9255dafa3282ea11c3fb66 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 07:12:48 +0000
Subject: [PATCH 147/319] * Fix bug #32157.

---
 module/build/view/edit.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index dc3b4f78eb..726696ad77 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -36,7 +36,6 @@
           </td>
           <td><?php if($disabled) echo $lang->build->notice->changeProduct;?></td>
         </tr>
-        <tr>
         <tr class='<?php if((!empty($product) and $product->type == 'normal') or empty($product) or empty($build->execution)) echo 'hidden'?>'>
           <?php
           if(empty($product)) $product = new stdclass();

From fcf2ca081f5fa45412126830a166745823c5ec9c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 07:44:17 +0000
Subject: [PATCH 148/319] * Fix bug #32559.

---
 module/execution/control.php             |  5 ++++-
 module/execution/view/batchedit.html.php |  2 +-
 module/execution/view/edit.html.php      | 12 ++++++------
 module/execution/view/view.html.php      |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 8f1b2d3db6..4abc731974 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2093,7 +2093,7 @@ class execution extends control
         $project = $this->project->getById($execution->project);
         if(!$project->hasProduct) $this->lang->execution->PO = $this->lang->common->story . $this->lang->execution->owner;
 
-        if($execution->type == 'stage')
+        if($project->model == 'waterfall' or $project->model == 'waterfallplus')
         {
             $parentStage = $this->project->getByID($execution->parent, 'stage');
 
@@ -2182,6 +2182,8 @@ class execution extends control
         if(!$this->post->executionIDList) return print(js::locate($this->session->executionList, 'parent'));
         $executionIDList = $this->post->executionIDList;
         $executions      = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
+        $projects        = $this->dao->select('id,project')->from(TABLE_PROJECT)->where('id')->in($executionIDList)->fetchPairs();
+        $projects        = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($projects)->fetchAll('id');
 
         $appendPoUsers = $appendPmUsers = $appendQdUsers = $appendRdUsers = array();
         foreach($executions as $execution)
@@ -2214,6 +2216,7 @@ class execution extends control
         $this->view->position[]  = $this->lang->execution->batchEdit;
         $this->view->executions  = $executions;
         $this->view->allProjects = $allProjects;
+        $this->view->projects    = $projects;
         $this->view->pmUsers     = $pmUsers;
         $this->view->poUsers     = $poUsers;
         $this->view->qdUsers     = $qdUsers;
diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index e17011af51..25a0929662 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -105,7 +105,7 @@
             <td class='text-left<?php echo zget($visibleFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$executionID]", $qdUsers, $executions[$executionID]->QD, "class='form-control picker-select'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$executionID]", $rdUsers, $executions[$executionID]->RD, "class='form-control picker-select'");?></td>
             <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>'>
-              <?php if($executions[$executionID]->type == 'stage'):?>
+              <?php if(isset($projects[$execution->project]) and ($projects[$execution->project]->model == 'waterfall' or $projects[$execution->project]->model == 'waterfallplus')):?>
               <?php echo html::select("attributes[$executionID]", $lang->stage->typeList, $executions[$executionID]->attribute, 'class=form-control');?>
               <?php else:?>
               <?php echo html::select("lifetimes[$executionID]", $lang->execution->lifeTimeList, $executions[$executionID]->lifetime, 'class=form-control');?>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 3f98b17402..6cab24ea30 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -87,19 +87,19 @@
             </div>
           </td>
         </tr>
-        <?php if($execution->type != 'kanban'):?>
+        <?php if($execution->type != 'kanban' or $project->model == 'waterfall' or $project->model == 'waterfallplus'):?>
         <tr>
           <th><?php echo $lang->execution->type;?></th>
           <td>
           <?php
-          if($execution->type != 'stage')
-          {
-              echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
-          }
-          else
+          if($project->model == 'waterfall' or $project->model == 'waterfallplus')
           {
               echo $enableOptionalAttr ? html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='form-control chosen'") : zget($lang->stage->typeList, $execution->attribute);
           }
+          elseif($execution->type != 'kanban')
+          {
+              echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
+          }
           ?>
           </td>
           <td>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 684954cf4f..69b3611ff1 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -277,7 +277,7 @@
                   <?php if($execution->deleted):?>
                   <span class='label label-danger label-outline'><?php echo $lang->execution->deleted;?></span>
                   <?php endif;?>
-                  <?php if(!empty($execution->lifetime) and $execution->type != 'kanban'):?>
+                  <?php if(!empty($execution->lifetime) and $execution->type != 'kanban' and $project->model != 'waterfall' and  $project->model != 'waterfallplus'):?>
                   <span class="label label-primary label-outline"><?php echo zget($lang->execution->lifeTimeList, $execution->lifetime);?></span>
                   <?php endif;?>
                   <?php if(isset($execution->delay)):?>

From e89d668fc589e495e55ccb8080e45f2c9a6da15e Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 1 Mar 2023 07:44:23 +0000
Subject: [PATCH 149/319] * Format the code and remove type restriction when
 batch change execution's status.

---
 db/update18.1.sql          | 2 +-
 module/execution/model.php | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/db/update18.1.sql b/db/update18.1.sql
index 8f24ad812c..15ea153c8f 100644
--- a/db/update18.1.sql
+++ b/db/update18.1.sql
@@ -1,6 +1,6 @@
 DELETE FROM `zt_config` WHERE module = 'datatable' AND section = 'executionAll';
 
-update `zt_task` set `assignedTo` = '' where `mode` = 'multi' and `status` != 'done' and `status` != 'closed';
+UPDATE `zt_task` SET `assignedTo` = '' WHERE `mode` = 'multi' AND `status` != 'done' AND `status` != 'closed';
 
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC;
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC;
diff --git a/module/execution/model.php b/module/execution/model.php
index d4438ce1b6..7e6ab8c702 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1120,8 +1120,6 @@ class executionModel extends model
             $actionID = $this->action->create('execution', $executionID, 'Started');
             $this->action->logHistory($actionID, $changes);
 
-            if($type != 'stage') return '';
-
             /* This stage has a parent stage. */
             $checkTopStage = $this->programplan->checkTopStage($executionID);
             if(!$checkTopStage) $this->programplan->computeProgress($executionID);
@@ -1168,8 +1166,6 @@ class executionModel extends model
             $actionID = $this->action->create('execution', $executionID, strtoupper($status));
             $this->action->logHistory($actionID, $changes);
 
-            if($type != 'stage') return '';
-
             /* Suspended: When all child stages at the same level are suspended or closed, the status of the parent stage becomes "suspended". */
             /* Closed: When all child stages at the same level are closed, the status of the parent stage becomes "closed". */
             $checkTopStage = $this->programplan->checkTopStage($executionID);

From fdc0e3fa41c312aedd3b054ef8bef2bcef2f12cd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 15:56:55 +0800
Subject: [PATCH 150/319] * Code for fix bug #32567.

---
 module/programplan/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 8f68042399..cab364b73f 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -715,7 +715,7 @@ class programplanModel extends model
 
         $project   = $this->loadModel('project')->getByID($projectID);
         $setCode   = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
-        $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '');
+        $sameCodes = $setCode ? $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '') : false;
 
         $datas = array();
         foreach($names as $key => $name)

From cdb476bc4bf7cc3faa435d145f942c500da048ab Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Mar 2023 15:58:56 +0800
Subject: [PATCH 151/319]  * adjust for safe file timeout.

---
 config/zentaopms.php      |  1 +
 module/common/model.php   |  2 +-
 module/editor/control.php | 38 +++++++++++++++++++++++++++-----------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index a504e541ef..ac6e6557a8 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -424,6 +424,7 @@ $config->programPriv->waterfall     = array_merge($config->programPriv->scrum, a
 $config->programPriv->agileplus     = $config->programPriv->scrum;
 $config->programPriv->waterfallplus = $config->programPriv->waterfall;
 
+$config->safeFileTimeout  = 3600;
 $config->waterfallModules = array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'opportunity', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport');
 
 $config->showMainMenu = true;
diff --git a/module/common/model.php b/module/common/model.php
index 8b909187c6..e4585ac243 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2398,7 +2398,7 @@ EOD;
         if($this->app->getModuleName() == 'upgrade' and $this->session->upgrading) return false;
 
         $statusFile = $this->app->getAppRoot() . 'www' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'ok.txt';
-        return (!is_file($statusFile) or (time() - filemtime($statusFile)) > 3600) ? $statusFile : false;
+        return (!is_file($statusFile) or (time() - filemtime($statusFile)) > $this->config->safeFileTimeout) ? $statusFile : false;
     }
 
     /**
diff --git a/module/editor/control.php b/module/editor/control.php
index b8d01dce4b..21e88d7d7a 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -11,6 +11,20 @@
  */
 class editor extends control
 {
+    /**
+     * Construct
+     *
+     * @param  string $module
+     * @param  string $method
+     * @access public
+     * @return void
+     */
+    public function __construct($module = '', $method = '')
+    {
+        parent::__construct($module, $method);
+        if($this->app->getMethodName() != 'switch' and empty($this->config->global->editor)) $this->locate($this->createLink('dev', 'editor'));
+    }
+
     /**
      * Show module files and edit them.
      *
@@ -59,7 +73,7 @@ class editor extends control
         if($filePath)
         {
             $filePath = helper::safe64Decode($filePath);
-            if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) die($this->lang->editor->editFileError);
+            if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) return print($this->lang->editor->editFileError);
             if($action == 'extendOther' and file_exists($filePath))
             {
                 $this->view->showContent = file_get_contents($filePath);
@@ -88,7 +102,7 @@ class editor extends control
             {
                 $okUrl = $this->editor->getExtendLink($filePath, 'extendControl', 'yes');
                 $cancelUrl = $this->editor->getExtendLink($filePath, 'extendControl', 'no');
-                if(!$isExtends) die(js::confirm($this->lang->editor->extendConfirm, $okUrl, $cancelUrl));
+                if(!$isExtends) return print(js::confirm($this->lang->editor->extendConfirm, $okUrl, $cancelUrl));
                 $fileContent = $this->editor->extendControl($filePath, $isExtends);
             }
             elseif($action == 'newPage')
@@ -124,8 +138,8 @@ class editor extends control
         {
             $saveFilePath = $this->editor->getSavePath($filePath, 'newMethod');
             $extendLink   = $this->editor->getExtendLink($saveFilePath, 'newPage');
-            if(file_exists($saveFilePath) and !$this->post->override) die(js::confirm($this->lang->editor->repeatPage, $extendLink, '', 'parent'));
-            die(js::locate($extendLink, 'parent'));
+            if(file_exists($saveFilePath) and !$this->post->override) return print(js::confirm($this->lang->editor->repeatPage, $extendLink, '', 'parent'));
+            return print(js::locate($extendLink, 'parent'));
         }
         $this->view->filePath    = $filePath;
         $this->display();
@@ -140,20 +154,22 @@ class editor extends control
      */
     public function save($filePath = '', $action = '')
     {
+        /* Reduce expiration time for check safe file. */
+        $this->config->safeFileTimeout = 15 * 60;
         $statusFile = $this->loadModel('common')->checkSafeFile();
         if($statusFile)
         {
-            die(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
+            return print(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
         }
         if($filePath and $_POST)
         {
             $filePath = helper::safe64Decode($filePath);
-            if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) die($this->lang->editor->editFileError);
+            if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) return print($this->lang->editor->editFileError);
             if($action != 'edit' and $action != 'newPage') $filePath = $this->editor->getSavePath($filePath, $action);
-            if($action != 'edit' and $action != 'newPage' and file_exists($filePath) and !$this->post->override) die(js::error($this->lang->editor->repeatFile));
+            if($action != 'edit' and $action != 'newPage' and file_exists($filePath) and !$this->post->override) return print(js::error($this->lang->editor->repeatFile));
             $this->editor->save($filePath);
             echo js::reload('parent.parent.extendWin');
-            die(js::locate(inlink('edit', "filePath=" . helper::safe64Encode($filePath) . "&action=edit"), 'parent'));
+            return print(js::locate(inlink('edit', "filePath=" . helper::safe64Encode($filePath) . "&action=edit"), 'parent'));
         }
     }
 
@@ -169,11 +185,11 @@ class editor extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->editor->deleteConfirm, inlink('delete', "filePath=$filePath&confirm=yes")));
+            return print(js::confirm($this->lang->editor->deleteConfirm, inlink('delete', "filePath=$filePath&confirm=yes")));
         }
         $filePath = helper::safe64Decode($filePath);
-        if(file_exists($filePath) and unlink($filePath)) die(js::reload('parent'));
-        die(js::alert($this->lang->editor->notDelete));
+        if(file_exists($filePath) and unlink($filePath)) return print(js::reload('parent'));
+        return print(js::alert($this->lang->editor->notDelete));
 
     }
 

From 996ea7bf93d002a22c979a8b5a9d935633e1f126 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Wed, 1 Mar 2023 15:59:46 +0800
Subject: [PATCH 152/319] * Fix bug #32563.

---
 module/bug/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 5981d7067e..f9727a0d45 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -636,7 +636,7 @@ class bug extends control
 
         /* Get executions. */
         $executions = array(0 => '');
-        if(isset($projects[$projectID])) $executions += $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID, !$projectID ? 'multiple' : '');
+        if(isset($projects[$projectID])) $executions += $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID, !$projectID ? 'multiple|stagefilter' : 'stagefilter');
         $execution  = $executionID ? $this->loadModel('execution')->getByID($executionID) : '';
         $executions = isset($executions[$executionID]) ? $executions : $executions + array($executionID => $execution->name);
 

From 9567ecadfb9b113aaf26c27106d6bb5e6a588762 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 08:11:25 +0000
Subject: [PATCH 153/319] * Fix bug of check date.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 37dc1845d5..3e30fb225d 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -613,7 +613,7 @@ class executionModel extends model
 
         if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);
 
-        if(empty($execution->project) or $execution->project == $oldExecution->project) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end, $execution);
+        if(empty($execution->project) or $execution->project == $oldExecution->project) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end, !empty($execution->parent) ? $execution : $oldExecution);
         if(dao::isError()) return false;
 
         /* Child stage inherits parent stage permissions. */

From bc5bdab5d46216dd8f1a09c137d13774c31fce7b Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 08:22:01 +0000
Subject: [PATCH 154/319] * Fix bug #32569.

---
 module/common/model.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 56ab529ab7..ed45177d33 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -156,10 +156,8 @@ class commonModel extends model
             $this->loadModel('action')->create('execution', $parentExecutionID, 'syncexecutionbychild');
         }
 
-        if($execution->type == 'stage')
-        {
-            $this->loadModel('programplan')->computeProgress($execution->id);
-        }
+        $project = $this->loadModel('project')->getByID($execution->project);
+        if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->loadModel('programplan')->computeProgress($execution->id);
 
         return $parentExecution;
     }

From f159017f4548e97b3625140f321084ea91b03d61 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 16:22:34 +0800
Subject: [PATCH 155/319] * Code for fix bug #32562.

---
 module/execution/control.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 649664c636..839b334141 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2629,11 +2629,14 @@ class execution extends control
         $this->session->set('execGroupBy', $groupBy);
         $this->session->set('storyList', $this->app->getURI(true), 'execution');
         $this->session->set('rdSearchValue', '');
-        $this->session->set('execLaneType', $browseType);
 
         $features   = $this->execution->getExecutionFeatures($execution);
         $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
 
+        /* Set lane type. */
+        if(!$features['story'] and !$features['qa']) $browseType = 'task';
+        $this->session->set('execLaneType', $browseType);
+
         /* Remove lanes if no feature. */
         foreach($kanbanData as $regionID => $region)
         {
@@ -2732,7 +2735,6 @@ class execution extends control
         $uri = $this->app->getURI(true);
         $this->app->session->set('taskList', $uri, 'execution');
         $this->app->session->set('bugList',  $uri, 'qa');
-        $this->app->session->set('execLaneType', $browseType);
         $this->app->session->set('execGroupBy', $groupBy);
 
         /* Load language. */
@@ -2751,6 +2753,8 @@ class execution extends control
             unset($this->lang->kanban->group->task['story']);
         }
 
+        $this->app->session->set('execLaneType', $browseType);
+
         if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
 

From 046187237ec2b731653cebfa5494b270b096f56c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 16:35:24 +0800
Subject: [PATCH 156/319] * Code for fix bug #32561.

---
 module/build/view/view.html.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 138180d569..7c8103e77c 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -385,7 +385,10 @@ tbody tr td:first-child input {display: none;}
                 <?php if($build->execution):?>
                 <tr>
                   <th><?php echo empty($multipleProject) ? $lang->build->project :($executionType ? $lang->build->executionAB : $lang->build->execution);?></th>
-                  <td><?php echo zget($executions, $build->execution);?></td>
+                  <td>
+                    <?php $executionName = zget($executions, $build->execution);?>
+                    <?php echo ltrim($executionName, '/');?>
+                  </td>
                 </tr>
                 <?php else:?>
                 <tr>

From 3bbc0476733a381473f02c731e68a17638eb7277 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Wed, 1 Mar 2023 16:36:57 +0800
Subject: [PATCH 157/319] * Show productplan in bug.

---
 module/bug/view/edit.html.php | 2 +-
 module/bug/view/view.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 168617381d..2a0e86dc51 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -125,7 +125,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                     </div>
                   </td>
                 </tr>
-                <tr class='<?php if(!($product->shadow and zget($project, 'model') == 'scrum' and $project->multiple)) echo 'hide'?>'>
+                <tr class='<?php if($product->shadow and isset($project) and !$project->multiple) echo 'hide'?>'>
                   <th><?php echo $lang->bug->productplan;?></th>
                   <td>
                     <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control chosen'");?></span>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 63300878dd..7f11fcfa4f 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -161,7 +161,7 @@
                   <th><?php echo $lang->bug->fromCase;?></th>
                   <td><?php if($bug->case) echo html::a(helper::createLink('testcase', 'view', "caseID=$bug->case&version=$bug->caseVersion", '', true), "<i class='icon icon-sitemap'></i> {$lang->bug->fromCase}$lang->colon$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?></td>
                 </tr>
-                <tr valign='middle' class='<?php if(!($product->shadow and zget($project, 'model') == 'scrum' and $project->multiple)) echo 'hide'?>'>
+                <tr valign='middle' class='<?php if($product->shadow and isset($project) and !$project->multiple) echo 'hide'?>'>
                   <th><?php echo $lang->bug->productplan;?></th>
                   <td><?php if(!$bug->plan or !common::printLink('productplan', 'view', "planID=$bug->plan&type=bug", $bug->planName)) echo $bug->planName;?></td>
                 </tr>

From 38dcd2e51ec5bc11597cc75552f80c6754c7d074 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 1 Mar 2023 08:46:17 +0000
Subject: [PATCH 158/319] * Fix bug #32490.

---
 module/project/view/browsebycard.html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php
index 8de3c49593..e9800019c2 100644
--- a/module/project/view/browsebycard.html.php
+++ b/module/project/view/browsebycard.html.php
@@ -107,10 +107,12 @@
           <span class="label label-<?php echo $status;?>"><?php echo $lang->project->statusList[$status];?></span>
         </div>
         <div class='panel-heading'>
-          <?php if($project->model === 'waterfall'):?>
-          <span class='project-type-label label label-warning label-outline'><i class='icon icon-waterfall'></i></span>
+          <?php if(in_array($project->model, array('waterfall', 'waterfallplus'))):?>
+          <span class='project-type-label label label-warning label-outline'><i class='icon icon-<?php echo $project->model;?>'></i></span>
           <?php elseif($project->model === 'kanban'):?>
           <span class='project-type-label label label-info label-outline'><i class='icon icon-kanban'></i></span>
+          <?php elseif($project->model === 'agileplus'):?>
+          <span class='project-type-label label label-info label-outline'><i class='icon icon-agileplus'></i></span>
           <?php else:?>
           <span class='project-type-label label label-info label-outline'><i class='icon icon-sprint'></i></span>
           <?php endif;?>

From aa7540d1630c6cc20f11ee5a72438942cb83a850 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 08:47:10 +0000
Subject: [PATCH 159/319] * Fix bug #32558.

---
 module/execution/model.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 3e30fb225d..08e9cbb735 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -843,9 +843,7 @@ class executionModel extends model
             /* Attribute check. */
             if(isset($data->attributes))
             {
-                $executionType = $oldExecutions[$executionID]->type;
-
-                if($executionType == 'stage')
+                if(isset($project->model) and ($project->model == 'waterfall' or  $project->model == 'waterfallplus'))
                 {
                     $this->app->loadLang('stage');
                     $attribute = $executions[$executionID]->attribute;

From bb6e606e906a08865b559c6218073742e9f3c8e7 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Wed, 1 Mar 2023 16:56:15 +0800
Subject: [PATCH 160/319] * Fix bug #32566.

---
 module/task/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index 7cd530939c..080051259e 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -4120,7 +4120,7 @@ class taskModel extends model
             }
         }
         $list .= '</td>';
-        if(!empty($execution->division)) $list .= '<td></td>';
+        if(!empty($execution->division) and $execution->hasProduct) $list .= '<td></td>';
         $list .= "<td class='status-{$task->status} text-center'>" . $this->processStatus('task', $task) . '</td>';
         $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
         $list .= helper::isZeroDate($task->estStarted) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->estStarted . '</td>';

From 48020c2b5d1f8e1e1a2219c95448de4fd3a68d3e Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Wed, 1 Mar 2023 17:04:39 +0800
Subject: [PATCH 161/319] * Fix bug #32459.

---
 module/my/control.php             | 21 ++++++++++++++-------
 module/my/view/execution.html.php |  5 +++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index d683f1f131..7594b17506 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -837,13 +837,20 @@ EOF;
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->execution;
-        $this->view->position[] = $this->lang->my->execution;
-        $this->view->tabID      = 'project';
-        $this->view->executions = $this->user->getObjects($this->app->user->account, 'execution', $type, $orderBy, $pager);
-        $this->view->type       = $type;
-        $this->view->pager      = $pager;
-        $this->view->mode       = 'execution';
+        $executions  = $this->user->getObjects($this->app->user->account, 'execution', $type, $orderBy, $pager);
+        $parentGroup = $this->dao->select('parent, id')->from(TABLE_PROJECT)
+            ->where('parent')->in(array_keys($executions))
+            ->andWhere('type')->in('stage,kanban,sprint')
+            ->fetchGroup('parent', 'id');
+
+        $this->view->title       = $this->lang->my->common . $this->lang->colon . $this->lang->my->execution;
+        $this->view->position[]  = $this->lang->my->execution;
+        $this->view->tabID       = 'project';
+        $this->view->executions  = $executions;
+        $this->view->parentGroup = $parentGroup;
+        $this->view->type        = $type;
+        $this->view->pager       = $pager;
+        $this->view->mode        = 'execution';
 
         $this->display();
     }
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 2c7b73f4c9..e45749f02c 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -46,9 +46,10 @@
     </thead>
     <tbody>
       <?php foreach($executions as $execution):?>
+      <?php $isParent = isset($parentGroup[$execution->id]);?>
       <?php $link = $this->createLink('execution', 'browse', "id=$execution->id", '', '', $execution->project);?>
       <tr class='text-left'>
-        <td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
+        <td><?php echo $isParent ? sprintf('%03d', $execution->id) : html::a($link, sprintf('%03d', $execution->id));?></td>
         <td class='c-name text-left'>
           <?php if($config->systemMode == 'ALM'):?>
           <?php
@@ -57,7 +58,7 @@
           if($execution->type === 'kanban') echo "<span class='project-type-label label label-outline label-info'>{$lang->execution->kanban}</span> ";
           ?>
           <?php endif;?>
-          <?php echo html::a($link, $execution->name, '', "title='$execution->name'");?>
+          <?php echo $isParent ? $execution->name : html::a($link, $execution->name, '', "title='$execution->name'");?>
         </td>
         <td class="c-status">
           <?php if(isset($execution->delay)):?>

From ed3a128e50ec86d84389ff27c705eee4e669dc54 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Wed, 1 Mar 2023 17:07:41 +0800
Subject: [PATCH 162/319] Fix bug #32570.

---
 module/upgrade/model.php | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 91fcae6cdd..68b87051d1 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -588,7 +588,7 @@ class upgradeModel extends model
                 $this->updateMyBlocks();
                 break;
             case '18_1':
-                $this->addMixStage();
+                $this->insertMixStage();
                 break;
         }
 
@@ -8170,30 +8170,51 @@ class upgradeModel extends model
     }
 
     /**
-     * Add mix stage.
+     * Insert mix stage.
      *
      * @access public
      * @return bool
      */
-    public function addMixStage()
+    public function insertMixStage()
     {
-        $typeList = $this->dao->select('lang,vision')->from(TABLE_LANG)
+        $typeList = $this->dao->select('*')->from(TABLE_LANG)
             ->where('module')->eq('stage')
             ->andWhere('section')->eq('typeList')
-            ->groupBy('lang,vision')
             ->fetchAll();
+        $this->dao->delete()->from(TABLE_LANG)
+            ->where('module')->eq('stage')
+            ->andWhere('section')->eq('typeList')
+            ->exec();
+
+        $mixInserted = array();
         foreach($typeList as $type)
         {
-            $langFile = $this->app->getModuleRoot() . DS . 'stage' . DS . 'lang' . DS . ($type->lang == 'all' ? $this->app->clientLang : $type->lang) . '.php';
-            if(is_file($langFile)) include $langFile;
+            if(!isset($mixInserted[$type->lang . '-' . $type->vision]))
+            {
+                $langFile = $this->app->getModuleRoot() . DS . 'stage' . DS . 'lang' . DS . ($type->lang == 'all' ? $this->app->clientLang : $type->lang) . '.php';
+                if(is_file($langFile)) include $langFile;
+
+                $this->dao->replace(TABLE_LANG)
+                    ->set('module')->eq('stage')
+                    ->set('section')->eq('typeList')
+                    ->set('lang')->eq($type->lang)
+                    ->set('vision')->eq($type->vision)
+                    ->set('key')->eq('mix')
+                    ->set('value')->eq($lang->stage->typeList['mix'])
+                    ->exec();
+
+                $mixInserted[$type->lang . '-' . $type->vision] = true;
+            }
+
+            if($type->key == 'mix') continue;
 
             $this->dao->replace(TABLE_LANG)
                 ->set('module')->eq('stage')
                 ->set('section')->eq('typeList')
                 ->set('lang')->eq($type->lang)
                 ->set('vision')->eq($type->vision)
-                ->set('key')->eq('mix')
-                ->set('value')->eq($lang->stage->typeList['mix'])
+                ->set('key')->eq($type->key)
+                ->set('value')->eq($type->value)
                 ->exec();
         }
 

From 4ad274cf1b4d0d6e435249352481ce4231b00540 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 1 Mar 2023 17:12:53 +0800
Subject: [PATCH 163/319] * Code for bug #32448.

---
 module/block/view/preference.html.php | 6 +++---
 module/my/css/preference.css          | 2 +-
 module/my/js/preference.js            | 2 +-
 www/theme/green/style.css             | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/block/view/preference.html.php b/module/block/view/preference.html.php
index 3f93a22484..dedd47f4f3 100644
--- a/module/block/view/preference.html.php
+++ b/module/block/view/preference.html.php
@@ -53,7 +53,6 @@
 .picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border,
 .picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border {
     background: rgba(230,240,255, 0.4)!important;
-    border: 1px solid #2E7FFF;
 }
 #pickerDropMenu-pk_URSR > .picker-option-list {
     display: flex;
@@ -173,7 +172,7 @@ function initPreference() {
             $option.addClass('option-ursr');
             $option.parent().addClass('list-ursr');
             $option.empty();
-            $option.prepend('<div class="border"><div class="value"><p>' + (b.$_index + 1) + '</p></div><div class="context">' + b.text + '</div></div>');
+            $option.prepend('<div class="border shadow-primary-hover"><div class="value"><p>' + (b.$_index + 1) + '</p></div><div class="context">' + b.text + '</div></div>');
         }
         return $option;
     }
@@ -204,4 +203,5 @@ $(function()
     initPreference();
 })
 
-</script>
\ No newline at end of file
+</script>
+
diff --git a/module/my/css/preference.css b/module/my/css/preference.css
index b3169618d0..edcebaff0e 100644
--- a/module/my/css/preference.css
+++ b/module/my/css/preference.css
@@ -18,7 +18,7 @@
 .picker-option.picker-option-selected.option-ursr {background: unset !important; color: unset;}
 .picker-option.picker-option-active > .border,
 .picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border,
-.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border {background: rgba(230,240,255, 0.4) !important; border: 1px solid #2E7FFF;}
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border {background: rgba(230,240,255, 0.4) !important;}
 #pickerDropMenu-pk_URSR > .picker-option-list {display: flex; flex-wrap: wrap;}
 .option-ursr {flex: 1 1 50%;}
 .option-ursr > .border  {height: 46px; display: flex; padding: 5px 16px; border: 1px solid #EDEEF2; align-items: center;}
diff --git a/module/my/js/preference.js b/module/my/js/preference.js
index b2cb786eba..088236d74e 100644
--- a/module/my/js/preference.js
+++ b/module/my/js/preference.js
@@ -56,7 +56,7 @@ function initPreference() {
             $option.addClass('option-ursr');
             $option.parent().addClass('list-ursr');
             $option.empty();
-            $option.prepend('<div class="border"><div class="value"><p>' + (b.$_index + 1) + '</p></div><div class="context">' + b.text + '</div></div>');
+            $option.prepend('<div class="border shadow-primary-hover"><div class="value"><p>' + (b.$_index + 1) + '</p></div><div class="context">' + b.text + '</div></div>');
         }
         return $option;
     }
diff --git a/www/theme/green/style.css b/www/theme/green/style.css
index 40964cb7bb..8003b7c4b1 100644
--- a/www/theme/green/style.css
+++ b/www/theme/green/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - Green - v1.10.0 - 2023-02-24
+ * ZUI: Zentao Theme - Green - v1.10.0 - 2023-03-01
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2023 cnezsoft.com; Licensed MIT
- */a{color:#313c52}a:focus,a:hover{color:#29aa93}.btn{color:#313c52;background-color:#fff;border-color:#d8dbde;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-warning{color:#fff;background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-danger{color:#fff;background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-success{color:#fff;background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-link{color:#313c52;background-color:transparent}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover,.btn-link[disabled],fieldset[disabled] .btn-link{border-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link:focus,.btn-link:hover{color:#29aa93}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#c4c4c4}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#29aa93}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#1f816f}.label-primary.label-outline{color:#29aa93;background:0 0;border:1px solid #29aa93}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#1f816f}.label-success{background-color:#22c98d}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#1b9d6e}.label-success.label-outline{color:#22c98d;background:0 0;border:1px solid #22c98d}.label-success[href]:focus,.label-success[href]:hover{background-color:#1b9d6e}.label-info{background-color:#37b2fe}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#049efe}.label-info.label-outline{color:#37b2fe;background:0 0;border:1px solid #37b2fe}.label-info[href]:focus,.label-info[href]:hover{background-color:#049efe}.label-warning{background-color:#ffba34}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#ffa901}.label-warning.label-outline{color:#ffba34;background:0 0;border:1px solid #ffba34}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ffa901}.label-danger{background-color:#fc5959}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#fb2727}.label-danger.label-outline{color:#fc5959;background:0 0;border:1px solid #fc5959}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#fb2727}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#60d9c3}.text-primary{color:#29aa93}.text-primary:hover{color:#1f816f}.text-warning{color:#ffba34}.text-warning:hover{color:#ffa901}.text-danger{color:#fc5959}.text-danger:hover{color:#fb2727}.text-success{color:#22c98d}.text-success:hover{color:#1b9d6e}.text-info{color:#37b2fe}.text-info:hover{color:#049efe}.text-important{color:#ff6f42}.text-important:hover{color:#ff480f}.text-special{color:#8166ee}.text-special:hover{color:#5b38e9}.text-muted a:active,.text-muted a:hover{color:#313c52}.text-link:active,.text-link:hover{color:#313c52}.bg-primary{background-color:#29aa93}a.bg-primary:hover{background-color:#1f816f}.hl-primary{background-color:#f0fdfb}a.hl-primary:hover{background-color:#c3f7ef}.progress{background-color:#f0fdfb;border-radius:3px}.progress-bar{color:#fff;background-color:#29aa93;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#29aa93;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-control:focus{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#29aa93;border-color:#29aa93}.switch input:focus+label{color:#29aa93}.switch input:focus+label:before{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border-color:#838a9d}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.checked>label:before,.checkbox-primary>input:checked+label:before,.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{color:#fff}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 8px #29aa93;box-shadow:0 0 8px #29aa93}.checkbox-primary input:disabled+label:after,.checkbox-primary.disabled>label:after,.radio-primary input:disabled+label:after,.radio-primary.disabled>label:after{background-color:#e5e5e5;border-color:#bbb}.checkbox-primary input:disabled:checked+label:after,.checkbox-primary.checked.disabled>label:after,.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#bbb}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#fff;border-color:#29aa93}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93}.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#fff;border-color:#bbb}.radio-primary input:disabled:checked+label:before,.radio-primary.checked.disabled>label:before{background-color:#bbb}.form-control:focus+.input-control-label-left{color:#23c8ec}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.input-group-addon{background-color:#eee}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon{border-radius:4px}.input-group-btn.fix-border>.btn{border-radius:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.list-group-item{background-color:#fff;border:1px solid #c4c4c4}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#313c52;text-decoration:none;background-color:#f0fdfb}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.list-group-item.active .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#e6e6e6}.list-group-item-heading{color:#313c52}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#23c8ec;border-color:#11a9cb}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#14bde2}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#52d4f0}.navbar-inverse .navbar-toggle{border-color:#52d4f0}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#14bde2}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#13b5d9}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#52d4f0}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#11a9cb}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{background-color:#52d4f0}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #52d4f0;-webkit-box-shadow:inset 0 -1px 0 #11a9cb;box-shadow:inset 0 -1px 0 #11a9cb}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#d1d1d1;background-color:#12b1d4}.nav>li>a:focus,.nav>li>a:hover{color:#29aa93}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#313c52}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#29aa93}.nav-primary>li:first-child>a{border-top-left-radius:4px;border-bottom-left-radius:4px}.nav-primary>li:last-child>a{border-top-right-radius:4px;border-bottom-right-radius:4px}.nav-primary>li>a{border:1px solid #c4c4c4}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#29aa93;border-bottom-color:#29aa93}.nav-stacked.nav-primary>li,.nav-stacked.nav-primary>li>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li:first-child.nav-heading,.nav-stacked.nav-primary>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.nav-stacked.nav-primary>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.nav-stacked.nav-primary>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.nav-stacked.nav-secondary>li>a{border-top-right-radius:4px;border-bottom-right-radius:4px;-webkit-box-shadow:inset 2px 0 0 #f5f5f5;box-shadow:inset 2px 0 0 #f5f5f5}.nav-stacked.nav-secondary>li>a:hover{-webkit-box-shadow:inset 2px 0 0 #eee;box-shadow:inset 2px 0 0 #eee}.nav-stacked.nav-secondary>li.active>a,.nav-stacked.nav-secondary>li.active>a:focus,.nav-stacked.nav-secondary>li.active>a:hover{background-color:#f5f5f5;-webkit-box-shadow:inset 2px 0 0 #29aa93;box-shadow:inset 2px 0 0 #29aa93}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #c4c4c4}.nav-tabs>li>a{border-radius:4px 4px 0 0}.pager{border-radius:4px}.pager>li>a,.pager>li>span{background-color:#fff;border:1px solid #c4c4c4}.pager>li:first-child>a,.pager>li:first-child>span{border-top-left-radius:4px;border-bottom-left-radius:4px}.pager>li:last-child>a,.pager>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pager>li>a:focus,.pager>li>a:hover,.pager>li>span:focus,.pager>li>span:hover{background-color:#eee}.pager>li.active>a,.pager>li.active>a:hover,.pager>li.active>span,.pager>li.active>span:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.pager>li.disabled>a,.pager>li.disabled>a:focus,.pager>li.disabled>a:hover,.pager>li.disabled>span,.pager>li.disabled>span:focus,.pager>li.disabled>span:hover{color:#c4c4c4;background-color:#fff;border-color:#c4c4c4}.panel{border-radius:4px}.panel>.panel-heading{background-image:none;border-top-left-radius:4px;border-top-right-radius:4px}.panel-group .panel{border-radius:4px}.dashboard .panel{-webkit-box-shadow:none;box-shadow:none}.panel-primary{border-color:#29aa93}.panel-primary>.panel-heading{color:#fff;background-color:#29aa93;border-color:#29aa93}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#29aa93}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#29aa93}.panel-danger>.panel-body,.panel-info>.panel-body,.panel-primary>.panel-body,.panel-success>.panel-body,.panel-warning>.panel-body{-webkit-box-shadow:none;box-shadow:none}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f0fdfb}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe7d0}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#313c52!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#29aa93!important}.chosen-container-single .chosen-single{border-radius:2px!important}.chosen-container-single.chosen-with-drop .chosen-single{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-single.chosen-with-drop.chosen-up .chosen-single{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container .chosen-results li.highlighted{background-color:#29aa93!important}.chosen-container-active .chosen-single{border-color:#29aa93!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b2b2b2!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#29aa93!important}.chosen-container-multi .chosen-choices{border-radius:2px!important}.chosen-container-multi.chosen-with-drop .chosen-choices{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-multi.chosen-with-drop.chosen-up .chosen-choices{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container.chosen-highlight-selected .result-selected{color:#29aa93;background:#f0fdfb}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #c4c4c4}.menu>.nav>li>.nav>li>a:focus,.menu>.nav>li>.nav>li>a:hover{background-color:#e4e4e4}.menu>.nav>li>.nav>li.active>a,.menu>.nav>li>.nav>li.active>a:focus,.menu>.nav>li>.nav>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.menu>.nav>li.show>a,.menu>.nav>li.show>a:focus,.menu>.nav>li.show>a:hover{color:#313c52;background-color:#fff;border-color:#c4c4c4}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#313c52}.menu>.nav>li.show>a:hover{background-color:#f1f1f1}.menu>.nav>li.show:last-child>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li.show:last-child>.nav>li:last-child>a{border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#29aa93}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#29aa93}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#29aa93}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ffba34!important;border-color:#ffba34!important}.datetimepicker td.day.active{background-color:#29aa93!important;border-color:#1f816f!important}.datetimepicker td.day.active:hover{background-color:#1f816f!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#ffa901!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.ke-menu-item-on{background-color:#29aa93!important}.ke-colorpicker-cell-on{background-color:#29aa93!important}.ke-input-text:focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#29aa93}.messager-success{background-color:#22c98d}.messager-info{background-color:#37b2fe}.messager-warning{background-color:#ffba34}.messager-danger{background-color:#fc5959}.messager-important{background-color:#ff6f42}.messager-special{background-color:#8166ee}.comment:hover>.content>.actions>a{color:#313c52}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#273042;background-color:#f0fdfb}.alert-primary hr{border-top-color:#d1f9f3}.alert-primary .alert-link{color:#1a202c}.alert-success{color:#1eb37e;background-color:#ecfff8}.alert-success hr{border-top-color:#b9ffda}.alert-success .alert-link{color:#199568}.alert-info{color:#1ea8fe;background-color:#e7f6ff}.alert-info hr{border-top-color:#9beaff}.alert-info .alert-link{color:#0199f7}.alert-warning{color:#ffb11a;background-color:#fff4ea}.alert-warning hr{border-top-color:#ffdfd0}.alert-warning .alert-link{color:#f6a200}.alert-danger{color:#fc4040;background-color:#ffebeb}.alert-danger hr{border-top-color:#ffd1d9}.alert-danger .alert-link{color:#fb1d1d}.alert-primary-inverse{color:#fff;background-color:#29aa93;border-color:#29aa93}.alert-primary-inverse hr{border-top-color:#c4c4c4;border-top-color:rgba(196,196,196,.25)}.alert-primary-inverse .alert-link{color:rgba(255,255,255,.8)}.modal-dialog{border-radius:6px}.card{border-radius:4px;-webkit-box-shadow:none;box-shadow:none}pre{border-radius:4px}.datagrid .datagrid-hover-col .datagrid-cell.hover,.datagrid .datagrid-hover-col .datagrid-row-cell.active .datagrid-cell.hover,.datagrid .datagrid-hover-row .datagrid-row-cell:hover .datagrid-cell{background-color:#f0fdfb}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#29aa93}.tree-drag-holder{background-color:#f0fdfb}.tree-menu li.active>a{color:#fff;background-color:#29aa93;border-color:#29aa93}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#23c8ec}a.text-primary{color:#29aa93}.nav-primary>li.active>a{color:#27988a}.nav-primary>li.active>a:hover{color:#27988a}.bg-primary,.m-user-login{background:#23c8ec -webkit-gradient(linear,right top,left top,from(#29aa93),to(#23c8ec))!important;background:#23c8ec -webkit-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec -o-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec linear-gradient(-90deg,#29aa93 0,#23c8ec 100%)!important}.bg-primary-pure{color:#fff;background-color:#29aa93}.bg-primary-pale{color:#29aa93;background-color:#f0fdfb}.bg-secondary{background:#23c8ec}.alert-info{color:#29aa93;background:#f0fdfb}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary.hover,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:rgba(41,170,147,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#249581;background-image:none;border-color:rgba(0,0,0,0)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{color:rgba(255,255,255,.3);background-color:#29aa93;border-color:transparent}.btn-secondary{color:#fff;background-color:#23c8ec;border-color:transparent}.btn-secondary.active,.btn-secondary.hover,.btn-secondary:active,.btn-secondary:focus,.btn-secondary:hover,.open .dropdown-toggle.btn-secondary{color:#fff;background-color:rgba(35,200,236,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#14bde2;background-image:none;border-color:rgba(0,0,0,0)}.btn-secondary.disabled,.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary[disabled],.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:focus,.btn-secondary[disabled]:hover,fieldset[disabled] .btn-secondary,fieldset[disabled] .btn-secondary.active,fieldset[disabled] .btn-secondary:active,fieldset[disabled] .btn-secondary:focus,fieldset[disabled] .btn-secondary:hover{color:rgba(255,255,255,.3);background-color:#23c8ec;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:rgba(240,253,251,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#dafaf5;background-image:none;border-color:rgba(0,0,0,0)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{color:rgba(41,170,147,.3);background-color:#f0fdfb;border-color:transparent}.btn-icon-left>.icon{color:#23c8ec;background:#f0fdfb}.btn-active-line{color:#29aa93}.btn-active-line:after{border-bottom-color:#29aa93}.btn-active-line:hover{color:#29aa93}.btn-active-text .text{color:#27988a}.btn-active-text .text:after{border-bottom-color:#27988a}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(41,170,147,.8)}.label-primary{background:#29aa93!important}.label-pale{background:#c3f7ef!important}.label-outline.label-primary{background:#f0fdfb!important;border-color:rgba(41,170,147,.25)!important}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 0 3px rgba(41,170,147,.2);box-shadow:0 0 0 3px rgba(41,170,147,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#29aa93}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#29aa93!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#29aa93!important}.nav-tabs>li.active>a:before{background:#29aa93}.nav-tabs-primary>li.active>a{color:#29aa93!important}.panel-actions .btn.text-primary{color:#29aa93}.picker-focus .picker-selections{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.status-bars .bar{background:#29aa93}.status-bars-h .bar{background:#29aa93}.messagger-zt .messager-content>.icon{color:#29aa93}.tree li.active>a{color:#29aa93}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#29aa93}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#23c8ec}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#313c52;background-color:#f0fdfb}.dropdown-submenu:hover>a:after{border-left-color:#29aa93}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#23c8ec}.timeline>li>a:after,.timeline>li>div:after{background-color:#29aa93}.timeline>li.active:before{background-color:rgba(41,170,147,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#29aa93!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#29aa93!important}#mainHeader{background:#33c6ab;border-top-color:#29aa93;border-bottom-color:#f0fdfb}#searchGo{background-color:#23c8ec}#searchGo:hover{background-color:#29aa93}#subNavbar{margin-top:7px;text-align:center}#subNavbar .nav>li.active>a{color:#29aa93}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a:after{border-color:#29aa93}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#29aa93}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn.active:before,.btn-toolbar>.angle-btn:last-child:after,.btn-toolbar>.angle-btn:last-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn:last-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn,.btn-toolbar>.angle-btn.normal{border-color:#c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#313c52}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.active+.angle-btn:before,.btn-toolbar>.angle-btn.normal:after,.btn-toolbar>.angle-btn.normal:before{border-color:transparent transparent transparent #c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.normal:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before,.btn-toolbar>.angle-btn.normal>.btn-group:first-child:before{border-color:transparent transparent transparent #c4c4c4!important}#sidebarHeader{border-left:3px solid #29aa93}#sidebarHeader .title{color:#29aa93}#sidebar>.sidebar-toggle>.icon{background:#81dff4}#main .querybox-toggle.querybox-opened{color:#29aa93}#contentNav .nav>li.active>a{color:#29aa93}#contentNav .nav>li.active>a:before{background:#29aa93}td.c-actions .btn{color:#23c8ec}td.c-actions .btn:hover{color:#29aa93;background-color:#dafaf5}td.c-actions .btn-link{color:#313c52;background:0 0}td.c-actions .btn-link:hover{color:#29aa93;background:#f0fdfb}.main-table table .btn-icon-left:hover>.icon{background:#f0fdfb}.main-table tbody>tr:hover{background:#f0fdfb}.main-table tbody>tr.checked:hover{background:#ffe6c6}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#29aa93}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f9fefd}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f9fefd}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#2f8a8f}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#0b2f28}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover,.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down,.table.has-sort-head thead>tr>th>a.sort-up,.table.has-sort-head thead>tr>th>a:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#29aa93}.table.fixed-header-copy thead>tr>th>a.sort-down,.table.fixed-header-copy thead>tr>th>a.sort-down:after,.table.fixed-header-copy thead>tr>th>a.sort-up,.table.fixed-header-copy thead>tr>th>a.sort-up:before,.table.fixed-header-copy thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover:after,.table.fixed-header-copy thead>tr>th>a:hover:before{color:#f0fdfb}.table-nest-toggle:hover{color:#29aa93}.table-footer .checkbox-primary.checked label:after{border-color:#29aa93!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#37cfb4!important;border-color:#37cfb4!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffe6c6}.files-list>li>a:hover{color:#29aa93}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#29aa93;border-color:#29aa93}.article-content a{color:#29aa93}.article-content a:focus,.article-content a:hover{color:#23c8ec}.list-group{overflow-y:auto}.list-group>a.selected{color:#f0fdfb;background-color:#29aa93}.list-group>a.active{color:#29aa93;background-color:#f0fdfb}.list-group>a.active:hover,.list-group>a:hover{background-color:#29aa93}.list-group.tab-menu a.active:hover,.list-group.tab-menu a:hover{color:#29aa93}#swapper #dropMenu .tree li>.selected{color:#29aa93!important;background:#f0fdfb!important}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .list-group>a.selected,#swapper #dropMenu .list-group>a.selected:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu .tree li>.clickable:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#29aa93!important}#pageNav #dropMenu .list-group>a.active{color:inherit;background-color:inherit}#pageNav #dropMenu .list-group>a.active:hover,#pageNav #dropMenu.searchbox-focus .list-group>a.active:hover{color:#29aa93!important;background:#f0fdfb!important}#pageNav #dropMenu .list-group>a.active.selected,#pageNav #dropMenu .list-group>a.active.selected:hover{color:#fff!important;background:#29aa93!important}.release-line>li>a:hover:before{background-color:#f0fdfb}.release-line>li>a:hover .title{color:#29aa93}.release-line>li.active>a:before{border-color:#29aa93}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#23c8ec}#poweredBy .icon-zentao{color:#23c8ec}#poweredBy a:hover{color:#29aa93}#poweredBy a:hover .icon-zentao{color:#29aa93}#poweredBy a.text-primary{color:#29aa93}#poweredBy a.text-primary:hover{color:#23c8ec}.block-guide .nav-secondary>li.active>a:before,.block-statistic .nav-secondary>li.active>a:before{background:#29aa93!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#23c8ec!important}.dynamic.active .dynamic-date:before{background-color:#23c8ec!important}.tablesorter-header-inner:hover,table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after,table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{color:#29aa93!important}.table td.has-child>.task-toggle:hover{color:#29aa93!important}#openTaskPage.open:hover,#task .task-nav{color:#29aa93!important;background:#f0fdfb!important}#tasksProgress>.progress-bar{background:#29aa93!important}#tasksProgress .progress-text{color:#29aa93!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#29aa93!important;background:#f0fdfb!important;border-left-color:#29aa93!important;-webkit-box-shadow:inset 4px 0 0 #29aa93!important;box-shadow:inset 4px 0 0 #29aa93!important}#copyProjectModal a:hover{border-color:#23c8ec!important}#zeroTaskStory.checked{background:#f0fdfb!important;border-color:#23c8ec!important}.cols-list .col:hover{background:#f0fdfb!important}.files-grid .actions,.files-grid .col:hover .file{background:#f0fdfb!important}.dashboard .panel,.panel-default{-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}#menu .nav>li.active>a{background:#23c8ec!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#23c8ec!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#29aa93!important}#bars>li.active:after{background:#f0fdfb!important}#userNav>li>a>.icon{filter:none;opacity:1;-webkit-filter:none}#menu{background:#415a72}#mainMenu>.btn-toobar .btn-active-text,#mainMenu>.btn-toolBar .btn-active-text,#mainMenu>.btn-toolbar .btn-active-text{color:#27988a;background:#e7eded}#mainMenu>.btn-toobar .btn-active-text .text,#mainMenu>.btn-toolBar .btn-active-text .text,#mainMenu>.btn-toolbar .btn-active-text .text{top:0}#mainMenu>.btn-toobar .btn-active-text .text:after,#mainMenu>.btn-toolBar .btn-active-text .text:after,#mainMenu>.btn-toolbar .btn-active-text .text:after{border:none}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text:after{border-color:#29aa93}td.c-actions .btn{color:#29aa93}.main-table tbody>tr:hover{background:rgba(240,253,251,.8)}.main-table tbody>tr>td.c-name a{color:#2f8a8f}.main-table tbody>tr>td.c-name a:hover{color:#27988a}.table.table-data tbody>tr:hover,.table.table-form tbody>tr:hover{background:0 0}#programTableList>tr:hover{background:#e6f0ff;opacity:.8}#programTableList>tr>.c-name:hover>a{color:#29aa93!important}.assigned-none{color:#27988a!important}.assigned-current{color:#faae1a!important}a.assigned-current:hover,a.assigned-none:hover,a.assigned-other:hover{color:#27988a!important}a.assigned-current:hover .icon,a.assigned-none:hover .icon,a.assigned-other:hover .icon{color:#27988a!important}#dashboard .block-welcome .progress{background:#edeef2}#dashboard .block-welcome .progress>.progress-bar{background:#33c6ab}#assigntomeBlock .nav>li.active>a{color:#27988a}.consumedTotally{color:#29aa93;background:#f0fdfb}#toggleFoldIcon .icon-border{border:1px solid #d4eee9}#createEffort .table tbody .date-group .input-group-addon .icon,#recordForm .table tbody .date-group .input-group-addon .icon,#toggleFoldIcon{color:#29aa93}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.nav-steps>ul>li.active>a{background-color:#23c8ec}.nav-steps>ul>li.active>a:focus{background-color:#29aa93}.nav-steps>ul>li.active+li:after{border-left-color:#23c8ec}.nav-steps>ul>li.active:hover+li:after{border-left-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{background-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{color:#fff}.shadow-primary-hover:hover{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.border-primary-hover:hover{border:1px solid #29aa93}.menu-hover-primary>li>a:hover{color:#27988a!important;background-color:#d4eee9!important}.menu-active-primary>li.active>a{color:#29aa93!important;background-color:unset}.menu-active-primary>li.disabled>a:hover{color:#c4c4c4!important;background-color:unset!important}.bg-primary-100{background-color:#d4eee9!important}.form-active-primary .active .label,.form-active-primary .hover .label{color:#29aa93!important}.form-active-primary .active .form-control,.form-active-primary .hover .form-control{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#faae1a;border-color:#faae1a}#mainHeader{color:#313c52;background:#fff;border-bottom:1px solid #eee}#heading .header-btn .btn,#navbar .nav>li>a,#userNav>li>a{color:#313c52}#navbar .nav>li.active>a{position:relative;font-weight:500;color:#27988a;background:0 0}#navbar .nav>li.active>a:before{position:absolute;right:10px;bottom:0;left:10px;display:block;height:2px;content:' ';background-color:#27988a}#navbar .nav>li>a.active:hover,#navbar .nav>li>a:hover{background-color:rgba(0,0,0,.1)}#navbar .nav>li.divider{background-color:#f1f1f1}#visionSwitcher .dropdown-toggle>div,#visionSwitcher>div{background-color:rgba(0,0,0,.1)}#menu{position:relative;background:#248f83!important}#menu::after{position:absolute;bottom:0;left:0;z-index:-1;width:100%;height:108px;content:'';background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABsCAYAAACVWrdDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAA7dSURBVHgB7V1Nc9vGGV4QBL8pSjLp2LUddWK3jWvVOdjptMk4Mzl0euk1/gnN78ifyEzPuSk9J9PpIZlm6saTpJ00VJQ2jhJaiiOLFKkvghS/0H2ABQ1RILEgdkEi1ePBQCJpgXiffT/33YVCBMMwjAQ9pemR0Ikex2sZkhnQ0wkORVFa5BxDKEQQqOCz9JSjQo9N+hwlo0dPx+dEWAhMABvxeSr4hJ//R4kAAQeUCIP8HyMQAVT4C1TwWTIlKAnQhCP2txTzJUKS9NCgScx0denR+rFqzFQEUGGp9FSgQkqSgKBCPqAnmK3sJPPFTFedEtEnPyL4JoCZnILtYMMEyKIE6ExblujRpL+fkAjDlxDhaKngF8js0GPCX2Y+J0l/P6IkHJOIgosAdtP5IPZeEJJkxOHTn/P0+5GokuBpgpi9X/Qb5YQNap4iqQkTCSiXy4nSTzNLMSXGnGOWZBCnmMHK/CGKJIwlgI58CJ2aqHXy9GlfSyRy8XrnOBlXNWgEyZpMgJD5IoOSUI+SY54mClIbjc3cvJJhEGOQJdlaVMLVqRMxEFGtrqd1JZZ3vg4yMpkSmSWQZVMC9kkEIKIUoW4frhf6ndippGzWRNCrVykJPTLnEFaM290t50a1AZgVEVFxyMIIALa2ttL91NGi23thExEVMxQjAnHt2rWW2s673nRT10m1ViEhIhJVVqEaYGOSJgBhaAO9wm4UIiGhGmADmpAxBkfj3oc26HqVyAIVvh6VMFQKAcDFi6vHamIwNiGSbJJOzR3QSC1w2VwWpBEAXF24dWAYg4m2WDQJAzLo09Hfwc8ondMDldNlep7L+olUAmAGaPnUMxQECTrVCBHIkVyLCltjgr9gTxrRc4HNZcwVpBIAvP32n3UvLQCa1CcIIgHTmcUxs3UFVlqfG4TyZb7e+3hBGyxwzSWUiitEJpzz0PMA6RoAnPyQa/N+VnauQDUjN0+mKBQCbt265SskDCFhy5E5QSgEvPXWW76zUpkkwD9QLUiTOUBoDmnroLw8WjH1gsyMGW0u1BfIywY5EYoGADw5wSisjFlMeDoKtNXMgxaERgBygr3H7b1ev+vLHzR1qYN05gQINUEsxo6xv4szWgv7zv5PTOA8qj/Mxvu5jKLEuK8vKzylpmjPzpxlYW1tTX3jjZKyvZ3U6tpRTI0lzPvuDzp8SQkTLOZ/NXZ2HjZiZLxGDXs86dGBNuBvbm9vp+icSaaX9A4Ls9QXyJhzFp0XWPf1j1QzNYgbJ1qipxnxk1ZnrKVRxv0RYvWeaOwQ3YbY2zneIc4qxUm763kNGVqA2lFeye+SAIC81tc/zJJCMtHu97gDDa2n9hWXP4ZRvUzEC/0MarUaaRJ+Gy8rKpp27gCm5YU7SzmiJqdSzefU+L6bkAskBOEDxWIR4Qi3o0VUJKnzBffLTQBG/MNH7+fjWm7qVs1+vNO5dvW11hnb9OjRw55O5IR+bihmiqZ954WkBI07GiyX1xL/2vmoGET4wE+MjO564Rs3HjepPTNqenjzt35JkJUbeOHzz/+SbecuXaDTTIEsBGz/tWuvmJNGZwhQlPv9WHt779tv141KbYOEBZDA23MqITfwND8PttbS3UJaSGt+bjk5nCl0Vb27d9/svnyrWT14stXfqHxEoA1hjLrS7LTAk4Br5CoRhReWNofh3/j4lGrC7dsHe4Pj+Eml8hUBERXJVUrE+bymSJQWdEm3zRMBvff0CyFddksLaBi4P7zeROeDD66uvlInagdJFKlVvyKyHbRlivgQVAuQAxRI4dDtPcP4II4w0/79TWoVBkY/cK9Ra2nzVMMAn/c/+uFgMLAuXql8Jp2EMLQAGTCdP66Ojn5EOeWtB8ufVdTSC7++dPHTb/5asInIxJOBShYIPVeV+6f+BnctBhFAVzNMJwRTsbJyBzdBZIE3ACgVQRb/92Dt6w23+s/HX7+34BZe0iJ6r01z91g7pwUJP1MrO3ujBHDHvy+99Hta3kiaNROovmxN4NUCXW8SP1CIgnsuOEvRSKww6scJF2Fnon9psZC+oJEp4Tb6AV/l6NXV14/DIoHXFzSn8AOYC6DHIhX8IswLEiueGk6zdzL1XHL2St214Od7PgAkaF3lED5hSIKkELWU4Su+Td/m+KRz496l5aCJlRcQ+biNfiDACpk19YsvMgudeDyF34ul581qpWi/wFuw818p1cl/djZ6soUP3FnZ2XWGnk4EnpDBSsqmupNXjV7CqtdTCrJF0zmKIgMaVjVH+XhN8+uMK5UNEkbNK5XpH61efH1sd6DA7WrW1M3NpVzjpG8tZJUQKdX02tjQ00+pGgW9WrNGZAM1n5duvDpxrkHYnDBU7Pr13x2cdtJia0lwzOP8Aq8zDkv4wO3r3+95feYUAQjH6GF2C7Ajy4406zT2tJdw0ktJ1ZSGTkcsDpGAZo0jwTsYoEanGU4l9bKGjUXue5Y44mz6EfFvgmf7mabRhFmBR0dtBOfOaDb5zjt/P/rD/d+YtqdSrZCbK/zlBR6YNSNScjFHyAnGm7xKpRKa3b9y8S7XhRQq0MskICghKK8OJ9zxWrn8YLkdOzQJvXnznpSs2SoOnr7PcdEQQtVK9TERAdSEYh3S02MtJaPl4vg9mU4MkqrR6hUXT1aVVe6ShZAQjGmOKWyqUSCi9fDh+734AuuEg4wkVC1Qvq6emThyv1gqk8LAUIkAxBRViS0Q5d6lNC1pvBaoSiq8MYuSkcaKlOu/+uUwra9Kml1zK1+PK03kyHP7KTUubA8J5A8o2JXLHwRq9A2lM64mSPXdMFqyOB0NWZFY/fBbbJfZ6WtHwjfxaOfUPCqm0y78kEZAJnO6riU6GnLCvXCnD53u00Y9+c8f/lZSa1e6RAI0I0NN7btTydLVB1jhXNNqjnWJGuBQrcQnS8Yb94xpIuzQUEY05Pw+TsODa5pLnhzfHSajnatfIBKgXi/sK8qrUy2LZQTopu2sYpQ2iWeohvdr7I4z2YwpALdSAN6zCYAGYG65mBHf3Qai4w2lgxZHdGD3BwcDmmwJcbheMEsNPqKeUSjfVb+8jORERHwMgSNJsns4zdCPzicP35c7kYPtL+EQjz578mGWdNWpa/e84Ck1eCGGtFxUcgIiK9UNNpulm7UZZ0OtLndxtinwRmMzEYbwEfvzlBq8IMUJg4gNGn1A2CVapnYCEZEkhwxz2tvv6ikSAi7Hk1ylBi/EctnYsZZqHT63Et/HAZuG1zCFFrQLANpVrdbOtJVDSySUBEybX281pIfWkI/d2RYUnrFr2Sgn0o12+rh+kuzG+9M5NpciGSZwVoo3iUB0G41Gd/Ow7MvBZEjR9F2AzmOOT/rdu794XZgKe1c3LQ9vevmtrQfp+omR900ENGCEBCs5o05ZXM+/0SCbXB80o7bSypkkzqwsNR8PSbGCk2eyhtO9/fOdBhEIX7UgpnatqYhwJeErGjVht0Uh+UGn1ex4Ot9i9vmxpNutkcP32ddCULF7/NTo7m/Q2s+bQrfBmcpeggiEX/AXJCA2xE3qd7w6GzCyJ2mcGSa7vI9MuxevHty588cemx/JsXPgXCOQw8JcJyacoZpc/2HM6gr0nQYkgV7/3YlVySC5R2qQ6v/26htoSblEDzSn5dn5IsggASBsTri8+0Gurat5rg+PEXax9OK0PuFofX29M1pqKGatdQe2rUdofHNFqOMfXn/aHRqFhWzQBu2gdcj14TGaAJ8wxZoELIM9rmY/Gd4L7PydlXtmlOV0tKWStH3q8tNuCCV8q4JPP/2Tpi2uLnE56DGa4KNkgTzFbLBFYNBPLS46SyFnL6fL3l7Z95pjKXtFoEXl399cucAdJY01SUVWW3KNkiB83LBZYt7f318qFAqhZMETgPXQvvatlrZZxzQkQNBuZQqMWsTlWfq+WV+yNAM7Ix5Y1zK7tmf9cAkbmPyp835Y6m4pfkmwnaZZyzfbR0Y1AwmURYK9wJo9v2yWj1Vxg/msG54PSt+uBiR88l2phIlsns8XzbZGvkgIC6yJlS6FtukIJ2CKdnmekSb9i5urLvf+y122tbrWvAcPNIBY9f95Ez5gPpaL94PSgVWX3CEqsRqovGAQAwTMo/BtZHkm6kO7Aayw4c2YUQLzmrjJ42FKhPhbHhMuIFvPBR2hPoxNbRf2u5wT4zBF41rOmfnB8lI6yAy0moSxNTHsOQi3WzIHozbesV+SHXR4dmGEvonpuIVwbkC4ueJSOsDDGYg1eAx2lrkNJcjel7WpUyidA05cvfCz7s9ffj5JBjHPa3fpv2xCI5p2mi8Nm+NaBTF7AylZQH1nX+ZO7DPZxtdvfmAV0DKm6YmRmMo0gK/w5/OrESuEBFph7LA7kyjC3Abh+vd7vE65WrPa0HMkt0eFj/8jy+bDru+yI5TtjWcWxtkk8DTMYjaKPUkVwh+QZ6NUNEKXx1zsJI5K5hNFz6i9xClnqqXUfqK33H/xyouGXV+hkQZ29IKgRBfeQG7DLu6Fhbnayt3c/I6sm/O6X5Iv+/eplrCNtvHs4F0WdiL7ReQDAkR9fwh/bxaPPQn9ocyTwOLqzshrHRZfa+w9CCnFfhbhCzDiG7N65sw8p/JOQNi2eQJJiJ5E9PrbZmdmD/yJIgF2DSiorbYndGb6tKWoEID03+75sSMgCM6vFoA0u9TamodHXc2VD5gAaECM9eHY9Rf4BWSq8ANtdvZyygabRTsgc4JIaAAVmrkJOD0S7GcbpjOmr8GO77DXkECBEJA2948zjIoGADAfdukCgoVJgl8wTQp7AjjQcvbosAgK96mQOQu7gSgR4FznOyDPdnO3O+IUx3tDsNA21OTKD6LihAEI0emIMXgGjjKxSQ7PPOw8IUoEYKQ7NSBNno1+4ng9UogSARBubKQj2Zk1414iNfqByBDgiNlh6+2fnQTg9XMNkAwIXhv53YYzR4gMokYAbP4wlKRaMeoDIvEQZyeiqAF218GosM81ICRA0Cg7uBFwrgGSYc8FAG5Lks6dsGTAxIz7znafUKQQNQImjXDcy7kJkoxJI/w8DwgBrgJ2ZMfnJihEjCZhZB5muPzifzvaxdIXFrNVAAAAAElFTkSuQmCC) no-repeat}#userNav>li>a>.icon{color:#23c8ec}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:-webkit-gradient(linear,left top,right top,from(rgba(229,244,169,.4)),to(rgba(237,254,171,.036)))!important;background:-webkit-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:-o-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:linear-gradient(90deg,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;border-radius:4px;opacity:1}#featurebar .nav li.active a{color:#27988a!important}#featurebar .nav li.active a:after{border-bottom:2px solid #27988a!important}.btn.btn-action,.c-actions .btn,td.c-name a{color:#29aa93}#logForm .table .versions a,#mainMenu .page-title strong a,#readOnlyOfKanban i{color:#29aa93!important}.picker-drop-menu .picker-option-list .picker-option.picker-option-active,.picker-drop-menu .picker-option-list .picker-single .picker-option.picker-option-selected.picker-option-active{color:#fff;background:#29aa93}.table-actions .btn{background:#29aa93!important;border-color:#29aa93!important}.table-actions .btn:hover{color:#fff;background:#27988a;border-color:#27988a}.table-actions>.btn-group:first-child>.btn:first-child{border-right:1px solid rgba(255,255,255,.2)!important}a.programName:focus,a.programName:hover{background:#29aa93!important}#guideDialog .project-type-img:hover,#guideDialog .project-type.active img,.kanbans .panel:hover{border-color:#29aa93!important}.btn.btn-action:hover,.c-actions .btn:hover{color:#29aa93;background:#f0fdfb}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.main-table table tr{border-color:#f2f6f8!important}#mainHeader #headerActions .btn-group>.btn{color:#313c52!important}.c-manager .avatar.avatar-top{border-color:#faae1a}#programTableList>tr:hover{background:#f0fdfbcc}#programTableList>tr:hover>.c-name>a{color:#27988a!important}#programTableList>tr[data-type=project]>.c-name>a{color:#2f8a8f!important}.m-product-all #mainMenu>div.btn-toolbar.pull-right>a.btn.btn-link.iframe{color:#00c4d0!important}#featuresNav.nav-simple>li.active>a,.nav-simple>li.active>a,.nav-simple>li.active>a:focus,.nav-simple>li.active>a:hover{color:#29aa93}#featuresCarousel .carousel-indicators .active{background-color:#29aa93!important;border-color:#29aa93!important}#dashboard .block-welcome .progress{background:#eee}
\ No newline at end of file
+ */a{color:#313c52}a:focus,a:hover{color:#29aa93}.btn{color:#313c52;background-color:#fff;border-color:#d8dbde;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-warning{color:#fff;background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-danger{color:#fff;background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-success{color:#fff;background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-link{color:#313c52;background-color:transparent}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover,.btn-link[disabled],fieldset[disabled] .btn-link{border-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link:focus,.btn-link:hover{color:#29aa93}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#c4c4c4}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#29aa93}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#1f816f}.label-primary.label-outline{color:#29aa93;background:0 0;border:1px solid #29aa93}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#1f816f}.label-success{background-color:#22c98d}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#1b9d6e}.label-success.label-outline{color:#22c98d;background:0 0;border:1px solid #22c98d}.label-success[href]:focus,.label-success[href]:hover{background-color:#1b9d6e}.label-info{background-color:#37b2fe}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#049efe}.label-info.label-outline{color:#37b2fe;background:0 0;border:1px solid #37b2fe}.label-info[href]:focus,.label-info[href]:hover{background-color:#049efe}.label-warning{background-color:#ffba34}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#ffa901}.label-warning.label-outline{color:#ffba34;background:0 0;border:1px solid #ffba34}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ffa901}.label-danger{background-color:#fc5959}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#fb2727}.label-danger.label-outline{color:#fc5959;background:0 0;border:1px solid #fc5959}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#fb2727}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#60d9c3}.text-primary{color:#29aa93}.text-primary:hover{color:#1f816f}.text-warning{color:#ffba34}.text-warning:hover{color:#ffa901}.text-danger{color:#fc5959}.text-danger:hover{color:#fb2727}.text-success{color:#22c98d}.text-success:hover{color:#1b9d6e}.text-info{color:#37b2fe}.text-info:hover{color:#049efe}.text-important{color:#ff6f42}.text-important:hover{color:#ff480f}.text-special{color:#8166ee}.text-special:hover{color:#5b38e9}.text-muted a:active,.text-muted a:hover{color:#313c52}.text-link:active,.text-link:hover{color:#313c52}.bg-primary{background-color:#29aa93}a.bg-primary:hover{background-color:#1f816f}.hl-primary{background-color:#f0fdfb}a.hl-primary:hover{background-color:#c3f7ef}.progress{background-color:#f0fdfb;border-radius:3px}.progress-bar{color:#fff;background-color:#29aa93;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#29aa93;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-control:focus{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#29aa93;border-color:#29aa93}.switch input:focus+label{color:#29aa93}.switch input:focus+label:before{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border-color:#838a9d}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.checked>label:before,.checkbox-primary>input:checked+label:before,.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{color:#fff}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 8px #29aa93;box-shadow:0 0 8px #29aa93}.checkbox-primary input:disabled+label:after,.checkbox-primary.disabled>label:after,.radio-primary input:disabled+label:after,.radio-primary.disabled>label:after{background-color:#e5e5e5;border-color:#bbb}.checkbox-primary input:disabled:checked+label:after,.checkbox-primary.checked.disabled>label:after,.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#bbb}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#fff;border-color:#29aa93}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93}.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#fff;border-color:#bbb}.radio-primary input:disabled:checked+label:before,.radio-primary.checked.disabled>label:before{background-color:#bbb}.form-control:focus+.input-control-label-left{color:#23c8ec}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.input-group-addon{background-color:#eee}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon{border-radius:4px}.input-group-btn.fix-border>.btn{border-radius:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.list-group-item{background-color:#fff;border:1px solid #c4c4c4}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#313c52;text-decoration:none;background-color:#f0fdfb}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.list-group-item.active .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#e6e6e6}.list-group-item-heading{color:#313c52}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#23c8ec;border-color:#11a9cb}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#14bde2}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#52d4f0}.navbar-inverse .navbar-toggle{border-color:#52d4f0}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#14bde2}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#13b5d9}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#52d4f0}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#11a9cb}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{background-color:#52d4f0}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #52d4f0;-webkit-box-shadow:inset 0 -1px 0 #11a9cb;box-shadow:inset 0 -1px 0 #11a9cb}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#d1d1d1;background-color:#12b1d4}.nav>li>a:focus,.nav>li>a:hover{color:#29aa93}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#313c52}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#29aa93}.nav-primary>li:first-child>a{border-top-left-radius:4px;border-bottom-left-radius:4px}.nav-primary>li:last-child>a{border-top-right-radius:4px;border-bottom-right-radius:4px}.nav-primary>li>a{border:1px solid #c4c4c4}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#29aa93;border-bottom-color:#29aa93}.nav-stacked.nav-primary>li,.nav-stacked.nav-primary>li>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li:first-child.nav-heading,.nav-stacked.nav-primary>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.nav-stacked.nav-primary>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.nav-stacked.nav-primary>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.nav-stacked.nav-secondary>li>a{border-top-right-radius:4px;border-bottom-right-radius:4px;-webkit-box-shadow:inset 2px 0 0 #f5f5f5;box-shadow:inset 2px 0 0 #f5f5f5}.nav-stacked.nav-secondary>li>a:hover{-webkit-box-shadow:inset 2px 0 0 #eee;box-shadow:inset 2px 0 0 #eee}.nav-stacked.nav-secondary>li.active>a,.nav-stacked.nav-secondary>li.active>a:focus,.nav-stacked.nav-secondary>li.active>a:hover{background-color:#f5f5f5;-webkit-box-shadow:inset 2px 0 0 #29aa93;box-shadow:inset 2px 0 0 #29aa93}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #c4c4c4}.nav-tabs>li>a{border-radius:4px 4px 0 0}.pager{border-radius:4px}.pager>li>a,.pager>li>span{background-color:#fff;border:1px solid #c4c4c4}.pager>li:first-child>a,.pager>li:first-child>span{border-top-left-radius:4px;border-bottom-left-radius:4px}.pager>li:last-child>a,.pager>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pager>li>a:focus,.pager>li>a:hover,.pager>li>span:focus,.pager>li>span:hover{background-color:#eee}.pager>li.active>a,.pager>li.active>a:hover,.pager>li.active>span,.pager>li.active>span:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.pager>li.disabled>a,.pager>li.disabled>a:focus,.pager>li.disabled>a:hover,.pager>li.disabled>span,.pager>li.disabled>span:focus,.pager>li.disabled>span:hover{color:#c4c4c4;background-color:#fff;border-color:#c4c4c4}.panel{border-radius:4px}.panel>.panel-heading{background-image:none;border-top-left-radius:4px;border-top-right-radius:4px}.panel-group .panel{border-radius:4px}.dashboard .panel{-webkit-box-shadow:none;box-shadow:none}.panel-primary{border-color:#29aa93}.panel-primary>.panel-heading{color:#fff;background-color:#29aa93;border-color:#29aa93}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#29aa93}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#29aa93}.panel-danger>.panel-body,.panel-info>.panel-body,.panel-primary>.panel-body,.panel-success>.panel-body,.panel-warning>.panel-body{-webkit-box-shadow:none;box-shadow:none}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f0fdfb}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe7d0}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#313c52!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#29aa93!important}.chosen-container-single .chosen-single{border-radius:2px!important}.chosen-container-single.chosen-with-drop .chosen-single{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-single.chosen-with-drop.chosen-up .chosen-single{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container .chosen-results li.highlighted{background-color:#29aa93!important}.chosen-container-active .chosen-single{border-color:#29aa93!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b2b2b2!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#29aa93!important}.chosen-container-multi .chosen-choices{border-radius:2px!important}.chosen-container-multi.chosen-with-drop .chosen-choices{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-multi.chosen-with-drop.chosen-up .chosen-choices{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container.chosen-highlight-selected .result-selected{color:#29aa93;background:#f0fdfb}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #c4c4c4}.menu>.nav>li>.nav>li>a:focus,.menu>.nav>li>.nav>li>a:hover{background-color:#e4e4e4}.menu>.nav>li>.nav>li.active>a,.menu>.nav>li>.nav>li.active>a:focus,.menu>.nav>li>.nav>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.menu>.nav>li.show>a,.menu>.nav>li.show>a:focus,.menu>.nav>li.show>a:hover{color:#313c52;background-color:#fff;border-color:#c4c4c4}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#313c52}.menu>.nav>li.show>a:hover{background-color:#f1f1f1}.menu>.nav>li.show:last-child>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li.show:last-child>.nav>li:last-child>a{border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#29aa93}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#29aa93}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#29aa93}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ffba34!important;border-color:#ffba34!important}.datetimepicker td.day.active{background-color:#29aa93!important;border-color:#1f816f!important}.datetimepicker td.day.active:hover{background-color:#1f816f!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#ffa901!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.ke-menu-item-on{background-color:#29aa93!important}.ke-colorpicker-cell-on{background-color:#29aa93!important}.ke-input-text:focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#29aa93}.messager-success{background-color:#22c98d}.messager-info{background-color:#37b2fe}.messager-warning{background-color:#ffba34}.messager-danger{background-color:#fc5959}.messager-important{background-color:#ff6f42}.messager-special{background-color:#8166ee}.comment:hover>.content>.actions>a{color:#313c52}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#273042;background-color:#f0fdfb}.alert-primary hr{border-top-color:#d1f9f3}.alert-primary .alert-link{color:#1a202c}.alert-success{color:#1eb37e;background-color:#ecfff8}.alert-success hr{border-top-color:#b9ffda}.alert-success .alert-link{color:#199568}.alert-info{color:#1ea8fe;background-color:#e7f6ff}.alert-info hr{border-top-color:#9beaff}.alert-info .alert-link{color:#0199f7}.alert-warning{color:#ffb11a;background-color:#fff4ea}.alert-warning hr{border-top-color:#ffdfd0}.alert-warning .alert-link{color:#f6a200}.alert-danger{color:#fc4040;background-color:#ffebeb}.alert-danger hr{border-top-color:#ffd1d9}.alert-danger .alert-link{color:#fb1d1d}.alert-primary-inverse{color:#fff;background-color:#29aa93;border-color:#29aa93}.alert-primary-inverse hr{border-top-color:#c4c4c4;border-top-color:rgba(196,196,196,.25)}.alert-primary-inverse .alert-link{color:rgba(255,255,255,.8)}.modal-dialog{border-radius:6px}.card{border-radius:4px;-webkit-box-shadow:none;box-shadow:none}pre{border-radius:4px}.datagrid .datagrid-hover-col .datagrid-cell.hover,.datagrid .datagrid-hover-col .datagrid-row-cell.active .datagrid-cell.hover,.datagrid .datagrid-hover-row .datagrid-row-cell:hover .datagrid-cell{background-color:#f0fdfb}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#29aa93}.tree-drag-holder{background-color:#f0fdfb}.tree-menu li.active>a{color:#fff;background-color:#29aa93;border-color:#29aa93}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#23c8ec}a.text-primary{color:#29aa93}.nav-primary>li.active>a{color:#27988a}.nav-primary>li.active>a:hover{color:#27988a}.bg-primary,.m-user-login{background:#23c8ec -webkit-gradient(linear,right top,left top,from(#29aa93),to(#23c8ec))!important;background:#23c8ec -webkit-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec -o-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec linear-gradient(-90deg,#29aa93 0,#23c8ec 100%)!important}.bg-primary-pure{color:#fff;background-color:#29aa93}.bg-primary-pale{color:#29aa93;background-color:#f0fdfb}.bg-secondary{background:#23c8ec}.alert-info{color:#29aa93;background:#f0fdfb}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary.hover,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:rgba(41,170,147,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#249581;background-image:none;border-color:rgba(0,0,0,0)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{color:rgba(255,255,255,.3);background-color:#29aa93;border-color:transparent}.btn-secondary{color:#fff;background-color:#23c8ec;border-color:transparent}.btn-secondary.active,.btn-secondary.hover,.btn-secondary:active,.btn-secondary:focus,.btn-secondary:hover,.open .dropdown-toggle.btn-secondary{color:#fff;background-color:rgba(35,200,236,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#14bde2;background-image:none;border-color:rgba(0,0,0,0)}.btn-secondary.disabled,.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary[disabled],.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:focus,.btn-secondary[disabled]:hover,fieldset[disabled] .btn-secondary,fieldset[disabled] .btn-secondary.active,fieldset[disabled] .btn-secondary:active,fieldset[disabled] .btn-secondary:focus,fieldset[disabled] .btn-secondary:hover{color:rgba(255,255,255,.3);background-color:#23c8ec;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:rgba(240,253,251,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#dafaf5;background-image:none;border-color:rgba(0,0,0,0)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{color:rgba(41,170,147,.3);background-color:#f0fdfb;border-color:transparent}.btn-icon-left>.icon{color:#23c8ec;background:#f0fdfb}.btn-active-line{color:#29aa93}.btn-active-line:after{border-bottom-color:#29aa93}.btn-active-line:hover{color:#29aa93}.btn-active-text .text{color:#27988a}.btn-active-text .text:after{border-bottom-color:#27988a}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(41,170,147,.8)}.label-primary{background:#29aa93!important}.label-pale{background:#c3f7ef!important}.label-outline.label-primary{background:#f0fdfb!important;border-color:rgba(41,170,147,.25)!important}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 0 3px rgba(41,170,147,.2);box-shadow:0 0 0 3px rgba(41,170,147,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#29aa93}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#29aa93!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#29aa93!important}.nav-tabs>li.active>a:before{background:#29aa93}.nav-tabs-primary>li.active>a{color:#29aa93!important}.panel-actions .btn.text-primary{color:#29aa93}.picker-focus .picker-selections{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.status-bars .bar{background:#29aa93}.status-bars-h .bar{background:#29aa93}.messagger-zt .messager-content>.icon{color:#29aa93}.tree li.active>a{color:#29aa93}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#29aa93}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#23c8ec}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#313c52;background-color:#f0fdfb}.dropdown-submenu:hover>a:after{border-left-color:#29aa93}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#23c8ec}.timeline>li>a:after,.timeline>li>div:after{background-color:#29aa93}.timeline>li.active:before{background-color:rgba(41,170,147,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#29aa93!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#29aa93!important}#mainHeader{background:#33c6ab;border-top-color:#29aa93;border-bottom-color:#f0fdfb}#searchGo{background-color:#23c8ec}#searchGo:hover{background-color:#29aa93}#subNavbar{margin-top:7px;text-align:center}#subNavbar .nav>li.active>a{color:#29aa93}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a:after{border-color:#29aa93}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#29aa93}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn.active:before,.btn-toolbar>.angle-btn:last-child:after,.btn-toolbar>.angle-btn:last-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn:last-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn,.btn-toolbar>.angle-btn.normal{border-color:#c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#313c52}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.active+.angle-btn:before,.btn-toolbar>.angle-btn.normal:after,.btn-toolbar>.angle-btn.normal:before{border-color:transparent transparent transparent #c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.normal:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before,.btn-toolbar>.angle-btn.normal>.btn-group:first-child:before{border-color:transparent transparent transparent #c4c4c4!important}#sidebarHeader{border-left:3px solid #29aa93}#sidebarHeader .title{color:#29aa93}#sidebar>.sidebar-toggle>.icon{background:#81dff4}#main .querybox-toggle.querybox-opened{color:#29aa93}#contentNav .nav>li.active>a{color:#29aa93}#contentNav .nav>li.active>a:before{background:#29aa93}td.c-actions .btn{color:#23c8ec}td.c-actions .btn:hover{color:#29aa93;background-color:#dafaf5}td.c-actions .btn-link{color:#313c52;background:0 0}td.c-actions .btn-link:hover{color:#29aa93;background:#f0fdfb}.main-table table .btn-icon-left:hover>.icon{background:#f0fdfb}.main-table tbody>tr:hover{background:#f0fdfb}.main-table tbody>tr.checked:hover{background:#ffe6c6}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#29aa93}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f9fefd}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f9fefd}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#2f8a8f}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#0b2f28}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover,.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down,.table.has-sort-head thead>tr>th>a.sort-up,.table.has-sort-head thead>tr>th>a:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#29aa93}.table.fixed-header-copy thead>tr>th>a.sort-down,.table.fixed-header-copy thead>tr>th>a.sort-down:after,.table.fixed-header-copy thead>tr>th>a.sort-up,.table.fixed-header-copy thead>tr>th>a.sort-up:before,.table.fixed-header-copy thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover:after,.table.fixed-header-copy thead>tr>th>a:hover:before{color:#f0fdfb}.table-nest-toggle:hover{color:#29aa93}.table-footer .checkbox-primary.checked label:after{border-color:#29aa93!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#37cfb4!important;border-color:#37cfb4!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffe6c6}.files-list>li>a:hover{color:#29aa93}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#29aa93;border-color:#29aa93}.article-content a{color:#29aa93}.article-content a:focus,.article-content a:hover{color:#23c8ec}.list-group{overflow-y:auto}.list-group>a.selected{color:#f0fdfb;background-color:#29aa93}.list-group>a.active{color:#29aa93;background-color:#f0fdfb}.list-group>a.active:hover,.list-group>a:hover{background-color:#29aa93}.list-group.tab-menu a.active:hover,.list-group.tab-menu a:hover{color:#29aa93}#swapper #dropMenu .tree li>.selected{color:#29aa93!important;background:#f0fdfb!important}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .list-group>a.selected,#swapper #dropMenu .list-group>a.selected:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu .tree li>.clickable:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#29aa93!important}#pageNav #dropMenu .list-group>a.active{color:inherit;background-color:inherit}#pageNav #dropMenu .list-group>a.active:hover,#pageNav #dropMenu.searchbox-focus .list-group>a.active:hover{color:#29aa93!important;background:#f0fdfb!important}#pageNav #dropMenu .list-group>a.active.selected,#pageNav #dropMenu .list-group>a.active.selected:hover{color:#fff!important;background:#29aa93!important}.release-line>li>a:hover:before{background-color:#f0fdfb}.release-line>li>a:hover .title{color:#29aa93}.release-line>li.active>a:before{border-color:#29aa93}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#23c8ec}#poweredBy .icon-zentao{color:#23c8ec}#poweredBy a:hover{color:#29aa93}#poweredBy a:hover .icon-zentao{color:#29aa93}#poweredBy a.text-primary{color:#29aa93}#poweredBy a.text-primary:hover{color:#23c8ec}.block-guide .nav-secondary>li.active>a:before,.block-statistic .nav-secondary>li.active>a:before{background:#29aa93!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#23c8ec!important}.dynamic.active .dynamic-date:before{background-color:#23c8ec!important}.tablesorter-header-inner:hover,table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after,table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{color:#29aa93!important}.table td.has-child>.task-toggle:hover{color:#29aa93!important}#openTaskPage.open:hover,#task .task-nav{color:#29aa93!important;background:#f0fdfb!important}#tasksProgress>.progress-bar{background:#29aa93!important}#tasksProgress .progress-text{color:#29aa93!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#29aa93!important;background:#f0fdfb!important;border-left-color:#29aa93!important;-webkit-box-shadow:inset 4px 0 0 #29aa93!important;box-shadow:inset 4px 0 0 #29aa93!important}#copyProjectModal a:hover{border-color:#23c8ec!important}#zeroTaskStory.checked{background:#f0fdfb!important;border-color:#23c8ec!important}.cols-list .col:hover{background:#f0fdfb!important}.files-grid .actions,.files-grid .col:hover .file{background:#f0fdfb!important}.dashboard .panel,.panel-default{-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}#menu .nav>li.active>a{background:#23c8ec!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#23c8ec!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#29aa93!important}#bars>li.active:after{background:#f0fdfb!important}#userNav>li>a>.icon{filter:none;opacity:1;-webkit-filter:none}#menu{background:#415a72}#mainMenu>.btn-toobar .btn-active-text,#mainMenu>.btn-toolBar .btn-active-text,#mainMenu>.btn-toolbar .btn-active-text{color:#27988a;background:#e7eded}#mainMenu>.btn-toobar .btn-active-text .text,#mainMenu>.btn-toolBar .btn-active-text .text,#mainMenu>.btn-toolbar .btn-active-text .text{top:0}#mainMenu>.btn-toobar .btn-active-text .text:after,#mainMenu>.btn-toolBar .btn-active-text .text:after,#mainMenu>.btn-toolbar .btn-active-text .text:after{border:none}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text:after{border-color:#29aa93}td.c-actions .btn{color:#29aa93}.main-table tbody>tr:hover{background:rgba(240,253,251,.8)}.main-table tbody>tr>td.c-name a{color:#2f8a8f}.main-table tbody>tr>td.c-name a:hover{color:#27988a}.table.table-data tbody>tr:hover,.table.table-form tbody>tr:hover{background:0 0}#programTableList>tr:hover{background:#e6f0ff;opacity:.8}#programTableList>tr>.c-name:hover>a{color:#29aa93!important}.assigned-none{color:#27988a!important}.assigned-current{color:#faae1a!important}a.assigned-current:hover,a.assigned-none:hover,a.assigned-other:hover{color:#27988a!important}a.assigned-current:hover .icon,a.assigned-none:hover .icon,a.assigned-other:hover .icon{color:#27988a!important}#dashboard .block-welcome .progress{background:#edeef2}#dashboard .block-welcome .progress>.progress-bar{background:#33c6ab}#assigntomeBlock .nav>li.active>a{color:#27988a}.consumedTotally{color:#29aa93;background:#f0fdfb}#toggleFoldIcon .icon-border{border:1px solid #d4eee9}#createEffort .table tbody .date-group .input-group-addon .icon,#recordForm .table tbody .date-group .input-group-addon .icon,#toggleFoldIcon{color:#29aa93}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.nav-steps>ul>li.active>a{background-color:#23c8ec}.nav-steps>ul>li.active>a:focus{background-color:#29aa93}.nav-steps>ul>li.active+li:after{border-left-color:#23c8ec}.nav-steps>ul>li.active:hover+li:after{border-left-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{background-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{color:#fff}.shadow-primary-hover:hover{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.border-primary-hover:hover{border:1px solid #29aa93}.menu-hover-primary>li>a:hover{color:#27988a!important;background-color:#d4eee9!important}.menu-active-primary>li.active>a{color:#29aa93!important;background-color:unset}.menu-active-primary>li.disabled>a:hover{color:#c4c4c4!important;background-color:unset!important}.bg-primary-100{background-color:#d4eee9!important}.form-active-primary .active .label,.form-active-primary .hover .label{color:#29aa93!important}.form-active-primary .active .form-control,.form-active-primary .hover .form-control{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#faae1a;border-color:#faae1a}#mainHeader{color:#313c52;background:#fff;border-bottom:1px solid #eee}#heading .header-btn .btn,#navbar .nav>li>a,#userNav>li>a{color:#313c52}#navbar .nav>li.active>a{position:relative;font-weight:500;color:#27988a;background:0 0}#navbar .nav>li.active>a:before{position:absolute;right:10px;bottom:0;left:10px;display:block;height:2px;content:' ';background-color:#27988a}#navbar .nav>li>a.active:hover,#navbar .nav>li>a:hover{background-color:rgba(0,0,0,.1)}#navbar .nav>li.divider{background-color:#f1f1f1}#visionSwitcher .dropdown-toggle>div,#visionSwitcher>div{background-color:rgba(0,0,0,.1)}#menu{position:relative;background:#248f83!important}#menu::after{position:absolute;bottom:0;left:0;z-index:-1;width:100%;height:108px;content:'';background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABsCAYAAACVWrdDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAA7dSURBVHgB7V1Nc9vGGV4QBL8pSjLp2LUddWK3jWvVOdjptMk4Mzl0euk1/gnN78ifyEzPuSk9J9PpIZlm6saTpJ00VJQ2jhJaiiOLFKkvghS/0H2ABQ1RILEgdkEi1ePBQCJpgXiffT/33YVCBMMwjAQ9pemR0Ikex2sZkhnQ0wkORVFa5BxDKEQQqOCz9JSjQo9N+hwlo0dPx+dEWAhMABvxeSr4hJ//R4kAAQeUCIP8HyMQAVT4C1TwWTIlKAnQhCP2txTzJUKS9NCgScx0denR+rFqzFQEUGGp9FSgQkqSgKBCPqAnmK3sJPPFTFedEtEnPyL4JoCZnILtYMMEyKIE6ExblujRpL+fkAjDlxDhaKngF8js0GPCX2Y+J0l/P6IkHJOIgosAdtP5IPZeEJJkxOHTn/P0+5GokuBpgpi9X/Qb5YQNap4iqQkTCSiXy4nSTzNLMSXGnGOWZBCnmMHK/CGKJIwlgI58CJ2aqHXy9GlfSyRy8XrnOBlXNWgEyZpMgJD5IoOSUI+SY54mClIbjc3cvJJhEGOQJdlaVMLVqRMxEFGtrqd1JZZ3vg4yMpkSmSWQZVMC9kkEIKIUoW4frhf6ndippGzWRNCrVykJPTLnEFaM290t50a1AZgVEVFxyMIIALa2ttL91NGi23thExEVMxQjAnHt2rWW2s673nRT10m1ViEhIhJVVqEaYGOSJgBhaAO9wm4UIiGhGmADmpAxBkfj3oc26HqVyAIVvh6VMFQKAcDFi6vHamIwNiGSbJJOzR3QSC1w2VwWpBEAXF24dWAYg4m2WDQJAzLo09Hfwc8ondMDldNlep7L+olUAmAGaPnUMxQECTrVCBHIkVyLCltjgr9gTxrRc4HNZcwVpBIAvP32n3UvLQCa1CcIIgHTmcUxs3UFVlqfG4TyZb7e+3hBGyxwzSWUiitEJpzz0PMA6RoAnPyQa/N+VnauQDUjN0+mKBQCbt265SskDCFhy5E5QSgEvPXWW76zUpkkwD9QLUiTOUBoDmnroLw8WjH1gsyMGW0u1BfIywY5EYoGADw5wSisjFlMeDoKtNXMgxaERgBygr3H7b1ev+vLHzR1qYN05gQINUEsxo6xv4szWgv7zv5PTOA8qj/Mxvu5jKLEuK8vKzylpmjPzpxlYW1tTX3jjZKyvZ3U6tpRTI0lzPvuDzp8SQkTLOZ/NXZ2HjZiZLxGDXs86dGBNuBvbm9vp+icSaaX9A4Ls9QXyJhzFp0XWPf1j1QzNYgbJ1qipxnxk1ZnrKVRxv0RYvWeaOwQ3YbY2zneIc4qxUm763kNGVqA2lFeye+SAIC81tc/zJJCMtHu97gDDa2n9hWXP4ZRvUzEC/0MarUaaRJ+Gy8rKpp27gCm5YU7SzmiJqdSzefU+L6bkAskBOEDxWIR4Qi3o0VUJKnzBffLTQBG/MNH7+fjWm7qVs1+vNO5dvW11hnb9OjRw55O5IR+bihmiqZ954WkBI07GiyX1xL/2vmoGET4wE+MjO564Rs3HjepPTNqenjzt35JkJUbeOHzz/+SbecuXaDTTIEsBGz/tWuvmJNGZwhQlPv9WHt779tv141KbYOEBZDA23MqITfwND8PttbS3UJaSGt+bjk5nCl0Vb27d9/svnyrWT14stXfqHxEoA1hjLrS7LTAk4Br5CoRhReWNofh3/j4lGrC7dsHe4Pj+Eml8hUBERXJVUrE+bymSJQWdEm3zRMBvff0CyFddksLaBi4P7zeROeDD66uvlInagdJFKlVvyKyHbRlivgQVAuQAxRI4dDtPcP4II4w0/79TWoVBkY/cK9Ra2nzVMMAn/c/+uFgMLAuXql8Jp2EMLQAGTCdP66Ojn5EOeWtB8ufVdTSC7++dPHTb/5asInIxJOBShYIPVeV+6f+BnctBhFAVzNMJwRTsbJyBzdBZIE3ACgVQRb/92Dt6w23+s/HX7+34BZe0iJ6r01z91g7pwUJP1MrO3ujBHDHvy+99Hta3kiaNROovmxN4NUCXW8SP1CIgnsuOEvRSKww6scJF2Fnon9psZC+oJEp4Tb6AV/l6NXV14/DIoHXFzSn8AOYC6DHIhX8IswLEiueGk6zdzL1XHL2St214Od7PgAkaF3lED5hSIKkELWU4Su+Td/m+KRz496l5aCJlRcQ+biNfiDACpk19YsvMgudeDyF34ul581qpWi/wFuw818p1cl/djZ6soUP3FnZ2XWGnk4EnpDBSsqmupNXjV7CqtdTCrJF0zmKIgMaVjVH+XhN8+uMK5UNEkbNK5XpH61efH1sd6DA7WrW1M3NpVzjpG8tZJUQKdX02tjQ00+pGgW9WrNGZAM1n5duvDpxrkHYnDBU7Pr13x2cdtJia0lwzOP8Aq8zDkv4wO3r3+95feYUAQjH6GF2C7Ajy4406zT2tJdw0ktJ1ZSGTkcsDpGAZo0jwTsYoEanGU4l9bKGjUXue5Y44mz6EfFvgmf7mabRhFmBR0dtBOfOaDb5zjt/P/rD/d+YtqdSrZCbK/zlBR6YNSNScjFHyAnGm7xKpRKa3b9y8S7XhRQq0MskICghKK8OJ9zxWrn8YLkdOzQJvXnznpSs2SoOnr7PcdEQQtVK9TERAdSEYh3S02MtJaPl4vg9mU4MkqrR6hUXT1aVVe6ShZAQjGmOKWyqUSCi9fDh+734AuuEg4wkVC1Qvq6emThyv1gqk8LAUIkAxBRViS0Q5d6lNC1pvBaoSiq8MYuSkcaKlOu/+uUwra9Kml1zK1+PK03kyHP7KTUubA8J5A8o2JXLHwRq9A2lM64mSPXdMFqyOB0NWZFY/fBbbJfZ6WtHwjfxaOfUPCqm0y78kEZAJnO6riU6GnLCvXCnD53u00Y9+c8f/lZSa1e6RAI0I0NN7btTydLVB1jhXNNqjnWJGuBQrcQnS8Yb94xpIuzQUEY05Pw+TsODa5pLnhzfHSajnatfIBKgXi/sK8qrUy2LZQTopu2sYpQ2iWeohvdr7I4z2YwpALdSAN6zCYAGYG65mBHf3Qai4w2lgxZHdGD3BwcDmmwJcbheMEsNPqKeUSjfVb+8jORERHwMgSNJsns4zdCPzicP35c7kYPtL+EQjz578mGWdNWpa/e84Ck1eCGGtFxUcgIiK9UNNpulm7UZZ0OtLndxtinwRmMzEYbwEfvzlBq8IMUJg4gNGn1A2CVapnYCEZEkhwxz2tvv6ikSAi7Hk1ylBi/EctnYsZZqHT63Et/HAZuG1zCFFrQLANpVrdbOtJVDSySUBEybX281pIfWkI/d2RYUnrFr2Sgn0o12+rh+kuzG+9M5NpciGSZwVoo3iUB0G41Gd/Ow7MvBZEjR9F2AzmOOT/rdu794XZgKe1c3LQ9vevmtrQfp+omR900ENGCEBCs5o05ZXM+/0SCbXB80o7bSypkkzqwsNR8PSbGCk2eyhtO9/fOdBhEIX7UgpnatqYhwJeErGjVht0Uh+UGn1ex4Ot9i9vmxpNutkcP32ddCULF7/NTo7m/Q2s+bQrfBmcpeggiEX/AXJCA2xE3qd7w6GzCyJ2mcGSa7vI9MuxevHty588cemx/JsXPgXCOQw8JcJyacoZpc/2HM6gr0nQYkgV7/3YlVySC5R2qQ6v/26htoSblEDzSn5dn5IsggASBsTri8+0Gurat5rg+PEXax9OK0PuFofX29M1pqKGatdQe2rUdofHNFqOMfXn/aHRqFhWzQBu2gdcj14TGaAJ8wxZoELIM9rmY/Gd4L7PydlXtmlOV0tKWStH3q8tNuCCV8q4JPP/2Tpi2uLnE56DGa4KNkgTzFbLBFYNBPLS46SyFnL6fL3l7Z95pjKXtFoEXl399cucAdJY01SUVWW3KNkiB83LBZYt7f318qFAqhZMETgPXQvvatlrZZxzQkQNBuZQqMWsTlWfq+WV+yNAM7Ix5Y1zK7tmf9cAkbmPyp835Y6m4pfkmwnaZZyzfbR0Y1AwmURYK9wJo9v2yWj1Vxg/msG54PSt+uBiR88l2phIlsns8XzbZGvkgIC6yJlS6FtukIJ2CKdnmekSb9i5urLvf+y122tbrWvAcPNIBY9f95Ez5gPpaL94PSgVWX3CEqsRqovGAQAwTMo/BtZHkm6kO7Aayw4c2YUQLzmrjJ42FKhPhbHhMuIFvPBR2hPoxNbRf2u5wT4zBF41rOmfnB8lI6yAy0moSxNTHsOQi3WzIHozbesV+SHXR4dmGEvonpuIVwbkC4ueJSOsDDGYg1eAx2lrkNJcjel7WpUyidA05cvfCz7s9ffj5JBjHPa3fpv2xCI5p2mi8Nm+NaBTF7AylZQH1nX+ZO7DPZxtdvfmAV0DKm6YmRmMo0gK/w5/OrESuEBFph7LA7kyjC3Abh+vd7vE65WrPa0HMkt0eFj/8jy+bDru+yI5TtjWcWxtkk8DTMYjaKPUkVwh+QZ6NUNEKXx1zsJI5K5hNFz6i9xClnqqXUfqK33H/xyouGXV+hkQZ29IKgRBfeQG7DLu6Fhbnayt3c/I6sm/O6X5Iv+/eplrCNtvHs4F0WdiL7ReQDAkR9fwh/bxaPPQn9ocyTwOLqzshrHRZfa+w9CCnFfhbhCzDiG7N65sw8p/JOQNi2eQJJiJ5E9PrbZmdmD/yJIgF2DSiorbYndGb6tKWoEID03+75sSMgCM6vFoA0u9TamodHXc2VD5gAaECM9eHY9Rf4BWSq8ANtdvZyygabRTsgc4JIaAAVmrkJOD0S7GcbpjOmr8GO77DXkECBEJA2948zjIoGADAfdukCgoVJgl8wTQp7AjjQcvbosAgK96mQOQu7gSgR4FznOyDPdnO3O+IUx3tDsNA21OTKD6LihAEI0emIMXgGjjKxSQ7PPOw8IUoEYKQ7NSBNno1+4ng9UogSARBubKQj2Zk1414iNfqByBDgiNlh6+2fnQTg9XMNkAwIXhv53YYzR4gMokYAbP4wlKRaMeoDIvEQZyeiqAF218GosM81ICRA0Cg7uBFwrgGSYc8FAG5Lks6dsGTAxIz7znafUKQQNQImjXDcy7kJkoxJI/w8DwgBrgJ2ZMfnJihEjCZhZB5muPzifzvaxdIXFrNVAAAAAElFTkSuQmCC) no-repeat}#userNav>li>a>.icon{color:#23c8ec}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:-webkit-gradient(linear,left top,right top,from(rgba(229,244,169,.4)),to(rgba(237,254,171,.036)))!important;background:-webkit-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:-o-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:linear-gradient(90deg,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;border-radius:4px;opacity:1}#featurebar .nav li.active a{color:#27988a!important}#featurebar .nav li.active a:after{border-bottom:2px solid #27988a!important}.btn.btn-action,.c-actions .btn,td.c-name a{color:#29aa93}#logForm .table .versions a,#mainMenu .page-title strong a,#readOnlyOfKanban i{color:#29aa93!important}.picker-drop-menu .picker-option-list .picker-option.picker-option-active,.picker-drop-menu .picker-option-list .picker-single .picker-option.picker-option-selected.picker-option-active{color:#29aa93}.table-actions .btn{background:#29aa93!important;border-color:#29aa93!important}.table-actions .btn:hover{color:#fff;background:#27988a;border-color:#27988a}.table-actions>.btn-group:first-child>.btn:first-child{border-right:1px solid rgba(255,255,255,.2)!important}a.programName:focus,a.programName:hover{background:#29aa93!important}#guideDialog .project-type-img:hover,#guideDialog .project-type.active img,.kanbans .panel:hover{border-color:#29aa93!important}.btn.btn-action:hover,.c-actions .btn:hover{color:#29aa93;background:#f0fdfb}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.main-table table tr{border-color:#f2f6f8!important}#mainHeader #headerActions .btn-group>.btn{color:#313c52!important}.c-manager .avatar.avatar-top{border-color:#faae1a}#programTableList>tr:hover{background:#f0fdfbcc}#programTableList>tr:hover>.c-name>a{color:#27988a!important}#programTableList>tr[data-type=project]>.c-name>a{color:#2f8a8f!important}.m-product-all #mainMenu>div.btn-toolbar.pull-right>a.btn.btn-link.iframe{color:#00c4d0!important}#featuresNav.nav-simple>li.active>a,.nav-simple>li.active>a,.nav-simple>li.active>a:focus,.nav-simple>li.active>a:hover{color:#29aa93}#featuresCarousel .carousel-indicators .active{background-color:#29aa93!important;border-color:#29aa93!important}#dashboard .block-welcome .progress{background:#eee}
\ No newline at end of file

From e23d18108bbdba31ed0a014359c1ba016b0e4ece Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 1 Mar 2023 17:22:08 +0800
Subject: [PATCH 164/319] * Code for change lang in admin.

---
 module/admin/lang/zh-cn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index f63f4d25c4..bc4a35220a 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -61,7 +61,7 @@ $lang->admin->info->account = "您的禅道社区账户为%s。";
 $lang->admin->info->log     = '超出存天数的日志会被删除，需要开启计划任务。';
 
 $lang->admin->notice = new stdclass();
-$lang->admin->notice->register = "可%s禅道社区 www.zentao.net, 及时获得禅道最新信息。";
+$lang->admin->notice->register = "可%s禅道社区 www.zentao.net，及时获得禅道最新信息。";
 $lang->admin->notice->ignore   = "不再提示";
 $lang->admin->notice->int      = "『%s』应当是正整数。";
 

From 2e596f390743ece77603995638e352df89e236e3 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Mar 2023 18:33:50 +0800
Subject: [PATCH 165/319]  * add title for show all desc.

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

diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php
index 55d203d8d4..538d7fd72f 100644
--- a/module/holiday/view/browse.html.php
+++ b/module/holiday/view/browse.html.php
@@ -51,7 +51,7 @@
         <td><?php echo $holiday->name;?></td>
         <td><?php echo formatTime($holiday->begin, DT_DATE1) . ' ~ ' . formatTime($holiday->end, DT_DATE1);?></td>
         <td><?php echo zget($lang->holiday->typeList, $holiday->type);?></td>
-        <td><p class='c-desc'><?php echo $holiday->desc;?></p></td>
+        <td><p class='c-desc' title='<?php echo $holiday->desc?>'><?php echo $holiday->desc;?></p></td>
         <td class=" c-actions">
           <?php common::printIcon('holiday', 'edit', "id=$holiday->id", $holiday, 'list', '', '', 'iframe', 'yes');?>
           <?php common::printIcon('holiday', 'delete', "id=$holiday->id", $holiday, 'list', '', 'hiddenwin');?>

From 426e369ef13825f76b3f7fc887294c7e2c421624 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Thu, 2 Mar 2023 00:22:30 +0000
Subject: [PATCH 166/319] * Fix the lack of story data

---
 module/story/model.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 1a9cd5724f..17bde87147 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3023,11 +3023,6 @@ class storyModel extends model
      */
     public function getProductStoryPairs($productID = 0, $branch = 'all', $moduleIdList = 0, $status = 'all', $order = 'id_desc', $limit = 0, $type = 'full', $storyType = 'story', $hasParent = true)
     {
-        if($moduleIdList)
-        {
-            $moduleInfo   = $this->loadModel('tree')->getByID($moduleIdList);
-            $moduleIdList = (isset($moduleInfo->type) and $moduleInfo->type == 'bug') ? 0 : $moduleIdList;
-        }
         $stories = $this->dao->select('t1.id, t1.title, t1.module, t1.pri, t1.estimate, t2.name AS product')
             ->from(TABLE_STORY)->alias('t1')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('1=1')

From 72b0baa4cdd1d91033d2d605a093feaaa8ee1191 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 00:29:11 +0000
Subject: [PATCH 167/319] * Fix bug #32578, and fix bug of set path.

---
 module/programplan/model.php            | 2 +-
 module/testsuite/view/linkcase.html.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 88db39867e..ed7d761bd3 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -1046,7 +1046,7 @@ class programplanModel extends model
 
         $this->dao->update(TABLE_PROJECT)->set('path')->eq($path['path'])->set('grade')->eq($path['grade'])->where('id')->eq($stage->id)->exec();
 
-        if(count($children) > 0)
+        if(!empty($children))
         {
             foreach($children as $id => $child) $this->setTreePath($id);
         }
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index e1bf64774f..d7e6927384 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -26,6 +26,13 @@
 </div>
 <div class="cell show" id="queryBox" data-module='testsuite'></div>
 <div id='mainContent'>
+  <?php if(empty($cases)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
+    </p>
+  </div>
+  <?php else:?>
   <form class='main-table table-testcase' data-ride='table' method='post'>
     <div class="table-header">
       <i class="icon-unlink"></i> &nbsp;<strong><?php echo $lang->testsuite->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
@@ -87,5 +94,6 @@
     </div>
     <?php endif;?>
   </form>
+  <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>

From 73b5269051bf847991a810b8a0a8a52167d279fc Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 2 Mar 2023 08:37:15 +0800
Subject: [PATCH 168/319] * Fix bug #32428.

---
 module/programplan/js/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/js/edit.js b/module/programplan/js/edit.js
index fd3a453708..c2a243fa1f 100644
--- a/module/programplan/js/edit.js
+++ b/module/programplan/js/edit.js
@@ -2,7 +2,7 @@ function changeParentStage(stageID)
 {
     $.get(createLink('programplan', 'ajaxGetAttribute', 'stageID=' + stageID + '&attribute=' + plan.attribute), function(attribute)
     {
-        $('#attributeType th + td').html(attribute);
+        $('#attributeType td:first').html(attribute);
         $("#attribute" + "_chosen").remove();
         $("#attribute").next('.picker').remove();
         $("#attribute").chosen();

From 41a51b8b254e45b2365b9c04fdfddfe3730ce43d Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 2 Mar 2023 00:52:42 +0000
Subject: [PATCH 169/319] * Adjust code

---
 module/zanode/view/browse.html.php | 4 ++--
 module/zanode/view/create.html.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php
index 5e236b48da..e586757bfa 100644
--- a/module/zanode/view/browse.html.php
+++ b/module/zanode/view/browse.html.php
@@ -53,7 +53,7 @@
           <tr>
             <th class='c-id'><?php common::printOrderLink('t1.id', $orderBy, $vars, $lang->idAB); ?></th>
             <th class='c-name'><?php common::printOrderLink('t1.name', $orderBy, $vars, $lang->zanode->name); ?></th>
-            <th class='c-type'><?php common::printOrderLink('t1.type', $orderBy, $vars, $lang->zahost->type); ?></th>
+            <th class='c-type hidden'><?php common::printOrderLink('t1.type', $orderBy, $vars, $lang->zahost->type); ?></th>
             <th class='c-ip'><?php common::printOrderLink('t1.extranet', $orderBy, $vars, $lang->zanode->extranet); ?></th>
             <th class='c-cpu'><?php common::printOrderLink('t1.cpuCores', $orderBy, $vars, $lang->zanode->cpuCores); ?></th>
             <th class='c-memory'><?php common::printOrderLink('t1.memory', $orderBy, $vars, $lang->zanode->memory); ?></th>
@@ -69,7 +69,7 @@
             <tr>
               <td><?php echo $node->id; ?></td>
               <td title='<?php echo $node->name ?>'><?php echo html::a($this->inlink('view', "id=$node->id"), $node->name, '', ""); ?></td>
-              <td><?php echo zget($this->lang->zanode->typeList, $node->type); ?></td>
+              <td class='hidden'><?php echo zget($this->lang->zanode->typeList, $node->type); ?></td>
               <td><?php echo $node->extranet; ?></td>
               <td><?php echo zget($config->zanode->os->cpuCores, $node->cpuCores); ?></td>
               <td><?php echo $node->memory . $this->lang->zahost->unitList['GB']; ?></td>
diff --git a/module/zanode/view/create.html.php b/module/zanode/view/create.html.php
index b704f2d16e..19f1a570df 100644
--- a/module/zanode/view/create.html.php
+++ b/module/zanode/view/create.html.php
@@ -22,7 +22,7 @@
       </div>
       <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
         <table class='table table-form'>
-          <tr>
+          <tr class='hidden'>
             <th><?php echo $lang->zahost->type;?></th>
             <td><?php echo html::select('type', $lang->zanode->typeList, 'virtual', "class='form-control chosen' onchange='zahostType()'")?></td>
             <td></td>

From cb7757e92d26dafa0d670d6385d1b299eae60578 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 01:02:17 +0000
Subject: [PATCH 170/319] * Fix bug #32582.

---
 module/project/css/execution.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/css/execution.css b/module/project/css/execution.css
index 291cca644c..afd49abd35 100644
--- a/module/project/css/execution.css
+++ b/module/project/css/execution.css
@@ -16,6 +16,7 @@ td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; alig
 td.c-name > .project-type-label {flex: 0 0 36px; padding-right: 2px;}
 .c-name > a, .table-children .text-left > a, .c-name > span.text-ellipsis { padding-left: 5px; text-overflow: clip;}
 span.table-nest-icon.table-nest-toggle {min-width: 22px; max-width: 22px;}
+span.table-nest-icon {padding-left: 22px;}
 #projectForm .c-name, #executionTableList .c-name, #programTableList .c-name {padding-right:47px;}
 #mainMenu .pull-left > .btn-group > a > .text{overflow: hidden;display: block;}
 #mainMenu .pull-right .icon-list{padding-left: 7px;}

From 477c1fe2f2fcd2da6099eb8a3a1a542a54fd7859 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 2 Mar 2023 09:19:05 +0800
Subject: [PATCH 171/319] * Fix bug #32577.

---
 module/task/js/create.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/task/js/create.js b/module/task/js/create.js
index 5244f4426d..52497f9380 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -619,7 +619,7 @@ $(document).on('click', '#testStory_chosen', function()
 
 $('#modalTeam tfoot .btn').click(function()
 {
-    var team  = '';
+    var team  = [];
     var time  = 0;
     var error = false;
     var mode  = $('[name="mode"]').val();
@@ -630,7 +630,7 @@ $('#modalTeam tfoot .btn').click(function()
 
         var tr      = $(this).closest('tr');
         var account = $(this).find('option:selected').text();
-        team += ' ' + account;
+        if(!team.includes(account)) team.push(account);
 
         estimate = parseFloat($(this).parents('td').next('td').find('[name^=teamEstimate]').val());
         if(!isNaN(estimate) && estimate > 0) time += estimate;
@@ -643,8 +643,7 @@ $('#modalTeam tfoot .btn').click(function()
     });
 
     if(error) return false;
-    var teamList = team.split(" ");
-    if(teamList.length <= 2)
+    if(team.length < 2)
     {
         bootbox.alert(teamMemberError);
         return false;

From 6ba9f870692890c1a232f95787e2f87437a77721 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 2 Mar 2023 10:08:29 +0800
Subject: [PATCH 172/319]  * code for bug #32512.

---
 module/admin/model.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index 3a7f8492a6..a85a8f49a6 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -643,10 +643,11 @@ class adminModel extends model
      */
     public function checkInternet()
     {
+        $timeoutMS = 400;
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->config->admin->apiSite);
-        curl_setopt($curl, CURLOPT_TIMEOUT_MS, 1000);
-        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, 1000);
+        curl_setopt($curl, CURLOPT_TIMEOUT_MS, $timeoutMS);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, $timeoutMS);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);

From a01f62d591755d1afa551569bb12a5cf92def325 Mon Sep 17 00:00:00 2001
From: zhaoke <yuaiwuhen@hotmail.com>
Date: Thu, 2 Mar 2023 10:13:03 +0800
Subject: [PATCH 173/319] * Fix bug#32141.

---
 config/zentaopms.php         | 2 +-
 module/zanode/lang/de.php    | 1 +
 module/zanode/lang/en.php    | 1 +
 module/zanode/lang/fr.php    | 1 +
 module/zanode/lang/zh-cn.php | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index a504e541ef..19acea91ea 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -227,7 +227,7 @@ $config->openMethods[] = 'doc.createbasicinfo';
 $config->openMethods[] = 'project.createguide';
 $config->openMethods[] = 'task.editteam';
 $config->openMethods[] = 'feedback.mergeproductmodule';
-$config->openMethods[] = 'zanode.nodeList';
+$config->openMethods[] = 'zanode.nodelist';
 $config->openMethods[] = 'action.restoreStages';
 
 $config->openModules = array();
diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php
index 8b27396080..2d269e533c 100644
--- a/module/zanode/lang/de.php
+++ b/module/zanode/lang/de.php
@@ -1,6 +1,7 @@
 <?php
 $lang->zanode->common          = 'ZenAgent Node';
 $lang->zanode->browse          = 'ZenAgent Node List';
+$lang->zanode->nodeList        = 'ZenAgent Node List';
 $lang->zanode->create          = 'Create ZenAgent Node';
 $lang->zanode->edit            = 'Edit ZenAgent Node';
 $lang->zanode->editAction      = 'Edit ZenAgent Node';
diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php
index 3a2f5b10bd..996e12770c 100644
--- a/module/zanode/lang/en.php
+++ b/module/zanode/lang/en.php
@@ -1,6 +1,7 @@
 <?php
 $lang->zanode->common          = 'ZenAgent Node';
 $lang->zanode->browse          = 'ZenAgent Node List';
+$lang->zanode->nodeList        = 'ZenAgent Node List';
 $lang->zanode->create          = 'Create ZenAgent Node';
 $lang->zanode->edit            = 'Edit ZenAgent Node';
 $lang->zanode->editAction      = 'Edit ZenAgent Node';
diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php
index 8b27396080..2d269e533c 100644
--- a/module/zanode/lang/fr.php
+++ b/module/zanode/lang/fr.php
@@ -1,6 +1,7 @@
 <?php
 $lang->zanode->common          = 'ZenAgent Node';
 $lang->zanode->browse          = 'ZenAgent Node List';
+$lang->zanode->nodeList        = 'ZenAgent Node List';
 $lang->zanode->create          = 'Create ZenAgent Node';
 $lang->zanode->edit            = 'Edit ZenAgent Node';
 $lang->zanode->editAction      = 'Edit ZenAgent Node';
diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php
index dcd471c766..abfcbd593d 100644
--- a/module/zanode/lang/zh-cn.php
+++ b/module/zanode/lang/zh-cn.php
@@ -1,6 +1,7 @@
 <?php
 $lang->zanode->common          = '执行节点';
 $lang->zanode->browse          = '执行节点列表';
+$lang->zanode->nodeList        = '执行节点列表';
 $lang->zanode->create          = '创建执行节点';
 $lang->zanode->edit            = '编辑执行节点';
 $lang->zanode->editAction      = '编辑执行节点';

From 40015657cc8a727245b1928cfad8d784e7bf413d Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 2 Mar 2023 10:16:48 +0800
Subject: [PATCH 174/319] * Code for task #85502

---
 lib/base/front/front.class.php | 31 +++++++++++++++----------------
 module/common/lang/de.php      |  2 ++
 module/common/lang/en.php      |  2 ++
 module/common/lang/fr.php      |  2 ++
 module/common/lang/vi.php      |  2 ++
 module/common/lang/zh-cn.php   |  2 +-
 www/js/my.full.js              | 20 +++++++-------------
 7 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index 19988c4acc..a32c400872 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -1202,22 +1202,21 @@ EOT;
         $jsLang->timeout      = isset($lang->timeout) ? $lang->timeout : '';
         $jsLang->confirmDraft = isset($lang->confirmDraft) ? $lang->confirmDraft : '';
         $jsLang->resume       = isset($lang->resume)  ? $lang->resume  : '';
-        $jsLang->program      = isset($lang->program->common) ? $lang->program->common : '';
-        $jsLang->project      = isset($lang->project->common) ? $lang->project->common : '';
-        $jsLang->product      = isset($lang->product->common) ? $lang->product->common : '';
-        $jsLang->task         = isset($lang->task->common) ? $lang->task->common : '';
-        $jsLang->story        = isset($lang->story->common) ? $lang->story->common : '';
-        $jsLang->bug          = isset($lang->bug->common) ? $lang->bug->common : '';
-        $jsLang->testcase     = isset($lang->testcase->common) ? $lang->testcase->common : '';
-        $jsLang->testsuite    = isset($lang->testsuite->common) ? $lang->testsuite->common : '';
-        $jsLang->zahost       = isset($lang->zahost->common) ? $lang->zahost->common : '';
-        $jsLang->zanode       = isset($lang->zanode->common) ? $lang->zanode->common : '';
-        $jsLang->gitlab       = isset($lang->gitlab->common) ? $lang->gitlab->common : '';
-        $jsLang->gogs         = isset($lang->gogs->common) ? $lang->gogs->common : '';
-        $jsLang->gitea        = isset($lang->gitea->common) ? $lang->gitea->common : '';
-        $jsLang->jenkins      = isset($lang->jenkins->common) ? $lang->jenkins->common : '';
-        $jsLang->sonarqube    = isset($lang->sonarqube->common) ? $lang->sonarqube->common : '';
-        $jsLang->repo         = isset($lang->repo->common) ? $lang->repo->common : '';
+        $jsLang->program      = zget($lang->program, 'common', '');
+        $jsLang->project      = zget($lang->project, 'common', '');
+        $jsLang->product      = zget($lang->product, 'common', '');
+        $jsLang->task         = zget($lang->task, 'common', '');
+        $jsLang->story        = zget($lang->story, 'common', '');
+        $jsLang->bug          = zget($lang->bug, 'common', '');
+        $jsLang->testcase     = zget($lang->testcase, 'common', '');
+        $jsLang->zahost       = zget($lang->zahost, 'common', '');
+        $jsLang->zanode       = zget($lang->zanode, 'common', '');
+        $jsLang->gitlab       = zget($lang->gitlab, 'common', '');
+        $jsLang->gogs         = zget($lang->gogs, 'common', '');
+        $jsLang->gitea        = zget($lang->gitea, 'common', '');
+        $jsLang->jenkins      = zget($lang->jenkins, 'common', '');
+        $jsLang->sonarqube    = zget($lang->sonarqube, 'common', '');
+        $jsLang->repo         = zget($lang->repo, 'common', '');
 
         $js  = static::start(false);
         $js .= 'window.config=' . json_encode($jsConfig) . ";\n";
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 27992839f9..39d4b9fc17 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -90,6 +90,8 @@ $lang->viewDetails        = 'View Details';
 
 $lang->actions         = 'Aktionen';
 $lang->restore         = 'Wiederherstellen';
+$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->resume          = 'resume';
 $lang->comment         = 'Notiz';
 $lang->history         = 'Historie';
 $lang->attatch         = 'Anlagen';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 8469152e6e..43874c90d6 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -90,6 +90,8 @@ $lang->viewDetails        = 'View Details';
 
 $lang->actions         = 'Action';
 $lang->restore         = 'Reset';
+$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->resume          = 'resume';
 $lang->comment         = 'Note';
 $lang->history         = 'History';
 $lang->attatch         = 'Files';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 3cb42e4570..70ca8d5a91 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -90,6 +90,8 @@ $lang->viewDetails        = 'View Details';
 
 $lang->actions         = 'Action';
 $lang->restore         = 'Réinitialiser';
+$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->resume          = 'resume';
 $lang->comment         = 'Note';
 $lang->history         = 'Historique';
 $lang->attatch         = 'Fichiers';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index a7f9012aa7..ece2d6442c 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -69,6 +69,8 @@ $lang->whitelist    = 'Lista bianca';
 
 $lang->actions         = 'Hành động';
 $lang->restore         = 'Thiết lập lại';
+$lang->confirmDraft    = 'There are unsaved form of %name%. Do you want to restore them?';
+$lang->resume          = 'resume';
 $lang->comment         = 'Ghi chú';
 $lang->history         = 'Lịch sử';
 $lang->attatch         = 'Files';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d3ce94cce8..dd4bccd1e9 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -90,7 +90,7 @@ $lang->viewDetails        = '查看详情';
 
 $lang->actions         = '操作';
 $lang->restore         = '恢复默认';
-$lang->confirmDraft    = '有未保存的%s%表单，是否恢复？';
+$lang->confirmDraft    = '有未保存的%name%表单，是否恢复？';
 $lang->resume          = '恢复';
 $lang->comment         = '备注';
 $lang->history         = '历史记录';
diff --git a/www/js/my.full.js b/www/js/my.full.js
index fffa853be9..ea85964ad5 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1,4 +1,3 @@
-/* Tab session */
 (function($)
 {
     /**
@@ -9,8 +8,8 @@
      */
     function handleSaveFormDraft()
     {
-        if (config.currentMethod === 'login') return;
-        setTimeout(() => {
+        if(config.currentMethod === 'login') return;
+        setTimeout(function() {
             var form = $('.table-form').parent();
             if(form.length)
             {
@@ -18,7 +17,7 @@
                 var formDataStored = $.zui.store.get(formDataID);
                 if(formDataStored)
                 {
-                    var message = lang.confirmDraft.replace('%s%', lang[config.currentModule] || '');
+                    var message = lang.confirmDraft.replace('%name%', lang[config.currentModule] ? lang[config.currentModule] : '');
                     new $.zui.Messager(message, {
                         type: 'success',
                         close: true,
@@ -34,8 +33,7 @@
                                     for(var i = 0; i < formDataStored.length; i++)
                                     {
                                         var item = formDataStored[i];
-
-                                        /* formItem === checkbox || formItem === multipleSelect */
+                                        /* formItem === checkbox or formItem === multipleSelect */
                                         if(item.name.indexOf('[]') != -1)
                                         {
                                             var formItem = $('[name^=' + item.name.replace('[]', '') + ']');
@@ -63,10 +61,7 @@
                                                  if($(formItem).attr('multiple'))
                                                  {
                                                      var value = [];
-                                                     if (!valueMultiple[item.name])
-                                                     {
-                                                         valueMultiple[item.name] = [];
-                                                     }   
+                                                     if(!valueMultiple[item.name]) valueMultiple[item.name] = [];
                                                      valueMultiple[item.name].push(item.value);
                                                      $(formItem).data('zui.picker').setValue(valueMultiple[item.name]);
                                                  }   
@@ -110,17 +105,16 @@
                  }).on('change', function()
                  {
                      $.zui.store.set(formDataID, $(form).serializeArray());
-                     console.log($(form).serializeArray());
                  }).on('success.form.zui', function(event, res)
                  {
-                     if (res.result === 'fail' || res.status === 'fail') return
-                     $.zui.store.remove(formDataID);
+                     if(res.result === 'fail' || res.status === 'fail') $.zui.store.remove(formDataID);
                  })  
              }   
          }, 500);
      }  
     handleSaveFormDraft();
 
+    /* Tab session */
     if(!config.tabSession) return;
     /** Store current tab id */
     var _tid = '';

From 8641dcb13a8824cc140f544bb4a4c92712370848 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 10:25:07 +0800
Subject: [PATCH 175/319] * Adds navigation custom limits for function
 switches.

---
 module/dev/config.php | 28 +++++++++++++++++++++++++++-
 module/dev/model.php  |  3 +++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index d53f40920b..0c9b72278a 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -258,4 +258,30 @@ if($config->vision == 'lite')
 $config->dev->linkMethods['my']['my-calendar'] = array('my', 'todo');
 
 $config->dev->skipMenus['first']  = array('project', 'product');
-$config->dev->skipMenus['second'] = array('menu_storyGroup', 'menu_story');
+$config->dev->skipMenus['second'] = array('menu_storyGroup', 'menu_story', 'menu_other', 'menu_more');
+
+$config->dev->skipMenus['scrum'] = array();
+if(!helper::hasFeature('scrum_issue')      and !helper::hasFeature('agileplus_issue'))      $config->dev->skipMenus['scrum']['issue']      = 'otherDropMenu_issue';
+if(!helper::hasFeature('scrum_risk')       and !helper::hasFeature('agileplus_risk'))       $config->dev->skipMenus['scrum']['risk']       = 'otherDropMenu_risk';
+if(!helper::hasFeature('scrum_meeting')    and !helper::hasFeature('agileplus_meeting'))    $config->dev->skipMenus['scrum']['meeting']    = 'otherDropMenu_meeting';
+if(!helper::hasFeature('scrum_measrecord') and !helper::hasFeature('agileplus_measrecord')) $config->dev->skipMenus['scrum']['measrecord'] = 'otherDropMenu_report';
+
+$config->dev->skipMenus['waterfall'] = array();
+if(!helper::hasFeature('waterfall_track')        and !helper::hasFeature('waterfallplus_track'))        $config->dev->skipMenus['waterfall']['track']        = 'menu_track';
+if(!helper::hasFeature('waterfall_researchplan') and !helper::hasFeature('waterfallplus_researchplan')) $config->dev->skipMenus['waterfall']['researchplan'] = 'otherDropMenu_research';
+if(!helper::hasFeature('waterfall_issue')        and !helper::hasFeature('waterfallplus_issue'))        $config->dev->skipMenus['waterfall']['issue']        = 'otherDropMenu_issue';
+if(!helper::hasFeature('waterfall_risk')         and !helper::hasFeature('waterfallplus_risk'))         $config->dev->skipMenus['waterfall']['risk']         = 'otherDropMenu_risk';
+if(!helper::hasFeature('waterfall_opportunity')  and !helper::hasFeature('waterfallplus_opportunity'))  $config->dev->skipMenus['waterfall']['opportunity']  = 'otherDropMenu_opportunity';
+if(!helper::hasFeature('waterfall_process')      and !helper::hasFeature('waterfallplus_process'))      $config->dev->skipMenus['waterfall']['process']      = 'otherDropMenu_pssp';
+if(!helper::hasFeature('waterfall_measrecord')   and !helper::hasFeature('waterfallplus_measrecord'))   $config->dev->skipMenus['waterfall']['measrecord']   = 'otherDropMenu_report';
+if(!helper::hasFeature('waterfall_auditplan')    and !helper::hasFeature('waterfallplus_auditplan'))    $config->dev->skipMenus['waterfall']['auditplan']    = 'otherDropMenu_auditplan';
+if(!helper::hasFeature('waterfall_meeting')      and !helper::hasFeature('waterfallplus_meeting'))      $config->dev->skipMenus['waterfall']['meeting']      = 'otherDropMenu_meeting';
+if(!helper::hasFeature('waterfall_gapanalysis')  and !helper::hasFeature('waterfallplus_gapanalysis'))  $config->dev->skipMenus['waterfall']['gapanalysis']  = 'otherDropMenu_gapanalysis';
+
+$config->dev->skipMenus['execution'] = array();
+if(!helper::hasFeature('issue'))        $config->dev->skipMenus['execution']['issue']        = 'otherDropMenu_issue';
+if(!helper::hasFeature('risk'))         $config->dev->skipMenus['execution']['risk']         = 'otherDropMenu_risk';
+if(!helper::hasFeature('opportunity'))  $config->dev->skipMenus['execution']['opportunity']  = 'otherDropMenu_opportunity';
+if(!helper::hasFeature('process'))      $config->dev->skipMenus['execution']['process']      = 'otherDropMenu_pssp';
+if(!helper::hasFeature('auditplan'))    $config->dev->skipMenus['execution']['auditplan']    = 'otherDropMenu_auditplan';
+if(!helper::hasFeature('meeting'))      $config->dev->skipMenus['execution']['meeting']      = 'otherDropMenu_meeting';
diff --git a/module/dev/model.php b/module/dev/model.php
index c2c7e6aae2..a395b1b5a0 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -368,6 +368,8 @@ class devModel extends model
         {
             if(isset($menus[$menuKey])) $sortedMenus[$menuKey] = $menus[$menuKey];
         }
+
+        $sortedMenus = array_merge($sortedMenus, $menus);
         return $sortedMenus;
     }
 
@@ -442,6 +444,7 @@ class devModel extends model
                 {
                     if($type == $menuType and in_array($linkKey, $skipMenus)) continue 2;
                 }
+                if(in_array($module, array('scrum', 'waterfall', 'execution')) and in_array($linkKey, $this->config->dev->skipMenus[$module])) continue;
 
                 if($menu == '@branch@') $menu = $this->lang->dev->branch;
                 $originalLangs[$langKey . $linkKey] = $menu;

From 872138ec117604f581ee8b28a9a594c9831cc36c Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 2 Mar 2023 11:03:12 +0800
Subject: [PATCH 176/319] * Fix warning.

---
 module/upgrade/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 19e6f4cd63..f115a85b0a 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7062,6 +7062,8 @@ class upgradeModel extends model
             foreach($labels as $method => $label)
             {
                 $workflowAction = $this->dao->select('*')->from(TABLE_WORKFLOWACTION)->where('module')->eq($module)->andWhere('action')->eq($method)->fetch();
+                if(!$workflowAction) continue;
+
                 unset($workflowAction->id);
                 $workflowAction->vision = $workflowAction->vision == 'lite' ? 'rnd' : 'lite';
                 $this->dao->replace(TABLE_WORKFLOWACTION)->data($workflowAction)->exec();

From 0da04e4c4dce3387709eb1d4b1019dcd53a867dc Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 2 Mar 2023 03:10:58 +0000
Subject: [PATCH 177/319] * Change the EasyCorp to ZenTao Software.

---
 doc/LICENSE.EN                              |  6 +++---
 doc/LICENSE.LITE.EN                         |  6 +++---
 extension/lite/install/ext/lang/de/lite.php |  6 +++---
 extension/lite/install/ext/lang/en/lite.php |  6 +++---
 extension/lite/install/ext/lang/fr/lite.php |  6 +++---
 module/install/lang/de.php                  | 10 +++++-----
 module/install/lang/en.php                  | 10 +++++-----
 module/install/lang/fr.php                  | 10 +++++-----
 module/install/lang/vi.php                  | 10 +++++-----
 module/misc/lang/en.php                     |  4 ++--
 10 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/doc/LICENSE.EN b/doc/LICENSE.EN
index e6c758402d..090132df9b 100644
--- a/doc/LICENSE.EN
+++ b/doc/LICENSE.EN
@@ -11,13 +11,13 @@ Z PUBLIC LICENSE(ZPL) 1.2
 
 Authorization
 
-Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by EasyCorp(www.easycorp.ltd).
+Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by ZenTao Software(www.easycorp.ltd).
 Anyone can use the agreement to publish open source software, and modify the blank in the following text of the agreement accordingly. 
-No other text of the agreement shall be changed. EasyCorp has the final interpretation of the terms in the agreement.
+No other text of the agreement shall be changed. ZenTao Software has the final interpretation of the terms in the agreement.
 
 Preface
 
-ZenTao ALM (Hereinafter referred to as "the software") developed by EasyCorp (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software. 
+ZenTao ALM (Hereinafter referred to as "the software") developed by ZenTao Software (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software. 
 The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement. 
 By installation of the software, you agree that a contractual relationship between you and me is automatically established. 
 You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional agreement with me.
diff --git a/doc/LICENSE.LITE.EN b/doc/LICENSE.LITE.EN
index 0f5d8d8e26..d49da3944d 100644
--- a/doc/LICENSE.LITE.EN
+++ b/doc/LICENSE.LITE.EN
@@ -2,13 +2,13 @@ Z PUBLIC LICENSE 1.2
 
 Authorization
 
-Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by EasyCorp(www.easycorp.ltd).
+Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by ZenTao Software(www.easycorp.ltd).
 Anyone can use the agreement to publish open source software, and modify the blank in the following text of the agreement accordingly.
-No other text of the agreement shall be changed. EasyCorp has the final interpretation of the terms in the agreement.
+No other text of the agreement shall be changed. ZenTao Software has the final interpretation of the terms in the agreement.
 
 Preface
 
-ZenTao LITE (Hereinafter referred to as "the software") developed by EasyCorp (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software.
+ZenTao LITE (Hereinafter referred to as "the software") developed by ZenTao Software (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software.
 The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement.
 By installation of the software, you agree that a contractual relationship between you and me is automatically established.
 You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional agreement with me.
diff --git a/extension/lite/install/ext/lang/de/lite.php b/extension/lite/install/ext/lang/de/lite.php
index c190378e52..217460939d 100644
--- a/extension/lite/install/ext/lang/de/lite.php
+++ b/extension/lite/install/ext/lang/de/lite.php
@@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma
 
 EOT;
 $lang->install->links    = <<<EOT
-ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao Lite</a>
 
 
diff --git a/extension/lite/install/ext/lang/en/lite.php b/extension/lite/install/ext/lang/en/lite.php
index c190378e52..217460939d 100644
--- a/extension/lite/install/ext/lang/en/lite.php
+++ b/extension/lite/install/ext/lang/en/lite.php
@@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma
 
 EOT;
 $lang->install->links    = <<<EOT
-ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao Lite</a>
 
 
diff --git a/extension/lite/install/ext/lang/fr/lite.php b/extension/lite/install/ext/lang/fr/lite.php
index c190378e52..217460939d 100644
--- a/extension/lite/install/ext/lang/fr/lite.php
+++ b/extension/lite/install/ext/lang/fr/lite.php
@@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma
 
 EOT;
 $lang->install->links    = <<<EOT
-ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao Lite</a>
 
 
diff --git a/module/install/lang/de.php b/module/install/lang/de.php
index 909ce75858..7221f12766 100644
--- a/module/install/lang/de.php
+++ b/module/install/lang/de.php
@@ -27,14 +27,14 @@ $lang->install->license          = 'ZenTao PMS läuft unter der Z PUBLIC LICENSE
 $lang->install->desc             = <<<EOT
 ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> or <a href='https://www.gnu.org/licenses/agpl-3.0.en.html' target='_blank'>AGPL</a> License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
 
-ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
+ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
 EOT;
 $lang->install->links = <<<EOT
-ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
 
 You are installing ZenTao <strong class='text-danger'>%s</strong>.
@@ -293,7 +293,7 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo');
 
-$lang->install->promotion = "Produkte von Nature Easy Soft:";
+$lang->install->promotion = "Produkte von Nature ZenTao Software:";
 
 $lang->install->chanzhi       = new stdclass();
 $lang->install->chanzhi->name = 'ZSITE';
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 5112748207..22db291309 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -27,14 +27,14 @@ $lang->install->license          = 'License';
 $lang->install->desc             = <<<EOT
 ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> or <a href='https://www.gnu.org/licenses/agpl-3.0.en.html' target='_blank'>AGPL</a> License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
 
-ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
+ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
 EOT;
 $lang->install->links = <<<EOT
-ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
 
 You are installing ZenTao <strong class='text-danger'>%s</strong>.
@@ -293,7 +293,7 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot');
 
-$lang->install->promotion = "Products also from EasyCorp:";
+$lang->install->promotion = "Products also from ZenTao Software:";
 
 $lang->install->chanzhi       = new stdclass();
 $lang->install->chanzhi->name = 'ZSITE';
diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php
index 146c2fc05b..1960c322a2 100644
--- a/module/install/lang/fr.php
+++ b/module/install/lang/fr.php
@@ -27,14 +27,14 @@ $lang->install->license          = 'ZenTao est sous Z PUBLIC LICENSE(ZPL) 1.2';
 $lang->install->desc             = <<<EOT
 ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> or <a href='https://www.gnu.org/licenses/agpl-3.0.en.html' target='_blank'>AGPL</a> License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
 
-ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
+ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
 EOT;
 $lang->install->links = <<<EOT
-ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
 
 You are installing ZenTao <strong class='text-danger'>%s</strong>.
@@ -293,7 +293,7 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo');
 
-$lang->install->promotion = "Autres produits de l'équipe Nature Easy Soft :";
+$lang->install->promotion = "Autres produits de l'équipe Nature ZenTao Software :";
 
 $lang->install->chanzhi       = new stdclass();
 $lang->install->chanzhi->name = 'ZSITE';
diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php
index 3dd3485b7f..59596a9fab 100644
--- a/module/install/lang/vi.php
+++ b/module/install/lang/vi.php
@@ -27,14 +27,14 @@ $lang->install->license          = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2';
 $lang->install->desc = <<<EOT
 ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>Z Public License</a>. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
 
-ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
+ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
 EOT;
 $lang->install->links = <<<EOT
-ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
+ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
 Official Website: <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
 Technical Support: <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
-LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
-Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
+LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
+Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
 Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
 
 You are installing ZenTao <strong class='text-danger'>%s</strong>.
@@ -182,7 +182,7 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot');
 
-$lang->install->promotion = "Sản phẩm từ EasyCorp:";
+$lang->install->promotion = "Sản phẩm từ ZenTao Software:";
 
 $lang->install->chanzhi  = new stdclass();
 $lang->install->chanzhi->name = 'ZSITE';
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 07c712660f..44192c59ae 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -21,7 +21,7 @@ $lang->misc->zentao->labels['about']   = 'About ZenTao';
 $lang->misc->zentao->labels['support'] = 'Tech Support';
 $lang->misc->zentao->labels['cowin']   = 'Help Us';
 $lang->misc->zentao->labels['service'] = 'Service';
-$lang->misc->zentao->labels['others']  = 'From EasyCorp';
+$lang->misc->zentao->labels['others']  = 'From ZenTao Software';
 
 $lang->misc->zentao->icons['about']   = 'group';
 $lang->misc->zentao->icons['support'] = 'question-sign';
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
 
 $lang->misc->mobile      = "Mobile Access";
 $lang->misc->noGDLib     = "Please visit <strong>%s</strong> in the browser of your phone.";
-$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://easycorp.ltd/' target='_blank'>EasyCorp</a> Email <a href='mailto:Renee@easycorp.ltd'>Renee@easycorp.ltd</a>";
+$lang->misc->copyright   = "&copy; 2009 - " . date('Y') . " <a href='https://easycorp.ltd/' target='_blank'>ZenTao Software</a> Email <a href='mailto:Renee@easycorp.ltd'>Renee@easycorp.ltd</a>";
 $lang->misc->checkTable  = "Check Data Table";
 $lang->misc->needRepair  = "Repair Table";
 $lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!";

From 58fb43d90a5c9af1b90d5e75c90266c0cda6764d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 11:17:09 +0800
Subject: [PATCH 178/319] * Modify devops sub menu.

---
 module/common/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index 1e36e0d26b..0e10011cc8 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1855,7 +1855,8 @@ EOD;
         $pipelineList = $app->dbh->query("SELECT type,name,url FROM " . TABLE_PIPELINE . " WHERE `deleted` = '0' $condition order by type")->fetchAll();
         if(empty($pipelineList)) return;
 
-        $html  = "<li class='dropdown dropdown-hover'><a href='javascript:;' data-toggle='dropdown'>{$lang->app->common}<span class='caret'></span></a>";
+        $appCommon = isset($lang->db->custom['devopsMenu']['menu']['app']) ? $lang->db->custom['devopsMenu']['menu']['app'] : $lang->app->common;
+        $html  = "<li class='dropdown dropdown-hover'><a href='javascript:;' data-toggle='dropdown'>{$appCommon}<span class='caret'></span></a>";
         $html .= "<ul class='dropdown-menu'>";
 
         foreach($pipelineList as $pipeline)

From f898b790ef5a51f7f226b4a3659e65be3e63d105 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 03:23:59 +0000
Subject: [PATCH 179/319] * Fix bug #32588.

---
 module/execution/view/view.html.php | 2 +-
 module/project/view/view.html.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 69b3611ff1..a680f2da7d 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -398,7 +398,7 @@
                       <th><?php echo $lang->execution->totalEstimate;?></th>
                       <td><?php echo (float)$execution->totalEstimate . $lang->execution->workHour;?></td>
                       <th><?php echo $lang->execution->totalDays;?></th>
-                      <td><?php echo $execution->days;?></td>
+                      <td><?php echo (float)$execution->days . $lang->execution->day;?></td>
                     </tr>
                     <tr>
                       <th><?php echo $lang->execution->totalConsumed;?></th>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 6d72bc4611..cabc758530 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -226,7 +226,7 @@
                     <th><?php echo $lang->execution->totalEstimate;?></th>
                     <td><?php echo (float)$workhour->totalEstimate . $lang->execution->workHour;?></td>
                     <th><?php echo $lang->execution->totalDays;?></th>
-                    <td><?php echo $project->days;?></td>
+                    <td><?php echo (float)$project->days . $lang->execution->day;?></td>
                   </tr>
                   <tr>
                     <th><?php echo $lang->execution->totalConsumed;?></th>

From aba725ef304f16894488ac89b4fdf70aeebd51ca Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 13:12:55 +0800
Subject: [PATCH 180/319] * Code for fix bug 32562.

---
 module/execution/control.php | 19 ++-----------------
 module/kanban/model.php      |  3 +++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 153deec30c..a59b74b8e8 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2633,25 +2633,10 @@ class execution extends control
         $this->session->set('execGroupBy', $groupBy);
         $this->session->set('storyList', $this->app->getURI(true), 'execution');
         $this->session->set('rdSearchValue', '');
-
-        $features   = $this->execution->getExecutionFeatures($execution);
-        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
-
-        /* Set lane type. */
-        if(!$features['story'] and !$features['qa']) $browseType = 'task';
         $this->session->set('execLaneType', $browseType);
 
-        /* Remove lanes if no feature. */
-        foreach($kanbanData as $regionID => $region)
-        {
-            foreach($region->groups as $groupID => $group)
-            {
-                if(!$features['story'] and $group->lanes[0]->type == 'story') unset($kanbanData[$regionID]->groups[$groupID]);
-                if(!$features['qa']    and $group->lanes[0]->type == 'bug')   unset($kanbanData[$regionID]->groups[$groupID]);
-            }
-            $kanbanData[$regionID]->groups = array_values($kanbanData[$regionID]->groups);
-        }
-
+        $features         = $this->execution->getExecutionFeatures($execution);
+        $kanbanData       = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
         $executionActions = array();
         foreach($this->config->execution->statusActions as $action)
         {
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 570468ead2..c7c9db3a13 100755
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -927,6 +927,7 @@ class kanbanModel extends model
         $laneGroup    = $this->getLaneGroupByRegions($regionIDList, $browseType);
         $columnGroup  = $this->getRDColumnGroupByRegions($regionIDList, array_keys($laneGroup));
         $cardGroup    = $this->getCardGroupByExecution($executionID, $browseType, $orderBy, $searchValue);
+        $execution    = $this->loadModel('execution')->getByID($executionID);
 
         foreach($regions as $regionID => $regionName)
         {
@@ -943,6 +944,8 @@ class kanbanModel extends model
 
                 foreach($lanes as $key => $lane)
                 {
+                    if(in_array($execution->attribute, array('request', 'design', 'review')) and $lane->type == 'bug') continue 2;
+                    if(in_array($execution->attribute, array('request', 'review')) and $lane->type == 'story') continue 2;
                     $this->refreshCards($lane);
                     $lane->items           = isset($cardGroup[$lane->id]) ? $cardGroup[$lane->id] : array();
                     $lane->defaultCardType = $lane->type;

From 8f2ef6fa582fda2a996fce017eebb48e1abdb7ee Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 2 Mar 2023 13:18:53 +0800
Subject: [PATCH 181/319] * Code for js refactors in task #85502

---
 www/js/my.full.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index ea85964ad5..5681684425 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -93,9 +93,14 @@
                                              $(formItem).kindeditor();
                                          }
                                      }
+                                     $.zui.store.remove(formDataID);
                                  }
                              }
-                         ]
+                         ],
+                         onAction: function(name, action, messager)
+                         {
+                             $.zui.store.remove(formDataID);
+                         }
                      }).show();
                  }
                  form.on('input', function()

From 89db51f678e053a606cd21e04ab0bba003b84bd3 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 13:30:19 +0800
Subject: [PATCH 182/319] * Code for fix bug 32562.

---
 module/execution/control.php  | 6 +++++-
 module/execution/js/kanban.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index a59b74b8e8..0c473b3597 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2633,7 +2633,6 @@ class execution extends control
         $this->session->set('execGroupBy', $groupBy);
         $this->session->set('storyList', $this->app->getURI(true), 'execution');
         $this->session->set('rdSearchValue', '');
-        $this->session->set('execLaneType', $browseType);
 
         $features         = $this->execution->getExecutionFeatures($execution);
         $kanbanData       = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
@@ -2643,6 +2642,11 @@ class execution extends control
             if($this->execution->isClickable($execution, $action)) $executionActions[] = $action;
         }
 
+        /* Set lane type. */
+        if(!$features['story'] and !$features['qa']) $browseType = 'task';
+        if(!$features['story']) unset($this->lang->kanban->group->task['story']);
+        $this->session->set('execLaneType', $browseType);
+
         $userList    = array();
         $users       = $this->loadModel('user')->getPairs('noletter|nodeleted');
         $avatarPairs = $this->user->getAvatarPairs('all');
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 87ac799f21..13228c26c6 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -215,7 +215,7 @@ $('.c-group').change(function()
 {
     $('.c-group').show();
 
-    var type  = $('#type').val();
+    var type  = $('#type').val() ? $('#type').val() : browseType;
     var group = $('#group').val();
     var link  = createLink('execution', 'kanban', 'executionID=' + executionID + '&type=' + type + '&orderBy=id_asc' + '&groupBy=' + group);
     location.href = link;

From c5b40fea231290fb6a5168de35595fc87fd2021e Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 2 Mar 2023 05:34:58 +0000
Subject: [PATCH 183/319] * Change weixin images.

---
 www/theme/default/images/main/weixin.jpg | Bin 29869 -> 9156 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/www/theme/default/images/main/weixin.jpg b/www/theme/default/images/main/weixin.jpg
index 8ce38e4b869f2770382c3db1f7c9714cefee8483..df0c55442e3848ba64b1fe3a90faa76ba4c2fbed 100644
GIT binary patch
literal 9156
zcmdUUc{r5&`~NcrgDk00Dp655+GLb{I2~(QvLsZ~iDO9{lHHI>%@MLxN0zA!DU3uZ
zGL*fAkSRskw`3g#vwZJIozLm}`Cgyv`u={`_50&Dd17Xs<$d4x>vg~H`*ri*^S>ZV
zElkW!5DW%EFz^rIe?)d8SOEd_2VR2kBP1duBq%5(hQkSqh>MAfFA-a^L_%`eQVB_E
z$t6pcu2?F)94{jyBQCX4b_HH`8D0jD-UNe%YXpTvg@i=$5=$iT|Hm(W1tKkiIe<BU
z#cV(Xq%l}&48ICdfOQIC7GKDZ7e)ZqD2x*k6<Y!)6fZ>tFj%aBAQoLUoE-+=BZAUG
z%hszK2`}IGJ8pvyen;fhTOx|TKB$zjeLJqCan$#msMv~?va42a+@!3c`U^pG=PoU6
zo!!3~o0yuJTiDq<>~}oi<m~G9hr5TT*D=2{{$~RMgMy>ZU$_{3=`tlDF)8`l^&5Ys
z+`f}Z%gVl+bFc7WQSqb4B~P9{e^FIkQ(ITx(A?7cu8sNrLwi?uPj6rUz~IpE#N^a8
zYi5=`H;>wdL9pM=g8#o8_HTAcgIxlGf>=QuY8OTz01m9QpwN1C;blhqaKHO3->@T6
z1pn*RTMsHl6*X+fWsds36<eW1=-N1enzm@!|IV;;|5uj%%dmg!YDdJe7ziF#8X+QF
zyW12M<p0rup%r);DPbuhugPkHy-hflwJ})@Z}Zb{Blrd{S%l%*t*BN}itsVfAT?BK
z6X1Q5AE}`ln}?9?zw}>=KSQGmDn(eSV%?aNg_08R;n9etk0j7bj8@V6j-;j_ynCvm
z)mzpN8H$!f#e@^6y^fO)Q+PQM)rercX!W||DZKqgmGt3MaT|fR#&{&jaq@vN+`ame
zR<(+@3?~;$dZ#5zMN-8Kt5T09#V{ueEaB_vAE*7>ZwLH7W908cIheO!Z9aPp77SPP
zesOD(^i<ryNKTz-jv(F(R+~G}SiEY6Dm9$WNG4nG?y1c=PQ$wlt!i+~5hlyRbnm<^
z-KcTEP@$o2l_u9NDn&#|I>m5j3UZjm$#rB|XXL?|M<b9Oo;4CGU#2-D^O<9Yl63+R
zzN(pipNB{dA4ZxZmgkY}=SFs)86h>iUDqUVlyUEfpXJANuZkl!xXA~m&gvGzQUtJ@
zWu*ZjSH^CN>9y%ln{)2T9x)W9@Ny#S=zZR2RhI|^qY)xCFlb~48P5HA^j$oTfW2zw
zsN~nqNY0J3KzKQW^gdUERsjvv#FHiTK6u<|uoUb9Fi{159D=A*$oAZk@82+z!{2f3
z9VhAS5n?L0;Yte6fvYxum)=K0?{nM(;*elTw(lthSS*5o!rQMx#bJibO!YnMM@a9s
z%i<AvoCR-xsUyq6#6$w#ewuHl8`Tc%iEM$Z7GY-9A+;)tzKM}cJ?%Z8jm0D9M+wvf
zOtqjpBl(=KCw4x&LX(rrqN4!`zX3~5^}zp#bFX`%Y__d@5{8p2Ut|;f)==S{G5Hr>
z^5Uw8;GNd!qD6}<L~L~48jk$ihZwH?KET)CM;e$8s7rO6EHDC-?DvrxYP(Fk;39o6
zHXI+0+POTE)bK`~f~g#`up*0rcTJC>kjesfC`lXQoOwA@MuM@$oV*n{IS9udCR_?}
z6k7BW>QAN&*Deu!W$KLV1-!JS7-`Y_j;9CP2w)OTq-bRO*Dc`VhR%@iBIFZ#!VO<*
z8d>f96zcY)r+0YPQDflpNLduYrO|mvubs#MqnVNXJZQ*JMA%Z+Aen0yZ&u?&YH0g*
zE@BNu1gMl0RXH=LHs_+4o{<cfu{gQGj;y^_YI9DgqqYz20WQz)WB=g0!Ucs3a8^|}
z#6aDuQMQ^ei2@D$WP|x}2uP<O0@o<WUYkH#roIa1No5Uj_37R-^ga(@1%`r1VQIUx
zwQ75;6d`{7uyh-Zwj@Mlt*R$Rv;xqJMHYZg-(i9Mjy(16tQ>8cNb%I<<YA*o?+kEO
ztr$+8M|#nXS-=1V;W<oMh!T<{ixA#BuC1i0^_v(s8)0D~$Q(M3lSL*t=TjEEoP{Rb
zWRbp~r9NN^eg1MZ=K$ov^~_0n3&hbju}Qi;6}J{VAPnqNH^i*UtWj-^rXkotmD&Qx
zQ!Etpt`*Ao$cMnBMR?YzAPPn%`WMJ*xV%Mx`~;r!k!?WnRldP9V4UJ2)si{6^EM*W
z^x^oe8m|$pGc>qs#xadi@VL6xDuSC$&|2>~=dVKlilf=syyN5}Yj7u0e@AdNFDFhB
zg~ErSk6?I?FVYWB$W9L$f?z*n(tboJ0l=rPuX=~cEJny`f%@<k2N|s(Of_>dkSYj7
zGzf0$&|yv%nGujrZcQeTlCznRV(SL7`%u6@Dq0(2(;=mm6=^7`1mHJO?R?Mi%FaU&
zHzvzU(reAFfyrBedNu;Hi@D>(C+6fs3WC(rD#3O82ZL&1J!LaoAS>;S5Yp=gaWJb<
zo2Ov~B38st(=rtaKvCCC=eB##XSMsK!nR-q`T9TRW%Q|g5`5Jcz3%xM(LL#BW{+))
zNiPOqMWTsU4)Q^~UrK;8Z@(y2NLe@`w#Y^xveB7$w{}xT8zVUb&3d8(DGq~LoFN}D
zRkR*5N7_?Br)Nw+7DOcD8Tjgm$1}3MYqkZNx#fe<+%jcm0)U|U!{15iLA1kBac^P(
zob`>taKk#Fxb_g~ojxR)Boslh`cIjYk4yn%Srv*YNCj1@&sE8hWeMyA-02Tu=bYX^
zG^)vJ^2J<x8v*(BqPIgsov9|?b55HgR<0eHrwLw7J<3Rq$#7m=A)1c=Ee-$21dXPt
zLSrDQo84(sB7ota(C57$GPAO_K&-%Fvzhu3`jXmMbj5FfBs9@B#=TG$^_(d<@K0<k
zQ3tVxy!EujVn7ZIGMlCf9==^(z+S>f1mCh7C#DRGnO~<zwk`48<<;-}Iq;%K)ToGq
z(;-EB50%QoH7BK75*NOPX*j9Zw3j86zEnDUw_nrjrdO!kGP8mFK-f*|jNnc->?~q`
z(0DYL<<CcIyl3=HBz3wU#zuSU+|1yJUFRbdI$`2-HC>FYW4^^TVZ@eURZtnQ70*YC
zJ{G8DOI^&PWIVjJQn@#%gi|Ye&DMXyAFnttA3)r}N4o0y2>yBo+bVSZbjSDG>v@z1
zpQXq9XT+`kc6;Efq1W5Q=d`NA?ee{kiSfDCY-iptpGy}`PH{i$Kj4fEdyVHC_>|?A
zd-VHrtm<>D6QoninjiPSog{IzcXwYS_Xhs6axHOju{o>>do2He*1{3q+c>@Gl4RMq
zyC;c?hiku({ydDIh<VUnzp?GF@b?01{(NHSI+#}~T=vS{IJR<YaC})vp7pJUl8>8S
z_vW<Rf2rK;9M&O4qNb~DIitH%ZcQQ|Ic3X7CLBycyh63Nlr?>_)Qm~oY+I@O*Upn#
z`}Zqll$jXS4HO6BIu%}aknJma?T`4yCUf!!+9NLs1Mmca!jclYr-#NM(QG>iyCsxM
zGMrq<;8y59q$Hn&jcUHGT|pHTSS&nhf*QN5<e;?U<oW|O^gU0edC$2h>)*xPsHet2
z8VX@SI!?E?Zh(v!48;Ii5TM8E*HP$3egNQYw^Yg*7=R>Tv@$z@acKRPAq!8qF8`d7
z9Mwia_SKKfF<E9h(?CMG)f$PgIIaE|8y(vw0d!Ao6UIP>Pl}0Iy<G)UTHq5`14%^+
zVEG7Ym<p<}$85>WYxluu_Y|vOOCo80m_;?8swF=6t_$DJo+04^v0vM^zHn&G&wBJo
zboSyOCtm5#)wWWGUi>~l$y>d>bMKd0SJf}uTdG>y)y5|0QfI69$mRLQ82=%?^<RpE
zGFR=nSz>*-3d>m+pv^}{TE+*y<`EuT_U|}SGg^P~tzXo)QRZa+{pTZHj1PRIa(`pq
zLDLmEXKtG}Txo7#*E@VOe51-+&CLqk*1h)R=e=h1ElMTv#`whBqnpi;(^eWJm(}mv
z2?u?jp0JCZdPFZ}xK7S}*-_@cK{N2;y=1RZ%a>-#g@q#>g-MLU@(5Rh!`XKgXEw(3
zk*~!A=>+c0Vm>1EV&j{?c6hHCsy9BAh~bT`<Kf2Xx%i9te!~#Qo6+5JHRqqCS^e=L
zy?<Ba4!uLWME3QD_1v2Kpjftpa56VGTReBW(JcP0y5LeXeP6ZVZE<A5I}<XQPx~*N
zT<&=3REkLL$|aw9LY$G_nX6YRk9K3vN$n%i|IkjBYme3=c>8nD5L2gkYpUF2>3`TA
zU|c-JN50G&P}plG+C5KF$N9)5<sHWBMNb4NhBkz#$$yz4_K<da2PRsLTpifm$Srne
zuY7*?>WKXM!j?Yr=0n7IdWX|RJWql$U)m*gC2PVu((OU393Sx>+U4VX@Zv)4vb*Bs
z4MZ#{&Bw&STEc-z%`G|+%p!V!*}Ncq`F6p9dOv4Q-dMKj<a?Hf?=}bW`^I7Kxug2t
z({{WiN6Fp1z?Hn}t9*oJ#~g53X0Dt_5)7}~sy~Q$K>0mwgWYwcN8t+OO%%Q-ppJ|*
z6xP469=70zP$`N9v+hjLhi{<mj9#-eAoMk~IJytCWw^Gn|CAkD@cRsfemWEyN>)J)
zDNSmq`!Y?N*#L|={JrEpavIWpHL?~M`dXp|x&*f<bXVUc<&3Gza!oJh<jX%(!OmwX
z3qU*KipMru*oK7wXDxJWn>_>~jHpsIjqD8poa>EirRJ|$^OB87zHH{<#|-vRR&_8W
zjIB*o%w^)^Vr2=-<4C1*Vr*}oNLp=eqg)T~0wfihjpJKBBI~c3YoNlu^LypBpxfHS
z=g#G|7q@2|thN#zX&9X<G{D9@*d}o<Td8QkaqgH0d#ZL<y57Xb&ijD_voXKz8`z*#
zIcFcPkni1YfZ<@Dv?{l7?D7+Z?#YxC71h4#mAn6#I#laC2LzdcKyQAVyNUSZ>9dO~
z`G|iimNPOYMIkTE<>A?z4*ga`-_X5ePv{rD8@i?iJ=65!Zaw4Uaw>g+vL9Z%SbcN~
z&PY35eki)ufqt{!YWQaPvsnfQTTs@Tccx^u_x&3uZduVaE?_4#uV-@%$2;>*uPbC0
zjpSUeh*isUCmKqGO60Rkt3I#L+r6yA+JF|KJ9@5JFX`aSZ-WMmwBXMd$*$Z0yGOBM
zE>4e|QzJrebZb22TG>mrmAgp42s~b%5XiAO|M|E4uty4%2T!he$UPQq6na-mt}uAw
zF7avm3?0L+UD&07Km0P6eWK?PBk5auyLIwLVyE5vW-mS>9=?gAetuVUnI-O0-iCvG
z#Di2*UlP3aK+lwn#~$weGcM+R1rt`uA=G09YZHwhzOwneuaRM0Q}#+m+<n>O#|^_F
zd(L)t`UIzE{qBOf(KKJ~XWm@?=_9FO&+f)>+3?12wc?5Lw4hw4Ey)*>Ms(|%g*zSN
z@lrmHWoziQG+tA=Qb8mic}xFx{tw4n{>f{m-i*C@tQWR$c<}9zol)1HUSr#OZFBr|
zj>i&b9<*|a&g1l`*{RQ=PEFYfCf9;aUF|)qy?M_$bI$9q7*BUu&Q9f(H(n(BI;pvw
zIOW<!?Ao=Zy6be1{in}G{in!k2N#B|G-ddR-+T(s>0=bB^;PPyYAxp>FDqYCSc8<H
z@H7LZk1VYc2bFkE^!JwO4HW$Kf;I^BEbEx8y&XC{2Topw^={Z1w)#L3g*GlXVt9B-
zWEGTF?vZUVwh_iq^?rbgO7LjfsHHxXoOhvU`dJjgWM^CO97P2FYK9sI3c0>hkB>oJ
zsF*zfdyE<3JgRM21qZhn4HKPxK#y=sK>~8<!!f=(;r^W5-uWh|O;r{PO!*M5SC!ko
z2q9#9BB`Nkq%96Dl5B829vo?1-kyP2##bleyn|4f>4MeZGB487Yb={N=LGW&@j8VK
z!xbUi7B*$hk0)}Ik8B*PCCzNk;Qn%sVOFlk(JPstzxX{QOL1rMosQQ5C;DPaF={9G
zjYVeMm6_&f$2o<&iY0s)<dMg%uXXQz)~_8pRO^3lPC;fc<%QSkcNgZv7F;g%D>xh>
z)8OHr^?ti9a#a0R{qE+T#8~LVXAjC3g-daC*nShI_B@!dX})9Wyi8~`b%)Gl54ps?
z*zLiwpP0F!PHevu6Wb~sgOzgE-^gF^dXTZzXx6&r!3;g`RY{bT-bac3_MZ-IYNZc+
zY<V)N9U$eHo!qTz;&tz`*2kAmrf^^Vyu1S@*4U(UIb=O5@Q4mL>SUxiPR#QsNfVE&
zjVf2~3MNMvjhN@2a8uW;ZtLGsprwSE2ph5J%ZlZ<bJI8h5~Hu9+CTm3<hLPF=vA1A
zxK13C=EGBM&DA_~c6iqEoQq4yU*fmhZDp%o`PytB-VvxJceW?vUXZ~`!YkSp`mrRM
zOvBjiuv7D)jcM68x(i=D)%s=S1!Lvcowb9w%58tP@sX8fx|#zYE~MY`>{h!gQ;1Pq
zfBpRzp2GkU_R|+HT^QoV-8Tcz2VY426aVcF*Uhq`u|#X&Q(N@c$Z;MYc`h$j-pZ1d
zZwqs_5A2Fx`kR?#v+40~uG7^{+yXtvQ@2C6oY1@xMz>4b5W6F2y_q}lBCcO;DpXJL
zLbpoG%Z{Em36D=Qwlp@Wiv^ZNzLbCV&1K~CtqJ9{v6LBw4^g|rJZk$FytWV3B`klh
zVL`dWI#tJvzHF|wHpH<b<Ke&yCq2ygGv#OJtM47VzG8N{n)r@wH%gasG0MX=jD6jl
z<J+Ci<b3YTxy>bGrw*@Z=%c(^Z`=7*laFkx;&k(obMIYwD+eM0rwa29`r&88HMx5q
z>m<w{2VO$OI8HXYh=GP3c0(5D{&Y1^>wR5+lK5F@^C*ao_K3v?Yzi;O48*1*sZE#^
z4P$6}?XK2ZfTZIQ>pf3XR1}UmVuKZ(p8|f!vF<=yaWV-h`blqFzs{d3M=?2={_Oso
za~&$Br6<z1te3OFTs72QB?F!PV+OFws0Y+THN+i+DPyu4HcvMjo@C1cp389Uwvg2b
z2qqEwSU)4da~ftV@ldFy7op;qF=CwYnU7RhdJO)_u+r)cn)2ZzCk``k<S&2m5&7wi
z2u4xgg-(Y5ii}&{GrpeJ10EjP$ha{$QTlMH^lw+Q`t^lF{77Z$x`UH@<M0VCX8pef
zUibOc$|7ESBthyK5;`%lyNhwzK$>0HQ~OzJ`J2Z#x8w{CXWpOPjQ7VS)~=h>WgZ&u
znaLj~T{%KoGg3XyyL*~`DzwrrU}0N}!ok(7thTS8<ihUYcxfB?NVj)&xoY?uc@g#%
z0<&Oa=Y{*`*LLl^=6n3Cey4s3F;ciZ>!Pku?0L`r%UMMZiqA^T{SSv^=-P>1es0-X
zL1^jRcIvuo`_?1PWqVu;Jx4Y7sNy<K7uLLB2^ZuVtO(p@{A^`g`kLmvlS{ujU3-VI
z8`kO>r^ggqf4JXGjLHgV(iEj1t$*>JFf%Frjb=J%>Gw451u@3CU~*e-sBwsb<>O_q
zH}Eo<rMsiYTSz6ZZd18-3;99Ce!tXr=1V*Y&FFFc%D4pmm`9X>T;&ey9Mha*>M>g`
z{CQa+;7HYJ#+A@56U6TH`xACm&BvbJ6tvMR4Y4O~R!zMi&&w)RkO;3&C$!Oa-xWDy
zX1zaM)eT~WG3MPazsh!5&<a%OdR5T*X=CTJ`!&0l+`O;7Q&Dp8=4pfMP0w<-DzEQ4
zKm0albR@tfY++k<`e8+>lz}UD_Z2*>AJ5I|F=yPlDfy@9TS6VXOWn`4ZBT*=^C00$
zyD5&kHrjcf>AdF57ab`b1@7vksDlp;4O}8{T%DJEr0SjMH>C-=rb>yji38QYyxcss
zKIVx@or7KdTtt1%c3?77v&x+veJP*2^0!jOuajS&#=02W-hM{%J8V5Cs=ScV%ABkx
zwWiV9Nu>JC9%sBK)g;;UzM@#~TK#=UJye2n&GJU8s1jKb_;{TrN#pgapp|k1vCl?_
z31YF28K``BXaI5jd0UTms1}c+(ySt$`emA$_B>*#II6$^C-%f^Why746rKKwUYa*?
z*|3)upc2G7`68%bF-ihH=B1jP+^B!lvom^fwm^M5P)Hjp(5>yNuca;&pu*_m%s_o~
zi&+hdE4nlOE%D(d3v__tAx{$>n;*{nno!%Wom8L@Ym{FIYDISh(b$x;qPF|G_V})-
zDc&d(xRyyAcTu1iX0UICuID469ps5&&PaVf;~w#0H6PJS<jvtR1E0sQ2U4Zj;}19v
ze1v_E^MH>;GdZ?6-ftuk*OrwePB25~A?cm$qf6wMN_?c;7zx*cJpI)`)s;AYj=g*G
zDIe*1H=n^rL<1-$e%bGP$%TA`;}DGd(7jf1-!wkM{ZEDA#b>d*pkaE*&I}G*Sqb&%
z*%3Yx=Xiw^0$K4!s0VwFdMGe_%;v#(eq?|`vcGHB`@;%F>&0{96ic=DOI$qkUTY|3
zV7BG!1i6ubE=1)D{xmgA2(fF~y#I}mp%#{QxJDNmZ7WMW;-2JZZi-4yzNXKhte0}$
z3!w!CFgd1~?rfoh*6@BUENFXKd_+vcXmMuJeKn^w%@aH4JUcx~dZ!|H=8izbcIbRP
zZ&MJJAIGoIhG^s4<OV*{$Z8&R3&cWgK3jS1kj7QOf!cw;l|E{4cYL}vnwp#ClQ~db
zOFmOUAj&uM2v9`T571E1L_^j^t0>o11ZhCV&X&}EMsk9$CxQiFoCDEIPClu;3YPjq
zu-*%k8#OJ+*BS6^gCyuicy}x2rwpamszMtx(w;a@6@;;b0*I|QZw<h&{Zlo%!A)2n
zBUw$Z?U&Tmy#1F^(e3u)93^K`==<Gn{yj+9>!?LTB80&M2e6yYsT+>);4(TC$~p*d
z{{<LBc;&$iq2Yrbh*4DkJ9rE#7kt<AyBW#QINkf(OXzQJ`Jh|Dl0+Tb?=vaH4Q3>9
z@+?j+1cC|bW1cI60V_4^p~>Pgk^imFlN@VHlxK16B$J8|+vODJ-7uZ;S*%QD2_C}V
zM-YmzS>~N>q#r{!!^%5w4^G|;giW^h3}<A{xn4LPhFa);33^;6$e#~Wkkbg0WukM2
zhHjQRKT1whWqdcfKmvqnnb8oaB$woi&N1$VC&7lsBRsQKhFI(~l<1(?m?PaWl4<wn
z4k&Mm5EI=*QNg@y0SBRaHzPUTjEWA?awfj2RDU1R?KQ_`ft0*1xLJ&sGyi>R_V-ld
ze+tv+n2V#rfo3xs!V~vA?m4RKpdYFR%bUQ*w7L-xUl;Y-k0~}Hh&y08LIYH!4UFW-
zwzSc>8o1zKEbQqA6hQ($^kmFJYw;wg7Up4a6SJK3PJN&~0)G{(mCcs)MaIm6zN^}@
z1XR}Fsy$*T`9mu%PS^D#z54}fgTAAYs4%%ek!rO;fLx$k?eu|Z3%XEc8BXq1xa-i6
zB{qkv0>l|IR$WC%0#_zRCYl&afCil#6Q&EU{u{x?oLtoLR>GF6{u!ANShtf{nZTd_
zC_j_!2O^u}<$fA0vS;wF?|%%P*uv1A1FF!O8}O=!wq@PW9>}XDT0l5hBc$sP7(NtO
z6WmeJ3uQ;oWG1c&G;wqm%3iAr6TU|XF>O(KM#Z_d2#DG1#Y!iA8fjrF<Y}D&jqJx5
zg}0x)8V6np23!)8sqmEe#ZD#9Ey@g4(d|cDfS_&|iU;6(0_1#PCkmr!6dB;0bg!MD
z)*Hi#Rq^1<dhkDGQEN_3zyUNVk)Nj)_3*Wxm?s0-B<G(;IL<#weaj)U$$*>;r6I%~
zW`PS(f1&fE4H3&I>L_RyCxeW|F(Dc-ltPt|3+!axs2Z-rq#&Xd^>?)K%WFY%E<|b>
z&WP8Dv0(oqlYg2|o_K+dQA&ONGM<C}2hyM64iHRmgy?t^Pb@AE*%rJwz*U}rnluK|
z)%Wn;dg?e?oc^9F_}|jrMhNBiWv5RA!@ds*5p-%hKv-&~NQm@-z%ilv?eL<R>x1N}
zgig88&>nPTSpz*EP>_=<D8lX1VZy5B=GQWbR<QqBlb<q_U96oKxrt7ZppNF{)UWeE
z8_k#_3(eRl6LXaQu}MWyv@HnvmpR&-Z$;=hYxGVY0o7V3;JKo&Vf51SX!bQh4#o*F
z?l3=Bhj_xyf^PIMv1_R4Wo5gTdr`ZAFA$Jqs;bC99tcl2#Kn*`w|WRokPUFK@KDLL
zyTFx3eJ}Mfm|Q^Ox(^7oT#O~_HS8iTrlepmG)(cpe`R!OKTq=^)ADj^kHKIUV|uul
lYm03R_F08Lf-w}0VbQQ_f&coRXp;ZQBLe>){Vm1+@L%EDX)pi)

literal 29869
zcmd6Q2RN1g|MzW%C>dD|*$$CCS`^Bjhm6SHWHpqLq^yL4tZZ?PksT#1${raRDY7Ch
zq+~pw`#8=yzT@|+|MS0|>p9=+`sON}``q{Eet+KY*SgnUuf2ol)l^hfAQBQ1=p^_L
zS{sCpLu91z3;sVDc#%_*!!IgIN(xG9DjFJUDr#yP+U>M7Teoecrl#9Lw{1H;{SJB>
zS_Vc2dPeXyJ^V{Z;GZNTrvg7nzm<9`_}f2xtv!ZzP>~do6p@i|L8LoK$aavdJ%{!{
z5E(dF><e0dQBl)up`;)oB_{*_Zbc74q!e2yXer64=*h{qfNvooB_rRmgMyNZfsu)s
zdM8_MH_JXQZeDTO6GqoUDp(~X9qPyU6_t4e#iVqtY<vWy<&LQ!4Xy33#G>NL%3oPV
z$Cv1Ncn8TGxAlxEeGcA(9h@vuG7{X|WB(wb1aCqC{!L&9_%~AU;mJwKaNhvle+M}Q
z!#+kaOG@1<(OildonO`lAX@MnNOzF!fQ~}wGsM5^f9>mU+NvKkPKb)x%EW)m8QSCe
zvLSbA(8sLP)~T8T@uNb3uSB50B<K*6){fA}H(IXt1|n*7^8^QT3z|7NC9`z&t2B+{
zr4{IONHIC=L8&!PEhVL7YEl#jy?YX^ZJ-|L55L_rflW<@S@n?1P{Gf(LvJ2fUB3PL
zh2@2clJ9Y9Glus}TO$ykpYrb2o4<p4?m4$p|DrqM^plC92q*W#DrD<UL(DC`;&8nn
zXNIu)Jnkn-BdjS@5ibur{OQpx&*V=kZ|OWT_QGM-yi!7rH`zIM=N3VUfqp?v&o(hH
zd793k3e}vaC$p%SG+sttfrvln=b{R5N;}1DUc}GZ4q3T2^VN)jQ`+uqQ!OPVTk(>!
zgjLue=@5_Ffl#H0h-bZlWQ~XUbHsK%tVa!-HYJ?BSjEkrJmcEqr5uMIW5SGfrzbtn
zEODaxqARPyPs%O6-2_5^P)Wb*mQ*I}as>@RqU|boymdV1KIxx}5}Y~nDn_N`QOOz4
zSn%^G7NPe{Wx0g{7?U6~rkgviJbwAI)-)oABP{!lw434O$vtjwN{(o_Sl@eS^7@xr
zjt}P4{)q<W^CJv5e9mm=`IFP!e8q9&paR*`@e7pV=hUmVux;jkO>Ujzhh5k`Pxi|6
z3UAYMD6P;78oz86@7<Hb?5v|66#evoEE^k3d{?BR)*C6iQ~i*X!q&N>yQxfjm43zU
z&Z_Wz-7*&MTBLDmS2j48Ia1BC^(|9EDl|QO3DjH>oVpTR(&P~Ihwn#!fRm;O<wSGt
z14g{zC7nPw)9fol+sIpF21F-0kocJX@Y^>|1c^aYWQXp=qG*a3WdR~lw}$4>@c3K^
zCp{I!o<|aQmd*g8L_U_%f!K_o9)&<T-5Q^V!{gu1anczc-}B&*%va9tag`~7xl0Lc
ztU-mhUKF*{EuWME-$wX7psKBoRZj_gd@$3-ajY=mVE$2t%aWv+n8~}QrJsxWU0HtE
znn5H1o@Vn*=T0w7(q)oBlxWiYIF9tJ)=w6)Ry39CZ?z8z*_t_}lOf)*7v#N>A9nZr
zd63?zly#whq%M^5E^oWy3EQ{kX9w8t(c~Jq1x3kJUmm%kun!%G{jj{|W}mW`Rljs1
z9>c%mJrd&FX5g0U4!$e(1|kF96#1$UoQK#F3Ij4E(XlD)N;oY4Cc*FGL5I4>B#>v8
z_sqrG=CO~*)*vdfIF7rf;28O>Aao#7BjoV83+|)G&`{HTN;Cu?XC6e03A7l>dqc4Y
z9PKmuKm~9rH(tyd_`i30O8B@WPzah5*?@*l(p-Gi7Wc_KZf<<w;EBSkn$>%0tHsXf
zIV;B%BsEprvsR}{g(_Qhca89zji4b{QhqF%rC(fi*f{#Tg00GjUT{$wUk9N{&|Q&Q
zkA@cPPV|%Hu&4S}Pq##sQW!u|Iz%VHVubL?6xa)JpCq=H-&Aa`Qa$QTR@1GL&?@1i
z<Qe7<UWW@~#^5_RH|Y795<Tj(dIC?kFi3DGv(fr~{POns)n97-Q{FBf5{V1DdfSAD
zsy%I&CfzT%=(Nrh^dd3trnfyXbW_i-#yeD}-?j8@6?Q$->7}UkbRp@~z*EfKgKsXK
zex!g@*rVE8(|==pLiqOV?t*JqTdP_7%x)K}CkYoC@xdQnvX_@RTwgsH+@S(Hb}+qe
zPVG($J;IJikGtqq6Z@6_nF23rtIsRudA&#02TvsIdoST;{JgOuY`*$VZ<D5zS#gA3
z($*b8^(T3sfP%T}WXsJ*QyT|lCDiG&#LTg`yx&h*sw`Ya^kJfZ_24jTUzzWWRGiab
z@5C;rXTD<mzqHQRe1C8`kP@TZN^x*&ucNgy1I?YAHCENWM(qg>vpk2`U0=So6caN~
zkTf=FEWpHjgvV-H>7J^Pysx^8oAk<#9S$i9yYQ=-60<Mr^c{{Lx4iSG=Ivi4WCs7d
z=+<TS<StKS2nVBUk2<*Y*-bh2JFCgz`lNp%IP|HQ0NaijQ{1h0v^>+pUR8!sE+xM$
z<xShc1i>Nqc$RbZbVqVKPdoK8UmU0Dd>c&5)qryH`96seKk^ch8=gdSj-{Zhp_lnI
z<&k;$*tt<O6gHoc!}vYp>OxAlLzcl(%cQ$R(J7wL5V0l}(?Rx--l!T5q=<u7*>Sb`
zAI=QdeDj_#C^L-9>*n_j-YIzbi!<PZa!hiU=2Dw|&x1C%$=%Jd66QZG&s&2vQ0xS@
z%)%A{!;odJ%NWI|+HKj(KPZgUq~w2j^(5}Kp~N2=d*S-=yz8+3d_4c?5mGcn0_E&P
zrm4J`kxMCh*I%EUAfn$Eo?1H+d0accMi^r_Tzu%g;la);WO~a}_eb;jgBYi8_rFN4
zN|8VfvVIiZX*k?c0nP(Wb?3FyQ%dif=FK|v@73DHOPBmqO!D$|urKcPx3}}>_&&VP
zw{|$-guY(k;9Qo)bjUA55+r_=J~JRe%uik_cCLB}c@IaD38XLa59NLv*3WOS=P9%H
zbA7?fcgd7jK+vc@-$BvjfMGuQ1p$;LV`ySx>t&4OX%7SEp$8tuk;#emk)xM$U-!G8
zzYq4g9<Z_sC!R`Gy(hhne3kmCw&*P<vx%4f?fi_yqsl+i5??0_Ubr^Bcy494rdpMI
zTVw#5W90E^=dLt2b3fIn{R7SS4~<0^7HL)?_wO`B>+6+;n*}*_g;nHdJq1k%iuOix
zoukTK3pd{~?vGcH5S;;01!MW~zqt;Hwg85*f4H>FI*?O2zFMt8Hn};B3)#8T2P?Ew
z-nX_e(vCGqAKY5MG}s>}RA}<VNd5q(mMX>SK00x|#sm`HU>|gC1;2?=k&_`e>MQi`
zo10TQypxcV5EXqXWBlHR-7$!FyL|z{gl~liTMj}-@kH{_qqEPMUDhk6Vm|&zpg^!g
z;CqiCD3D?mzh9GLv@9NJCYoOhIQbye%DDNv^3yfwT#di@gMq$k$)%bFmmf%HZZ<<i
zE^d>hDGE>W`Oa3*b)=V$MRMk&gmJcCfyFxr>AlhHDsqB~VJ9?|a~WGP8tjJ3uoVLo
zYgE#D#n{PB5f%$7hRP0s=;)+nh*=+3Y_dQ9Nw=Nb@VA{m&>!FV5t<Tm5{T|_O<xYY
zfyC}Htw`{IH;|cF&_co+NO!?#A18JLarhD~@RXN9Tw)=^pwX*CxBq-!igZW;xQs*%
zGBt(vi7YV-WueLD=5sL<64K)-2VN(;VG?IuvU`z#Z(#f0K>^?N^+M})i+y$v+--BS
z-$@<fX>Dy=JG|ohu_+#jal@oi^$tgD+rEl#v^c3Ci&=cLrB;hS)rc&(UBF)hIn%k!
z_X}BeRN823y9tlsvu*m;E>#cuO)rVV_b__$m{e63SqLf^gWHryk%15i`U+u>{Y&@I
zV<R?G_AG#bP7B|-Ao_8;sXo3DB7p)yCu#7~y3amjm52A#|KiOcWr8o=TbD^7Z~U!^
zuNQ%$U&u-Rp_72>o<idr-NqGsgRzYibm_nR7^ktrPy;`<EY{@PSCr}n#a%W*(HllE
zqZRki@Ukk6+SysEiEp%V|M{L$fa(TB90XsRm#K4{+TN0Im|{0*&7L_RODBE!N3}z4
z8mY1C9(7_pYTT+4CZ%1_c5Y67Jm}<Y>s=W>wIzA34!<%g^d^F5BqfWrLrMgU&=EU$
zbVc$Niyvv;d6bj}Zb!@N3heE8v37Mod^<|`Hi6qw%9)oQ2|Cmn(4mgaX0AchYmged
z$o(W%+5A>jUnvc<wu_A5ozyQR+kkhf6tHsmm0IC6;XNZ!UVJ>HP{61lf`LbmXA8a-
zk`ULFt;<Bc7%7^)0N-;?R}1FVjOGj0+?>_tkexeE{!C7@<mS__{*~Wt(O@G*wt?C6
z82`>(6xdcI4|wP&#mqb1u1@*J=hI9c|5dv2*vusto#&m42c3FaKJ?l<nqQ|g(J3}&
z<vE$Hs6dH)hQwbon*7X(pww$Kk|h;^fm~?ZlBBjhyxY6pbG|rDq;ufp1<Aqadrz&b
zYDK`L6l-iG{GNpmI|n+RjgeKMAm!rn{<eN4K}WoG_VAvFCC_=CG|~M7>bE7wqVGMk
za;?b+KZ;5;fbajL^2|afaR1Ay@RD(f-|{6|gb+1}w*1Ae+UBlDmmi#PSh(j{#XXY1
zCrqP>e`kqY7zRi(;{g+-!i^h2b%EN;sP0Vva@3m>=kn)LE>;Iwrrd4-lX@MvGvO%`
zF{#3QK7%pJ|87=inwEJO<M{XkRWHhv7-?3Q^<A?x77>?XGRA0#LKbT7Vc@5Fo^GR}
z@Prl<g27)pW_^6OM*=CZvir(^2pj)kapZJX`K>SDFfD_h*ZTsn!kMqM$hbj7b90ye
zwp3r&r(RDVl%-s0kBLv9EG1j-zBUTVQZur*@C+uE6*(NN#Tf`0O<(K~2SY0MFi+@T
z)ly~6ero0V!j>;w$XGQ_t!=;8u}#~1lS1Hs-?nJ-Buw55s;oHlM<&Om$yKMEchQbz
z9o+xvd*zX?d|Q*snTz)#U4J~z=pl>~EI&x04;!5WDDk*?0<w5VMTTEL0Aazka3lub
zvb>qVm^4XyjD(T|jN0+rGp*FXs9kGj=h`d{kJ_4`6qv1#+VIA73yj(-^s>>3?5jjO
zI2j65@Kl~5jS0`Y@?Pg<KbhV2cy#LYAd}=$vNE`y$VrsY34i({MG!+Vu9K8x{nat8
z-5!?r4}T@6J_j%cP`BODmnSAX%+I!IxZvt`4xw%ba>~>CP5JOoK1qKud|l7~vb<Xj
zKr;LoKWUu1*)wA;5o25l<}lA#u#KVmz#SlwUdSqB0M=pHfh$TaH(t~K{a{!ov$W*}
z<Ss4>J~)8_Yq^p8)Z0_{<Ww`8depYYeGM~y1ur;75t<WJkKftYD2_WwD5f1-URcs;
z-}U90|MO>`s?^&*Y{m3GTy;VCc??gZey7jhzR;i-S+A$fAtQ9eD@w-gbsC?v*lY9s
zE`B+BH9ZA8=d5WSd<i{)f#Q7EKXJVQ1QE4?8=cN}L2Y?Ty;?9yU4B^QFzu08C2X0%
zH*^lZhOx%*oh-Q-K3X|V`RIF_?~;?>ZnyA|iN1lwU)LrUe^h?8)mv(vK^T_5>qVnT
z2+a}|xzNI)4=}i;O#N+kcUCXxqf7NHOTe@X&N3={ecGjPcw&+brd{1&8a|s7oC;3q
zoJ^UGnjiR9>?Nk(Ov-rO9B)i4zI^XNNuJ$8Uj<knh7(Le$NhI4A;5s!mS)UR&;1y8
zYFu>dJ>9@JRO$@(%Prq4)nl>!GCUHhf_^!R3U%^j3*U=Rq5&EQOD<fZc^XhVI4~N}
z+Fi1;;J+OK&mpQZ%wW*E?}8n)CY8TE{q#EHZucAJ-a<>GJ358Ce<%#3fOa1gBy776
z3KHDz!vzW3?h|0Gh(2FQ+MKHiw_}o<FS=nUlRc#(7piu}nt)-KGsj|QP6oDy?0A=X
zHbRSB#b)adbdpzXU&Y`UIR@HR2<B~rSpQe>yxltV9-g;xvsOV5I26;{I)!vUl-_>C
zP4&pIeB881M(8c*sT`8P;OciIOh6kuxY~KD%ff>zs%)TNO#?f)Vka3exH4Iih9>TK
zc^KawQLNH$LC9!TfnHeax#$-nn23VXvBf~N-92;pOZzUF*@s7FydSRKtf_TwpLlw=
zZ}%sRnlR=_j2psBPXBEGgOu~|I5&RnO$j{CfyV!7@u3WpgI}(o+r-18dSfp1%Na+4
zvv}_LPt8cM2|8QP3c)3_Dw!4eHdyU2sLS%dXnP&^Iz#A4Fx+HLr22(8OGZ_M<>PT+
zXx!lU)=a))673SpWN}x>g~<?(?|gfGYRm&po;I(ToU_!Qxw+`?Q><onBs84wP?fXD
zdqy{7sXo3z^aPmu8uN|oixeqtJh95|9O2RpR^zd;A5Tja7(#L!IPRxEDI*a!hwDX~
zz<>kB);C7-I|^%AcaeQVX$gPe8?~2+lY5n1{latnU?gr;4G^7<bd&Yl^;zzpBEsaP
zC}Y7|p0@=Pex?s6K6wmPOGteN0D%<kaLxCk3TK+3r`H_ZpYp9if#ew6*iE-Sg^#TI
zduMqVxICd-&`ud@6KZ2?jEsz5yd>mqXHZ&b>SH#gQaOL-?6@x;iKj5yT$AA~6o<is
zAs+{Bk{~y~&1mc&%?#h#+fZ(Z$lLoK<<Eg}`r<P=v69l^&$gR;d?;{AY%!xdEsgT(
zUf<oSKfm<gCo{sp0+3z&=m>w&bf3<E+6aeNs@(%~A5s5DMMi`X5<`h#DvP_g-nw4{
z)%35wrUZ%WbfLI2Sa>k}SIlI3763wJUFlB!hmjThrVWHqF&{rBT{9IqujkM6!+{1y
zYd1r*=s^6e0E1$G8z-Qi2uvU(`bqsx(9PyY4@b%o{p-M)5(YmSQW){JYgGYQRck=>
z3sRi0tAn=!z%VJ=wryJbc^Vx<!N$RDz@H?9Sq^`Y=pf|y`uCF{9z)<)fDg6)vT*z(
zyepQR2t1`W#<w5<)+DjWV^e4n0Ch~mKK|PqEkKjRpc*TxcB8<kn8TL?=%f8qFh0*2
zMZplk<sl()ge1-`ya*9_DZx!htjtTc<e@fdkYoR+MUK6WCh*FB_*$iM`HYUhgE;%n
zl6uVqgcgTvndh&ji=AFo52ZyN7i5${_s}z$;`GAzfC%PS`O%K=?;q`}_i+Cdzw?y+
zT-<EkCH-K=)4jEV-^VArZ-0AJ@Zf5jD*FH+VDtc|m4hW<_+UB&5HNt#Qg|8h;QN1o
z!Tz{4#{5ta{4GGv@@GsEO1n2EIqy>s+%g={kcee{{ZW)<2HfSKK2VrVJuRB&^7!06
z?<?`4x$_uk2pmOVa_1RcXytTHW>c@8?cZ^y#{DbxpFdnbC%WD8l=k9-OJ>?XYvPYS
zDt-craZ?#6cy}e@WazL3@6gmngO>?f6vSK;b5<P{t7oA=_snd&p^e`yL^`uRuC8oH
zDl}2*D$eU3vp!T65BicuVN|YW;r)+*im?@x`Um)}=B9Y~O;9f2jRcencq4(!1-y|M
z0!W}LnX30~1kGO5X%Bmq7mU(o`C2KXt<9eWhuqFBhSbjj6csec3l}HZONJx10%-rw
zmM!WkzICR!o5L6`uX;bRWn9Y}TZpyZgU+Q=z;Qu349s<yb^*hi%bX57aRmziW>gdc
zr3FjUM~z#?&r@P?^*i2Xv!7|5*!?t#4vT8<7ql&blfmKXo@iZL<M~(*{luo^5Nwlh
z$J;_!WHt=`VIpLho+O|gkBLIc1~?d!EUqgAr9BX`z1K@OGg5y>BK2Wg^_dtx))xY&
z-CdkGOpZ*s8dPV<x6%o{8Yxg?p3WjyWl~4$IDd|{FV4N&B{F%+&DAgZY~8SXK)BoY
ziccEDrM0F<=u8@w=GnV6e@UI!8Jh97c-KoEJ|wa$dG>tBC6h%V3%zTmY7Y?=k@@MZ
zlzv<1`aT>#<n@g17vuJtH=;+gMT$-4e%{MpcyU3N;?NYE@)l9hJ$`$Wl@IXp2t7+N
z>G!38ZNvfQ8B&hQCf#5^J{zG%sbtHkf^t+EZHsZ^1Fc7@9Jcki{}y*bh*lmu1#So+
zL*l37tN8JcP6ymqa8&?6x6plQ54-VZ)LbSYJFInHO}m97da5w(vOPEF&nPzKH!oIt
z33U`t&3K!s%lY@!4T<z=HyDK@5_;2&^eXPsR2Wz`P1UOL&uT2rNIP_@8ZX=t8NTq=
zqneS{I`*@Xiqveu8ssg8(CfHn7-CEPWhXa#oL(4T41dqjbJv&l44r>2TeN?r>uEFX
zs%LH0XQ#6@g)E->zF@tSE>&Fw>*dimJLe&=UYz@DeP-chTz#GW-f+Z8c>pfr7ytk+
zGJO;^&WS9LI)?nvwrJkxehccs^EB3I*(MQLw6wL&xSh0{J@X*rxO7AFrP{)%@<L<7
z!kS?hZd3mQ0{*%_OS{3)h9ytV%YFvr34Bkpz~l*0Q*NZ?<mJmUVbtjl8Z6%L!=S-B
zU3UWCV0~fRU=abrYcM|!RtZg&D7;EWL}cJqlJha)9K1?I&A=)dLR4tr8VM3K9;kmF
zbT_N$cF{V8rn(*U)zYjQ8b&#QlP`5fjHg(Qy*h<5+^;FZ0OqcAB_$Jn_$Jf$Rjo5_
z0VfT6pV&ErW%1F84V*OiKB>M&)A2S~Lk`D(?n9De{-w4_;ur#S5Mg${g2vrYxTfme
zZUjXw+x(J1hS(j`<^(ZN!A9){z_x%dV2aqO2Xy|r!CHKF_A`4^S#}|Lz8v#|;h=M%
zkHmrpppT5l5P<Rkftt~_$eVmF)q1INfF&8$zYnfFUHE{XW@b}`>-1cklyxmDixG*G
z<0RND<$OWYA3wWWi%yQmDwaAFY?gp#v*m+v)mCbZ8lpEhikdOlN=KYqkW};&9-~y?
z1TD<Qi->fUvLw*TP@n<?9oSZL1$EDlkpWCyojuloiL0!Zejnq!0R;bLe0-xu=Qo?O
zFyFl-|AvLGwYcK*;?~yBUtLF=au$+%4GJBf6e0zr<V1XF4vH+zg>+zWT?q6~Z5_a&
zx31vZe}W8zo*de{jFHUrFu+b{04{m}rZcRt1D?)^L<eEuBT}w&vf!(W{Mqxl+zGc!
z!KkM9X}k28wZ5NgO%Xt)%&^ENBfO#jvI(H0cS?3<Tk$>b-bBKJ4kW^vIVCePXTIlN
z0$f`{mO*_xi~AwBQ#@6nC5?-iEcOt-sOmw(e1~J0<KpwOPMwizFY6hVxzk1oq`HFg
z^-1LyGb%0gX$B3gE$<(Wq~taLPN@`NgcwkRkZr-v?kZchBW6y!z>q9}F?x@|kgThx
zRjnWl$tJ<KLI(`Vf?GkERUy+($vX?zSrTB+bOQGP0CB)?3oVcdf}tIh-H6#eroGs*
zn^;)_hIY8@c2`@l=A>fFF2lR*vk}`URg|V>n{@A^Ro~l<+qZd4%nmY+H8cR82NV#r
zkx50+u#2UU{|<qP@{Mj%LGWOgul|na7GurvhxzBXBzubGKdO9V1lZIfMYTu!)u;>9
zgm$J!QGnHXmP<l}0)L^mx8T`zm~|(@SO1yoMpGN%redT5X#IN>n(l8UwB|IG>*|4y
z?*AfX*d!N#>JGDC>{M)Suhtwmbhi)yc<c>J^;eoS0XwGy6VPo~02DCjvMO81xVg?K
z5z|ay$7n1AJH`hVuL7`Ryu5Gm3EnY4$>U2iGA~S{DYUUdPgUQwuuN*@p0z~dcmYH@
z(cl}tjJ-XHJNK=>@Pq<A70@YcyoeMRbf*YEpukBFp9|2dlPc)9-SIBQLBT*Y<NET4
zZDTkoj8fS2B4Odn2l#5_CQx$+pV8ss5?O<OubbS4Avz?-*$?vlH<tK>b7%J$T#L}G
zw&{L*s#qO#?+Kjnijv#}7w#p+7yHLxe!ImqcQ;jNs20#f<>#VILBT)5=4tgfyB8p)
zQgK+36s*F^2O_BvRwk+&H-vut3#;*%o`BU8C}~oF{BMke@&;Q$54_%dCWyeW;PciB
z&;tW`fu0jq@CEC!P6EMK7FCKyOMCB8d9Zn^z6)N0ao^cVTCjP7wI5eiwjW;mMc$T1
zzB^=tjT*gP6#@<{wlaK~e?`EdX4K)#=v^t^sU9&exiO8Ic<TM5t})kozrW51&H8k%
z2b1`!pslNR8+&<%dFg?Z(I;>1#`nsk=p)a2lVWo(s~41+*lH#ko>kX;o+zQ(Wy;V{
znbSkBDmjfXROO2^pjYL-;?5PC_<2WobLMmqjGB~G+`KcDH#OqW^!RntL@H)i2-w7#
z8_^~e`6c;?yeG!xlDSD;21sf|T%!rUF&CF)j09C3ug&A!`J#sWTGRL%jCmmiy3;u!
zyGNZiM&JprUFT`?@EK)sZqdiKtWgV7`FFS5e6(2LNnZW&fTzf(h)Zjcx8%hdgmP(S
zr`x;o{l<wk=(+!!NsF)Dv8$|Q4kXmx2CuG{o)cY)(OiQrTkQBIGFSX#T6GPgH7+Op
zEWZZb%uf4KpR7QAT&oG{O8wqdbotQa+0Se_a@E2kReagwxjVg#t@%pxjOz<c!W;lT
z(|kGXK&U$#>pNeB<Fo#QEGw!2`gkPLGwibl?N&WH5-uHhn(+Pt4*Ux2`qc<z%lVYA
zZ{ABL%J8_TEp-Q%Kkaau&F;;i`B9;+rwKTTEABg<iX9%6VD7#g{%~ehJ|^JVPFLtb
zTiyG7{$(+{4zig*qJJP;cBNx%)6nFLLuY?D9Y-4GWXzP?(xJSNB-P6oX21P$Xp-1+
zI^Q{52||xmf9M5js>VU()XN4gXPNF=CC`5Lv}2mm-Iv*gLdEk8)LULCtK{bMLASKD
z9xD~s;tNf;edrOD=F?4^dG&Uho^|uNn;1ZQ9Ij}r+6C|R2Dz}PWOI*fLre9yI!Je_
z?Ew(K3GaIN9Ejh_eeVN4s1O#vCBfQEtoUtn4M6DrzbygB{uju|v1bGU7)>4l_DL80
z0-q41_r`#9Z*St?dXQa3D9KF!?gRd1Ns&xWX~rqD6M%_}KF}Zsm^f>lfzHL_PC2dA
zy$+7%X>?XP#Yk4JlbNUWu3B79KI|uTB>KGkGcV_l;n!B@E-jm$uPFAkTZo(P|KilE
zwh!?bpyYo#=Kz#^qryW(0>7SX-~SBm4LPTRCMW6i(t7kvD(S>Py#Zd$0I5C13z#+-
zgKdC^6{&NwuQOg}N57t%YrwLjyV87X#PZhJ(fD9Qxr8WSM_IcIB6KD7jsPCEwhZQB
zPnc$o03Nn>bp)ni9~v7xD)ViME0mQ&=Rg6DN-NtyZ|ij=D+#Lr(x?MdFkKjE(33!K
zJL9!Y%CeR<h5|SE`l5k~E^K=yAkknIT|}FzP4+V@tH(J&p(Ciez9nqZ&E8Z9+yK`}
zrlhiyzdL=(sP3Jrds4v2a^Fl&X5cd|m|qPa<<L~dT|hdsWAG^R^`-FcOe_g&7s(U{
zE<GS&7dgPC$C9w-1MQ2)8FH{BtWFvUeCY*vRJjzJ=GPgkt2j_2AjK9S#XMijJj*6Q
zhd&$o%^Ic$dtVG7VJVEe^Z`sA70UM>wGnPIRVx9?0&lZd#rIn6qQBo`)+SOyKI+)t
zr+s(5K{LA!8W0XfzFwiOc$h%U_k1L#<_LH9=?N5I$381A&PPSm1^nMp0?QI3JGRFZ
zgnG|7lye=-zLVW^VllVEYG4hTD>=S;e46jF6V>XeHR$!_28%(ntflJk<%U~(%^+y|
z#8KVtV-Z=kKaL8lyyYI=L;dj~>hxGpNnzY^MDKiusw7=W&dzfx$div_92`vIztMC`
zDAj%CiH;G7PK>;NcJT1~-P~Rx{@PqAW`@nN14ku({Jiu`QavT$`V585$u(%(4;@yU
z>q|>K%&&T#4%?lpwASP?KpSQhUP-)slrBg$Gt&FyA|{DPCE(N?qu^3)m7jcqrtv^^
zp|vTykCAFuSa+<l<IbNkg4uR4)NJmV(L4@&zJI-S@BNZJpRZ|0v#I%`g*nDmE2iZ&
z$mIRVc!B4S#oU8G!rOBB7goPte7^>fESbI^(fH8E+wNFdFURBE(w~g%Q)UXI=8WFO
zpvbipqs%2PzMOqzazxCecK^*+>J7PvG%goi@O*WcTSV@Soebk*XuuhWT>261fIXjd
z^~Gotd#m6)N3_we9-E|VLJVA@d6AN@)Yl-%2)_{T84UMcdF5qW(bbaUE8MciDBFYS
zb31aIdVjg}qEB{c?iz?|qdY+-5GxExlOaZlWlKnWe|d&kr$@&wrT*CR_a)JG+ON<2
z2eG8&)C``Kl*F$=hmEfE%-$uDaezDdm)SObf&o6iaV)_1y03gGnFwa#SmmK06JS$Y
z6jl2f@om^N|4HspROnk%kA5itDQaTdsgBKp^Wt~B<~VT7VIAD3GsLqB1j#fh26vnI
zn23z!&bxpkS#X<6F|PI-Yw6q2bPf;-N30$o$ANMXOO6BOARxy%VC5i8j)VDs>&235
zr++AA^#lSu9<RPq*oFQrUWLD@&g0UO<(u$luMHVjJ`MLVuDaz!ea3t-0r)0P<BcdE
z|25VhH)S**Ufs)^QfFf(y6AlOy-;o8rC4oDv0?i)!%{J_R|%>z9}z=!UWJ_j!S{zn
z&))Y;C_UXj>pWCY>&fgYbQawsfh#EAP_*f`a8EoT0m#L>a8Jw+B#JiJo;V*2QR>Gw
zITM=dz-Pn12v}mElr`cV^q+^K<Az`?WLd<EcsS|*A~J+{&DZ5)FmQrXNAaElGILmv
z2N9ZUfaEvbhnzy~i;PwRzKhKz2Do}gO;3o<u`BU3B3}hr1$?lL+V9BXn()0(V716<
z4HC=V(g!RyKaMU}1u>(xc~@2*`k6AT>7+JRACae4cydP~quMKz5(=e+aUN>&cNTG$
zX(QVU{L^#wpFC0jyiFx$*zBc^S<n8~YmWJjHafay9WNb?3JSvgczUu`;`H81>Zx&z
zlil;%pS*2b{!Op8%<~*+4vCRUtHUSEUR+KQ^7W_&x`?AyuF=eGJ`(KCg6F7Omk(3#
zSKPhSOBtCY<-}0?d0AItX$>myJfCoaCFUD{vgBgC{jUDlBsM0ro?3sL2#=nki7GEs
zjQZu4nZy&*0`w+kE7JUfrO_S9g?h(AjYCy)>@qy<B4bo8jfH+@=lB}N&%hl)b-gP^
zGV^lrw5eT^-maKr`O5AB<FQ0OF>||1Gdl}Tj@pH~CrFWN2iw>w2@eI_t*O!)9~2QX
zte9J#)E~Y4^X<yFoCWioF5d+91K+IrQXBF)ZVX+BvcB`qF4mwcnXZW;ftA;gZ(@F+
ze`iUO%9S0NVbmx+t_Xca?%`qC#1(6_`}S><6Y7_r-Y)gNA}pQRH5{}vk}t3AiJqO3
zQjY4LpF)OV0_jn`HWAvFTQ1#534k)azWEL%zkTq)>xfU`@~Tl$!i$@t+xG|*yJZbt
z>T6it+X0choVVa2RITRjiXY>3Ymh<J8Z^|9VPnytw+78H9qp31c1bWw;YH%mu;+8q
zEs+L5aSx_i@glr<l39mH2ucOa7!c`(xQSUu?cv{*n@$bL#}Krkt_voxVKjLV;dTfn
zCBaz>;CqGe_g4*xxGDJU$RNPds&5e$;{m>%Jw<fVW6rQ|hp!x980)^BO(SU->UYJk
zPI(eqRvG@6{8%PKE{xQ<jx3tyOwRlC%$NsAGatGCnL;10Mx`Q0+`TIj<Ng|1?LTP>
z>(@LUnva|v7qxj%21IVgzGH|1!x1Ff4o^4yvHQT{DT$geYB<Kd*Xu~(FjlOSn6%iu
z^#OZ``{_$y!oB8Zd8}M!gpvBx@&}a_NB$s==`^_)$q6az6cen?hAS*yo2_iHnHhe^
zdx}Ui+=DCn3<YEa3EMWq-}%*}-JR!oWwMjQl11~<V0HT9x;ov(e6u>;Z-c)kFTLVc
zWA!M^sKwsl+t?u>VUkUhE-_C4&MVbIbs*o-SF}2CDxdtmAd@9oC|h*j8$6DVcy!f7
zI>4@Inj`a*&ocXy1K}%cP^@3kmrh%~U(VC|h4w~QO-k6;#T=0Q&B`E@p{M>Q%?m~K
zz3<9GG?hJR3vZ8Qzp@MKQ3ZMy=K)4T4@JpvKNyWY{B^)Mz*TR(ES~5zo{3w7ELI{e
zPgo2ZY&2AcVp~S`hMeVm*j@wX|C?XNC*2DBv@c$)bQiYQd)?2!>vmy$r&BNsR}i(7
zw4f?C52MPVy-y`_h3u+ax$OMeOKo%67j16e_|-B^E4K!{y!i7yx4QUPyi4h!To>o_
zqaNagKV@EeRHter=F8b%CGUveU9gb!LZC#ZN&v-sEH=J0sZxrk`l51Vp|4LUSt#@A
zuV32*Tz4C`guXb+YAfhk7<LSWYK(}O9;>)fp&nYapw7yC*RbCNX_#WAax!0&n@fPL
zzU1xh2d<0^NjAAoi+WbppZ8df-c6;Q)EJNNYigy9(O2tf>{WHrQRIpGmY8V^y2{Z@
z?|bEI1l8x*3I;met<Ds;^Lf4%Uk<TlJi45D_~CVpExQkPpb{r|s)e-j%{5|U;tWrg
zY6K6I>X@~J^*F_<s%7`=b4E%vy=-KZ5O{uB1?|+*%jOs4BwfAOlxrNvRP1PVM$1}?
zt2Re3sWKm<&?d-r&0C1gpXTMN-foGuaf`h<F7Zh(79`|Xq>Qe;DALxuKl5g>+x`3J
zZ~8QPUZn9-k<`UfCm;9n|Ii4y=SkV5p^?uvD08U4PkItHXlv)LqHY^Ao=EMyD_^jZ
z@8s(|Yg>&OQB5n=7=hy#T4F+@x$G>4y0aftr)(YMNeo~}EDO<&W6eHSP3a*K6Vl^K
z7ancUXxPdd)+c0^<d7Lu@0cB|MQP))uQ}hl=G~TC=S24?`_3J{<J;P6*F#IUUo+wc
z#?>%vtE#kJT*M4*BU6k3yHkw#+qc}JPkwAEraz(-{-eoa#p?Q!ipM1XOyTXQjA1pA
z&he8MS_b1?+zX6yU<uW&zq@LpI$zdB<g7ux0s-0fj1<CE7xa&P->#x=N|BE#z7yxH
zFv4oKZEql%(Lc~@G({<&eP+-7Btb&<R$yHH16z$ePVaCXnX^;PT~%gAF3s>WmgduF
zy#y3Sk;i3<Y5`;NwCX^H3CEYv1vT0Z`;NN9{wRqThYq|gIq<8nYi{Y-^g{8`WSTUy
z^MORAR5DAAf2VgWFgP`(e86%<sSQAI<pMZAS0e3K$9|lBh4&Q2Mk%9b*Oe{Jvi_dZ
zW-zIRr3*jF9K7_5JtR%v0Z0veAI?Rd`m92}{X4EnQXP&3r#jOLwke)G^?Wd1Q*#09
zU~2S)WrKgIJ5Q%+U)|2Lxbs%|=g1vd_rVK(y&o>F?Dp~POKZKRU39S3aQ%EjbcT4!
zkCO^N?cy3`a?EaHpc`E3EW_#sy<|TD-Jn>d>6=+tHwZfA-Z@M5!LL^o0E3N?KI#ZF
z*poZm%&N8C13iRT9$>JEm`?z0NU|Xu?5ny$>?h6v9TnDCa}sZ?`Ek(*NFz@j2@M6(
z$oK_VTlgB5MoQi3UH^>69j798B7ig!@DigcHqJk=-Xb8x(6aA#p9De-So8-AF$7@I
z9}r^T%vn5uvw?SJ?2Blu{R_Aa0XuV1x~=eDrRTt<Q0{XItY_CE&HH0X8`juXDq)qa
z%zRPQKrW)o&3zOBtVKXQi?tR3^(?R!y@u7Zu(b%Vs?*gSk*-sZM;yOx_!%<{aeXd{
zaJp$HmW^Z^e^~7W8gXep*L8<*sk0ueir>r~As6x75g@CibpB98szF60#ADXS|E@hb
zeflsW;@5bybD-7*2>qn{_<;9yg9w`NX3nB;iUrO(6?%ch=so9%{E)C}oqz$YLKNS@
z&gcjDLk;ZC2z<1!;hhl$dYdLq?9QlZqH9<IcE(-YWLKi2eP2uhCpBQI-WvRDZ5ahj
z)os}Q1T$6Y1g2_R!G>G2V-Na{_gv=HDd2=Vce4{Kz7;(1`u06RRTyTsH7koSYYQqr
zQ>X_7=mJkE7{$47aYA&u!V67nQ1NQR5iil%BHb0U`c><bOG1Y|>t@!VlBksCU(Toi
zBe8(nU1ZbQx`42ja8!H0SE+o3S8kTCTuo2UE8nA{N;O72U$;~%HrtL_3B%-K-j-Bq
zGF-t#O`+kWd$K(!B7nwTBP#g#vnFw#WxEtQ&w_9vjH8t^?+o3w!W>CmgX*1Lii&7)
zZgi09Ub?-HRZixbF5LK*GZA}V8DrXzb0md3<?=^~B}a*N$DO9`7Kdy?eU3HCBdy|I
zj#1O)hkDW&?MLaESEz5bn(q-*w8~L()=`uUp#Hqw^2B*p)t`aSWcg^S?`XyZ^*`<7
zZq0WyMfEj_o3-268w6F%qIa0J<Vc1}IqNE>ppv9NaK(8V1eHhf?+8-4M0-QX*(t8O
zToR*GXpEMQ;dPAJ|AEirokFZ?9FLCVNE-m&&#poFFQbg*4(skunWlF-`8wL%$%)4%
zOgJ~}y^%2~qM^&?&g$3n2$?JriHlX$CiRyU&s+L1Jj=f|ZXEb!x53nfMpZB4JIYC~
znw-iD?c#Fer1Y)I;~Mv?W>%9~n+J{G$c-7(=T%2?#yGOEmnmFiZ2b0RQg41wO7@qe
ziSik1Zb1g83^`k4HBB2^Z9iurv&@)p&YD)QIaLeor5rdNm<@LBaIgM06eri$CbvgF
z)|6f~Ix@7-R4o|vNI|{9A0yQqxo&=qMxN4@efsDt>kkc2^+DA{RcZBz=@@QzW!of&
z0!eyJ*0Su-9>fQX`c<R|b@cO=h#M!ov-2KS9p+VM@;?>)?riLv81uxru9L3rvAk@W
zkGvSv7@TaCOER@iJ0vy4dnf9uGV<(Dw&HaNO%GG?_$ndd-YBm2)5;`vOr>A&7-NiW
z^Myli&gmycN9#+*3NtJ;(<|rbJ@1t)RCE$R8Y)FF@5ll6d4Jw&E?>1*`=gH~DpNW>
z4@EnfI2o~5UUHpN)zcZ_$>leA8Oan8CU*1d8g!-7<sr3kzEkKiGlOs%&6b%~W}&WQ
zrP=J!TId5R0&$`2)LhZ2-c^fNA2eJ~$mmWGYLpDP#nc?blf_dZS=mfCRjMYOUnZHJ
zld11$me-5W2<4&Ub*5KCE2-!T+#EQvtH&z-6su8Lvu0>{k@Q48`jx6{#%sP>NmLdq
z69OZtd%b7-Q|nK(cIOZ7B^uGL&i0GtKYc48RZ%L(p{#CHph;d9e^MaRkuCc1K&B`;
zp@Ucr<?nw<PETA({xmP(VI>~y;WZ~1xzj~~aPDuuc?J4S(#XwzKEU^G(EDKM=@5_m
zoCz$~;}1^gN3>R3(*mJFDG(~)Tyz<mWxdl=Qb5+z_evj@^~gv+0<s=anY#KaSk~ii
z3}ii&6$Tjuq=O8t7lP8_OZ<dbmr)%uSNe*TQT6i=7e$7x%cycvX$n3z0~wWy6e5c$
zl1Y<Lai0*2PH|fs_=Dp6ohTK!3d1T6-WIqDTb4+_F@USE2HMcW`4+YcOI|pc!p(3c
znvINHyojAxQAZ>K1=<a~y7VS8&JL&nvC7CJUS6_aAFew^U}Yp$^NUkP(m*7f0&Lpy
zMz|4axDxpDBD4V2ty=KCQqNfro2amfx7{5;66Zne`KKfSyHfl%b1PM_D;+ii<Z>^(
zE5U9bGgzK5;l0W4O)sCgE>=B82oj(}Qa<`A4Z9AwKKTIGK|jmZ71(v~+1Y%obw;SC
z>|IX*>a@&hSn+ak5$Lv^rq2Q=hN)SyM<dpW;RH@q(qF7Uk0UUV1{6kk$rs5_BE9Z6
zt%}|jkW*p<CVLxUIH#m$3~T*a=fWB{8<b*NfZW8t9P9lBV&xaG+yvHXVC5#Dalv_i
z1AWX0(gnppU&*<gt5d)kP=3+fh%MQ(HF6=GEY^5~4o}4{NFcD#4c^9Mr&1T#!_aP4
z3{a+z)|29^1LJ#pS}Z0cqcSVFl&#96zCByL^lZFP{7lLXsX}gEy>NNjp7#&K>K*xF
zsM6LT4`HpnUsd+r+A=^`T;QuM%f0&zbI9WhG@0lXB6(s?zEe{Eq4D@~Bg<D*-BSJb
z`G^toChHEdiSsfkC6xZkS{RAT_o~TnDOP9jW$TKM7-t3vaDfda4ACe$vz1bxR6Je3
zIcg+0e3Djy^8zIL9p8<T%@N3p66O!bfgJAmmKnLcPL=$H#I|93vwNyQ4u=w{s+6KD
z-0LlkHtR^W3yJ&irI(jxK{tpejHmne(34|8`CR@-8rCL7f&&VuF`*57X&;i(+00hp
zZ6SvkOxegt+=M9`4q!BeDH~Ya?=HQgu#S~UJ{K?P1u_Cifk4x<<9%;rcpC*igu%I%
zKj+9>r6p_(i$`c9Xpc?Z(BS%`(qU%^Iozz>IuQhHy|RgksRB3^$R=~mze%=sW&W1k
zVBsv@AoLu=p2ucH6xM-nZrM}*X2uLuaHv_KiHsU>d6bEz>V~mY9aexyMAgNv;HWyy
z^CmO)gHwQ>E<abgQw*DL!~8*g!)C>|xzGDNAmZ5f+OF*6FECymoj(m5fktzir}^h#
zngM|O8=Aubpd%LYqG8Ucqe?^Ix147y%G0{Cuz#~mB}}co0QPVGihOz78tdN_b+!MM
z5vqsvZ{}$S!cI{X15Y&PbU9mkdxpR7ih%vi3zl_OmRQK`8Xj`<QPVwoJj*&Xr9E$=
z5}xm3Mf<>fX9XZIJ9xeudKP)gU4?h)w>XBT(ha@60<){!@XWyMH&Qe$C`S-!zLpd1
zl7pQQ7^>|2d9g#)n>xZ!^~>=8nbj>ZOGHdkNOD{Fm#DrwZ#nnWNOaL?XJ3j)j?yzp
zrkR*#jNbWF?y$4%tVyZ8vswG2`yGZV_Lio8OlRy#LnB7RU&S6dX(XVdJHYN>cvE5_
zU?HS~4k6Aps>l&Mj_MW=N8I3wiOYL79i)!TjZRpI`b>#hgW^i7zH6j?3^j^Br|FQq
z^)!QvP@jbPTu^P2-8HBCm$|n;qX9Y+u_JGS8+}FNFRR|{AINi!=jSPLanVo~;7squ
zCML0ubtuBdJ<|_ZM-x4r@R_c(Z<U6tjj=1Y2wz51NxIrXA47E4Ahb<w!BO+nd6wBa
zBVIogS@Tu3fTn)aUwqo%6$xJ|Sp+ayWba4ZDX(0edLd=XZ(5$p;<D|Ok&uMyRQa34
zIPr4D)I!gkDWs!4Y{wPLKb098qw;cWB2$WU*XopMjYdN?3(M294^(v%D+ihuUANZs
z#O-sy8P-XTe{t0QX(|+8)42Nb0O8BYUkL#R%2rkAn(J;GuR+`-9Yp`Q23=K3;4kA0
z*BD7)sX!=-WBg4DO)}M|!vwg31OuLyu%1-A!^Fb92E9L5r1nc-4Z1{eRDiSPUOeAY
zr^NDI=^U>$=%<3rOwMSEkdAGvu15b3aaE~&E{CL7qK}nMJUY2@>DSlgTW`NHC3x(K
z{>0!}Ej$G#JU$Wqf09-2-4*K@-=TPoK`HGD(@~!OcxlB2b;N%1P60QNO49I>#Bc-q
zU0?Tbhz%})i5!E!haXFsUo}y!gVEJgw{U>2ie0+)3<g)*oz2Icr*$xnM%N5WDkT5&
zJ?oo9QS)Jbd@4gMHLDpIcpJH`YzFFmfiuHdP)fw8K~Qs(hEW+vaDT_j6^9q$2b1p1
z1fmcR$#!7R#)?8lzwt+6MIntx7Q9_>q7dOJq`e(13K7dkvSvGEIuHT}NYERn1Lwse
zoDPubgG)FAeB`>4;3g6V;v;V&fJ7nymj8+X%nO91l)#u*0SHN{I`H0*qcapK^INfI
z{Msi@A4yYY;s=ttm_5KxlXBqp?P4{s1Lg3+s=vm~_Sa_zK{ymXDuG#N`wA>WSG}KK
zx)iz$oDOd<u3OIPKmOHnrek;Y$hDs{^BH&KMnYCXufK6iNb6!TD!jP-+F<GZLz|5d
zsT0WGa-wZR5~&JJ!gRVqpT9a>ujM4Ei}te*e|bknm_g|o2hXpb&XVKKC*IJZQDqs(
z)I{IQQa2iM46LFvL(}E)Tg=vVAtkOY5-$QdPBgiHb50!tLPlI76h0t}rbzuxsv9s^
zrIuT~BhW-JeY80c0wTxYHgEP6d;_=<Y;cWW#3Dh$s%z2>D;3OPRliaF5j&F3Y=+Mb
zsC%}VtEH#17{YJR6dSHFg0>e>LJ%O$Hh(NBD}tKpDiSA;1<Wj*ZG}A(WIzQBlC($=
z-`3+7fa{um%fC6sz)x&&YS#?djOYyU=Y?XG&FJ6y3Zj?`M74;o&jXRAZ|6D#f(U_G
zn^mm8Ku*Y!lv=P_;hYd4Xm^2gLeM~?x~^w`x!GrRdtZ~_@AyDil_T-0N{bQ1hGqws
z|3qQ*x4uo`H+(G-|Kc2=(V9<nflbOFIuCISHYq#(Cxrb9-k@Q*5gSCeUN#{_`kyLd
z!|H;6(<8bI{TrgS!+QUNU<$M1MV7kU-LD@WzGiuJcy`v~=*0A?)up;EaeCp1c0k+#
z_<Tqjj+Fv#8yxcPM&z2ZY{F*?DF%eVS!!gcy5AAsqPu||ZR$1flgACg9>4K*j~|R_
zZ}Rv7Z}5K#i~4aE#u5H3xgnfbmJP9PISoK@xr?EE2SN75Sr95=YIYld;vg@;(;0+_
zC2sbuXyxK~+rX~S`Z$nVhRsU|mk|MZ39!bc8_r80coaF&#)A1uD~{My5g;=20;wWm
zu%Q}G6;UIkitJhWvzsY<_kXr~PhfsSwsHW-YH%@jiUGkJCS*i9h)@LQ6u{O^?)%5(
zQ()Lyrgz8_3tPj+i}>J8lTebemPKtDoUsJNgrgv135W^dh$UD|SiV#P#Dqw6);6sF
zJTj`+OYZa&kn;x4S1JpRkMRbMrdsoh4F%`3NEHNIwXAYOY*tt%{OzqQTt`_jZwBXm
zq!4fF<fT^g+zGiigb<8fMd3xl`Ftz6&2fUTm)mdM%iU0Wx0~3@T{p1q<$f$>f)BR2
zWiStd>(-M`9QVC@<)-qCIuy`8uoMalc_(dB41_C<fLOHOVYz}ZF-gGcinVu&l|{*%
z)mYC(gYBIr#P-hlxpZ5mUF%i!=3Sr^7E=v=K6n#$F03b{OayNVpi2n&FAhCCeFg;{
z2b;zy+Hu`oMlvoq34kM9Uf!NcppLjKJ_dlJ!VQboUw|K$fJRL<{ux!x?(<HteBd@8
zTVsUFIhOE+sxkzTj=pI?_vkU8-o#E~*aSM!KAafAZj;d+mvck%XH?sl{dkJsNB(za
zKAtNZpBPc^pKePAGUL`wUp}%RKvYeiuXpGiyp~Z(C=jk%&Iw0~fP`BR$NIdbWsE9d
z>bKm-oB@PHyC%ou%6*K-w=m1)i>l;@C$@9J@QFL43k;vs(`xSZsw^~XOSL-}H+8lr
zhh`x<NGVLY372d4I|4J}I~6I37e%9SUVCN`zl$ezZ|1!hxIdcL9~m2WyT3Zc$YtGQ
z4QI~4tQkIYCUBEh=ih*fJ*poL3&PouAau{*0h|rl4L}hL5VEhwWst*Ip$-5=o{Gut
zU`r?@@}_P1gvW<L+}A%vlm3IT3};ujxD$D3Dt&x%2v}3}VY^eLwV&1FaS+FY6o3Z>
z`^{w60WL!O6ewlz8?rtiE#HvwZbX7H>kzB1S2yLefN-dMrO~`TI2;N9PvLMGhwaR8
z87HRGKqHLnN@?<FRzR#$C+wNV#wwM-p6S~z8mE}Bo@sG7u*m)|K_B!09w!gHn@T2V
zz9eXI#2m1svVbK$&>ZV_kPpOzs20E&a}qtw(}K(-5b2evqT;hmoS1fS<&V{!5S$5#
zi;JMs0g<Yd0OW>6IPF-F8y4ZfAh!`L!oeQEEvyI!fZQlchEO)PpC{OWDGr1-rxY}_
z9U20m&Di7>IJ6lK&ccN@@6p@9@i;-j?mmrG?%T!8$AJtjpxj^N02x|X<-Ymz_Qit?
zJy_+w&UF$vLrZ{5l}DREHyqs@kMMu9Sdf}{IjHD7a5ORPT_3-qOxaRm8dXD{*I!Z7
z0LXeQ>|y;2U%LzBK7+kv0~<rCpaIl~k7_yE5AwuT9I#7<Lq;MB&J&BoEg2%OAPoe@
z8-mYsUx4QZ6m<-n9!^H4P?aTSwyr7loB&nZMPqRN4z%foGZy|5(Vg%P1h?UXLGTgX
zijV?;LjNI)12%2yf+#oHB>VgM>rrlBFERoP0f=(50Tu#jf%Pc2cyB~mnJ9>IW9>#q
z=t=5IZox;uP~yi65XnJ!u?+YgW`n1FcpWDk0Mou@$a8ECgR`JGHn?SzQQU@>{!a~J
z|BUSZd#oP8Yj-^E_rUAZGTAeB+*81UT7FS)r<nA3tiB(JWCObgHc<<;SutUGTM-=y
zjDonZT}w1kim~E`Ymgam4u6SMhMb5lI^E$v$^w2zXlAH@V;DauD}a@>p^Hdoc3GcW
zGmv=8TL|Xwu2a!3@YUmAMJDMUHIe#s`hEeB4!m#pdPD;bT^#z0C`AAw4@|c`^Z_na
zFrWkSxd-FL4$kbPz?LekT<<TE5}#!dWkN(k5M1!27~IfH6gS#qW(yqH9Ac%OKp!I!
z2EhJgI8_pW{e}Qr*#P_H4DojlIVn8bf;eqL{G%e0ogXAV0bN6yC$JG~-37Nb;B|l(
zD{%wY&)Dqy9>=FL+@mKat<!J2g3`ey>&d48!mpl>k<sm-An?VmGk$-evGmA+7>0!N
z4|^?oBcdpY>xkcLycP)T6&1OZ4i-~jD8^mZZ>T@>XNC#`sK>uN78^SBzO@;I4q=-;
zICO}pU)`n$Q@HRl!M^@o?SoEQ@3vtc17!GacHV#}-#^*jFS_E3G~Q&ujtgc2lGMLH
zcVMG2qM{Q>G1e{lrDc!sx{IAM&vW21jLV6Jj;>oo`kf6p36{;{jlQ5r6H?*<AcT+M
z1mh|5*15r{x<e8#=zh6l<1(^}HsUfaHS2dywHS4({RC+l+0}sMwx^X|&#n@bf@1|e
zH!Gf`eo$=WfZ%WiQs<gJQ<#*36YxPYc%$$j$mWJ2K~yd_n|qUjXs<sJV!IJt^-H;L
zCma%P+l2an4W~$L0J#}1=0HQY6NH2t-SNQeo_btuhws)7&J_CU@0iyx78`$He4aJg
zv$3dpeft;D{QEH<NM^(F!(_^RQwA>nuWT2X;570_->_-q)<Ek^oJOAZalIC0BJu7o
z3II~E{KEGjP!EM(N;lhlM@w-IZClH-`bUjp3zr`F-^$G~t(sJ+>!Dj+{*!FE_U5DV
zzzZ*ZCS(bYr)8c5na6OL2JizT;4qCMZ*EiH1G1!r%0mFmjp}uI1XR`7DDtF5ctrgU
zRMqfmakFeFkjY{Qc>1T0hrnl8li^S-qVAJm;6bEPI<|huxKpS6Gd1xC&=i6IYM?2^
z2T-r*{T7Fa{=L3qi{_s+_O~=6*YWUCG*Poi$QC2R;ze233n^_zXI(&$PXdT5XdC|0
z0H^d3t+JY&|NI%Jn1Ky@CI8Nf{kjdiez2Vbwqd(?`b|$YtlO~BCiLiz7TAVutye0h
z)Om6s0tMR1a%VV;6l4v(09mBiR0cSUv<F}@xRl^cZ2z%U{L>V$_JTmYa9F6mkkXDh
zkBxKZv#SMpa19yBeda{beoKTZK!>kMTgE9JB&ICx)Tyz(zr*VO`ZiV!x(_b~ZNP6(
zg!JYs0e4eD2?UcV9A=7rw1t|6GzeYAPNs=)-0NS$E}tsEj*D<Yzy?S^!v|>tK%ZBW
z_WP1f%W@kCv3xFS^q~C%jT7>Lzqj*>&fDqk|3UD@G>ZM#pxn%d{CS@m5sqXF=eM6&
zlHZOF*2k&O$Q0z8yt-<F)*;&*Ja=95j}(s_q#GN_rY?AMstJr@0O*@2S7P%+B*3o#
zQxhT2VN=8}*#?-7R7BwNaw+fPO;aQo?9(=Yk%cIfd}AJji0t31#63DER0r^JTp~&j
zi0{L@t3Y;xtr-l}za#3z2w`s!C58yH4+OC)8z6fic<cwuB3_X}f+2dpjh`pd-+;(p
zI9Q!x1uq~90nZe{9}_;Mh49FbVC<PDI&OL@kp8;<+!4}zywC=pzJbPXaqx33@Lgm0
zvUm}AUJ3rH5gq1#y=a-;UB7jY{WQcutPBODXq@+CBTbN5hbT0aI1d|KKwK0czpqv$
zoE8a0&T;#!;j~B@;KPN}B41)D#!V`o6VkYlK#=P9&rcmdg4TTfIV8v9?l<YynMhm1
zkt%NXyWvO`>Gez|G`x-AGMSh%{jaIY%*v(dwqoN-`7DZYv5&2UR3mLv;F&#<hd!KH
z;^P4jhiMNSBM(CyW4#*(YQNd(Qv43A9(?XEAt!@bXASy2lg*j#vER!6zqIgYVbb5a
z|1;~0PnY5(dO!hDvNJt7QWHm_uovR7K6X4ti}YTPccRR_DmgLV(Qc8s44MKEaSECO
z5OIoc3cf68f$SsrIY=P;sHgiKh|0reA7P(^1c%^D{)LbNXbbY$pIOF2yK(gJ@7fC%
zenTkdoAW=&9;wE;J2_VY5%J%Hn-7E&q)$k^-;4JYk;!y7@@J<9$S@}7?|~6(cUgPE
zN|0eJTv(gv1cW`zURg8`IznH>;n`uu{}L<akDrA9;juFtMl2#Q9y~bf4>W$Y4iJgo
zpQVdy&=U{<1zynb;-1U`r%h~lGay9u#;&@r$Md%W#19*FI0KJx&zs}0NBHU~KG-Ad
zUNOuDJi>*3YRs;PFX&!ruzK0%McXZMXur18%6!zo2K3&-2lT#s$MlCx0O|_6?jJ`R
zZdC3~0TufA4Uv?DD8Y-06e8-%3C-T-hc~d}!KOe?5NY_o@t6#dUOKk^m<AyKgU4F1
z=>VsUuE$cBHU~e54vmr#d7UO$QnH?~4X@6Pgl!Z)av6riaiPQ@Mi7@)%<_X6D-{|i
zed7(s=HG7X9DjKM#O9ZXyMmxDI5s~i0e<e%Us9t2VRrL3MhQeYc&JZk?xnExhx)X$
zM8iR2p&`<$AZW~L{h>aB_Qx;>#lb^;c0{V>)pIK|j^m!DM7+=ArvpnMMF73ZWBF-H
zy(jY;s$eubfduoU9f&r)32T4XL$y0LKj$Nd?YA(<Z9v&eNX7*!X96A!9<uaDSa9)U
zXbpn*nXoK#>@#MD+Jxa}%)s*&{EQi4LIm^P6?_K`RO3XTWt{IOOjWcTJX{J+K*c^>
z3NGu|hf84-P}d(W1xNGefrm?tu<oLb2oD@L&YS^{xEUV|YjFXOxN!&BiSQ$C8UStt
zC->oUJscp&{xl#uVI{O0AUbObU?nt6bYhjz>qO@!b|YqW6HD@M_lBeDZ)L#~R7?N-
vIJdtb%YS+nKnB)tEL0!M4M9mDaQtpO&Jhn2gNNx5fjt|w<Nwn?*ZThtw6>9U


From 5c99963d4dcf0c0e103ea500650f2d34b45339bc Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Thu, 2 Mar 2023 05:44:47 +0000
Subject: [PATCH 184/319] * Fix bug #85660.

---
 module/task/lang/de.php            | 1 +
 module/task/lang/en.php            | 1 +
 module/task/lang/fr.php            | 1 +
 module/task/lang/zh-cn.php         | 1 +
 module/task/view/edit.html.php     | 7 ++++++-
 module/task/view/taskteam.html.php | 2 +-
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 49c129142c..a9dfb4350e 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -276,6 +276,7 @@ $lang->task->error->consumedThisTime  = 'Bitte geben Sie die Stunden an';
 $lang->task->error->left              = 'Bitte geben Sie die verbleibenden Stunden an"';
 $lang->task->error->work              = '"Bemerkung" muss kleiner als %d Zeichen sein.';
 $lang->task->error->teamMember        = 'Team members must be at least 2 people';
+$lang->task->error->teamCantOperate   = 'Please activate the closed, suspended, and canceled tasks before setting the team.';
 $lang->task->error->skipClose         = 'Aufgabe: %s ist nicht “Erledigt” oder “Abgebrochen”. Möchten Sie die Aufgabe jetzt schließen?';
 $lang->task->error->closeParent       = 'Task: %s is the Parent Task, which is automatically closed after all subtasks under the Parent Task are closed and cannot be closed manually.';
 $lang->task->error->consumed          = 'Aufgabe: %s Hour must be more than 0. Ignore changes to this Task.';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 649c63c40b..13cd21ca77 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -276,6 +276,7 @@ $lang->task->error->consumedThisTime  = 'Please enter "Hours Cost"';
 $lang->task->error->left              = 'Please enter "Hours Left"';
 $lang->task->error->work              = '"Comment" must be <  %d characters.';
 $lang->task->error->teamMember        = 'Team members must be at least 2 people';
+$lang->task->error->teamCantOperate   = 'Please activate the closed, suspended, and canceled tasks before setting the team.';
 $lang->task->error->skipClose         = 'Task: %s is not “Finished” or “Cancelled”. Do you want to close it?';
 $lang->task->error->closeParent       = 'Task: %s is the Parent Task, which is automatically closed after all subtasks under the Parent Task are closed and cannot be closed manually.';
 $lang->task->error->consumed          = 'Task: %s hour must be < 0. Ignore changes to this task.';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index c602f0a06e..2fc2956dbb 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -276,6 +276,7 @@ $lang->task->error->consumedThisTime  = 'Entrez le "Coût en Heures"';
 $lang->task->error->left              = 'Entrez les "Heures Restantes"';
 $lang->task->error->work              = '"Commentaire" doit être <  %d caractères.';
 $lang->task->error->teamMember        = 'Team members must be at least 2 people';
+$lang->task->error->teamCantOperate   = 'Please activate the closed, suspended, and canceled tasks before setting the team.';
 $lang->task->error->skipClose         = 'Tâche: %s non “Finie” ou “Annulée”. Voulez-vous la fermer malgré tout ?';
 $lang->task->error->closeParent       = 'Task: %s is the Parent Task, which is automatically closed after all subtasks under the Parent Task are closed and cannot be closed manually.';
 $lang->task->error->consumed          = 'Tâche: %s heures doivent être < 0. Ignorer changements de cette tâche.';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 0b4bed4938..6f2f86dc88 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -276,6 +276,7 @@ $lang->task->error->consumedThisTime  = '请填写"消耗"';
 $lang->task->error->left              = '请填写"剩余"';
 $lang->task->error->work              = '"备注"必须小于%d个字符';
 $lang->task->error->teamMember        = '团队成员必须大于1人';
+$lang->task->error->teamCantOperate   = '已关闭、已暂停、已取消的任务请激活后再维护团队。';
 $lang->task->error->skipClose         = '任务：%s 不是“已完成”或“已取消”状态，确定要关闭吗？';
 $lang->task->error->closeParent       = '任务：%s 是父任务，父任务在所有子任务关闭后会自动关闭，无法手动关闭。';
 $lang->task->error->consumed          = '任务：%s工时不能小于0，忽略该任务工时的改动';
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 7a5c27761c..ae92707175 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -285,7 +285,12 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
           </button>
           <h4 class="modal-title"><?php echo $lang->task->team?></h4>
         </div>
-        <div class="modal-content with-padding" id='taskTeamEditor'>
+	<div class="modal-content with-padding" id='taskTeamEditor'>
+	  <?php if(strpos('|closed|cancel|pause|', $task->status) !== false):?>
+	     <h2 class='label label-info'>
+               <?php echo $this->lang->task->error->teamCantOperate;?>                                             
+             </h2>
+	  <?php endif;?>
           <table class='table table-form'>
             <tbody class="sortable">
               <?php include dirname(__FILE__) . DS . 'taskteam.html.php';?>
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index ba052b1bb7..9858380ae2 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -26,7 +26,7 @@ $memberStatus   = $member->status;
 if($memberStatus == 'done') $memberDisabled = true;
 if($memberStatus != 'wait' and $task->mode == 'linear') $sortDisabled = true;
 if($memberStatus == 'done' and $task->mode == 'multi')  $sortDisabled = true;
-if($task->mode == 'linear' and strpos('|closed|cancel|pause|', $task->status) !== false and $app->rawMethod != 'activate')
+if(strpos('|closed|cancel|pause|', $task->status) !== false and $app->rawMethod != 'activate')
 {
     $memberStatus   = $task->status;
     $memberDisabled = true;

From bf3081471dd59c0ced23f510053dcac9cd9b5914 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 13:48:04 +0800
Subject: [PATCH 185/319] * Optimized creating requirements page.

---
 module/execution/view/kanban.html.php | 2 +-
 module/story/view/create.html.php     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 58293d2cde..5b88da0f03 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -199,7 +199,7 @@ js::set('priv',
     <div class='dropdown' id='createDropdown'>
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
-        <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
+        <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe' data-width=80%") . '</li>';?>
         <?php
         if($canBatchCreateStory)
         {
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index ca5236ccee..c3decab087 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -112,11 +112,13 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
                 </div>
               </div>
             </td>
+            <?php if(count($branches) > 1):?>
             <td class="table-col c-actions text-left w-60px">
               <div>
                 <a href='javascript:;' onclick='addBranchesBox(this)' class='btn btn-link' title='<?php echo sprintf($lang->story->addBranch, $lang->product->branchName[$product->type])?>'><i class='icon-plus'></i></a>
               </div>
             </td>
+            <?php endif;?>
           </tr>
           <tr class='hidden' >
             <th></th>

From 6aaea2823eb2a2dd53d3e2be8b9361163bdc09a5 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Thu, 2 Mar 2023 06:09:51 +0000
Subject: [PATCH 186/319] * Fix bug for testcase create view

---
 module/testcase/js/common.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index 0a4a973edd..ae902f070d 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -96,8 +96,9 @@ function loadProductModules(productID, branch)
         $inputGroup.find('select').chosen()
         if(typeof(caseModule) == 'string') $('#moduleIdBox').prepend("<span class='input-group-addon'>" + caseModule + "</span>");
         $inputGroup.fixInputGroup();
+
+        setStories();
     });
-    setStories();
 }
 
 /**

From 75b2f2abe6e200fc219ec40759ecd7c53abef899 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 2 Mar 2023 14:34:20 +0800
Subject: [PATCH 187/319] * Code for view refactors in admin .

---
 module/admin/css/index.css       | 3 ++-
 module/admin/view/index.html.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index e3770ac26c..9aaf48f125 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -84,7 +84,8 @@
 
 /* css for without internet */
 .main.without-internet {display: flex; flex-wrap: wrap;}
-.main.without-internet > .plug.panel {flex: 1 1 60%; margin-bottom: unset; margin-right: 16px;}
+.main.without-internet > .plug.panel {flex: 1 1 60%; margin-bottom: unset;}
+.main.without-internet > .bottom {flex: 1 1 100%;}
 .main.without-internet > .bottom > .official.panel {margin-right: unset;}
 .main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;}
 
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 594c0b0270..8ffa2416c2 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -26,7 +26,7 @@
                 <img src="static/svg/admin-<?php echo $menuKey;?>.svg"/>
                 <?php echo $menu['name'];?>
               </div>
-              <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> ", '_blank', 'class="text-muted setting-help"');?>
+              <?php echo html::a($config->admin->helpURL[$menuKey], "<i title={$lang->help} class='icon icon-help'></i> ", '_blank', 'class="text-muted setting-help"');?>
             </h4>
             <p class="text-muted setting-desc" title="<?php echo $menu['desc'];?>"><?php echo $menu['desc'];?></p>
           </button>

From a261f37af4a4287a3eb007072e9a95ee64a7be7d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 14:51:35 +0800
Subject: [PATCH 188/319] * Add zentao api get.

---
 module/admin/control.php         | 41 +++++++++++++++++++++++++-------
 module/admin/model.php           | 10 ++++----
 module/admin/view/index.html.php |  2 +-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 2a38dac0ef..ed73da9f31 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -53,23 +53,46 @@ class admin extends control
 
         $this->loadModel('misc');
 
-        $hasInternet = $this->admin->checkInternet();
-        $clientLang  = $this->app->getClientLang();
-        $langNotCN   = common::checkNotCN();
-        $dateUsed    = $this->admin->genDateUsed();
+        $clientLang = $this->app->getClientLang();
+        $langNotCN  = common::checkNotCN();
+        $dateUsed   = $this->admin->genDateUsed();
 
         $this->view->title       = $this->lang->admin->common;
         $this->view->position[]  = $this->lang->admin->index;
-        $this->view->plugins     = $this->admin->getExtensionsByAPI('plugin', $langNotCN ? 5 : 6, $hasInternet);
-        $this->view->patches     = $this->admin->getExtensionsByAPI('patch', 5, $hasInternet);
+        $this->view->plugins     = $this->admin->getExtensionsByAPI('plugin');
+        $this->view->patches     = $this->admin->getExtensionsByAPI('patch');
         $this->view->dateUsed    = $dateUsed;
-        $this->view->hasInternet = $hasInternet;
-        $this->view->dynamics    = ($hasInternet and !$langNotCN) ? $this->admin->getDynamicsByAPI(3) : array();
-        $this->view->publicClass = ($hasInternet and !$langNotCN) ? $this->admin->getPublicClassByAPI(3) : array();
+        $this->view->dynamics    = array();
+        $this->view->publicClass = array();
         $this->view->langNotCN   = $langNotCN;
         $this->display();
     }
 
+    /**
+     * Get zentao.net data by api.
+     *
+     * @access public
+     * @return void
+     */
+    public function ajaxGetZentaoData()
+    {
+        $hasInternet = $this->admin->checkInternet();
+        $langNotCN   = common::checkNotCN();
+
+        $data['result'] = $hasInternet ? 'success' : 'fail';
+        $data['data']   = new stdClass();
+
+        if($hasInternet)
+        {
+            $data['data']->plugins     = $this->admin->getExtensionsByAPI('plugin', $langNotCN ? 5 : 6, true);
+            $data['data']->patches     = $this->admin->getExtensionsByAPI('patch', 5, true);
+            $data['data']->dynamics    = !$langNotCN ? $this->admin->getDynamicsByAPI(3) : array();
+            $data['data']->publicClass = !$langNotCN ? $this->admin->getPublicClassByAPI(3) : array();
+        }
+
+        return $this->send($data);
+    }
+
     /**
      * Ignore notice of register and bind.
      *
diff --git a/module/admin/model.php b/module/admin/model.php
index a85a8f49a6..0ed3137ced 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -514,7 +514,7 @@ class adminModel extends model
      * @access public
      * @return array
      */
-    public function getExtensionsByAPI($type = 'plugin', $limit = 6, $hasInternet = true)
+    public function getExtensionsByAPI($type = 'plugin', $limit = 6, $hasInternet = false)
     {
         if($hasInternet)
         {
@@ -643,11 +643,11 @@ class adminModel extends model
      */
     public function checkInternet()
     {
-        $timeoutMS = 400;
-        $curl = curl_init();
+        $timeout = 3;
+        $curl    = curl_init();
         curl_setopt($curl, CURLOPT_URL, $this->config->admin->apiSite);
-        curl_setopt($curl, CURLOPT_TIMEOUT_MS, $timeoutMS);
-        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, $timeoutMS);
+        curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $timeout);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 594c0b0270..b675190512 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php js::set('hasInternet', $hasInternet);?>
+<?php js::set('hasInternet', false);?>
 <div id='mainContent' class='main-content admin'>
   <div class="main <?php if(!$hasInternet) echo 'without-internet';?>">
     <div class="settings panel">

From 7ebf700fd4efdd269593bc9d04fd58ede820a9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E9=A3=9E=E9=BE=99?= <guofeilong@easycorp.ltd>
Date: Thu, 2 Mar 2023 06:57:28 +0000
Subject: [PATCH 189/319] * Adjust code.

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

diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 8ffa2416c2..cc7e7ec861 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -26,7 +26,7 @@
                 <img src="static/svg/admin-<?php echo $menuKey;?>.svg"/>
                 <?php echo $menu['name'];?>
               </div>
-              <?php echo html::a($config->admin->helpURL[$menuKey], "<i title={$lang->help} class='icon icon-help'></i> ", '_blank', 'class="text-muted setting-help"');?>
+              <?php echo html::a($config->admin->helpURL[$menuKey], "<i title='{$lang->help}' class='icon icon-help'></i> ", '_blank', 'class="text-muted setting-help"');?>
             </h4>
             <p class="text-muted setting-desc" title="<?php echo $menu['desc'];?>"><?php echo $menu['desc'];?></p>
           </button>

From ee007fe1f68862a1a3d2a11bd22a411b80937d2a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 07:35:35 +0000
Subject: [PATCH 190/319] * Fix bug #32513.

---
 module/execution/model.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 4a4e430561..935e2f2758 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1458,32 +1458,34 @@ class executionModel extends model
         }
 
         /* The total workload of the first stage should not exceed 100%. */
-        if($type == 'create' or (!empty($oldExecution) and $oldExecution->grade == 1))
+        if($type == 'create' or (!empty($oldExecution) and $oldExecution->grade == 1 and isset($this->lang->execution->typeList[$oldExecution->type])))
         {
             $oldPercentTotal = $this->dao->select('SUM(t2.percent) as total')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                 ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
                 ->where('t1.product')->eq($this->post->products[0])
+                ->beginIF(!empty($_POST['branch']))->andWhere('t1.branch')->eq(current($this->post->branch[0]))->fi()
                 ->andWhere('t2.type')->eq('stage')
                 ->andWhere('t2.grade')->eq(1)
                 ->andWhere('t2.deleted')->eq(0)
-                ->andWhere('t2.parent')->eq($oldExecution->parent)
+                ->beginIF($type == 'create')->andWhere('t2.parent')->eq($oldExecution->id)->fi()
+                ->beginIF(!empty($oldExecution) and isset($this->lang->execution->typeList[$oldExecution->type]))->andWhere('t2.parent')->eq($oldExecution->parent)->fi()
                 ->fetch('total');
 
             if(!$oldPercentTotal) $oldPercentTotal = 0;
             if($type == 'create') $percentTotal = $percent + $oldPercentTotal;
-            if(!empty($oldExecution) and $oldExecution->grade == 1) $percentTotal = $oldPercentTotal - $oldExecution->percent + $this->post->percent;
+            if(!empty($oldExecution) and isset($this->lang->execution->typeList[$oldExecution->type])) $percentTotal = $oldPercentTotal - $oldExecution->percent + $percent;
 
             if($percentTotal > 100)
             {
-                dao::$errors['percent'] = sprintf($this->lang->execution->workloadTotal, '%', $oldPercentTotal . '%');
+                $printPercent = $type == 'create' ? $oldPercentTotal : $percentTotal;
+                dao::$errors['percent'] = sprintf($this->lang->execution->workloadTotal, '%', $printPercent . '%');
                 return false;
             }
         }
 
         if($type == 'update' and $oldExecution->grade > 1)
         {
-            $parentPlan           = $this->loadModel('programPlan')->getByID($oldExecution->parent);
-            $childrenTotalPercent = $this->dao->select('SUM(percent) as total')->from(TABLE_EXECUTION)->where('parent')->eq($oldExecution->parent)->andWhere('deleted')->eq(0)->fetch('total');
+            $childrenTotalPercent = $this->dao->select('SUM(percent) as total')->from(TABLE_EXECUTION)->where('parent')->eq($oldExecution->parent)->andWhere('project')->eq($oldExecution->project)->andWhere('deleted')->eq(0)->fetch('total');
             $childrenTotalPercent = $childrenTotalPercent - $oldExecution->percent + $this->post->percent;
 
             if($childrenTotalPercent > 100)

From 7dce298f902e4eac2969bb1f67dc58524084c9bf Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Thu, 2 Mar 2023 15:37:05 +0800
Subject: [PATCH 191/319] * Fix bug: hide execution of request, design.

---
 module/bug/js/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 8c1fb0a745..e50f5bf3ed 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -369,7 +369,7 @@ function loadProductExecutions(productID, projectID = 0)
         var execution = $('#execution').val();
     }
 
-    link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID + '&branch=' + branch + '&number=&executionID=' + execution);
+    link = createLink('product', 'ajaxGetExecutions', 'productID=' + productID + '&projectID=' + projectID + '&branch=' + branch + '&number=&executionID=' + execution + '&from=&mode=stagefilter');
     $('#executionIdBox').load(link, function()
     {
         $(this).find('select').chosen();

From 9729366c986ff544504b0863603620a841789db2 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 15:40:44 +0800
Subject: [PATCH 192/319] * Modify the logic associated with the presentation
 of story language items.

---
 module/dev/model.php | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index a395b1b5a0..41fae8295e 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -406,7 +406,16 @@ class devModel extends model
             $originalLangs['executionCommon'] = $this->config->executionCommonList[$language][$projectKey];
             $originalLangs['URCommon']        = $this->lang->dev->UR;
             $originalLangs['SRCommon']        = $this->lang->dev->SR;
-            if(!$this->config->URAndSR) unset($originalLangs['URCommon']);
+
+            $URSRList = $this->loadModel('custom')->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+            $URSRList = array_shift($URSRList);
+            if($URSRList)
+            {
+                $URSRList = json_decode($URSRList->value);
+                $originalLangs['URCommon'] = isset($URSRList->defaultURName) ? $URSRList->defaultURName : $URSRList->URName;
+                $originalLangs['SRCommon'] = isset($URSRList->defaultSRName) ? $URSRList->defaultSRName : $URSRList->SRName;
+            }
+            if(!$this->config->URAndSR) unset($customedLangs['URCommon']);
         }
         elseif($type == 'tag')
         {
@@ -478,18 +487,17 @@ class devModel extends model
 
                 $customedLangs['URCommon'] = $this->lang->dev->UR == $this->lang->URCommon ? '' : $this->lang->URCommon;
                 $customedLangs['SRCommon'] = $this->lang->dev->SR == $this->lang->SRCommon ? '' : $this->lang->SRCommon;
-                if($this->config->custom->URSR)
+                $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                $URSRList = array_shift($URSRList);
+                if($URSRList)
                 {
-                    $URSRList = $this->custom->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
-                    $URSRList = array_shift($URSRList);
-                    if($URSRList)
-                    {
-                        $URSRList = json_decode($URSRList->value);
-                        $customedLangs['URCommon'] = $this->lang->dev->UR == $URSRList->URName ? '' : $URSRList->URName;
-                        $customedLangs['SRCommon'] = $this->lang->dev->SR == $URSRList->SRName ? '' : $URSRList->SRName;
-                    }
+                    $URSRList = json_decode($URSRList->value);
+                    $defaultURName = isset($URSRList->defaultURName) ? $URSRList->defaultURName : $URSRList->URName;
+                    $defaultSRName = isset($URSRList->defaultSRName) ? $URSRList->defaultSRName : $URSRList->SRName;
+                    $customedLangs['URCommon'] = $defaultURName == $URSRList->URName ? '' : $URSRList->URName;
+                    $customedLangs['SRCommon'] = $defaultSRName == $URSRList->SRName ? '' : $URSRList->SRName;
                 }
-                if(!$this->config->URAndSR) unset($customedLangs['SRCommon']);
+                if(!$this->config->URAndSR) unset($customedLangs['URCommon']);
                 break;
             case 'first':
                 $customeds = $this->loadModel('custom')->getItems("lang={$language}&module=common&section=mainNav&vision={$this->config->vision}");

From 17bc1bfacc983d55d2d47bc81d0df12b75d991e1 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 07:47:56 +0000
Subject: [PATCH 193/319] * Fix bug #32592.

---
 module/execution/lang/de.php    | 2 +-
 module/execution/lang/en.php    | 2 +-
 module/execution/lang/fr.php    | 2 +-
 module/execution/lang/zh-cn.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index eec5fc176e..c7edb3a7d8 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = 'Tree View Task';
 $lang->execution->treeViewStory             = 'Tree View Story';
 $lang->execution->storyKanban               = 'Story Kanban';
 $lang->execution->storySort                 = 'Story sortieren';
-$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only active ' . $lang->SRCommon . ' can be imported.';
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index f3e870debd..b9d06aa7ad 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = 'Tree View Task';
 $lang->execution->treeViewStory             = 'Tree View Story';
 $lang->execution->storyKanban               = 'Story Kanban';
 $lang->execution->storySort                 = 'Rank Story';
-$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only active ' . $lang->SRCommon . ' can be imported.';
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index f7f699c520..15d6cc69c0 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = 'Tree View Task';
 $lang->execution->treeViewStory             = 'Tree View Story';
 $lang->execution->storyKanban               = 'Story Kanban';
 $lang->execution->storySort                 = 'Rank Story';
-$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
+$lang->execution->importPlanStory           = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only active ' . $lang->SRCommon . ' can be imported.';
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index a746b5ece4..2430c2b7af 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -282,7 +282,7 @@ $lang->execution->treeViewTask              = '树状图查看任务';
 $lang->execution->treeViewStory             = "树状图查看{$lang->SRCommon}";
 $lang->execution->storyKanban               = "{$lang->SRCommon}看板";
 $lang->execution->storySort                 = "{$lang->SRCommon}排序";
-$lang->execution->importPlanStory           = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
+$lang->execution->importPlanStory           = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时只能导入激活状态的' . $lang->SRCommon . '。';
 $lang->execution->importEditPlanStory       = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
 $lang->execution->importBranchPlanStory     = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将只关联本' . $lang->executionCommon . '所关联分支的激活需求。';
 $lang->execution->importBranchEditPlanStory = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将只关联本' . $lang->executionCommon . '所关联分支的激活需求。';

From fc444462240d9ebdfb912322c4bdf6b9ce6a2f4d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 07:49:41 +0000
Subject: [PATCH 194/319] * Fix bug #32603.

---
 module/project/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/model.php b/module/project/model.php
index e089889aaf..6108d7bd8d 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1250,6 +1250,7 @@ class projectModel extends model
             ->setDefault('team', $this->post->name)
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
+            ->setDefault('days', '0')
             ->add('type', 'project')
             ->join('whitelist', ',')
             ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags)

From 285dcf409bcba2955e1c3b1135f947114c58e555 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 07:56:48 +0000
Subject: [PATCH 195/319] * Fix bug #32513.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 935e2f2758..0f09524fa6 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1463,7 +1463,7 @@ class executionModel extends model
             $oldPercentTotal = $this->dao->select('SUM(t2.percent) as total')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                 ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
                 ->where('t1.product')->eq($this->post->products[0])
-                ->beginIF(!empty($_POST['branch']))->andWhere('t1.branch')->eq(current($this->post->branch[0]))->fi()
+                ->beginIF(!empty($_POST['branch'][0]))->andWhere('t1.branch')->eq(current($this->post->branch[0]))->fi()
                 ->andWhere('t2.type')->eq('stage')
                 ->andWhere('t2.grade')->eq(1)
                 ->andWhere('t2.deleted')->eq(0)

From 843d2898fa2bda8ff173521fdcfee11eb64eb4d0 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Thu, 2 Mar 2023 07:57:13 +0000
Subject: [PATCH 196/319] * Fix bug #85660.

---
 module/task/view/edit.html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index ae92707175..9e0a61e639 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -295,9 +295,11 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
             <tbody class="sortable">
               <?php include dirname(__FILE__) . DS . 'taskteam.html.php';?>
             </tbody>
-            <tfoot>
+	    <tfoot>
+	      <?php if(strpos('|closed|cancel|pause|', $task->status) === false):?>
               <tr><td colspan='3' class='text-center form-actions'><?php echo html::a('javascript:void(0)', $lang->confirm, '', "id='confirmButton' class='btn btn-primary btn-wide'");?></td></tr>
-            </tfoot>
+	      <?php endif;?> 
+	    </tfoot>
           </table>
         </div>
       </div>

From d19a50e54319190e6489a7b2e2fb8f7c73596985 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 15:58:39 +0800
Subject: [PATCH 197/319] * Do not display common language items.

---
 module/dev/view/langitem.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php
index 0b159de9ef..9de235776d 100644
--- a/module/dev/view/langitem.html.php
+++ b/module/dev/view/langitem.html.php
@@ -60,6 +60,7 @@
         <?php $isCurrentLang = str_replace('-', '_', $this->app->getClientLang()) == $language;?>
         <?php foreach($originalLangs as $langKey => $originalLang):?>
         <?php
+        if(isset($config->custom->commonLang[$originalLang])) continue;
         $itemKey = "{$moduleName}_{$langKey}";
         if(!$isCurrentLang) $currentLangs[$langKey] = strtr($currentLangs[$langKey], $currentCommonLang);
         $defaultValue = $this->dev->parseCommonLang($originalLang);

From 3935b867755ef5b2d9382eb81a95a33d41697e8d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 2 Mar 2023 16:01:53 +0800
Subject: [PATCH 198/319]  * fix bug #32306.

---
 module/user/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/user/control.php b/module/user/control.php
index f36e1f5652..4870995750 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -978,6 +978,7 @@ class user extends control
         }
         else
         {
+            setcookie('tab', false, time(), $this->config->webRoot);
             $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == $this->config->webRoot or empty($this->referer) or preg_match("/\/www\/$/", strtolower($this->referer), $output));
 
             $this->loadModel('misc');
@@ -1050,7 +1051,7 @@ class user extends control
         if(isset($this->app->user->id)) $this->loadModel('action')->create('user', $this->app->user->id, 'logout');
         setcookie('za', false, time() - 3600, $this->config->webRoot);
         setcookie('zp', false, time() - 3600, $this->config->webRoot);
-        setcookie('tab', false, time() - 3600, $this->config->webRoot);        ;
+        setcookie('tab', false, time() - 3600, $this->config->webRoot);
         session_destroy();
 
         if($this->app->getViewType() == 'json') return print(json_encode(array('status' => 'success')));

From fda9efd09c560a04d41c9ac8af606ccdec198faa Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 2 Mar 2023 16:05:35 +0800
Subject: [PATCH 199/319] * Remove request stages in bug batch-create page.

---
 module/bug/config.php      | 2 +-
 module/bug/control.php     | 2 +-
 module/product/control.php | 2 +-
 module/product/model.php   | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 module/bug/config.php
 mode change 100644 => 100755 module/product/model.php

diff --git a/module/bug/config.php b/module/bug/config.php
old mode 100644
new mode 100755
index 060992e9ab..d9c707e2f2
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -223,7 +223,7 @@ $config->bug->datatable->fieldList['execution']['title']      = 'execution';
 $config->bug->datatable->fieldList['execution']['fixed']      = 'no';
 $config->bug->datatable->fieldList['execution']['width']      = '120';
 $config->bug->datatable->fieldList['execution']['required']   = 'no';
-$config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'product', 'method' =>'getAllExecutionPairsByProduct', 'params' => '$productID&$branch');
+$config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'product', 'method' =>'getAllExecutionPairsByProduct', 'params' => '$productID&$branch&0&stagefilter');
 
 $config->bug->datatable->fieldList['plan']['title']    = 'plan';
 $config->bug->datatable->fieldList['plan']['fixed']    = 'no';
diff --git a/module/bug/control.php b/module/bug/control.php
index f9727a0d45..94660d0e2b 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -859,7 +859,7 @@ class bug extends control
         $this->view->users            = $this->user->getPairs('devfirst|noclosed');
         $this->view->projects         = array('' => '') + $this->product->getProjectPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID);
         $this->view->projectID        = $projectID;
-        $this->view->executions       = array('' => '') + $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID, 'multiple');
+        $this->view->executions       = array('' => '') + $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID, 'multiple,stagefilter');
         $this->view->executionID      = $executionID;
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch === 'all' ? 0 : $branch);
         $this->view->moduleID         = $moduleID;
diff --git a/module/product/control.php b/module/product/control.php
index e4ac5a9fe4..fd081a90cd 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1031,7 +1031,7 @@ class product extends control
     public function ajaxGetExecutionsByProject($productID, $projectID = 0, $branch = 0, $number = 0)
     {
         $noMultipleExecutionID = $projectID ? $this->loadModel('execution')->getNoMultipleID($projectID) : '';
-        $executions            = $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, 'multiple');
+        $executions            = $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, 'multiple,stagefilter');
 
         $disabled = $noMultipleExecutionID ? "disabled='disabled'" : '';
         $html = html::select("executions[{$number}]", array('' => '') + $executions, 0, "class='form-control' onchange='loadExecutionBuilds($productID, this.value, $number)' $disabled");
diff --git a/module/product/model.php b/module/product/model.php
old mode 100644
new mode 100755
index 4461499a2b..5494bb053d
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1537,6 +1537,8 @@ class productModel extends model
         if($projectID) $executions = $this->loadModel('execution')->resetExecutionSorts($executions);
         foreach($executions as $execution)
         {
+            if(strpos($mode, 'stagefilter') !== false and in_array($execution->attribute, array('request', 'design', 'review'))) continue;
+
             if(isset($execution->children))
             {
                 $executionPairs = $executionPairs + $execution->children;
@@ -1544,7 +1546,6 @@ class productModel extends model
             }
 
             /* Some stage of waterfall not need.*/
-            if(strpos($mode, 'stagefilter') !== false and in_array($execution->attribute, array('request', 'design', 'review'))) continue;
             if(isset($projectPairs[$execution->project])) $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
         }
 

From d693d5884c747081c6d738b0a2516fa8d93a8ab4 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 2 Mar 2023 16:20:20 +0800
Subject: [PATCH 200/319]  * fix bug #32431.

---
 module/bug/control.php             | 2 +-
 module/bug/view/batchedit.html.php | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 94660d0e2b..de0279b862 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1398,7 +1398,7 @@ class bug extends control
         }
 
         /* Set users. */
-        $users = $this->user->getPairs('devfirst', '', $this->config->maxCount);
+        $users = $this->user->getPairs('devfirst');
         $users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;
 
         /* Assign. */
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index c3ed89d702..95cf0ba72d 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -74,9 +74,6 @@
         </thead>
         <tbody>
           <?php foreach($bugs as $bugID => $bug):?>
-          <?php
-          if(!empty($this->config->user->moreLink)) $this->config->moreLinks["assignedTos[$bugID]"] = $this->config->user->moreLink;
-          ?>
           <tr>
             <td><?php echo $bugID . html::hidden("bugIDList[$bugID]", $bugID);?></td>
             <td <?php echo zget($visibleFields, 'type', "class='hidden'")?>><?php echo html::select("types[$bugID]", $typeList, $bug->type, 'class=form-control');?></td>

From ab978f408eaef0ee702b306e38013ed7271fe13c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 16:24:20 +0800
Subject: [PATCH 201/319] * Change the order of items in the navigation tree.

---
 module/dev/model.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/module/dev/model.php b/module/dev/model.php
index 41fae8295e..c34b277e11 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -366,6 +366,14 @@ class devModel extends model
         ksort($menuOrders);
         foreach($menuOrders as $menuKey)
         {
+            if($menuKey == 'project')
+            {
+                $projectTypeList = array('scrum', 'waterfall', 'kanbanProject');
+                foreach($projectTypeList as $projectType)
+                {
+                    if(isset($menus[$projectType])) $sortedMenus[$projectType] = $menus[$projectType];
+                }
+            }
             if(isset($menus[$menuKey])) $sortedMenus[$menuKey] = $menus[$menuKey];
         }
 

From f1c5c8c82c4917d8c65eeae139c397eabdcb2919 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Thu, 2 Mar 2023 16:58:42 +0800
Subject: [PATCH 202/319] * Adjust code in admin.

---
 module/admin/control.php   | 2 +-
 module/admin/css/index.css | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 2a38dac0ef..d400508562 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -53,7 +53,7 @@ class admin extends control
 
         $this->loadModel('misc');
 
-        $hasInternet = $this->admin->checkInternet();
+        $hasInternet = !$this->admin->checkInternet();
         $clientLang  = $this->app->getClientLang();
         $langNotCN   = common::checkNotCN();
         $dateUsed    = $this->admin->genDateUsed();
diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 9aaf48f125..d457164dbc 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -84,8 +84,8 @@
 
 /* css for without internet */
 .main.without-internet {display: flex; flex-wrap: wrap;}
-.main.without-internet > .plug.panel {flex: 1 1 60%; margin-bottom: unset;}
-.main.without-internet > .bottom {flex: 1 1 100%;}
+.main.without-internet > .plug.panel {flex: 1 1 60%; margin-bottom: unset; margin-right: 16px;}
+.main.without-internet > .bottom {flex: 1 1 30%;}
 .main.without-internet > .bottom > .official.panel {margin-right: unset;}
 .main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;}
 

From 95184b53a36492aa6d59084c97b82b3566e53572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E9=A3=9E=E9=BE=99?= <guofeilong@easycorp.ltd>
Date: Thu, 2 Mar 2023 09:00:04 +0000
Subject: [PATCH 203/319] * Adjust code in control.php.

---
 module/admin/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index d400508562..2a38dac0ef 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -53,7 +53,7 @@ class admin extends control
 
         $this->loadModel('misc');
 
-        $hasInternet = !$this->admin->checkInternet();
+        $hasInternet = $this->admin->checkInternet();
         $clientLang  = $this->app->getClientLang();
         $langNotCN   = common::checkNotCN();
         $dateUsed    = $this->admin->genDateUsed();

From 8ea5eab784380cec0da801284f6b69b993a8506b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 2 Mar 2023 17:04:36 +0800
Subject: [PATCH 204/319] * Code for task 84525.

---
 module/dev/config.php | 1 +
 module/dev/model.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/dev/config.php b/module/dev/config.php
index 0c9b72278a..479215f542 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -259,6 +259,7 @@ $config->dev->linkMethods['my']['my-calendar'] = array('my', 'todo');
 
 $config->dev->skipMenus['first']  = array('project', 'product');
 $config->dev->skipMenus['second'] = array('menu_storyGroup', 'menu_story', 'menu_other', 'menu_more');
+$config->dev->skipMenus['third']  = array('bysearch');
 
 $config->dev->skipMenus['scrum'] = array();
 if(!helper::hasFeature('scrum_issue')      and !helper::hasFeature('agileplus_issue'))      $config->dev->skipMenus['scrum']['issue']      = 'otherDropMenu_issue';
diff --git a/module/dev/model.php b/module/dev/model.php
index c34b277e11..592c746a52 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -628,6 +628,7 @@ class devModel extends model
         $menus = array();
         if($this->config->vision == 'lite' and $menu == 'project') $menu = 'kanbanProject';
         if(!isset($this->lang->$menu->menu)) return $menus;
+        if(isset($this->lang->$menu->menuOrder)) $this->lang->$menu->menu->menuOrder = $this->lang->$menu->menuOrder;
 
         $menuLang    = $this->getLinkTitle($this->lang->$menu->menu);
         $menusPinYin = common::convert2Pinyin($menuLang);

From 58d9fd2ee95b1ff71e41f3798445b9d84ae57def Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 2 Mar 2023 17:04:44 +0800
Subject: [PATCH 205/319] * Fix bug #32593.

---
 module/admin/control.php         |  34 ++++----
 module/admin/js/index.js         |   2 +
 module/admin/model.php           | 132 +++++++++++++++++++------------
 module/admin/view/index.html.php |   2 +-
 module/block/model.php           |  39 +++++++++
 module/index/js/index.js         |   3 +
 module/index/view/index.html.php |   1 +
 7 files changed, 149 insertions(+), 64 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index ed73da9f31..97238f0cfe 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -57,13 +57,17 @@ class admin extends control
         $langNotCN  = common::checkNotCN();
         $dateUsed   = $this->admin->genDateUsed();
 
+        $zentaoData  = $this->admin->getZentaoData();
+        $hasInternet = $zentaoData->hasData;
+
         $this->view->title       = $this->lang->admin->common;
         $this->view->position[]  = $this->lang->admin->index;
-        $this->view->plugins     = $this->admin->getExtensionsByAPI('plugin');
-        $this->view->patches     = $this->admin->getExtensionsByAPI('patch');
+        $this->view->plugins     = $zentaoData->plugins;
+        $this->view->patches     = $zentaoData->patches;
         $this->view->dateUsed    = $dateUsed;
-        $this->view->dynamics    = array();
-        $this->view->publicClass = array();
+        $this->view->hasInternet = $hasInternet;
+        $this->view->dynamics    = $zentaoData->news;
+        $this->view->publicClass = $zentaoData->publicclass;
         $this->view->langNotCN   = $langNotCN;
         $this->display();
     }
@@ -74,23 +78,25 @@ class admin extends control
      * @access public
      * @return void
      */
-    public function ajaxGetZentaoData()
+    public function ajaxSetZentaoData()
     {
         $hasInternet = $this->admin->checkInternet();
-        $langNotCN   = common::checkNotCN();
-
-        $data['result'] = $hasInternet ? 'success' : 'fail';
-        $data['data']   = new stdClass();
 
         if($hasInternet)
         {
-            $data['data']->plugins     = $this->admin->getExtensionsByAPI('plugin', $langNotCN ? 5 : 6, true);
-            $data['data']->patches     = $this->admin->getExtensionsByAPI('patch', 5, true);
-            $data['data']->dynamics    = !$langNotCN ? $this->admin->getDynamicsByAPI(3) : array();
-            $data['data']->publicClass = !$langNotCN ? $this->admin->getPublicClassByAPI(3) : array();
+            $nextWeek   = date('Y-m-d', strtotime('-7 days'));
+            $zentaoData = $this->loadModel('block')->getZentaoData($nextWeek);
+
+            if(empty($zentaoData))
+            {
+                $this->admin->setExtensionsByAPI('plugin', 6);
+                $this->admin->setExtensionsByAPI('patch', 5);
+                $this->admin->setDynamicsByAPI(3);
+                $this->admin->setPublicClassByAPI(3);
+            }
         }
 
-        return $this->send($data);
+        return $this->send(array('result' => 'success'));
     }
 
     /**
diff --git a/module/admin/js/index.js b/module/admin/js/index.js
index f97411945c..fed2be7c68 100644
--- a/module/admin/js/index.js
+++ b/module/admin/js/index.js
@@ -10,4 +10,6 @@ $(function()
     {
         window.open($(this).data('link'));
     });
+
+    if(!hasInternet) $.get(createLink('admin', 'ajaxSetZentaoData'));
 });
diff --git a/module/admin/model.php b/module/admin/model.php
index 0ed3137ced..faa37c44d4 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -506,7 +506,7 @@ class adminModel extends model
     }
 
     /**
-     * Get extensions from zentao.net.
+     * Set extensions from zentao.net.
      *
      * @param  string $type plugin|patch
      * @param  int    $limit
@@ -514,44 +514,22 @@ class adminModel extends model
      * @access public
      * @return array
      */
-    public function getExtensionsByAPI($type = 'plugin', $limit = 6, $hasInternet = false)
+    public function setExtensionsByAPI($type = 'plugin', $limit = 5)
     {
-        if($hasInternet)
+        $searchType = $type == 'plugin' ? 'byModule,offcial' : 'byModule';
+        $param      = $type == 'plugin' ? '' : 'MTIxOA==';
+        $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
+        $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
+        $plugins    = array();
+        foreach($extensions as $extension)
         {
-            $searchType = $type == 'plugin' ? 'byModule,offcial' : 'byModule';
-            $param      = $type == 'plugin' ? '' : 'MTIxOA==';
-            $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
-            $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
-            $plugins    = array();
-            foreach($extensions as $extension)
-            {
-                if($type == 'patch' and !isset($extension->compatibleRelease)) continue;
+            if($type == 'patch' and !isset($extension->compatibleRelease)) continue;
 
-                $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink);
-                $plugins[] = $extension;
-            }
-        }
-        else
-        {
-            if($this->config->edition == 'open')
-            {
-                $plugins = array(
-                    $this->config->admin->plugins[27],
-                    $this->config->admin->plugins[26],
-                    $this->config->admin->plugins[30]
-                );
-            }
-            else
-            {
-                $plugins = array(
-                    $this->config->admin->plugins[198],
-                    $this->config->admin->plugins[194],
-                    $this->config->admin->plugins[203]
-                );
-            }
+            $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink);
+            $plugins[] = $extension;
         }
 
-        return $plugins;
+        return $this->loadModel('block')->setZentaoData($type, $plugins);
     }
 
     /**
@@ -575,13 +553,13 @@ class adminModel extends model
     }
 
     /**
-     * Get public class from zentao.net.
+     * Set public class from zentao.net.
      *
      * @param  int    $limit
      * @access public
-     * @return array
+     * @return void
      */
-    public function getPublicClassByAPI($limit = 2)
+    public function setPublicClassByAPI($limit = 3)
     {
         $apiURL  = $this->config->admin->videoAPIURL;
         $data    = $this->fetchAPI($apiURL);
@@ -599,24 +577,25 @@ class adminModel extends model
             $publicClass[$index]->viewLink = $this->config->admin->apiRoot . '/publicclass/' . ($course->alias ? "{$course->alias}-" : '') . "{$course->id}.html";
             $index ++;
         }
-        return $publicClass;
+
+        return $this->loadModel('block')->setZentaoData('publicclass', $publicClass);
     }
 
     /**
-     * Get dynamics by API.
+     * Set dynamics by API.
      *
      * @param  int    $limit
      * @access public
-     * @return array
+     * @return void
      */
-    public function getDynamicsByAPI($limit = 2)
+    public function setDynamicsByAPI($limit = 2)
     {
         $apiURL   = $this->config->admin->downloadAPIURL;
         $data     = $this->fetchAPI($apiURL);
         $articles = $data->articles;
 
-        $index     = 1;
-        $downloads = array();
+        $index = 1;
+        $news  = array();
         foreach($articles as $article)
         {
             if($index > $limit) break;
@@ -625,14 +604,15 @@ class adminModel extends model
             if(!isset($this->lang->admin->$tagKey)) break;
             if(!preg_match("/{$this->lang->admin->$tagKey}\d/", $article->title)) continue;
 
-            $downloads[$index] = new stdClass();
-            $downloads[$index]->id        = $article->id;
-            $downloads[$index]->title     = $article->title;
-            $downloads[$index]->addedDate = $article->addedDate;
-            $downloads[$index]->link      = $this->config->admin->apiRoot . "/download/{$article->alias}-{$article->id}.html";
+            $news[$index] = new stdClass();
+            $news[$index]->id        = $article->id;
+            $news[$index]->title     = $article->title;
+            $news[$index]->addedDate = $article->addedDate;
+            $news[$index]->link      = $this->config->admin->apiRoot . "/download/{$article->alias}-{$article->id}.html";
             $index ++;
         }
-        return $downloads;
+
+        return $this->loadModel('block')->setZentaoData('news', $news);
     }
 
     /**
@@ -674,4 +654,58 @@ class adminModel extends model
 
         return helper::getDateInterval($firstUseDate);
     }
+
+    /**
+     * Get zentao.net data.
+     *
+     * @access public
+     * @return object
+     */
+    public function getZentaoData()
+    {
+        $zentaoData = $this->loadModel('block')->getZentaoData();
+
+        $data = new stdclass();
+        $data->hasData = true;
+
+        $news        = array();
+        $publicclass = array();
+        $plugins     = array();
+        $patches     = array();
+        if(empty($zentaoData))
+        {
+            $data->hasData = false;
+            if($this->config->edition == 'open')
+            {
+                $plugins = array(
+                    $this->config->admin->plugins[27],
+                    $this->config->admin->plugins[26],
+                    $this->config->admin->plugins[30]
+                );
+            }
+            else
+            {
+                $plugins = array(
+                    $this->config->admin->plugins[198],
+                    $this->config->admin->plugins[194],
+                    $this->config->admin->plugins[203]
+                );
+            }
+        }
+        else
+        {
+            $news        = json_decode($zentaoData['news']);
+            $publicclass = json_decode($zentaoData['publicclass']);
+            $plugins     = json_decode($zentaoData['plugin']);
+            $patches     = json_decode($zentaoData['patch']);
+            if(common::checkNotCN()) array_pop($plugins);
+        }
+
+        $data->news        = $news;
+        $data->publicclass = $publicclass;
+        $data->plugins     = $plugins;
+        $data->patches     = $patches;
+
+        return $data;
+    }
 }
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index b675190512..594c0b0270 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php js::set('hasInternet', false);?>
+<?php js::set('hasInternet', $hasInternet);?>
 <div id='mainContent' class='main-content admin'>
   <div class="main <?php if(!$hasInternet) echo 'without-internet';?>">
     <div class="settings panel">
diff --git a/module/block/model.php b/module/block/model.php
index 383315585e..fcb3d99bab 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -1072,4 +1072,43 @@ class blockModel extends model
     {
         return $this->dao->select('count(estimate) as estimate')->from(TABLE_STORY)->where('id')->in($storyID)->fetch('estimate');
     }
+
+    /**
+     * Get zentao.net data.
+     *
+     * @param  string $minTime
+     * @access public
+     * @return array
+     */
+    public function getZentaoData($minTime = '')
+    {
+        return $this->dao->select('type,params')->from(TABLE_BLOCK)
+            ->where('account')->eq('system')
+            ->andWhere('vision')->eq('rnd')
+            ->andWhere('module')->eq('zentao')
+            ->beginIF($minTime)->andWhere('source')->ge($minTime)->fi()
+            ->andWhere('type')->in('plugin,patch,publicclass,news')
+            ->fetchPairs('type');
+    }
+
+    /**
+     * Set zentao data.
+     *
+     * @param  string $type
+     * @param  string $params
+     * @access public
+     * @return void
+     */
+    public function setZentaoData($type = 'patch', $params = '')
+    {
+        $data = new stdclass();
+        $data->account = 'system';
+        $data->vision  = 'rnd';
+        $data->module  = 'zentao';
+        $data->type    = $type;
+        $data->source  = date('Y-m-d');
+        $data->params  = json_encode($params);
+
+        $this->dao->replace(TABLE_BLOCK)->data($data)->exec();
+    }
 }
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 86ab05c19c..591c1b3753 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -891,6 +891,9 @@ $(function()
     {
         $('#globalSearchInput').click();
     });
+
+    /* Update patch, plugin, news, publicclass from zetao.net. */
+    if(isAdminUser) $.get(createLink('admin', 'ajaxSetZentaoData'));
 });
 
 /* Change the search object according to the module and method. */
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index be9093fc00..bb74a7d06c 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -21,6 +21,7 @@ js::set('appsMenuItems', commonModel::getMainNavList($app->rawModule));
 js::set('defaultOpen',   (isset($open) and !empty($open)) ? $open : '');
 js::set('manualText',    $lang->manual);
 js::set('manualUrl',     ((!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']) . '&theme=' . $_COOKIE['theme']);
+js::set('isAdminUser',   $this->app->user->admin);
 ?>
 <style>
 #versionTitle {margin: 8px 3px 0px 0px; background-image: url(<?php echo $config->webRoot . 'theme/default/images/main/version-upgrade.svg';?>);}

From bc54729fff00e5cc313e724b6f6698d4400066c6 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 2 Mar 2023 17:27:44 +0800
Subject: [PATCH 206/319] * Fix bug #32374.

---
 module/project/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/model.php b/module/project/model.php
index 6108d7bd8d..ee20af05e2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1447,6 +1447,7 @@ class projectModel extends model
 
                 $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
                 $productID = $this->dao->lastInsertId();
+                $this->loadModel('personnel')->updateWhitelist($whitelist, 'product', $productID);
                 $this->loadModel('action')->create('product', $productID, 'opened');
                 $this->dao->update(TABLE_PRODUCT)->set('`order`')->eq($productID * 5)->where('id')->eq($productID)->exec();
                 if($product->acl != 'open') $this->loadModel('user')->updateUserView($productID, 'product');

From 846129297dc3f24470ea441457049653c20d8c72 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 2 Mar 2023 17:32:47 +0800
Subject: [PATCH 207/319] * Fix bug #32374.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index ee20af05e2..2c15fd9ded 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1447,7 +1447,7 @@ class projectModel extends model
 
                 $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
                 $productID = $this->dao->lastInsertId();
-                $this->loadModel('personnel')->updateWhitelist($whitelist, 'product', $productID);
+                if(!$project->hasProduct) $this->loadModel('personnel')->updateWhitelist($whitelist, 'product', $productID);
                 $this->loadModel('action')->create('product', $productID, 'opened');
                 $this->dao->update(TABLE_PRODUCT)->set('`order`')->eq($productID * 5)->where('id')->eq($productID)->exec();
                 if($product->acl != 'open') $this->loadModel('user')->updateUserView($productID, 'product');

From 1ce1a24f1dd245fbaeff75f99b4d97056f4f2a51 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Thu, 2 Mar 2023 17:40:47 +0800
Subject: [PATCH 208/319] * Fix execution-stage list bug.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index 0f09524fa6..01eed079a3 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5164,7 +5164,7 @@ class executionModel extends model
         }
         else
         {
-            $path     = str_replace(",$execution->project", '', $execution->path);
+            $path     = str_replace(",$execution->project,", ',', $execution->path);
             $trClass  = 'table-nest-hide';
             $trAttrs  = "data-id={$execution->id} data-parent={$execution->parent} data-status={$execution->status}";
             $trAttrs .= " data-nest-parent='$execution->parent' data-order='$execution->order' data-nest-path='$path'";

From 5a2ffd541d79a24519144b5006cc4d2a695bc5bc Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 3 Mar 2023 09:07:21 +0800
Subject: [PATCH 209/319] * Code for task 84525.

---
 extension/lite/common/ext/lang/de/lite.php    |  2 +-
 extension/lite/common/ext/lang/en/lite.php    |  2 +-
 extension/lite/common/ext/lang/fr/lite.php    |  2 +-
 extension/lite/common/ext/lang/zh-cn/lite.php |  2 +-
 module/dev/config.php                         |  5 +++
 module/dev/control.php                        |  7 +++-
 module/dev/model.php                          | 41 +++++++++++--------
 7 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php
index 07f243d0a8..32b9d67573 100644
--- a/extension/lite/common/ext/lang/de/lite.php
+++ b/extension/lite/common/ext/lang/de/lite.php
@@ -7,7 +7,7 @@ $lang->story->common      = 'Story';
 /* Main Navigation. */
 $lang->mainNav            = new stdclass();
 $lang->mainNav->my        = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|";
-$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|";
+$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|";
 $lang->mainNav->execution = "{$lang->navIcons['execution']} Task|$executionModule|$executionMethod|";
 $lang->mainNav->kanban    = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|";
 $lang->mainNav->doc       = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|";
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index 07f243d0a8..32b9d67573 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -7,7 +7,7 @@ $lang->story->common      = 'Story';
 /* Main Navigation. */
 $lang->mainNav            = new stdclass();
 $lang->mainNav->my        = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|";
-$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|";
+$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|";
 $lang->mainNav->execution = "{$lang->navIcons['execution']} Task|$executionModule|$executionMethod|";
 $lang->mainNav->kanban    = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|";
 $lang->mainNav->doc       = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|";
diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php
index 07f243d0a8..32b9d67573 100644
--- a/extension/lite/common/ext/lang/fr/lite.php
+++ b/extension/lite/common/ext/lang/fr/lite.php
@@ -7,7 +7,7 @@ $lang->story->common      = 'Story';
 /* Main Navigation. */
 $lang->mainNav            = new stdclass();
 $lang->mainNav->my        = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|";
-$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|";
+$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|";
 $lang->mainNav->execution = "{$lang->navIcons['execution']} Task|$executionModule|$executionMethod|";
 $lang->mainNav->kanban    = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|";
 $lang->mainNav->doc       = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|";
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index d0016acc06..39dbd0bf2c 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -7,7 +7,7 @@ $lang->story->common      = '目标';
 /* Main Navigation. */
 $lang->mainNav            = new stdclass();
 $lang->mainNav->my        = "{$lang->navIcons['my']} {$lang->my->shortCommon}|my|index|";
-$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->project->common}|$projectModule|$projectMethod|";
+$lang->mainNav->project   = "{$lang->navIcons['project']} {$lang->projectCommon}|$projectModule|$projectMethod|";
 $lang->mainNav->execution = "{$lang->navIcons['execution']} 任务|$executionModule|$executionMethod|";
 $lang->mainNav->kanban    = "{$lang->navIcons['kanban']} {$lang->kanban->common}|kanban|space|";
 $lang->mainNav->doc       = "{$lang->navIcons['doc']} {$lang->doc->common}|doc|index|";
diff --git a/module/dev/config.php b/module/dev/config.php
index 479215f542..4f6e8851cc 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -260,6 +260,11 @@ $config->dev->linkMethods['my']['my-calendar'] = array('my', 'todo');
 $config->dev->skipMenus['first']  = array('project', 'product');
 $config->dev->skipMenus['second'] = array('menu_storyGroup', 'menu_story', 'menu_other', 'menu_more');
 $config->dev->skipMenus['third']  = array('bysearch');
+if($config->vision == 'lite')
+{
+    $config->dev->skipMenus['first'][] = 'execution';
+    $config->dev->skipMenus['second']  = array('menu_other', 'menu_more');
+}
 
 $config->dev->skipMenus['scrum'] = array();
 if(!helper::hasFeature('scrum_issue')      and !helper::hasFeature('agileplus_issue'))      $config->dev->skipMenus['scrum']['issue']      = 'otherDropMenu_issue';
diff --git a/module/dev/control.php b/module/dev/control.php
index 96b0d1fd1c..829fc57cb7 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -180,8 +180,11 @@ class dev extends control
         if($type == 'common') $section = '&section=';
         if($type == 'first')  $section = '&section=mainNav';
         if($type == 'tag')    $section = str_replace('_', '-', "&section=featureBar-{$method}");
-        $this->loadModel('custom')->deleteItems("lang={$language}&module={$module}&vision={$this->config->vision}{$section}");
-        if($type == 'common' and $this->config->custom->URSR)
+        $key = '';
+        if($type == 'common') $key = '&key=projectCommon,productCommon,executionCommon';
+
+        $this->loadModel('custom')->deleteItems("lang={$language}&module={$module}&vision={$this->config->vision}{$section}{$key}");
+        if($this->config->vision == 'rnd' and $type == 'common' and $this->config->custom->URSR)
         {
             $oldValue = $this->dao->select('*')->from(TABLE_LANG)->where('`key`')->eq($this->config->custom->URSR)->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($language)->andWhere('module')->eq('custom')->fetch('value');
             if($oldValue)
diff --git a/module/dev/model.php b/module/dev/model.php
index 592c746a52..b3f287f1c2 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -408,22 +408,29 @@ class devModel extends model
         $langKey = '';
         if($type == 'common')
         {
-            $projectKey = (int)$this->loadModel('setting')->getItem('owner=system&key=sprintConcept');
-            $originalLangs['productCommon']   = $this->config->productCommonList[$language][PRODUCT_KEY];
-            $originalLangs['projectCommon']   = $this->config->projectCommonList[$language][PROJECT_KEY];
-            $originalLangs['executionCommon'] = $this->config->executionCommonList[$language][$projectKey];
-            $originalLangs['URCommon']        = $this->lang->dev->UR;
-            $originalLangs['SRCommon']        = $this->lang->dev->SR;
-
-            $URSRList = $this->loadModel('custom')->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
-            $URSRList = array_shift($URSRList);
-            if($URSRList)
+            if($this->config->vision == 'rnd')
             {
-                $URSRList = json_decode($URSRList->value);
-                $originalLangs['URCommon'] = isset($URSRList->defaultURName) ? $URSRList->defaultURName : $URSRList->URName;
-                $originalLangs['SRCommon'] = isset($URSRList->defaultSRName) ? $URSRList->defaultSRName : $URSRList->SRName;
+                $projectKey = (int)$this->loadModel('setting')->getItem('owner=system&key=sprintConcept');
+                $originalLangs['productCommon'] = $this->config->productCommonList[$language][PRODUCT_KEY];
+                $originalLangs['projectCommon'] = $this->config->projectCommonList[$language][PROJECT_KEY];
+                $originalLangs['executionCommon'] = $this->config->executionCommonList[$language][$projectKey];
+                $originalLangs['URCommon']        = $this->lang->dev->UR;
+                $originalLangs['SRCommon']        = $this->lang->dev->SR;
+
+                $URSRList = $this->loadModel('custom')->getItems("lang={$language}&module=custom&section=URSRList&key={$this->config->custom->URSR}&vision={$this->config->vision}");
+                $URSRList = array_shift($URSRList);
+                if($URSRList)
+                {
+                    $URSRList = json_decode($URSRList->value);
+                    $originalLangs['URCommon'] = isset($URSRList->defaultURName) ? $URSRList->defaultURName : $URSRList->URName;
+                    $originalLangs['SRCommon'] = isset($URSRList->defaultSRName) ? $URSRList->defaultSRName : $URSRList->SRName;
+                }
+                if(!$this->config->URAndSR) unset($customedLangs['URCommon']);
+            }
+            else
+            {
+                $originalLangs['projectCommon'] = $this->config->projectCommonList[$language][PROJECT_KEY];
             }
-            if(!$this->config->URAndSR) unset($customedLangs['URCommon']);
         }
         elseif($type == 'tag')
         {
@@ -626,7 +633,6 @@ class devModel extends model
     public function getThirdMenus($menu, $module = '', $method = '')
     {
         $menus = array();
-        if($this->config->vision == 'lite' and $menu == 'project') $menu = 'kanbanProject';
         if(!isset($this->lang->$menu->menu)) return $menus;
         if(isset($this->lang->$menu->menuOrder)) $this->lang->$menu->menu->menuOrder = $this->lang->$menu->menuOrder;
 
@@ -926,7 +932,10 @@ class devModel extends model
         if($type == 'common') $section = '&section=';
         if($type == 'first')  $section = '&section=mainNav';
         if($type == 'tag')    $section = str_replace('_', '-', "&section=featureBar-{$method}");
-        $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}");
+        $key = '';
+        if($type == 'common') $key = '&key=projectCommon,productCommon,executionCommon';
+
+        $this->loadModel('custom')->deleteItems("lang={$language}&module={$moduleName}&vision={$this->config->vision}{$section}{$key}");
 
         $data = fixer::input('post')->get();
         if($type == 'common') unset($data->common_SRCommon, $data->common_URCommon);

From 6880b7428b012eef84c8102266d9a5fd5a92f46e Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 3 Mar 2023 01:53:23 +0000
Subject: [PATCH 210/319] * Fix bug for the post parent is empty.

---
 module/project/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 2c15fd9ded..6b78d8d3ba 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1527,7 +1527,6 @@ class projectModel extends model
             ->setDefault('team', $this->post->name)
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
-            ->setDefault('parent', $oldProject->parent)
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
             ->setIF($this->post->delta == 999, 'days', 0)
             ->setIF($this->post->begin == '0000-00-00', 'begin', '')
@@ -1540,6 +1539,8 @@ class projectModel extends model
             ->remove('products,branch,plans,delta,future,contactListMenu,teamMembers')
             ->get();
 
+        if(!isset($project->parent)) $project->parent = $oldProject->parent;
+
         $executionsCount = $this->dao->select('COUNT(*) as count')->from(TABLE_PROJECT)->where('project')->eq($project->id)->andWhere('deleted')->eq('0')->fetch('count');
 
         if(!empty($executionsCount) and $oldProject->multiple)

From c2bfa8c8ab15736a4dc766d51616ee6d50dd7a6e Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Fri, 3 Mar 2023 09:56:31 +0800
Subject: [PATCH 211/319] * Fix bug #32374.

---
 module/project/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/model.php b/module/project/model.php
index 2c15fd9ded..f91e7cc70f 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1663,6 +1663,7 @@ class projectModel extends model
 
             $whitelist = explode(',', $project->whitelist);
             $this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
+            if(!$project->hasProduct) $this->loadModel('personnel')->updateWhitelist($whitelist, 'product', current($linkedProducts));
             if($project->acl != 'open')
             {
                 $this->loadModel('user')->updateUserView($projectID, 'project');

From 46661419f6eda3f6262f7159fa4d5c7e3e73e49f Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Fri, 3 Mar 2023 09:59:15 +0800
Subject: [PATCH 212/319] * Code for stage path.

---
 module/execution/model.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 01eed079a3..be8ebe0187 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5164,7 +5164,13 @@ class executionModel extends model
         }
         else
         {
-            $path     = str_replace(",$execution->project,", ',', $execution->path);
+            if(strpos($execution->path, ",$execution->project,") !== false)
+            {
+                $path = explode(',', trim($execution->path, ','));
+                $path = array_slice($path, array_search($execution->project, $path) + 1);
+                $path = implode(',', $path);
+            }
+
             $trClass  = 'table-nest-hide';
             $trAttrs  = "data-id={$execution->id} data-parent={$execution->parent} data-status={$execution->status}";
             $trAttrs .= " data-nest-parent='$execution->parent' data-order='$execution->order' data-nest-path='$path'";

From 8dc3d3b291101ba60b3dd936d9ceaa2ee381bc02 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 3 Mar 2023 10:03:32 +0800
Subject: [PATCH 213/319] * Code for finish task 84525.

---
 module/dev/css/langitem.css | 3 ++-
 module/dev/js/langitem.js   | 2 +-
 module/dev/lang/de.php      | 4 ++--
 module/dev/lang/en.php      | 4 ++--
 module/dev/lang/fr.php      | 4 ++--
 module/dev/lang/zh-cn.php   | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index e7387a17dd..ff8ca82ccd 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -8,7 +8,7 @@
 .flex-center {display: flex; justify-content: center; align-items: center;}
 
 /* menu-tree */
-.menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;}
+.menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px; overflow: hidden;}
 .menu-tree > .tree {padding-top: 20px;}
 .tree ul {margin-bottom: 0;}
 #menuTree > li.has-list > ul > li {padding-left: 10px;}
@@ -36,6 +36,7 @@
 .form-item-content.hover-color-primary > .form-item.active .form-control {border-color: blue;}
 .form-item-content.border-color-primary > .form-item .form-control {border: 1px solid blue;}
 
+#menuTree > li > a, #menuTree > li > ul > li > a {white-space: nowrap; text-overflow: clip; overflow: hidden;}
 
 /* bottom-btn */
 .bottom-btn {display: flex; align-items: center; background: #fff; padding-left: 150px; padding-bottom: 20px;}
diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 9b94ba3d02..9579807ba8 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -114,7 +114,7 @@ $(function()
                 initialState: 'active',
                 itemCreator: function($li, item)
                 {
-                    $li.append('<a data-module="' + item.module  + '" data-method="' + item.method + '" data-has-children="' + (item.children ? !!item.children.length : false) + '" href=# >' + item.title + '</a>');
+                    $li.append('<a data-module="' + item.module  + '" data-method="' + item.method + '" data-has-children="' + (item.children ? !!item.children.length : false) + '" href=# title="' + item.title + '">' + item.title + '</a>');
                     if (item.active) $li.addClass('active open in');
                 }
             });
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 2bffeedf42..0f756da39c 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -197,7 +197,7 @@ $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
 $lang->dev->featureBar['langItem']['tag']     = 'Search Tag';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
-$lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
-$lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
+$lang->dev->projectMenu['scrum']         = "Scrum / Scrum + {$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "Waterfall / Waterfall + {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 59eff282a3..d6d66dece7 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -197,7 +197,7 @@ $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
 $lang->dev->featureBar['langItem']['tag']     = 'Search Tag';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
-$lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
-$lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
+$lang->dev->projectMenu['scrum']         = "Scrum / Scrum + {$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "Waterfall / Waterfall + {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 59eff282a3..d6d66dece7 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -197,7 +197,7 @@ $lang->dev->featureBar['langItem']['third']   = 'Third Menu';
 $lang->dev->featureBar['langItem']['tag']     = 'Search Tag';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon} Common";
-$lang->dev->projectMenu['scrum']         = "Scrum {$lang->projectCommon}";
-$lang->dev->projectMenu['waterfall']     = "Waterfall {$lang->projectCommon}";
+$lang->dev->projectMenu['scrum']         = "Scrum / Scrum + {$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "Waterfall / Waterfall + {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 64292ec0cd..7fe54b8e42 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -200,7 +200,7 @@ $lang->dev->featureBar['langItem']['third']   = '三级菜单';
 $lang->dev->featureBar['langItem']['tag']     = '检索标签';
 
 $lang->dev->projectMenu['project']       = "{$lang->projectCommon}通用";
-$lang->dev->projectMenu['scrum']         = "敏捷{$lang->projectCommon}";
-$lang->dev->projectMenu['waterfall']     = "瀑布{$lang->projectCommon}";
+$lang->dev->projectMenu['scrum']         = "敏捷 / 融合敏捷{$lang->projectCommon}";
+$lang->dev->projectMenu['waterfall']     = "瀑布 / 融合瀑布{$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "看板{$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;

From 10478231d82782d06fb30d13f125707bfb1f0ae3 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Fri, 3 Mar 2023 10:11:06 +0800
Subject: [PATCH 214/319] * Fix bug #32374.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index f91e7cc70f..317d66f7aa 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1663,7 +1663,7 @@ class projectModel extends model
 
             $whitelist = explode(',', $project->whitelist);
             $this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
-            if(!$project->hasProduct) $this->loadModel('personnel')->updateWhitelist($whitelist, 'product', current($linkedProducts));
+            if(!$oldProject->hasProduct) $this->loadModel('personnel')->updateWhitelist($whitelist, 'product', current($linkedProducts));
             if($project->acl != 'open')
             {
                 $this->loadModel('user')->updateUserView($projectID, 'project');

From 079d6a1821f4a5fea6371e2d009a6cf6736c3969 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Fri, 3 Mar 2023 10:18:38 +0800
Subject: [PATCH 215/319] * Fix bug in func filterChildren .

---
 module/dev/js/langitem.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js
index 9579807ba8..cf0373c3a1 100644
--- a/module/dev/js/langitem.js
+++ b/module/dev/js/langitem.js
@@ -82,8 +82,8 @@ $(function()
      */
     function filterChildren(item, val)
     {
-        var childern = null;
-        if (item && item.children)
+        var children = null;
+        if (item && item.children && item.children.length)
         {
             children = [];
             for (var i = 0; i < item.children.length; i++)
@@ -95,7 +95,7 @@ $(function()
                 }
             }
         }
-        return children;
+        return children && children.length ? children : null;
     }
 
     /**

From 935f0a764c24d50e3d3257b66f4abf050e3ad078 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 3 Mar 2023 10:24:00 +0800
Subject: [PATCH 216/319] * Modify page error.

---
 module/dev/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index b3f287f1c2..7ba622790e 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -425,7 +425,7 @@ class devModel extends model
                     $originalLangs['URCommon'] = isset($URSRList->defaultURName) ? $URSRList->defaultURName : $URSRList->URName;
                     $originalLangs['SRCommon'] = isset($URSRList->defaultSRName) ? $URSRList->defaultSRName : $URSRList->SRName;
                 }
-                if(!$this->config->URAndSR) unset($customedLangs['URCommon']);
+                if(!$this->config->URAndSR) unset($originalLangs['URCommon']);
             }
             else
             {

From 7f2f970bd54a28eaa225d40dea39e0fe25c68e24 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 3 Mar 2023 10:27:37 +0800
Subject: [PATCH 217/319]  * delete dev-editor priv.

---
 db/update18.2.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/update18.2.sql

diff --git a/db/update18.2.sql b/db/update18.2.sql
new file mode 100644
index 0000000000..2e79dbde14
--- /dev/null
+++ b/db/update18.2.sql
@@ -0,0 +1 @@
+DELETE FROM `zt_grouppriv` WHERE `module` = 'dev' AND `method` = 'editor';

From 7851944450635a9518e9d967685f915e7946ba22 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 3 Mar 2023 03:19:04 +0000
Subject: [PATCH 218/319] * Finish task #85640.

---
 module/product/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/product/control.php b/module/product/control.php
index e4ac5a9fe4..5f22d4101b 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -914,7 +914,8 @@ class product extends control
     {
         $this->loadModel('build');
         if(!$executionID) return print(html::select('product', array(), '', "class='form-control chosen' required"));
-        $products = $this->product->getProductPairsByProject($executionID);
+        $status   = empty($this->config->CRProduct) ? 'noclosed' : '';
+        $products = $this->product->getProductPairsByProject($executionID, $status);
         if(empty($products))
         {
             return printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project');

From 25fafa5a866700360c76e229d5d87a402435523b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 3 Mar 2023 11:29:15 +0800
Subject: [PATCH 219/319] * Modify lite vision language.

---
 extension/lite/project/ext/view/execution.html.php |  2 +-
 module/dev/config.php                              |  2 ++
 module/dev/control.php                             |  6 +++++-
 module/dev/model.php                               |  3 +++
 module/projectstory/lang/de.php                    | 14 ++++++--------
 module/projectstory/lang/en.php                    | 14 ++++++--------
 module/projectstory/lang/fr.php                    | 14 ++++++--------
 module/projectstory/lang/zh-cn.php                 | 12 +++++-------
 module/todo/lang/de.php                            |  9 +++++++++
 module/todo/lang/en.php                            |  9 +++++++++
 module/todo/lang/fr.php                            |  9 +++++++++
 module/todo/lang/zh-cn.php                         |  9 +++++++++
 12 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php
index e58cc8031d..139bd30f69 100644
--- a/extension/lite/project/ext/view/execution.html.php
+++ b/extension/lite/project/ext/view/execution.html.php
@@ -14,7 +14,7 @@
 <div class='clearfix' id='mainMenu'>
   <div class='btn-toolbar pull-left'>
     <?php
-      foreach($lang->project->featureBar['browse'] as $label => $labelName)
+      foreach($lang->project->featureBar['execution'] as $label => $labelName)
       {
           $active = $status == $label ? 'btn-active-text' : '';
           echo html::a($this->createLink('project', 'execution', "status=$label&projectID=$projectID"), '<span class="text">' . $labelName . '</span> ' . ($status == $label ? "<span class='label label-light label-badge'>" . (int)count($kanbanList) . '</span>' : ''), '', "class='btn btn-link $active'");
diff --git a/module/dev/config.php b/module/dev/config.php
index 4f6e8851cc..4017e54a9e 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -291,3 +291,5 @@ if(!helper::hasFeature('opportunity'))  $config->dev->skipMenus['execution']['op
 if(!helper::hasFeature('process'))      $config->dev->skipMenus['execution']['process']      = 'otherDropMenu_pssp';
 if(!helper::hasFeature('auditplan'))    $config->dev->skipMenus['execution']['auditplan']    = 'otherDropMenu_auditplan';
 if(!helper::hasFeature('meeting'))      $config->dev->skipMenus['execution']['meeting']      = 'otherDropMenu_meeting';
+
+$config->dev->liteTagMethod['my-contribute'] = 'contribute_task';
diff --git a/module/dev/control.php b/module/dev/control.php
index 829fc57cb7..b33cf1745a 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -179,7 +179,11 @@ class dev extends control
         $section  = '';
         if($type == 'common') $section = '&section=';
         if($type == 'first')  $section = '&section=mainNav';
-        if($type == 'tag')    $section = str_replace('_', '-', "&section=featureBar-{$method}");
+        if($type == 'tag')
+        {
+            if($this->config->vision == 'lite' and isset($this->config->dev->liteTagMethod["$module-$method"])) $method = $this->config->dev->liteTagMethod["$module-$method"];
+            $section = str_replace('_', '-', "&section=featureBar-{$method}");
+        }
         $key = '';
         if($type == 'common') $key = '&key=projectCommon,productCommon,executionCommon';
 
diff --git a/module/dev/model.php b/module/dev/model.php
index 7ba622790e..652170a5a0 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -435,6 +435,7 @@ class devModel extends model
         elseif($type == 'tag')
         {
             if(!isset($defaultLang->$module->featureBar)) return $originalLangs;
+            if($this->config->vision == 'lite' and isset($this->config->dev->liteTagMethod["$module-$method"])) $method = $this->config->dev->liteTagMethod["$module-$method"];
 
             $langKey     = 'featureBar-' . $method . '_';
             $featureBars = zget($defaultLang->$module->featureBar, $method, array());
@@ -526,6 +527,8 @@ class devModel extends model
                 $langKey   = "{$method}_";
                 break;
             case 'tag':
+                if($this->config->vision == 'lite' and isset($this->config->dev->liteTagMethod["$module-$method"])) $method = $this->config->dev->liteTagMethod["$module-$method"];
+
                 $method = str_replace('_', '-', $method);
                 $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
                 $langKey   = "featureBar-{$method}_";
diff --git a/module/projectstory/lang/de.php b/module/projectstory/lang/de.php
index 108557336d..5229e4e638 100644
--- a/module/projectstory/lang/de.php
+++ b/module/projectstory/lang/de.php
@@ -26,13 +26,11 @@ $lang->projectstory->confirm           = 'Confirm';
 $lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
 $lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
 
-global $app;
-$app->loadLang('product');
-$lang->projectstory->featureBar['story']['allstory']          = $lang->product->allStory;
-$lang->projectstory->featureBar['story']['unclosed']          = $lang->product->unclosed;
-$lang->projectstory->featureBar['story']['draft']             = $lang->product->draftStory;
-$lang->projectstory->featureBar['story']['reviewing']         = $lang->product->reviewingStory;
-$lang->projectstory->featureBar['story']['changing']          = $lang->product->changingStory;
-$lang->projectstory->featureBar['story']['closed']            = $lang->product->closedStory;
+$lang->projectstory->featureBar['story']['allstory']          = 'All';
+$lang->projectstory->featureBar['story']['unclosed']          = 'Open';
+$lang->projectstory->featureBar['story']['draft']             = 'Draft';
+$lang->projectstory->featureBar['story']['reviewing']         = 'Reviewing';
+$lang->projectstory->featureBar['story']['changing']          = 'Changing';
+$lang->projectstory->featureBar['story']['closed']            = 'Closed';
 $lang->projectstory->featureBar['story']['linkedExecution']   = 'Linked ' . $lang->execution->common;
 $lang->projectstory->featureBar['story']['unlinkedExecution'] = 'Unlinked ' . $lang->execution->common;
diff --git a/module/projectstory/lang/en.php b/module/projectstory/lang/en.php
index 157e7ed244..99bfce676b 100644
--- a/module/projectstory/lang/en.php
+++ b/module/projectstory/lang/en.php
@@ -26,13 +26,11 @@ $lang->projectstory->confirm           = 'Confirm';
 $lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
 $lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
 
-global $app;
-$app->loadLang('product');
-$lang->projectstory->featureBar['story']['allstory']          = $lang->product->allStory;
-$lang->projectstory->featureBar['story']['unclosed']          = $lang->product->unclosed;
-$lang->projectstory->featureBar['story']['draft']             = $lang->product->draftStory;
-$lang->projectstory->featureBar['story']['reviewing']         = $lang->product->reviewingStory;
-$lang->projectstory->featureBar['story']['changing']          = $lang->product->changingStory;
-$lang->projectstory->featureBar['story']['closed']            = $lang->product->closedStory;
+$lang->projectstory->featureBar['story']['allstory']          = 'All';
+$lang->projectstory->featureBar['story']['unclosed']          = 'Open';
+$lang->projectstory->featureBar['story']['draft']             = 'Draft';
+$lang->projectstory->featureBar['story']['reviewing']         = 'Reviewing';
+$lang->projectstory->featureBar['story']['changing']          = 'Changing';
+$lang->projectstory->featureBar['story']['closed']            = 'Closed';
 $lang->projectstory->featureBar['story']['linkedExecution']   = 'Linked ' . $lang->execution->common;
 $lang->projectstory->featureBar['story']['unlinkedExecution'] = 'Unlinked ' . $lang->execution->common;
diff --git a/module/projectstory/lang/fr.php b/module/projectstory/lang/fr.php
index 108557336d..5229e4e638 100644
--- a/module/projectstory/lang/fr.php
+++ b/module/projectstory/lang/fr.php
@@ -26,13 +26,11 @@ $lang->projectstory->confirm           = 'Confirm';
 $lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
 $lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
 
-global $app;
-$app->loadLang('product');
-$lang->projectstory->featureBar['story']['allstory']          = $lang->product->allStory;
-$lang->projectstory->featureBar['story']['unclosed']          = $lang->product->unclosed;
-$lang->projectstory->featureBar['story']['draft']             = $lang->product->draftStory;
-$lang->projectstory->featureBar['story']['reviewing']         = $lang->product->reviewingStory;
-$lang->projectstory->featureBar['story']['changing']          = $lang->product->changingStory;
-$lang->projectstory->featureBar['story']['closed']            = $lang->product->closedStory;
+$lang->projectstory->featureBar['story']['allstory']          = 'All';
+$lang->projectstory->featureBar['story']['unclosed']          = 'Open';
+$lang->projectstory->featureBar['story']['draft']             = 'Draft';
+$lang->projectstory->featureBar['story']['reviewing']         = 'Reviewing';
+$lang->projectstory->featureBar['story']['changing']          = 'Changing';
+$lang->projectstory->featureBar['story']['closed']            = 'Closed';
 $lang->projectstory->featureBar['story']['linkedExecution']   = 'Linked ' . $lang->execution->common;
 $lang->projectstory->featureBar['story']['unlinkedExecution'] = 'Unlinked ' . $lang->execution->common;
diff --git a/module/projectstory/lang/zh-cn.php b/module/projectstory/lang/zh-cn.php
index 0cc16a41ea..f2b2feaedb 100644
--- a/module/projectstory/lang/zh-cn.php
+++ b/module/projectstory/lang/zh-cn.php
@@ -26,13 +26,11 @@ $lang->projectstory->confirm           = '确定';
 $lang->projectstory->whyNoStories   = "看起来没有{$lang->SRCommon}可以关联。请检查下项目关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->projectstory->batchUnlinkTip = '其他需求已经移除，如下需求已与该项目下执行相关联，请从执行中移除后再操作。';
 
-global $app;
-$app->loadLang('product');
 $lang->projectstory->featureBar['story']['allstory']          = '全部';
-$lang->projectstory->featureBar['story']['unclosed']          = $lang->product->unclosed;
-$lang->projectstory->featureBar['story']['draft']             = $lang->product->draftStory;
-$lang->projectstory->featureBar['story']['reviewing']         = $lang->product->reviewingStory;
-$lang->projectstory->featureBar['story']['changing']          = $lang->product->changingStory;
-$lang->projectstory->featureBar['story']['closed']            = $lang->product->closedStory;
+$lang->projectstory->featureBar['story']['unclosed']          = '未关闭';
+$lang->projectstory->featureBar['story']['draft']             = '草稿';
+$lang->projectstory->featureBar['story']['reviewing']         = '评审中';
+$lang->projectstory->featureBar['story']['changing']          = '变更中';
+$lang->projectstory->featureBar['story']['closed']            = '已关闭';
 $lang->projectstory->featureBar['story']['linkedExecution']   = '已关联' . $lang->execution->common;
 $lang->projectstory->featureBar['story']['unlinkedExecution'] = '未关联' . $lang->execution->common;
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 1f5dd607bf..889e40d24a 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -120,6 +120,15 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
+$lang->todo->periods['all']             = 'Assigned To Yourself';
+$lang->todo->periods['before']          = 'Unfinished';
+$lang->todo->periods['future']          = 'TBD';
+$lang->todo->periods['thisWeek']        = 'This Week';
+$lang->todo->periods['thisMonth']       = 'This Month';
+$lang->todo->periods['thisYear']        = 'This Year';
+$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
+$lang->todo->periods['cycle']           = 'Recurrence';
+
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, wurde $extra von <strong>$actor</strong>.', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, wurde von <strong>$actor</strong> als <strong>$extra</strong> markiert.', 'extra' => 'statusList');
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 778cd46492..05ec3dbf24 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -120,6 +120,15 @@ $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
+$lang->todo->periods['all']             = 'Assigned To Yourself';
+$lang->todo->periods['before']          = 'Unfinished';
+$lang->todo->periods['future']          = 'TBD';
+$lang->todo->periods['thisWeek']        = 'This Week';
+$lang->todo->periods['thisMonth']       = 'This Month';
+$lang->todo->periods['thisYear']        = 'This Year';
+$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
+$lang->todo->periods['cycle']           = 'Recurrence';
+
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, is $extra by <strong>$actor</strong>.', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, is marked by <strong>$actor</strong> as <strong>$extra</strong>.', 'extra' => 'statusList');
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index 814933e949..e1b89eb757 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -120,6 +120,15 @@ $lang->todo->unfinishedTodo = "Les entrées de l'ID %s ne sont pas terminés et
 $lang->todo->today          = 'Todo Today';
 $lang->todo->selectProduct  = "Please select a product";
 
+$lang->todo->periods['all']             = 'Assigned To Yourself';
+$lang->todo->periods['before']          = 'Unfinished';
+$lang->todo->periods['future']          = 'TBD';
+$lang->todo->periods['thisWeek']        = 'This Week';
+$lang->todo->periods['thisMonth']       = 'This Month';
+$lang->todo->periods['thisYear']        = 'This Year';
+$lang->todo->periods['assignedToOther'] = 'Assigned To Other';
+$lang->todo->periods['cycle']           = 'Recurrence';
+
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, est $extra par <strong>$actor</strong>.', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, est marqué par <strong>$actor</strong> comme <strong>$extra</strong>.', 'extra' => 'statusList');
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index ebd1d81af0..83c9adbe62 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -120,6 +120,15 @@ $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。'
 $lang->todo->today          = '今日待办';
 $lang->todo->selectProduct  = "请选择产品";
 
+$lang->todo->periods['all']             = '指派自己';
+$lang->todo->periods['before']          = '未完';
+$lang->todo->periods['future']          = '待定';
+$lang->todo->periods['thisWeek']        = '本周';
+$lang->todo->periods['thisMonth']       = '本月';
+$lang->todo->periods['thisYear']        = '本年';
+$lang->todo->periods['assignedToOther'] = '指派他人';
+$lang->todo->periods['cycle']           = '周期';
+
 $lang->todo->action = new stdclass();
 $lang->todo->action->finished = array('main' => '$date, 由 <strong>$actor</strong> $extra。$appendLink', 'extra' => 'reasonList');
 $lang->todo->action->marked   = array('main' => '$date, 由 <strong>$actor</strong> 标记为<strong>$extra</strong>。', 'extra' => 'statusList');

From c6cd9a6077adf1f434b6ce50f480817f153fa026 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 3 Mar 2023 13:01:50 +0800
Subject: [PATCH 220/319] * Code for finish task 84527.

---
 db/update18.2.sql   | 1 +
 db/zentao.sql       | 2 +-
 module/my/model.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 db/update18.2.sql

diff --git a/db/update18.2.sql b/db/update18.2.sql
new file mode 100644
index 0000000000..c40980ab61
--- /dev/null
+++ b/db/update18.2.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_lang` MODIFY COLUMN `section` varchar(50) NOT NULL;
diff --git a/db/zentao.sql b/db/zentao.sql
index 3848051d2e..047ef4fa39 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1024,7 +1024,7 @@ CREATE TABLE IF NOT EXISTS `zt_lang` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
   `lang` varchar(30) NOT NULL,
   `module` varchar(30) NOT NULL,
-  `section` varchar(30) NOT NULL,
+  `section` varchar(50) NOT NULL,
   `key` varchar(60) NOT NULL,
   `value` text NOT NULL,
   `system` enum('0','1') NOT NULL default '1',
diff --git a/module/my/model.php b/module/my/model.php
index 4a65a3fe4a..9b462d72f1 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1029,7 +1029,7 @@ class myModel extends model
         foreach($typeList as $type)
         {
             $this->app->loadLang($type);
-            $menu->$type = isset($this->lang->$type->common) ? $this->lang->$type->common : zget($flows, $type);
+            $menu->$type = isset($this->lang->my->featureBar['audit'][$type]) ? $this->lang->my->featureBar['audit'][$type] : zget($flows, $type);
         }
 
         return $menu;

From 3387bf56e3a2f433a1458159c651cd8663d2ace8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 3 Mar 2023 13:03:53 +0800
Subject: [PATCH 221/319] * Code for finish task 84527.

---
 module/custom/model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/custom/model.php b/module/custom/model.php
index b9bbcd1e00..af592282a0 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -56,9 +56,11 @@ class customModel extends model
             if(strpos($customLang->section, 'featureBar-') !== false)
             {
                 $sections      = explode('-', $customLang->section);
+                $firstKey      = $sections[0];
                 $sectionIndex  = count($sections) - 1;
                 $sectionArr    = array($customLang->key => $customLang->value);
                 $oldSectionArr = empty($processedLang[$customLang->module]) ? array() : $processedLang[$customLang->module];
+                $oldFeatureBar = empty($oldSectionArr[$firstKey]) ? array() : $oldSectionArr[$firstKey];
                 if(!empty($oldSectionArr))
                 {
                     for($i = 0; $i <= $sectionIndex; $i ++)
@@ -70,6 +72,7 @@ class customModel extends model
                 }
 
                 for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
+                $sectionArr[$firstKey] = array_merge($oldFeatureBar, $sectionArr[$firstKey]);
                 $processedLang[$customLang->module] = $sectionArr;
             }
             else

From a42b9ed4c073f24f515ad6bb524824ca0fdec1ae Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 3 Mar 2023 13:40:13 +0800
Subject: [PATCH 222/319] * Hide execution route to lite vision.

---
 module/dev/model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/dev/model.php b/module/dev/model.php
index 652170a5a0..8413b48953 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -670,6 +670,8 @@ class devModel extends model
     public function getTagMenus($module, $moduleName = '', $methodName = '')
     {
         $menus = array();
+        if($this->config->vision == 'lite' and $module == 'execution') return $menus;
+
         foreach(array('homeMenu', 'menu') as $menu)
         {
             if(!isset($this->lang->$module->$menu)) continue;

From 1064bef3a7dc600b7889f6bc1691d2494a5c2b36 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 3 Mar 2023 14:19:31 +0800
Subject: [PATCH 223/319]  * adjust code for editor.

---
 lib/zfile/zfile.class.php        |  46 +++++-----
 module/editor/control.php        |  36 ++++----
 module/editor/model.php          | 146 +++++++++++++------------------
 module/editor/view/edit.html.php |  10 ++-
 4 files changed, 107 insertions(+), 131 deletions(-)

diff --git a/lib/zfile/zfile.class.php b/lib/zfile/zfile.class.php
index cfa3ce58f8..1acd6ef771 100644
--- a/lib/zfile/zfile.class.php
+++ b/lib/zfile/zfile.class.php
@@ -13,11 +13,11 @@ class zfile
 {
     /**
      * Copy a directory from an directory to another directory.
-     * 
-     * @param  string    $from 
-     * @param  string    $to 
+     *
+     * @param  string    $from
+     * @param  string    $to
      * @param  bool      $logLevel
-     * @param  string    $logFile 
+     * @param  string    $logFile
      * @param  array     $excludeFiles
      * @param  bool      $toIsLink
      * @access public
@@ -110,9 +110,9 @@ class zfile
 
     /**
      * Get count.
-     * 
-     * @param  string $dir 
-     * @param  array  $excludeFiles 
+     *
+     * @param  string $dir
+     * @param  array  $excludeFiles
      * @access public
      * @return int
      */
@@ -136,8 +136,8 @@ class zfile
 
     /**
      * Remove a dir.
-     * 
-     * @param  string    $dir 
+     *
+     * @param  string    $dir
      * @access public
      * @return bool
      */
@@ -171,9 +171,9 @@ class zfile
 
     /**
      * Get files under a directory recursive.
-     * 
-     * @param  string    $dir 
-     * @param  array     $exceptions 
+     *
+     * @param  string    $dir
+     * @param  array     $exceptions
      * @access private
      * @return array
      */
@@ -207,8 +207,8 @@ class zfile
 
     /**
      * Make a dir.
-     * 
-     * @param  string    $dir 
+     *
+     * @param  string    $dir
      * @access public
      * @return bool
      */
@@ -219,8 +219,8 @@ class zfile
 
     /**
      * Remove a file
-     * 
-     * @param  string    $file 
+     *
+     * @param  string    $file
      * @access public
      * @return bool
      */
@@ -232,7 +232,7 @@ class zfile
 
    /**
     * Batch remove files. use glob function.
-    * 
+    *
     * @param  string    $patern
     * @access public
     * @return void
@@ -245,7 +245,7 @@ class zfile
 
     /**
      * Remove a file
-     * 
+     *
      * @param  string    from
      * @param  string    to
      * @access public
@@ -258,7 +258,7 @@ class zfile
 
     /**
      * Rename a file or directory.
-     * 
+     *
      * @param  string    from
      * @param  string    to
      * @access public
@@ -271,8 +271,8 @@ class zfile
 
     /**
      * Get file size.
-     * 
-     * @param  string    $file 
+     *
+     * @param  string    $file
      * @access public
      * @return int
      */
@@ -283,10 +283,10 @@ class zfile
 
     /**
      * Get directory size.
-     * 
+     *
      * @param  string    $dir
      * @access public
-     * @return int 
+     * @return int
      */
     public function getDirSize($dir)
     {
diff --git a/module/editor/control.php b/module/editor/control.php
index 21e88d7d7a..9e96b7c09f 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -74,10 +74,8 @@ class editor extends control
         {
             $filePath = helper::safe64Decode($filePath);
             if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) return print($this->lang->editor->editFileError);
-            if($action == 'extendOther' and file_exists($filePath))
-            {
-                $this->view->showContent = file_get_contents($filePath);
-            }
+            if($action == 'extendOther' and file_exists($filePath)) $this->view->showContent = file_get_contents($filePath);
+
             if($action == 'edit' or $action == 'override')
             {
                 if(file_exists($filePath))
@@ -141,7 +139,7 @@ class editor extends control
             if(file_exists($saveFilePath) and !$this->post->override) return print(js::confirm($this->lang->editor->repeatPage, $extendLink, '', 'parent'));
             return print(js::locate($extendLink, 'parent'));
         }
-        $this->view->filePath    = $filePath;
+        $this->view->filePath = $filePath;
         $this->display();
     }
 
@@ -154,20 +152,13 @@ class editor extends control
      */
     public function save($filePath = '', $action = '')
     {
-        /* Reduce expiration time for check safe file. */
-        $this->config->safeFileTimeout = 15 * 60;
-        $statusFile = $this->loadModel('common')->checkSafeFile();
-        if($statusFile)
-        {
-            return print(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
-        }
         if($filePath and $_POST)
         {
             $filePath = helper::safe64Decode($filePath);
             if(strpos(strtolower($filePath), strtolower($this->app->getBasePath())) !== 0) return print($this->lang->editor->editFileError);
             if($action != 'edit' and $action != 'newPage') $filePath = $this->editor->getSavePath($filePath, $action);
             if($action != 'edit' and $action != 'newPage' and file_exists($filePath) and !$this->post->override) return print(js::error($this->lang->editor->repeatFile));
-            $this->editor->save($filePath);
+            if(!$this->editor->save($filePath)) return;
             echo js::reload('parent.parent.extendWin');
             return print(js::locate(inlink('edit', "filePath=" . helper::safe64Encode($filePath) . "&action=edit"), 'parent'));
         }
@@ -183,16 +174,25 @@ class editor extends control
      */
     public function delete($filePath = '', $confirm = 'no')
     {
-        if($confirm == 'no')
-        {
-            return print(js::confirm($this->lang->editor->deleteConfirm, inlink('delete', "filePath=$filePath&confirm=yes")));
-        }
+        if($confirm == 'no') return print(js::confirm($this->lang->editor->deleteConfirm, inlink('delete', "filePath=$filePath&confirm=yes")));
+
         $filePath = helper::safe64Decode($filePath);
-        if(file_exists($filePath) and unlink($filePath)) return print(js::reload('parent'));
+        if(file_exists($filePath) and unlink($filePath))
+        {
+            echo js::locate(inlink('edit'), 'parent.parent.editWin');
+            return print(js::reload('parent'));
+        }
         return print(js::alert($this->lang->editor->notDelete));
 
     }
 
+    /**
+     * Switch editor feature.
+     *
+     * @param  int    $status     1|0
+     * @access public
+     * @return void
+     */
     public function switch($status)
     {
         $this->loadModel('setting')->setItem('system.common.global.editor', $status);
diff --git a/module/editor/model.php b/module/editor/model.php
index 9caf1e4ce1..ad1d5a2470 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -11,27 +11,6 @@
  */
 class editorModel extends model
 {
-    /**
-     * Get all modules
-     *
-     * @access public
-     * @return string
-     */
-    public function getModules()
-    {
-        $modules = glob($this->app->getModuleRoot() . '*');
-        $moduleList  = "<div class='list-group'>";
-        foreach($modules as $module)
-        {
-            $module = basename($module);
-            if($module == 'editor' or $module == 'help' or $module == 'setting') continue;
-            $moduleName  = !empty($this->lang->editor->modules[$module]) ? $this->lang->editor->modules[$module] : $module;
-            $moduleList .= html::a(inlink('extend', "moduleDir=$module"),  $moduleName, 'extendWin', "class='list-group-item'");
-        }
-        $moduleList .= '</div>';
-        return $moduleList;
-    }
-
     /**
      * Get module files, contain control's methods and model's method but except ext.
      *
@@ -100,19 +79,18 @@ class editorModel extends model
      */
     public function getTwoGradeFiles($extensionFullDir)
     {
+        $zfile    = $this->app->loadClass('zfile');
         $fileList = array();
-        $langDirs = scandir($extensionFullDir);
+        $langDirs = $zfile->readDir($extensionFullDir);
         foreach($langDirs as $langDir)
         {
-            if($langDir == '.' or $langDir == '..' or $langDir == '.svn') continue;
             $langFullDir = $extensionFullDir . DS . $langDir;
             $fileList[$langFullDir] = array();
             if(is_dir($langFullDir))
             {
-                $langFiles = scandir($langFullDir);
+                $langFiles = $zfile->readDir($langFullDir);
                 foreach($langFiles as $langFile)
                 {
-                    if($langFile == '.' or $langFile == '..' or $langFile == '.svn') continue;
                     $langFullFile = $langFullDir . DS . $langFile;
                     $fileList[$langFullDir][$langFullFile] = $langFile;
                 }
@@ -131,7 +109,7 @@ class editorModel extends model
     public function analysis($fileName)
     {
         $classMethod = array();
-        $class = strstr($fileName, DS . 'module' . DS);
+        $class       = strstr($fileName, DS . 'module' . DS);
         if(empty($class))
         {
             $class = strstr($fileName, DS . 'extension' . DS);
@@ -167,32 +145,24 @@ class editorModel extends model
     public function printTree($files, $isRoot = true)
     {
         if(empty($files) or !is_array($files)) return false;
+
         $tree = $isRoot ? "<ul id='extendTree' class='tree tree-lines' data-ride='tree'>\n" : "<ul>\n";
         if($isRoot)
         {
-            $module = basename(dirname(key($files)));
-
-            $langFile = dirname(key($files)) . DS . 'lang' . DS . $this->cookie->lang. '.php';
+            $module   = basename(dirname(key($files)));
+            $langFile = dirname(key($files)) . DS . 'lang' . DS . $this->app->getClientLang() . '.php';
             if(file_exists($langFile))
             {
-                if(!isset($lang)) $lang = $this->lang;
+                if(!isset($lang)) $lang = new stdclass();
                 if(!isset($lang->$module)) $lang->$module = new stdclass();
-                include_once $langFile;
+                include $langFile;
             }
 
-            if(isset($lang->$module))
-            {
-                $this->module = $lang->$module;
-            }
-            elseif(isset($this->lang->$module))
-            {
-                $this->module = $this->lang->$module;
-            }
-            else
-            {
-                $this->module = '';
-            }
+            $this->module = '';
+            if(isset($lang->$module))       $this->module = $lang->$module;
+            if(isset($this->lang->$module)) $this->module = $this->lang->$module;
         }
+
         foreach($files as $key => $file)
         {
             $tree .= "<li>\n";
@@ -220,20 +190,12 @@ class editorModel extends model
      */
     public function addLink4Dir($filePath)
     {
-        $tree = '';
+        $tree     = '';
         $fileName = basename($filePath);
-        if(isset($this->lang->editor->modules[$fileName]))
-        {
-            $file = "<span title='$fileName'>" . $this->lang->editor->modules[$fileName] . '</span>';
-        }
-        elseif(isset($this->lang->editor->translate[$fileName]))
-        {
-           $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
-        }
-        else
-        {
-            $file = "<span title='$fileName'>$fileName</span>";
-        }
+        $file     = "<span title='$fileName'>$fileName</span>";
+        if(isset($this->lang->editor->modules[$fileName]))   $file = "<span title='$fileName'>" . $this->lang->editor->modules[$fileName]   . '</span>';
+        if(isset($this->lang->editor->translate[$fileName])) $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
+
         if(strpos($filePath, DS . 'ext' . DS) !== false)
         {
             switch($fileName)
@@ -284,7 +246,7 @@ class editorModel extends model
         else
         {
             $parentDir = basename(dirname($filePath));
-            $action = 'extendOther';
+            $action    = 'extendOther';
             if($parentDir == 'control.php') $action = 'extendControl';
             if($parentDir == 'model.php')   $action = 'extendModel';
 
@@ -329,18 +291,24 @@ class editorModel extends model
      *
      * @param  string    $filePath
      * @access public
-     * @return void
+     * @return bool
      */
     public function save($filePath)
     {
+        /* Reduce expiration time for check safe file. */
+        $this->config->safeFileTimeout = 15 * 60;
         $statusFile = $this->loadModel('common')->checkSafeFile();
-        if($statusFile) die(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
+        if($statusFile)
+        {
+            print(js::alert(sprintf($this->lang->editor->noticeOkFile, str_replace('\\', '/', $statusFile))));
+            return false;
+        }
 
-        $dirPath = dirname($filePath);
+        $dirPath     = dirname($filePath);
         $extFilePath = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS) + 4);
         if(!is_dir($dirPath) and is_writable($extFilePath)) mkdir($dirPath, 0777, true);
-        if(!is_dir($dirPath) or !is_writable($dirPath)) die(js::alert($this->lang->editor->notWritable . $extFilePath));
-        if(strpos(strtolower(realpath($dirPath)), strtolower($this->app->getBasePath())) !== 0) die(js::alert($this->lang->editor->editFileError));
+        if(!is_dir($dirPath) or !is_writable($dirPath)) return print(js::alert($this->lang->editor->notWritable . $extFilePath));
+        if(strpos(strtolower(realpath($dirPath)), strtolower($this->app->getBasePath())) !== 0) return print(js::alert($this->lang->editor->editFileError));
 
         $fileContent = $this->post->fileContent;
         $evils       = array('eval', 'exec', 'passthru', 'proc_open', 'shell_exec', 'system', '$$', 'include', 'require', 'assert', 'javascript', 'onclick');
@@ -349,6 +317,7 @@ class editorModel extends model
         if(get_magic_quotes_gpc()) $fileContent = stripslashes($fileContent);
 
         file_put_contents($filePath, $fileContent);
+        return true;
     }
 
     /**
@@ -362,9 +331,10 @@ class editorModel extends model
     {
         $className = basename(dirname(dirname($filePath)));
         if(!class_exists($className)) helper::import(dirname($filePath));
-        $methodName = basename($filePath);
+
+        $methodName  = basename($filePath);
         $methodParam = $this->getParam($className, $methodName, 'Model');
-        return $fileContent = <<<EOD
+        return <<<EOD
 <?php
 public function $methodName($methodParam)
 {
@@ -384,11 +354,12 @@ EOD;
     {
         $className = basename(dirname(dirname($filePath)));
         if(!class_exists($className)) helper::import(dirname($filePath));
+
         $methodName = basename($filePath);
         if($isExtends == 'yes')
         {
             $methodParam = $this->getParam($className, $methodName);
-            return $fileContent = <<<EOD
+            return <<<EOD
 <?php
 helper::importControl('$className');
 class my$className extends $className
@@ -403,7 +374,7 @@ EOD;
         else
         {
             $methodCode = $this->getMethodCode($className, $methodName);
-            return $fileContent = <<<EOD
+            return <<<EOD
 <?php
 class $className extends control
 {
@@ -422,11 +393,10 @@ EOD;
      */
     public function newControl($filePath)
     {
-        $className = strstr($filePath, DS . 'module' . DS);
-        $className = substr($className, 0, strpos($className, DS, 9));
-        $className = basename($className);
+        $className  = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS . 'control' . DS));
+        $className  = basename($className);
         $methodName = basename($filePath, '.php');
-        return $fileContent = <<<EOD
+        return <<<EOD
 <?php
 class $className extends control
 {
@@ -483,12 +453,10 @@ EOD;
         $fileName  = $method->getFileName();
         $startLine = $method->getStartLine();
         $endLine   = $method->getEndLine();
+
         $file = file($fileName);
         $code = '';
-        for($i = $startLine - 1; $i <= $endLine; $i++)
-        {
-            $code .= $file[$i];
-        }
+        for($i = $startLine - 1; $i <= $endLine; $i++) $code .= $file[$i];
         return $code;
     }
 
@@ -502,18 +470,23 @@ EOD;
      */
     public function getSavePath($filePath, $action)
     {
+        $fileExtension  = 'php';
+        $sourceFileName = basename($filePath);
+        if(strpos($sourceFileName, '.') !== false) $fileExtension = substr($sourceFileName, strpos($sourceFileName, '.') + 1);
+
         $fileName   = empty($_POST['fileName']) ? '' : trim($this->post->fileName);
         $moduleName = strstr($filePath, DS . 'module' . DS);
         $moduleName = substr($moduleName, 0, strpos($moduleName, DS, 9));
         $moduleName = basename($moduleName);
         $extPath    = $this->app->getExtensionRoot() . 'custom' . DS . $moduleName . DS . 'ext' . DS;
+        if($fileName and (strpos($fileName, '.' . $fileExtension) !== (strlen($fileName) - strlen($fileExtension) - 1))) $fileName .= '.' . $fileExtension;
         switch($action)
         {
         case 'extendModel':
-            $fileName = empty($fileName) ? strtolower(basename($filePath)) . '.php' : $fileName;
+            $fileName = empty($fileName) ? strtolower(basename($filePath)) . ".{$fileExtension}" : $fileName;
             return $extPath . 'model' . DS . $fileName;
         case 'extendControl':
-            $fileName = strtolower(basename($filePath)) . '.php';
+            $fileName = strtolower(basename($filePath)) . ".{$fileExtension}";
             return $extPath . 'control' . DS . $fileName;
         case 'override':
             $fileName = basename($filePath);
@@ -522,18 +495,19 @@ EOD;
             $editName = basename($filePath);
             $fileName = empty($fileName) ? $editName: $fileName;
             if($editName == 'config.php') return $extPath . 'config' .DS . $fileName;
-            elseif(strpos($editName, '.php') !== false) return $extPath . 'lang' . DS . str_replace('.php', '', $editName) . DS . $fileName;
-            else return $extPath . substr($editName, strrpos($editName, '.') + 1) . DS . substr($editName, 0, strrpos($editName, '.')) . DS . $fileName;
+            if(strpos($editName, '.php') !== false) return $extPath . 'lang' . DS . basename($editName, ".{$fileExtension}") . DS . $fileName;
+            return $extPath . $fileExtension . DS . basename($editName, ".{$fileExtension}") . DS . $fileName;
         default:
-            if(empty($fileName)) die(js::error($this->lang->editor->emptyFileName));
+            if(empty($fileName)) return print(js::error($this->lang->editor->emptyFileName));
+
             $action = strtolower(str_replace('new', '', $action));
-            if($action == 'hook') return $extPath . 'view' . DS . $fileName;
-            elseif($action == 'method') return $extPath . basename($filePath, '.php') . DS . $fileName;
-            elseif($action == 'extend') return $filePath . DS . $fileName;
-            elseif($action == 'config') return $extPath . 'config' . DS . $fileName;
-            elseif($action == 'js') return $extPath . 'js' . DS . substr($fileName, 0, strrpos($fileName, '.')) . DS . $fileName;
-            elseif($action == 'css') return $extPath . 'css' . DS . substr($fileName, 0, strrpos($fileName, '.')) . DS . $fileName;
-            else return $extPath . 'lang' . DS . str_replace('_', '-', $action) . DS . $fileName;
+            if($action == 'hook')   return $extPath . 'view' . DS . $fileName;
+            if($action == 'method') return $extPath . basename($filePath, ".{$fileExtension}") . DS . $fileName;
+            if($action == 'extend') return $filePath . DS . $fileName;
+            if($action == 'config') return $extPath . 'config' . DS . $fileName;
+            if($action == 'js')     return $extPath . 'js' . DS . basename($fileName, ".{$fileExtension}") . DS . $fileName;
+            if($action == 'css')    return $extPath . 'css' . DS . basename($fileName, ".{$fileExtension}") . DS . $fileName;
+            return $extPath . 'lang' . DS . str_replace('_', '-', $action) . DS . $fileName;
         }
     }
 }
diff --git a/module/editor/view/edit.html.php b/module/editor/view/edit.html.php
index b53615b56b..d016de8ecd 100644
--- a/module/editor/view/edit.html.php
+++ b/module/editor/view/edit.html.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php if(empty($filePath)) die();?>
 <?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
 <?php
 js::set('jsRoot', $jsRoot);
@@ -41,9 +42,9 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
           <?php echo html::hidden('fileContent');?>
         </td>
       </tr>
-      <tr>
+      <?php if($action and $action != 'edit' and $action != 'newPage' and $action != 'override' and $action != 'extendControl'):?>
+      <tr id='fileNameBox'>
         <td>
-          <?php if($action and $action != 'edit' and $action != 'newPage' and $action != 'override' and $action != 'extendControl'):?>
           <div class='form-group'>
             <div class='input-group'>
               <span class='input-group-addon'><?php echo $lang->editor->fileName;?></span>
@@ -70,9 +71,9 @@ js::import($jsRoot . 'monaco-editor/min/vs/loader.js');
               </span>
             </div>
           </div>
-          <?php endif;?>
         </td>
       </tr>
+      <?php endif;?>
       <tr>
         <td class='text-center'>
           <?php echo html::submitButton()?>
@@ -123,7 +124,8 @@ $(function()
             automaticLayout: true,
             minimap:         {enabled: false}
         });
-        var codeHeight = top.window.innerHeight - 300;
+        var codeHeight = top.window.innerHeight - 280;
+        if($('#fileNameBox').length == 0) codeHeight += 56;
         <?php if(!empty($showContent)):?>
         contentHeight = showContentEditor.getContentHeight();
         if(contentHeight > 300) contentHeight = 300;

From f2c4d28c5e41453555c1fbaa771f935b6735da5b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 3 Mar 2023 14:46:56 +0800
Subject: [PATCH 224/319] * Modify kanban feature bar language.

---
 .../lite/attend/ext/view/personal.html.php    | 11 +++-----
 module/dev/config.php                         |  2 ++
 module/dev/model.php                          | 27 +++++++++++++++++++
 module/kanban/control.php                     |  8 +++---
 module/kanban/lang/de.php                     |  8 +++---
 module/kanban/lang/en.php                     |  8 +++---
 module/kanban/lang/fr.php                     |  8 +++---
 module/kanban/lang/zh-cn.php                  |  8 +++---
 module/kanban/view/space.html.php             |  2 +-
 9 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/extension/lite/attend/ext/view/personal.html.php b/extension/lite/attend/ext/view/personal.html.php
index 45d98a3d15..bf8ec2f521 100644
--- a/extension/lite/attend/ext/view/personal.html.php
+++ b/extension/lite/attend/ext/view/personal.html.php
@@ -20,15 +20,10 @@
   <ul class='nav'>
   <?php
   $methodName = strtolower($this->app->getMethodName());
-  foreach($lang->attend->featurebar as $key => $menu)
+  foreach($lang->attend->featureBar['personal'] as $type => $name)
   {
-      if(is_string($menu)) $link = $menu;
-      if(is_array($menu)) $link = $menu['link'];
-
-      list($name, $currentModule, $currentMethod, $params) = explode('|', $link);
-      $class = strtolower($key) == $methodName ? "class='active'" : '';
-      if(isset($menu['alias'])) $class = strpos(strtolower($menu['alias']), strtolower($key)) !== false ? "class='active'" : $class;
-      if(common::hasPriv($currentModule, $currentMethod)) echo "<li id='$key' $class>" . html::a($this->createLink($currentModule, $currentMethod, $params), $name) . '</li>';
+      $class = strtolower($type) == $methodName ? "class='active'" : '';
+      if(common::hasPriv('attend', $type)) echo "<li id='$type' $class>" . html::a($this->createLink('attend', $type), $name) . '</li>';
   }
   ?>
   </ul>
diff --git a/module/dev/config.php b/module/dev/config.php
index 4017e54a9e..387e1e3393 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -293,3 +293,5 @@ if(!helper::hasFeature('auditplan'))    $config->dev->skipMenus['execution']['au
 if(!helper::hasFeature('meeting'))      $config->dev->skipMenus['execution']['meeting']      = 'otherDropMenu_meeting';
 
 $config->dev->liteTagMethod['my-contribute'] = 'contribute_task';
+
+$config->dev->onlyMainMenu = array('kanban');
diff --git a/module/dev/model.php b/module/dev/model.php
index 8413b48953..b68b9ce88b 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -672,6 +672,7 @@ class devModel extends model
         $menus = array();
         if($this->config->vision == 'lite' and $module == 'execution') return $menus;
 
+        $titleList = array();
         foreach(array('homeMenu', 'menu') as $menu)
         {
             if(!isset($this->lang->$module->$menu)) continue;
@@ -694,6 +695,8 @@ class devModel extends model
                     list($thisModule, $thisMethod) = $this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"];
                 }
 
+                $titleList[] = $label;
+
                 $subMenu = new stdclass();
                 $subMenu->title    = $label;
                 $subMenu->key      = '';
@@ -727,6 +730,8 @@ class devModel extends model
                             $this->app->loadLang($thisModule);
                             if(isset($this->lang->$thisModule->featureBar[$menuKey][$subMenuKey]))
                             {
+                                $titleList[] = $label;
+
                                 $thirdMenu = new stdClass();
                                 $thirdMenu->title  = $label;
                                 $thirdMenu->key    = '';
@@ -746,6 +751,8 @@ class devModel extends model
                                     if(is_array($this->lang->$thisModule->featureBar[$thisMethod][$arrayKey])) continue;
                                 }
 
+                                $titleList[] = $label;
+
                                 $subMenu = new stdClass();
                                 $subMenu->title    = $label;
                                 $subMenu->key      = '';
@@ -765,6 +772,26 @@ class devModel extends model
             }
         }
 
+        if(in_array($module, $this->config->dev->onlyMainMenu))
+        {
+            $mainNav = strip_tags($this->lang->mainNav->$module);
+            list($label, $thisModule, $thisMethod) = explode('|', $mainNav);
+            $titleList[] = $label;
+
+            $subMenu = new stdClass();
+            $subMenu->title    = $label;
+            $subMenu->key      = '';
+            $subMenu->module   = $thisModule;
+            $subMenu->method   = $thisMethod;
+            $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
+            $subMenu->children = array();
+
+            $menus[] = $subMenu;
+        }
+
+        $titlePinYin = common::convert2Pinyin($titleList);
+        foreach($menus as &$menu) $menu->key = zget($titlePinYin, $menu->title, '');
+
         return $menus;
     }
 
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 18e6400314..b46dd8cec0 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -60,11 +60,11 @@ class kanban extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
 
-        unset($this->lang->kanbanspace->featureBar['involved']);
+        unset($this->lang->kanban->featureBar['space']['involved']);
 
         $this->view->users    = $this->loadModel('user')->getPairs('noclosed|nodeleted');
         $this->view->type     = $type;
-        $this->view->typeList = $this->lang->kanbanspace->featureBar;
+        $this->view->typeList = $this->lang->kanban->featureBar['space'];
 
         $this->display();
     }
@@ -232,7 +232,7 @@ class kanban extends control
             $spaceID       = $copyKanban->space;
         }
 
-        unset($this->lang->kanbanspace->featureBar['involved']);
+        unset($this->lang->kanban->featureBar['space']['involved']);
 
         $space      = $this->kanban->getSpaceById($spaceID);
         $spaceUsers = $spaceID == 0 ? ',' : trim($space->owner) . ',' . trim($space->team);
@@ -245,7 +245,7 @@ class kanban extends control
         $this->view->spaceID       = $spaceID;
         $this->view->spacePairs    = $spacePairs;
         $this->view->type          = $type;
-        $this->view->typeList      = $this->lang->kanbanspace->featureBar;
+        $this->view->typeList      = $this->lang->kanban->featureBar['space'];
         $this->view->kanbans       = array('' => '') + $this->kanban->getPairs();
         $this->view->copyKanbanID  = $copyKanbanID;
         $this->view->copyKanban    = $copyKanbanID ? $copyKanban : '';
diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index 68a5701a90..33d6f7e8e2 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -315,10 +315,10 @@ $lang->kanbanspace->empty = 'No Space';
 $lang->kanbanspace->aclList['open']    = 'Open (Accessible with kanban view permissions)';
 $lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)';
 
-$lang->kanbanspace->featureBar['involved']    = 'Involved';
-$lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
-$lang->kanbanspace->featureBar['public']      = 'Public Space';
-$lang->kanbanspace->featureBar['private']     = 'Private Space';
+$lang->kanban->featureBar['space']['involved']    = 'Involved';
+$lang->kanban->featureBar['space']['cooperation'] = 'Cooperation Space';
+$lang->kanban->featureBar['space']['public']      = 'Public Space';
+$lang->kanban->featureBar['space']['private']     = 'Private Space';
 
 $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->typeList['public']      = 'Public Space';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 1b65882e93..7e5dc7a64e 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -315,10 +315,10 @@ $lang->kanbanspace->empty = 'No Space';
 $lang->kanbanspace->aclList['open']    = 'Open (Accessible with kanban view permissions)';
 $lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)';
 
-$lang->kanbanspace->featureBar['involved']    = 'Involved';
-$lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
-$lang->kanbanspace->featureBar['public']      = 'Public Space';
-$lang->kanbanspace->featureBar['private']     = 'Private Space';
+$lang->kanban->featureBar['space']['involved']    = 'Involved';
+$lang->kanban->featureBar['space']['cooperation'] = 'Cooperation Space';
+$lang->kanban->featureBar['space']['public']      = 'Public Space';
+$lang->kanban->featureBar['space']['private']     = 'Private Space';
 
 $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->typeList['public']      = 'Public Space';
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index 72ed3605a1..1d54a87353 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -315,10 +315,10 @@ $lang->kanbanspace->empty = 'No Space';
 $lang->kanbanspace->aclList['open']    = 'Open (Accessible with kanban view permissions)';
 $lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)';
 
-$lang->kanbanspace->featureBar['involved']    = 'Involved';
-$lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
-$lang->kanbanspace->featureBar['public']      = 'Public Space';
-$lang->kanbanspace->featureBar['private']     = 'Private Space';
+$lang->kanban->featureBar['space']['involved']    = 'Involved';
+$lang->kanban->featureBar['space']['cooperation'] = 'Cooperation Space';
+$lang->kanban->featureBar['space']['public']      = 'Public Space';
+$lang->kanban->featureBar['space']['private']     = 'Private Space';
 
 $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->typeList['public']      = 'Public Space';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 95047c31a1..2db24523b1 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -315,10 +315,10 @@ $lang->kanbanspace->empty = '暂时没有空间';
 $lang->kanbanspace->aclList['open']    = '公开（有看板空间视图权限即可访问）';
 $lang->kanbanspace->aclList['private'] = '私有（只有看板空间负责人、团队成员、白名单可访问）';
 
-$lang->kanbanspace->featureBar['involved']    = '我参与的';
-$lang->kanbanspace->featureBar['cooperation'] = '协作空间';
-$lang->kanbanspace->featureBar['public']      = '公共空间';
-$lang->kanbanspace->featureBar['private']     = '私人空间';
+$lang->kanban->featureBar['space']['involved']    = '我参与的';
+$lang->kanban->featureBar['space']['cooperation'] = '协作空间';
+$lang->kanban->featureBar['space']['public']      = '公共空间';
+$lang->kanban->featureBar['space']['private']     = '私人空间';
 
 $lang->kanbanspace->typeList['cooperation'] = '协作空间';
 $lang->kanbanspace->typeList['public']      = '公共空间';
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 2b4fb07369..124ce8fc67 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolBar pull-left">
-    <?php foreach($lang->kanbanspace->featureBar as $key => $label):?>
+    <?php foreach($lang->kanban->featureBar['space'] as $key => $label):?>
     <?php $active = $browseType == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($browseType == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>

From b611790d8c6cc878ace2f6fc8262253d12732033 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Fri, 3 Mar 2023 06:52:39 +0000
Subject: [PATCH 225/319] * Fix bug #85660.

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

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 9e0a61e639..410280eebd 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -287,7 +287,7 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
         </div>
 	<div class="modal-content with-padding" id='taskTeamEditor'>
 	  <?php if(strpos('|closed|cancel|pause|', $task->status) !== false):?>
-	     <h2 class='label label-info'>
+	     <h2 class='label label-info' style="margin-top:0;">
                <?php echo $this->lang->task->error->teamCantOperate;?>                                             
              </h2>
 	  <?php endif;?>

From f5699a3420471c13aa8c5db2bef35dfc43148c5c Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Fri, 3 Mar 2023 06:58:17 +0000
Subject: [PATCH 226/319] * Fix bug #85660.

---
 module/task/css/edit.css       | 1 +
 module/task/view/edit.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/task/css/edit.css b/module/task/css/edit.css
index bdc7eb84b9..5492e1306d 100644
--- a/module/task/css/edit.css
+++ b/module/task/css/edit.css
@@ -6,3 +6,4 @@
 
 #modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;}
 #taskTeamEditor tr .input-control {display: inline-block; width: 130px;}
+#taskTeamEditor h2 {margin-top:0;}
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 410280eebd..9e0a61e639 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -287,7 +287,7 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
         </div>
 	<div class="modal-content with-padding" id='taskTeamEditor'>
 	  <?php if(strpos('|closed|cancel|pause|', $task->status) !== false):?>
-	     <h2 class='label label-info' style="margin-top:0;">
+	     <h2 class='label label-info'>
                <?php echo $this->lang->task->error->teamCantOperate;?>                                             
              </h2>
 	  <?php endif;?>

From eebc016b4a56bb6aa46071c3c6f60ea1835db258 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Fri, 3 Mar 2023 15:18:41 +0800
Subject: [PATCH 227/319] * Remove unused code.

---
 module/project/model.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index cf45f47d8e..ce5b643326 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1347,12 +1347,6 @@ class projectModel extends model
         $requiredFields = $this->config->project->create->requiredFields;
         if($this->post->delta == 999) $requiredFields = trim(str_replace(',end,', ',', ",{$requiredFields},"), ',');
 
-        /* Redefines the language entries for the fields in the project table. */
-        foreach(explode(',', $requiredFields) as $field)
-        {
-            if(isset($this->lang->project->$field)) $this->lang->project->$field = $this->lang->project->$field;
-        }
-
         $this->lang->error->unique = $this->lang->error->repeat;
         $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_PROJECT)->data($project)
@@ -1592,12 +1586,6 @@ class projectModel extends model
         $requiredFields = $this->config->project->edit->requiredFields;
         if($this->post->delta == 999) $requiredFields = trim(str_replace(',end,', ',', ",{$requiredFields},"), ',');
 
-        /* Redefines the language entries for the fields in the project table. */
-        foreach(explode(',', $requiredFields) as $field)
-        {
-            if(isset($this->lang->project->$field)) $this->lang->project->$field = $this->lang->project->$field;
-        }
-
         $this->lang->error->unique = $this->lang->error->repeat;
         $this->dao->update(TABLE_PROJECT)->data($project)
             ->autoCheck($skipFields = 'begin,end')

From 4d400723ce18f612d94a427fc49637ec205122dd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 3 Mar 2023 15:54:33 +0800
Subject: [PATCH 228/319] * Modify more select display method.

---
 framework/router.class.php          |  2 +-
 module/custom/model.php             | 30 +++++++++---------------
 module/dev/model.php                | 30 ++++++++++++++++--------
 module/product/lang/de.php          | 18 +++++++--------
 module/product/lang/fr.php          | 18 +++++++--------
 module/product/lang/zh-cn.php       | 16 ++++++-------
 module/product/view/browse.html.php | 36 ++++++++++++++---------------
 7 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index aba0b08a3d..289e477a8c 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -124,7 +124,7 @@ class router extends baseRouter
         {
             foreach($lang->db->custom[$moduleName] as $section => $fields)
             {
-                if($section == 'featureBar')
+                if(in_array($section, array('featureBar', 'moreSelects')))
                 {
                     foreach($fields as $featureBarMethod => $featureBarValues)
                     {
diff --git a/module/custom/model.php b/module/custom/model.php
index af592282a0..f653a11289 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -30,7 +30,7 @@ class customModel extends model
             while($row = $stmt->fetch())
             {
                 /* Replace common lang for menu. */
-                if(strpos($row->module, 'Menu') !== false or strpos($row->section, 'featureBar-') !== false or $row->section == 'mainNav')
+                if(strpos($row->module, 'Menu') !== false or strpos($row->section, 'featureBar-') !== false or $row->section == 'mainNav' or strpos($row->section, 'moreSelects-') !== false)
                 {
                     $row->value = strtr($row->value, $this->config->custom->commonLang);
                 }
@@ -53,27 +53,19 @@ class customModel extends model
         {
             if(isset($sectionLang[$customLang->module][$customLang->section]['all']) and isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) and $customLang->lang == 'all') continue;
 
-            if(strpos($customLang->section, 'featureBar-') !== false)
+            if(strpos($customLang->section, 'featureBar-') !== false or strpos($customLang->section, 'moreSelects-') !== false)
             {
-                $sections      = explode('-', $customLang->section);
-                $firstKey      = $sections[0];
-                $sectionIndex  = count($sections) - 1;
-                $sectionArr    = array($customLang->key => $customLang->value);
-                $oldSectionArr = empty($processedLang[$customLang->module]) ? array() : $processedLang[$customLang->module];
-                $oldFeatureBar = empty($oldSectionArr[$firstKey]) ? array() : $oldSectionArr[$firstKey];
-                if(!empty($oldSectionArr))
+                $sections = explode('-', $customLang->section);
+                $sections = array_reverse($sections);
+                if(!isset($processedLang[$customLang->module])) $processedLang[$customLang->module] = array();
+                $sectionArr = array($customLang->key => $customLang->value);
+                foreach($sections as $section)
                 {
-                    for($i = 0; $i <= $sectionIndex; $i ++)
-                    {
-                        $sectionKey    = $sections[$i];
-                        $oldSectionArr = isset($oldSectionArr[$sectionKey]) ? $oldSectionArr[$sectionKey] : array();
-                    }
-                    $sectionArr = array_merge($oldSectionArr, $sectionArr);
+                    $sectionKey = key($sectionArr);
+                    $sectionArr[$section] = $sectionArr;
+                    unset($sectionArr[$sectionKey]);
                 }
-
-                for($index = $sectionIndex; $index >= 0; $index --) $sectionArr = array($sections[$index] => $sectionArr);
-                $sectionArr[$firstKey] = array_merge($oldFeatureBar, $sectionArr[$firstKey]);
-                $processedLang[$customLang->module] = $sectionArr;
+                if(!empty($sectionArr)) $processedLang[$customLang->module] = array_merge_recursive($processedLang[$customLang->module], $sectionArr);
             }
             else
             {
diff --git a/module/dev/model.php b/module/dev/model.php
index b68b9ce88b..f18e33f3ce 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -448,10 +448,10 @@ class devModel extends model
 
             foreach($featureBars as $feature => $featureName)
             {
-                $selectKey = $feature . 'Selects';
-                if(isset($defaultLang->$module->$selectKey))
+                $moreSelectsTags = isset($defaultLang->{$module}->moreSelects[$method][$feature]) ? $defaultLang->{$module}->moreSelects[$method][$feature] : '';
+                if($moreSelectsTags)
                 {
-                    foreach($defaultLang->$module->$selectKey as $feature => $featureName) $originalLangs[$langKey . $feature] = $featureName;
+                    foreach($moreSelectsTags as $tagKey => $tagName) $originalLangs["moreSelects-{$method}-{$feature}_" . $tagKey] = $tagName;
                     continue;
                 }
                 $originalLangs[$langKey . $feature] = $featureName;
@@ -530,16 +530,28 @@ class devModel extends model
                 if($this->config->vision == 'lite' and isset($this->config->dev->liteTagMethod["$module-$method"])) $method = $this->config->dev->liteTagMethod["$module-$method"];
 
                 $method = str_replace('_', '-', $method);
-                $customeds = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
-                $langKey   = "featureBar-{$method}_";
+                $customeds['featureBar']    = $this->loadModel('custom')->getItems("lang={$language}&module={$module}&section=featureBar-$method&vision={$this->config->vision}");
+                $customeds['moreSelects']   = $this->dao->select('*')->from(TABLE_LANG)->where('`lang`')->eq($language)->andWhere('module')->eq($module)->andWhere('section')->like("moreSelects-$method%")->andWhere('vision')->eq($this->config->vision)->fetchAll();
                 break;
         }
 
-        foreach($customeds as $customed)
+        foreach($customeds as $type => $customed)
         {
-            $customedKey = $customed->key;
-            if($type == 'second') $customedKey = $customed->section . '_' . $customed->key;
-            $customedLangs[$langKey . $customedKey] = $customed->value;
+            if(is_array($customed))
+            {
+                foreach($customed as $row)
+                {
+                    $langKey = $type == 'featureBar' ? "featureBar-{$method}_" : $row->section . '_';
+                    $rowKey  = $row->key;
+                    $customedLangs[$langKey . $rowKey] = $row->value;
+                }
+            }
+            else
+            {
+                $customedKey = $customed->key;
+                if($type == 'second') $customedKey = $customed->section . '_' . $customed->key;
+                $customedLangs[$langKey . $customedKey] = $customed->value;
+            }
         }
 
         return $customedLangs;
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index d6ca40aefc..7e7686b8b8 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -232,15 +232,15 @@ $lang->product->featureBar['project']['doing']     = 'In Arbeit';
 $lang->product->featureBar['project']['suspended'] = 'Ausgesetzt';
 $lang->product->featureBar['project']['closed']    = 'Geschlossen';
 
-$lang->product->moreSelects['openedbyme']     = $lang->product->openedByMe;
-$lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
-$lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme']     = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory']    = $lang->product->activeStory;
-$lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
-$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
-$lang->product->moreSelects['willclose']      = $lang->product->willClose;
-$lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+$lang->product->moreSelects['more']['openedbyme']     = $lang->product->openedByMe;
+$lang->product->moreSelects['more']['reviewedbyme']   = $lang->product->reviewedByMe;
+$lang->product->moreSelects['more']['assignedbyme']   = $lang->product->assignedByMe;
+$lang->product->moreSelects['more']['closedbyme']     = $lang->product->closedByMe;
+$lang->product->moreSelects['more']['activestory']    = $lang->product->activeStory;
+$lang->product->moreSelects['more']['changingstory']  = $lang->product->changingStory;
+$lang->product->moreSelects['more']['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['more']['willclose']      = $lang->product->willClose;
+$lang->product->moreSelects['more']['closedstory']    = $lang->product->closedStory;
 
 $lang->product->featureBar['dynamic']['all']       = 'All';
 $lang->product->featureBar['dynamic']['today']     = 'Today';
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index c724f9fd4b..1855f2a7f9 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -232,15 +232,15 @@ $lang->product->featureBar['project']['doing']     = 'En cours';
 $lang->product->featureBar['project']['suspended'] = 'Suspendu';
 $lang->product->featureBar['project']['closed']    = 'Fermé';
 
-$lang->product->moreSelects['openedbyme']     = $lang->product->openedByMe;
-$lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
-$lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme']     = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory']    = $lang->product->activeStory;
-$lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
-$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
-$lang->product->moreSelects['willclose']      = $lang->product->willClose;
-$lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+$lang->product->moreSelects['more']['openedbyme']     = $lang->product->openedByMe;
+$lang->product->moreSelects['more']['reviewedbyme']   = $lang->product->reviewedByMe;
+$lang->product->moreSelects['more']['assignedbyme']   = $lang->product->assignedByMe;
+$lang->product->moreSelects['more']['closedbyme']     = $lang->product->closedByMe;
+$lang->product->moreSelects['more']['activestory']    = $lang->product->activeStory;
+$lang->product->moreSelects['more']['changingstory']  = $lang->product->changingStory;
+$lang->product->moreSelects['more']['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['more']['willclose']      = $lang->product->willClose;
+$lang->product->moreSelects['more']['closedstory']    = $lang->product->closedStory;
 
 $lang->product->featureBar['dynamic']['all']       = 'All';
 $lang->product->featureBar['dynamic']['today']     = 'Today';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index d0d2d481c1..ed511328a7 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -233,14 +233,14 @@ $lang->product->featureBar['project']['suspended'] = '已挂起';
 $lang->product->featureBar['project']['closed']    = '已关闭';
 
 
-$lang->product->moreSelects['reviewedbyme']   = $lang->product->reviewedByMe;
-$lang->product->moreSelects['assignedbyme']   = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme']     = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory']    = $lang->product->activeStory;
-$lang->product->moreSelects['changingstory']  = $lang->product->changingStory;
-$lang->product->moreSelects['reviewingstory'] = $lang->product->reviewingStory;
-$lang->product->moreSelects['willclose']      = $lang->product->willClose;
-$lang->product->moreSelects['closedstory']    = $lang->product->closedStory;
+$lang->product->moreSelects['browse']['more']['reviewedbyme']   = $lang->product->reviewedByMe;
+$lang->product->moreSelects['browse']['more']['assignedbyme']   = $lang->product->assignedByMe;
+$lang->product->moreSelects['browse']['more']['closedbyme']     = $lang->product->closedByMe;
+$lang->product->moreSelects['browse']['more']['activestory']    = $lang->product->activeStory;
+$lang->product->moreSelects['browse']['more']['changingstory']  = $lang->product->changingStory;
+$lang->product->moreSelects['browse']['more']['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->moreSelects['browse']['more']['willclose']      = $lang->product->willClose;
+$lang->product->moreSelects['browse']['more']['closedstory']    = $lang->product->closedStory;
 
 $lang->product->featureBar['dynamic']['all']       = '全部';
 $lang->product->featureBar['dynamic']['today']     = '今天';
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 9144fa823a..fcb8e10d82 100755
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -108,28 +108,26 @@ js::set('vision',        $this->config->vision);
             if(isset($menuItem->hidden)) continue;
             if($menuItem->name == 'emptysr' && $storyType == 'story') continue;
             $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;
-            if($menuItem->name == 'more')
+            $moreSelects = empty($lang->product->moreSelects[$app->rawMethod][$menuItem->name]) ? '' : $lang->product->moreSelects[$app->rawMethod][$menuItem->name];
+            if($moreSelects)
             {
-                if(!empty($lang->product->moreSelects))
+                $moreLabel       = $lang->more;
+                $moreLabelActive = '';
+                $storyBrowseType = $this->session->storyBrowseType;
+                if(isset($moreSelects[$storyBrowseType]))
                 {
-                    $moreLabel       = $lang->more;
-                    $moreLabelActive = '';
-                    $storyBrowseType = $this->session->storyBrowseType;
-                    if(isset($lang->product->moreSelects[$storyBrowseType]))
-                    {
-                        $moreLabel       = "<span class='text'>{$lang->product->moreSelects[$storyBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-                        $moreLabelActive = 'btn-active-text';
-                    }
-                    echo '<div class="btn-group" id="more">';
-                    echo html::a('javascript:;', $moreLabel . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $moreLabelActive'");
-                    echo "<ul class='dropdown-menu'>";
-                    foreach($lang->product->moreSelects as $key => $value)
-                    {
-                        $active = $key == $storyBrowseType ? 'btn-active-text' : '';
-                        echo '<li>' . html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$key&param=0&storyType=$storyType"), "<span class='text'>{$value}</span>", '', "class='btn btn-link $active'") . '</li>';
-                    }
-                    echo '</ul></div>';
+                    $moreLabel       = "<span class='text'>{$moreSelects[$storyBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+                    $moreLabelActive = 'btn-active-text';
                 }
+                echo '<div class="btn-group" id="more">';
+                echo html::a('javascript:;', $moreLabel . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $moreLabelActive'");
+                echo "<ul class='dropdown-menu'>";
+                foreach($moreSelects as $key => $value)
+                {
+                    $active = $key == $storyBrowseType ? 'btn-active-text' : '';
+                    echo '<li>' . html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$key&param=0&storyType=$storyType"), "<span class='text'>{$value}</span>", '', "class='btn btn-link $active'") . '</li>';
+                }
+                echo '</ul></div>';
             }
             elseif($menuItem->name == 'QUERY')
             {

From 3aa7bc5a1bf134e78810c81a2506ddc07108f50e Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 3 Mar 2023 17:34:05 +0800
Subject: [PATCH 229/319]  * fix for get class name by path.

---
 module/editor/model.php            | 82 +++++++++++++++++++-----------
 module/editor/view/extend.html.php |  5 +-
 2 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/module/editor/model.php b/module/editor/model.php
index ad1d5a2470..002113b724 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -55,16 +55,24 @@ class editorModel extends model
         foreach($this->config->editor->extSort as $ext)
         {
             $extModulePaths = $this->app->getModuleExtPath('', $moduleName, $ext);
-            foreach($extModulePaths as $extensionFullDir)
+            foreach($extModulePaths as $extType => $extensionFullDir)
             {
-                if(!is_dir($extensionFullDir)) continue;
+                if(empty($extensionFullDir) or !is_dir($extensionFullDir)) continue;
 
+                if($extType == 'common') $extType = $this->config->edition;
                 if($ext == 'lang' or $ext == 'js' or $ext == 'css')
                 {
-                    $extensionList[$extensionFullDir] = $this->getTwoGradeFiles($extensionFullDir);
-                    continue;
+                    $extensionList[$extType][$extensionFullDir] = $this->getTwoGradeFiles($extensionFullDir);
+                }
+                else
+                {
+                    foreach(glob($extensionFullDir . '*') as $extensionFullFile)
+                    {
+                        $fileName = basename($extensionFullFile);
+                        if($fileName == 'index.html') continue;
+                        $extensionList[$extType][$extensionFullDir][$extensionFullFile] = $fileName;
+                    }
                 }
-                foreach(glob($extensionFullDir . '*') as $extensionFullFile) $extensionList[$extensionFullDir][$extensionFullFile] = basename($extensionFullFile);
             }
         }
         return $extensionList;
@@ -79,18 +87,19 @@ class editorModel extends model
      */
     public function getTwoGradeFiles($extensionFullDir)
     {
-        $zfile    = $this->app->loadClass('zfile');
         $fileList = array();
-        $langDirs = $zfile->readDir($extensionFullDir);
+        $langDirs = scandir($extensionFullDir);
         foreach($langDirs as $langDir)
         {
-            $langFullDir = $extensionFullDir . DS . $langDir;
+            if($langDir == '.' or $langDir == '..' or $langDir == '.svn' or $langDir == 'index.html') continue;
+            $langFullDir = $extensionFullDir . $langDir;
             $fileList[$langFullDir] = array();
             if(is_dir($langFullDir))
             {
-                $langFiles = $zfile->readDir($langFullDir);
+                $langFiles = scandir($langFullDir);
                 foreach($langFiles as $langFile)
                 {
+                    if($langFile == '.' or $langFile == '..' or $langFile == '.svn' or $langFile == 'index.html') continue;
                     $langFullFile = $langFullDir . DS . $langFile;
                     $fileList[$langFullDir][$langFullFile] = $langFile;
                 }
@@ -109,19 +118,7 @@ class editorModel extends model
     public function analysis($fileName)
     {
         $classMethod = array();
-        $class       = strstr($fileName, DS . 'module' . DS);
-        if(empty($class))
-        {
-            $class = strstr($fileName, DS . 'extension' . DS);
-            $class = str_replace(DS . 'extension' . DS, '', $class);
-            $class = ltrim(strstr($class, DS), DS);
-        }
-        else
-        {
-            $class = str_replace(DS . 'module' . DS, '', $class);
-        }
-
-        $class = dirname($class);
+        $class       = $this->getClassNameByPath($fileName);
         if(strpos($fileName, 'model.php') !== false) $class .= 'Model';
         if(!class_exists($class)) include $fileName;
         $reflection = new ReflectionClass($class);
@@ -159,8 +156,8 @@ class editorModel extends model
             }
 
             $this->module = '';
-            if(isset($lang->$module))       $this->module = $lang->$module;
-            if(isset($this->lang->$module)) $this->module = $this->lang->$module;
+            if(isset($lang->$module)) $this->module = $lang->$module;
+            if(empty($this->module) and isset($this->lang->$module)) $this->module = $this->lang->$module;
         }
 
         foreach($files as $key => $file)
@@ -393,8 +390,7 @@ EOD;
      */
     public function newControl($filePath)
     {
-        $className  = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS . 'control' . DS));
-        $className  = basename($className);
+        $className  = $this->getClassNameByPath($filePath);
         $methodName = basename($filePath, '.php');
         return <<<EOD
 <?php
@@ -475,9 +471,7 @@ EOD;
         if(strpos($sourceFileName, '.') !== false) $fileExtension = substr($sourceFileName, strpos($sourceFileName, '.') + 1);
 
         $fileName   = empty($_POST['fileName']) ? '' : trim($this->post->fileName);
-        $moduleName = strstr($filePath, DS . 'module' . DS);
-        $moduleName = substr($moduleName, 0, strpos($moduleName, DS, 9));
-        $moduleName = basename($moduleName);
+        $moduleName = $this->getClassNameByPath($filePath);
         $extPath    = $this->app->getExtensionRoot() . 'custom' . DS . $moduleName . DS . 'ext' . DS;
         if($fileName and (strpos($fileName, '.' . $fileExtension) !== (strlen($fileName) - strlen($fileExtension) - 1))) $fileName .= '.' . $fileExtension;
         switch($action)
@@ -510,4 +504,34 @@ EOD;
             return $extPath . 'lang' . DS . str_replace('_', '-', $action) . DS . $fileName;
         }
     }
+
+    /**
+     * Get class name by path.
+     *
+     * @param  string    $filePath
+     * @access public
+     * @return string
+     */
+    public function getClassNameByPath($filePath)
+    {
+        $className = '';
+        if(strpos($filePath, DS . 'module' . DS) !== false)
+        {
+            $className = strstr($filePath, DS . 'module' . DS);
+            $className = substr($className, 0, strpos($className, DS, 9));
+        }
+        elseif(strpos($filePath, DS . 'ext' . DS) !== false)
+        {
+            $className = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS));
+        }
+        elseif(strpos($filePath, DS . 'extension' . DS) !== false)
+        {
+            $className = strstr($filePath, DS . 'extension' . DS);
+            $className = str_replace(DS . 'extension' . DS, '', $className);
+            $className = substr($className, 0, strpos($className, DS, strpos($className, DS) + 1));
+        }
+        $className = basename($className);
+
+        return $className;
+    }
 }
diff --git a/module/editor/view/extend.html.php b/module/editor/view/extend.html.php
index 14f5b4d178..291d2e6af4 100644
--- a/module/editor/view/extend.html.php
+++ b/module/editor/view/extend.html.php
@@ -12,7 +12,10 @@
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
 <div class='main-header'>
-  <div class='heading'><i class='icon-list-ul'></i> <strong><?php echo isset($lang->editor->modules[$module])? $lang->editor->modules[$module] : $module;?></strong></div>
+  <div class='heading'>
+    <i class='icon-list-ul'></i>
+    <strong><?php echo zget($lang->editor->modules, $module, isset($lang->{$module}->common) ? $lang->{$module}->common : $module);?></strong>
+  </div>
 </div>
 <div class='main-content'>
   <?php echo $tree?>

From e9db77ef6c8b084eae333e768b24ad88a741d09f Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 00:38:08 +0000
Subject: [PATCH 230/319] * Fix bug #32603.

---
 module/project/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/model.php b/module/project/model.php
index cf45f47d8e..9e096977c7 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1527,6 +1527,7 @@ class projectModel extends model
             ->setDefault('team', $this->post->name)
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
+            ->setDefault('days', '0')
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
             ->setIF($this->post->delta == 999, 'days', 0)
             ->setIF($this->post->begin == '0000-00-00', 'begin', '')

From 436fc4a448fa135e13135c931b7885efe4cef952 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 00:40:45 +0000
Subject: [PATCH 231/319] * Fix bug #32632.

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

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 7f11fcfa4f..7cc63b0fa8 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -251,7 +251,7 @@
                   <?php if($browserList):?>
                   <p class='browserContent'>
                     <?php foreach($browserList as $browser):?>
-                    <?php if($os) echo "<span class='label label-outline'>" .  zget($lang->bug->browserList, $browser) . "</span>";?>
+                    <?php if($browser) echo "<span class='label label-outline'>" .  zget($lang->bug->browserList, $browser) . "</span>";?>
                     <?php endforeach;?>
                   </p>
                   <?php endif;?>

From 47c874ae0c94854e4a141cbd32fac1e204471b12 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 00:41:04 +0000
Subject: [PATCH 232/319] * Fix bug #32633.

---
 module/common/model.php      | 8 ++++++++
 module/execution/control.php | 2 ++
 module/execution/model.php   | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index ed45177d33..0263d31794 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3041,6 +3041,14 @@ EOD;
             }
             if($productsStatus[$object->product] == 'closed') return false;
         }
+        elseif(!empty($object->product) and is_string($object->product) and empty($config->CRProduct))
+        {
+            $products      = array(0) + explode(',', $object->product);
+            $products      = $app->control->loadModel('product')->getByIdList($products);
+            $productStatus = array();
+            foreach($products as $product) $productStatus[$product->status] = 1;
+            if(!empty($productStatus['closed']) and count($productStatus) == 1) return false;
+        }
 
         /* Check the execution is closed. */
         $productModuleList = array('story', 'bug', 'testtask');
diff --git a/module/execution/control.php b/module/execution/control.php
index 0c473b3597..91312d698f 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1703,6 +1703,8 @@ class execution extends control
             global $lang;
             $lang->executionCommon = $lang->execution->stage;
             include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
+
+            $this->config->execution->create->requiredFields .= ',products0';
         }
 
         $this->app->loadLang('program');
diff --git a/module/execution/model.php b/module/execution/model.php
index be8ebe0187..4d76ef6a90 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -386,6 +386,8 @@ class executionModel extends model
 
         if($project->model == 'waterfall' or $project->model == 'waterfallplus')
         {
+            $_POST['products'] = array_filter($_POST['products']);
+            if(empty($_POST['products'])) dao::$errors['products0'] = $this->lang->project->errorNoProducts;
             $this->checkWorkload('create', $_POST['percent'], $project);
             if(dao::isError()) return false;
         }
@@ -1883,7 +1885,7 @@ class executionModel extends model
             ->page($pager, 't1.id')
             ->fetchAll('id');
 
-        if(empty($productID) and !empty($executions)) $projectProductIdList = $this->dao->select('project, product')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($executions))->fetchPairs();
+        if(empty($productID) and !empty($executions)) $projectProductIdList = $this->dao->select('project, GROUP_CONCAT(product) as product')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($executions))->groupBy('project')->fetchPairs();
 
         $hours = $this->loadModel('project')->computerProgress($executions);
         $burns = $this->getBurnData($executions);

From 9ffce9d8a720c6d196191635244f98a30536f911 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 10:19:48 +0800
Subject: [PATCH 233/319] * Modify project lang to variable.

---
 module/productplan/lang/de.php     |  8 +++----
 module/productplan/lang/en.php     |  8 +++----
 module/productplan/lang/fr.php     |  8 +++----
 module/productplan/lang/zh-cn.php  | 10 ++++-----
 module/program/lang/de.php         | 26 ++++++++++-----------
 module/program/lang/en.php         | 26 ++++++++++-----------
 module/program/lang/fr.php         | 26 ++++++++++-----------
 module/program/lang/zh-cn.php      | 36 +++++++++++++++---------------
 module/projectbuild/lang/de.php    |  2 +-
 module/projectbuild/lang/en.php    |  2 +-
 module/projectbuild/lang/fr.php    |  2 +-
 module/projectbuild/lang/zh-cn.php |  2 +-
 module/projectstory/lang/de.php    | 14 ++++++------
 module/projectstory/lang/en.php    | 14 ++++++------
 module/projectstory/lang/fr.php    | 14 ++++++------
 module/projectstory/lang/zh-cn.php | 14 ++++++------
 module/tutorial/lang/de.php        | 14 ++++++------
 module/tutorial/lang/en.php        | 12 +++++-----
 module/tutorial/lang/fr.php        | 14 ++++++------
 module/tutorial/lang/zh-cn.php     | 12 +++++-----
 module/user/lang/de.php            |  2 +-
 module/user/lang/en.php            |  2 +-
 module/user/lang/fr.php            |  2 +-
 module/user/lang/zh-cn.php         |  2 +-
 module/weekly/lang/de.php          | 12 +++++-----
 module/weekly/lang/en.php          | 12 +++++-----
 module/weekly/lang/fr.php          | 12 +++++-----
 module/weekly/lang/zh-cn.php       | 12 +++++-----
 28 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php
index 82346ef8d3..1592ad972d 100644
--- a/module/productplan/lang/de.php
+++ b/module/productplan/lang/de.php
@@ -27,7 +27,7 @@ $lang->productplan->view       = "Details";
 $lang->productplan->bugSummary = "<strong>%s</strong> Bugs auf dieser Seite";
 $lang->productplan->basicInfo  = 'Basis Info';
 $lang->productplan->batchEdit  = 'Mehrere bearbeiten';
-$lang->productplan->project    = 'Project';
+$lang->productplan->project    = $lang->projectCommon;
 $lang->productplan->plan       = 'Plan';
 $lang->productplan->allAB      = 'All';
 $lang->productplan->to         = 'To';
@@ -71,8 +71,8 @@ $lang->productplan->confirmClose       = "Do you want to close this plan?";
 $lang->productplan->confirmActivate    = "Do you want to activate this plan?";
 $lang->productplan->noPlan             = 'Kein Plan. ';
 $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
-$lang->productplan->selectProjects     = "Please select the project";
-$lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
+$lang->productplan->selectProjects     = "Please select the " . $lang->projectCommon;
+$lang->productplan->projectNotEmpty    = $lang->projectCommon . ' cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 $lang->productplan->summary            = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>，Independent: <strong>%s</strong>.";
 $lang->productplan->checkedSummary     = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>, Independent: <strong>%independent%</strong>.";
@@ -133,7 +133,7 @@ $lang->productplan->beginLetterParent    = "The start date of the parent plan: %
 $lang->productplan->endGreaterParent     = "The completion date of the parent plan: %s, the completion date cannot be greater than the completion date of the parent plan.";
 $lang->productplan->beginGreaterChild    = "The start date of the child plan: %s, the start date cannot be greater than the start date of the child plan.";
 $lang->productplan->endLetterChild       = "The completion date of the child plan: %s, the completion date cannot be less than the completion date of the child plan.";
-$lang->productplan->noLinkedProject      = "The current product has not been linked with a project. Please enter the list of the product to link or create a project.";
+$lang->productplan->noLinkedProject      = "The current product has not been linked with a {$lang->projectCommon}. Please enter the list of the product to link or create a {$lang->projectCommon}.";
 $lang->productplan->enterProjectList     = "Enter the list of the product";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 889f37a297..406fac8684 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -27,7 +27,7 @@ $lang->productplan->view       = "View";
 $lang->productplan->bugSummary = "Total <strong>%s</strong> Bugs on this page.";
 $lang->productplan->basicInfo  = 'Basic Info';
 $lang->productplan->batchEdit  = 'Batch Edit';
-$lang->productplan->project    = 'Project';
+$lang->productplan->project    = $lang->projectCommon;
 $lang->productplan->plan       = 'Plan';
 $lang->productplan->allAB      = 'All';
 $lang->productplan->to         = 'To';
@@ -71,8 +71,8 @@ $lang->productplan->confirmClose       = "Do you want to close this plan?";
 $lang->productplan->confirmActivate    = "Do you want to activate this plan?";
 $lang->productplan->noPlan             = 'No plans yet. ';
 $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
-$lang->productplan->selectProjects     = "Please select the project";
-$lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
+$lang->productplan->selectProjects     = "Please select the " . $lang->projectCommon;
+$lang->productplan->projectNotEmpty    = $lang->projectCommon . ' cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 $lang->productplan->summary            = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>，Independent: <strong>%s</strong>.";
 $lang->productplan->checkedSummary     = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>, Independent: <strong>%independent%</strong>.";
@@ -133,7 +133,7 @@ $lang->productplan->beginLetterParent    = "The start date of the parent plan: %
 $lang->productplan->endGreaterParent     = "The completion date of the parent plan: %s, the completion date cannot be greater than the completion date of the parent plan.";
 $lang->productplan->beginGreaterChild    = "The start date of the child plan: %s, the start date cannot be greater than the start date of the child plan.";
 $lang->productplan->endLetterChild       = "The completion date of the child plan: %s, the completion date cannot be less than the completion date of the child plan.";
-$lang->productplan->noLinkedProject      = "The current product has not been linked with a project. Please enter the list of the product to link or create a project.";
+$lang->productplan->noLinkedProject      = "The current product has not been linked with a {$lang->projectCommon}. Please enter the list of the product to link or create a {$lang->projectCommon}.";
 $lang->productplan->enterProjectList     = "Enter the list of the product";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php
index d059b94f08..217e90a285 100644
--- a/module/productplan/lang/fr.php
+++ b/module/productplan/lang/fr.php
@@ -27,7 +27,7 @@ $lang->productplan->view       = "Détail Plan";
 $lang->productplan->bugSummary = "Total <strong>%s</strong> Bugs sur cette page.";
 $lang->productplan->basicInfo  = 'Infos de Base';
 $lang->productplan->batchEdit  = 'Edition par Lot';
-$lang->productplan->project    = 'Project';
+$lang->productplan->project    = $lang->projectCommon;
 $lang->productplan->plan       = 'Plan';
 $lang->productplan->allAB      = 'All';
 $lang->productplan->to         = 'To';
@@ -71,8 +71,8 @@ $lang->productplan->confirmClose       = "Do you want to close this plan?";
 $lang->productplan->confirmActivate    = "Do you want to activate this plan?";
 $lang->productplan->noPlan             = "Aucun plan pour l'instant. ";
 $lang->productplan->cannotDeleteParent = 'Impossible de supprimer le plan parent';
-$lang->productplan->selectProjects     = "Please select the project";
-$lang->productplan->projectNotEmpty    = 'Project cannot be empty.';
+$lang->productplan->selectProjects     = "Please select the " . $lang->projectCommon;
+$lang->productplan->projectNotEmpty    = $lang->projectCommon . ' cannot be empty.';
 $lang->productplan->nextStep           = "Next step";
 $lang->productplan->summary            = "Total: <strong>%s</strong>, Parents: <strong>%s</strong>, Children: <strong>%s</strong>，Independent: <strong>%s</strong>.";
 $lang->productplan->checkedSummary     = "Seleted: <strong>%total%</strong>, Parents: <strong>%parent%</strong>, Children: <strong>%child%</strong>, Independent: <strong>%independent%</strong>.";
@@ -133,7 +133,7 @@ $lang->productplan->beginLetterParent    = "The start date of the parent plan: %
 $lang->productplan->endGreaterParent     = "The completion date of the parent plan: %s, the completion date cannot be greater than the completion date of the parent plan.";
 $lang->productplan->beginGreaterChild    = "The start date of the child plan: %s, the start date cannot be greater than the start date of the child plan.";
 $lang->productplan->endLetterChild       = "The completion date of the child plan: %s, the completion date cannot be less than the completion date of the child plan.";
-$lang->productplan->noLinkedProject      = "The current product has not been linked with a project. Please enter the list of the product to link or create a project.";
+$lang->productplan->noLinkedProject      = "The current product has not been linked with a {$lang->projectCommon}. Please enter the list of the product to link or create a {$lang->projectCommon}.";
 $lang->productplan->enterProjectList     = "Enter the list of the product";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index 79af4f297c..0d0b2d441f 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -27,7 +27,7 @@ $lang->productplan->view       = "计划详情";
 $lang->productplan->bugSummary = "本页共 <strong>%s</strong> 个Bug";
 $lang->productplan->basicInfo  = '基本信息';
 $lang->productplan->batchEdit  = '批量编辑';
-$lang->productplan->project    = '项目';
+$lang->productplan->project    = $lang->projectCommon;
 $lang->productplan->plan       = '计划';
 $lang->productplan->allAB      = '所有';
 $lang->productplan->to         = '至';
@@ -71,8 +71,8 @@ $lang->productplan->confirmClose       = "您确认关闭该计划吗？";
 $lang->productplan->confirmActivate    = "您确认激活该计划吗？";
 $lang->productplan->noPlan             = "暂时没有计划。";
 $lang->productplan->cannotDeleteParent = "不能删除父计划";
-$lang->productplan->selectProjects     = "请选择所属项目";
-$lang->productplan->projectNotEmpty    = '所属项目不能为空。';
+$lang->productplan->selectProjects     = "请选择所属" . $lang->projectCommon;
+$lang->productplan->projectNotEmpty    = "所属{$lang->projectCommon}不能为空。";
 $lang->productplan->nextStep           = "下一步";
 $lang->productplan->summary            = "本页共 <strong>%s</strong> 个计划，父计划 <strong>%s</strong>，子计划 <strong>%s</strong>，独立计划 <strong>%s</strong>。";
 $lang->productplan->checkedSummary     = "共选中 <strong>%total%</strong> 个计划，父计划 <strong>%parent%</strong>，子计划 <strong>%child%</strong>，独立计划 <strong>%independent%</strong>。";
@@ -133,8 +133,8 @@ $lang->productplan->beginLetterParent    = "父计划的开始日期：%s，开
 $lang->productplan->endGreaterParent     = "父计划的完成日期：%s，完成日期不能大于父计划的完成日期";
 $lang->productplan->beginGreaterChild    = "子计划的开始日期：%s，开始日期不能大于子计划的开始日期";
 $lang->productplan->endLetterChild       = "子计划的完成日期：%s，完成日期不能小于子计划的完成日期";
-$lang->productplan->noLinkedProject      = "当前产品还未关联项目，请进入产品的项目列表关联或创建一个项目";
-$lang->productplan->enterProjectList     = "进入产品的项目列表";
+$lang->productplan->noLinkedProject      = "当前产品还未关联{$lang->projectCommon}，请进入产品的{$lang->projectCommon}列表关联或创建一个{$lang->projectCommon}";
+$lang->productplan->enterProjectList     = "进入产品的{$lang->projectCommon}列表";
 $lang->productplan->beginGreaterChildTip = "父计划[%s]的开始日期：%s，不能大于子计划的开始日期: %s";
 $lang->productplan->endLetterChildTip    = "父计划[%s]的完成日期：%s，不能小于子计划的完成日期: %s";
 $lang->productplan->beginLetterParentTip = "子计划[%s]的开始日期：%s，不能小于父计划的开始日期: %s";
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 9b7ef57ff4..c4752510ab 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -61,7 +61,7 @@ $lang->program->kanbanAction            = 'Kanban';
 $lang->program->view                    = 'Program Detail';
 $lang->program->copy                    = 'Copy Program';
 $lang->program->product                 = 'Products';
-$lang->program->project                 = 'Program Project List';
+$lang->program->project                 = "Program {$lang->projectCommon} List";
 $lang->program->all                     = 'All Programs';
 $lang->program->start                   = 'Start';
 $lang->program->finish                  = 'Finish';
@@ -79,10 +79,10 @@ $lang->program->updateOrder             = 'Rank';
 $lang->program->unbindWhitelist         = 'Unbind Whitelist';
 $lang->program->importStakeholder       = 'Import program';
 $lang->program->manageMembers           = 'Program Team';
-$lang->program->confirmChangePRJUint    = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
+$lang->program->confirmChangePRJUint    = "Synchronize the budget unit of the subprograms and the {$lang->projectCommon}s of the program? If yes, please the current exchange rate.";
 $lang->program->exRateNotNegative       = 'The『exchange rate』should not be negative.';
-$lang->program->changePRJUnit           = 'Update the budget unit of the project';
-$lang->program->showNotCurrentProjects  = 'Display project information of non current program';
+$lang->program->changePRJUnit           = 'Update the budget unit of the ' . $lang->projectCommon;
+$lang->program->showNotCurrentProjects  = "Display {$lang->projectCommon} information of non current program";
 
 $lang->program->progress         = 'Progress';
 $lang->program->children         = 'Child';
@@ -93,23 +93,23 @@ $lang->program->moreProgram      = 'More Programs';
 $lang->program->stakeholderType  = 'Stakeholder type';
 $lang->program->parentBudget     = 'Parent program surplus budget：';
 $lang->program->isStakeholderKey = 'Key stakeholder';
-$lang->program->summary          = 'This page contains %d top programs and %d independent projects.';
+$lang->program->summary          = "This page contains %d top programs and %d independent {$lang->projectCommon}s.";
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed programs.';
-$lang->program->tips               = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
+$lang->program->tips               = "If a parent program is selected, the products under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a product with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = 'The start date of the program is less than the start date of the parent program:';
 $lang->program->endGreaterParent   = 'The finish date of the program is greater than the finish date of the parent program:';
 $lang->program->dateExceedParent   = 'The start and finish date of the program was greater than the start and finish date of the parent program:';
-$lang->program->beginGreateChild   = 'The start date of the program is greater than the minimum start date of the subprogram or project:';
-$lang->program->endLetterChild     = 'The finish date of the program is less than the maximum finish date of the subprogram or project:';
-$lang->program->dateExceedChild    = 'The start and finish date of the program no longer include the date scope of the subprogram or project:';
-$lang->program->closeErrorMessage  = 'There are subprograms or projects that are not closed';
-$lang->program->hasChildren        = 'It has child programs or projects. You cannot delete it.';
+$lang->program->beginGreateChild   = "The start date of the program is greater than the minimum start date of the subprogram or {$lang->projectCommon}:";
+$lang->program->endLetterChild     = "The finish date of the program is less than the maximum finish date of the subprogram or {$lang->projectCommon}:";
+$lang->program->dateExceedChild    = "The start and finish date of the program no longer include the date scope of the subprogram or {$lang->projectCommon}:";
+$lang->program->closeErrorMessage  = "There are subprograms or {$lang->projectCommon}s that are not closed";
+$lang->program->hasChildren        = "The program has a child program or the {$lang->projectCommon} exists and can not be deleted.";
 $lang->program->hasProduct         = 'It has products. You cannot delete it.';
 $lang->program->confirmDelete      = "Do you want to delete it?";
 $lang->program->confirmUnlink      = 'Do you want to remove the Stakeholder?';
@@ -169,8 +169,8 @@ $lang->program->kanban->typeList['others'] = 'Others';
 
 $lang->program->kanban->openProducts    = 'Open Products';
 $lang->program->kanban->unexpiredPlans  = 'Unexpired Plans';
-$lang->program->kanban->waitingProjects = 'Waiting Projects';
-$lang->program->kanban->doingProjects   = 'Ongoing Projects';
+$lang->program->kanban->waitingProjects = "Waiting {$lang->projectCommon}s";
+$lang->program->kanban->doingProjects   = "Ongoing {$lang->projectCommon}s";
 $lang->program->kanban->doingExecutions = 'Ongoing Executions';
 $lang->program->kanban->normalReleases  = 'Normal Releases';
 
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 08978c0499..6263da2997 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -61,7 +61,7 @@ $lang->program->kanbanAction            = 'Kanban';
 $lang->program->view                    = 'Program Detail';
 $lang->program->copy                    = 'Copy Program';
 $lang->program->product                 = 'Products';
-$lang->program->project                 = 'Program Project List';
+$lang->program->project                 = "Program {$lang->projectCommon} List";
 $lang->program->all                     = 'All Programs';
 $lang->program->start                   = 'Start';
 $lang->program->finish                  = 'Finish';
@@ -79,10 +79,10 @@ $lang->program->updateOrder             = 'Rank';
 $lang->program->unbindWhitelist         = 'Unbind Whitelist';
 $lang->program->importStakeholder       = 'Import from program';
 $lang->program->manageMembers           = 'Program Team';
-$lang->program->confirmChangePRJUint    = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
+$lang->program->confirmChangePRJUint    = "Synchronize the budget unit of the subprograms and the {$lang->projectCommon}s of the program? If yes, please the current exchange rate.";
 $lang->program->exRateNotNegative       = 'The『exchange rate』should not be negative.';
-$lang->program->changePRJUnit           = 'Update the budget unit of the project';
-$lang->program->showNotCurrentProjects  = 'Display project information of non current program';
+$lang->program->changePRJUnit           = 'Update the budget unit of the ' . $lang->projectCommon;
+$lang->program->showNotCurrentProjects  = "Display {$lang->projectCommon} information of non current program";
 
 $lang->program->progress         = 'Progress';
 $lang->program->children         = 'Add Child';
@@ -93,23 +93,23 @@ $lang->program->moreProgram      = 'More program';
 $lang->program->stakeholderType  = 'Stakeholder type';
 $lang->program->parentBudget     = 'Parent program surplus budget：';
 $lang->program->isStakeholderKey = 'Key stakeholder';
-$lang->program->summary          = 'This page contains %d top programs and %d independent projects.';
+$lang->program->summary          = "This page contains %d top programs and %d independent {$lang->projectCommon}s.";
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed';
-$lang->program->tips               = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
+$lang->program->tips               = "If a parent program is selected, the products under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a product with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = 'The start date of the program is less than the start date of the parent program:';
 $lang->program->endGreaterParent   = 'The finish date of the program is greater than the finish date of the parent program:';
 $lang->program->dateExceedParent   = 'The start and finish date of the program was greater than the start and finish date of the parent program:';
-$lang->program->beginGreateChild   = 'The start date of the program is greater than the minimum start date of the subprogram or project:';
-$lang->program->endLetterChild     = 'The finish date of the program is less than the maximum finish date of the subprogram or project:';
-$lang->program->dateExceedChild    = 'The start and finish date of the program no longer include the date scope of the subprogram or project:';
-$lang->program->closeErrorMessage  = 'There are subprograms or projects that are not closed';
-$lang->program->hasChildren        = 'The program has a child program or the project exists and can not be deleted.';
+$lang->program->beginGreateChild   = "The start date of the program is greater than the minimum start date of the subprogram or {$lang->projectCommon}:";
+$lang->program->endLetterChild     = "The finish date of the program is less than the maximum finish date of the subprogram or {$lang->projectCommon}:";
+$lang->program->dateExceedChild    = "The start and finish date of the program no longer include the date scope of the subprogram or {$lang->projectCommon}:";
+$lang->program->closeErrorMessage  = "There are subprograms or {$lang->projectCommon}s that are not closed";
+$lang->program->hasChildren        = "The program has a child program or the {$lang->projectCommon} exists and can not be deleted.";
 $lang->program->hasProduct         = 'The program has products exist and can not be deleted.';
 $lang->program->confirmDelete      = 'Do you want to delete the \"%s\" Program?';
 $lang->program->confirmUnlink      = 'Do you want to remove the Stakeholder?';
@@ -169,8 +169,8 @@ $lang->program->kanban->typeList['others'] = 'Others';
 
 $lang->program->kanban->openProducts    = 'Open Products';
 $lang->program->kanban->unexpiredPlans  = 'Unexpired Plans';
-$lang->program->kanban->waitingProjects = 'Waiting Projects';
-$lang->program->kanban->doingProjects   = 'Ongoing Projects';
+$lang->program->kanban->waitingProjects = "Waiting {$lang->projectCommon}s";
+$lang->program->kanban->doingProjects   = "Ongoing {$lang->projectCommon}s";
 $lang->program->kanban->doingExecutions = 'Ongoing Executions';
 $lang->program->kanban->normalReleases  = 'Normal Releases';
 
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index dc915f9142..5dc38a4b1d 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -61,7 +61,7 @@ $lang->program->kanbanAction            = 'Kanban';
 $lang->program->view                    = 'Program Detail';
 $lang->program->copy                    = 'Copy Program';
 $lang->program->product                 = 'Products';
-$lang->program->project                 = 'Program Project List';
+$lang->program->project                 = "Program {$lang->projectCommon} List";
 $lang->program->all                     = 'All Programs';
 $lang->program->start                   = 'Start';
 $lang->program->finish                  = 'Finish';
@@ -79,10 +79,10 @@ $lang->program->updateOrder             = 'Rank';
 $lang->program->unbindWhitelist         = 'Unbind Whitelist';
 $lang->program->importStakeholder       = 'Import program';
 $lang->program->manageMembers           = 'Program Team';
-$lang->program->confirmChangePRJUint    = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
+$lang->program->confirmChangePRJUint    = "Synchronize the budget unit of the subprograms and the {$lang->projectCommon}s of the program? If yes, please the current exchange rate.";
 $lang->program->exRateNotNegative       = 'The『exchange rate』should not be negative.';
-$lang->program->changePRJUnit           = 'Update the budget unit of the project';
-$lang->program->showNotCurrentProjects  = 'Display project information of non current program';
+$lang->program->changePRJUnit           = 'Update the budget unit of the ' . $lang->projectCommon;
+$lang->program->showNotCurrentProjects  = "Display {$lang->projectCommon} information of non current program";
 
 $lang->program->progress         = 'Progress';
 $lang->program->children         = 'Child';
@@ -93,23 +93,23 @@ $lang->program->moreProgram      = 'More Programs';
 $lang->program->stakeholderType  = 'Stakeholder type';
 $lang->program->parentBudget     = 'Parent program surplus budget：';
 $lang->program->isStakeholderKey = 'Key stakeholder';
-$lang->program->summary          = 'This page contains %d top programs and %d independent projects.';
+$lang->program->summary          = "This page contains %d top programs and %d independent {$lang->projectCommon}s.";
 
 $lang->program->stakeholderTypeList['inside']  = 'Inside';
 $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed programs.';
-$lang->program->tips               = 'If a parent program is selected, the products under the parent program can be associated. If no program is selected for the project, a product with the same name as the project is created and associated with the project by default.';
+$lang->program->tips               = "If a parent program is selected, the products under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a product with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = 'La date de début du programme était < à la date de début du programme parent:';
 $lang->program->endGreaterParent   = 'La date de fin du programme était > à la date de fin du programme parent:';
 $lang->program->dateExceedParent   = 'La date de début et de fin du programme était > à la date de début et de fin du programme parent:';
-$lang->program->beginGreateChild   = 'La date de début du programme était > à la date minimale de début du sous-programme ou du projet:';
-$lang->program->endLetterChild     = 'La date de fin du programme était < à la de fin maximale du sous-programme ou du projet:';
-$lang->program->dateExceedChild    = 'La date de début et de fin du programme ne correspond plus la date du sous-programme ou du projet:';
-$lang->program->closeErrorMessage  = 'There are subprograms or projects that are not closed';
-$lang->program->hasChildren        = 'It has child programs or projects. You cannot delete it.';
+$lang->program->beginGreateChild   = "The start date of the program is greater than the minimum start date of the subprogram or {$lang->projectCommon}:";
+$lang->program->endLetterChild     = "The finish date of the program is less than the maximum finish date of the subprogram or {$lang->projectCommon}:";
+$lang->program->dateExceedChild    = "The start and finish date of the program no longer include the date scope of the subprogram or {$lang->projectCommon}:";
+$lang->program->closeErrorMessage  = "There are subprograms or {$lang->projectCommon}s that are not closed";
+$lang->program->hasChildren        = "The program has a child program or the {$lang->projectCommon} exists and can not be deleted.";
 $lang->program->hasProduct         = 'It has products. You cannot delete it.';
 $lang->program->confirmDelete      = "Do you want to delete it?";
 $lang->program->confirmUnlink      = 'Voulez - vous retirer les intervenants?';
@@ -169,8 +169,8 @@ $lang->program->kanban->typeList['others'] = 'Others';
 
 $lang->program->kanban->openProducts    = 'Open Products';
 $lang->program->kanban->unexpiredPlans  = 'Unexpired Plans';
-$lang->program->kanban->waitingProjects = 'Waiting Projects';
-$lang->program->kanban->doingProjects   = 'Ongoing Projects';
+$lang->program->kanban->waitingProjects = "Waiting {$lang->projectCommon}s";
+$lang->program->kanban->doingProjects   = "Ongoing {$lang->projectCommon}s";
 $lang->program->kanban->doingExecutions = 'Ongoing Executions';
 $lang->program->kanban->normalReleases  = 'Normal Releases';
 
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index ed43005598..0b8eb772d2 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -33,7 +33,7 @@ $lang->program->days           = '可用工作日';
 $lang->program->acl            = '访问控制';
 $lang->program->whitelist      = '白名单';
 $lang->program->deleted        = '已删除';
-$lang->program->lifetime       = '项目周期';
+$lang->program->lifetime       = $lang->projectCommon . '周期';
 $lang->program->output         = '输出';
 $lang->program->auth           = '权限控制';
 $lang->program->path           = '路径';
@@ -54,14 +54,14 @@ $lang->program->ignore         = '忽略';
 $lang->program->common                  = '项目集';
 $lang->program->index                   = '项目集主页';
 $lang->program->create                  = '添加项目集';
-$lang->program->createGuide             = '选择项目模板';
+$lang->program->createGuide             = "选择{$lang->projectCommon}模板";
 $lang->program->edit                    = '编辑项目集';
 $lang->program->browse                  = '项目集列表';
 $lang->program->kanbanAction            = '项目集看板';
 $lang->program->view                    = '项目集详情';
 $lang->program->copy                    = '复制项目集';
 $lang->program->product                 = '产品列表';
-$lang->program->project                 = '项目集项目列表';
+$lang->program->project                 = "项目集{$lang->projectCommon}列表";
 $lang->program->all                     = '所有项目集';
 $lang->program->start                   = '启动项目集';
 $lang->program->finish                  = '完成项目集';
@@ -79,12 +79,12 @@ $lang->program->updateOrder             = '排序';
 $lang->program->unbindWhitelist         = '移除白名单';
 $lang->program->importStakeholder       = '从父项目集导入';
 $lang->program->manageMembers           = '项目集团队';
-$lang->program->confirmChangePRJUint    = '是否同步更新该项目集下子项目集和项目的预算的单位？若确认更新,请填写今日汇率。';
+$lang->program->confirmChangePRJUint    = "是否同步更新该项目集下子项目集和{$lang->projectCommon}的预算的单位？若确认更新,请填写今日汇率。";
 $lang->program->exRateNotNegative       = '『汇率』不能是负数。';
-$lang->program->changePRJUnit           = '更新项目预算单位';
-$lang->program->showNotCurrentProjects  = '显示非当前项目集的项目信息';
+$lang->program->changePRJUnit           = "更新{$lang->projectCommon}预算单位";
+$lang->program->showNotCurrentProjects  = "显示非当前项目集的{$lang->projectCommon}信息";
 
-$lang->program->progress         = '项目进度';
+$lang->program->progress         = "{$lang->projectCommon}进度";
 $lang->program->children         = '添加子项目集';
 $lang->program->allInvest        = '项目集总投入';
 $lang->program->teamCount        = '总人数';
@@ -93,23 +93,23 @@ $lang->program->moreProgram      = '更多项目集';
 $lang->program->stakeholderType  = '干系人类型';
 $lang->program->parentBudget     = '所属项目集剩余预算：';
 $lang->program->isStakeholderKey = '关键干系人';
-$lang->program->summary          = '本页共 %d 个顶级项目集，%d 个独立项目。';
+$lang->program->summary          = "本页共 %d 个顶级项目集，%d 个独立{$lang->projectCommon}。";
 
 $lang->program->stakeholderTypeList['inside']  = '内部';
 $lang->program->stakeholderTypeList['outside'] = '外部';
 
 $lang->program->noProgram          = '暂时没有项目集';
 $lang->program->showClosed         = '显示已关闭';
-$lang->program->tips               = '选择了父项目集，则可关联该父项目集下的产品。如果项目未选择任何项目集，则系统会默认创建一个和该项目同名的产品并关联该项目。';
+$lang->program->tips               = "选择了父项目集，则可关联该父项目集下的产品。如果{$lang->projectCommon}未选择任何项目集，则系统会默认创建一个和该{$lang->projectCommon}同名的产品并关联该{$lang->projectCommon}。";
 $lang->program->confirmBatchUnlink = "您确定要批量移除这些干系人吗？";
 $lang->program->beginLetterParent  = '项目集的开始日期小于了父项目集的开始日期：';
 $lang->program->endGreaterParent   = '项目集的完成日期大于了父项目集的完成日期：';
 $lang->program->dateExceedParent   = '项目集的起止日期已超出父项目集的起止日期';
-$lang->program->beginGreateChild   = '项目集的开始日期大于了子项目集或项目的最小开始日期：';
-$lang->program->endLetterChild     = '项目集的完成日期小于了子项目集或项目的最大完成日期：';
-$lang->program->dateExceedChild    = '项目集的起止日期已不包含子项目集或项目的日期范围';
-$lang->program->closeErrorMessage  = '存在子项目集或项目为未关闭状态';
-$lang->program->hasChildren        = '该项目集有子项目集或项目存在，不能删除。';
+$lang->program->beginGreateChild   = "项目集的开始日期大于了子项目集或{$lang->projectCommon}的最小开始日期：";
+$lang->program->endLetterChild     = "项目集的完成日期小于了子项目集或{$lang->projectCommon}的最大完成日期：";
+$lang->program->dateExceedChild    = "项目集的起止日期已不包含子项目集或{$lang->projectCommon}的日期范围";
+$lang->program->closeErrorMessage  = "存在子项目集或{$lang->projectCommon}为未关闭状态";
+$lang->program->hasChildren        = "该项目集有子项目集或{$lang->projectCommon}存在，不能删除。";
 $lang->program->hasProduct         = '该项目集有产品存在，不能删除。';
 $lang->program->confirmDelete      = '您确定要删除\“%s\”项目集吗？';
 $lang->program->confirmUnlink      = '您确定要移除干系人吗？';
@@ -136,8 +136,8 @@ $lang->program->subAcls['private'] = '私有';
 $lang->program->subAcls['open']    = '全部公开';
 $lang->program->subAcls['program'] = '项目集内公开';
 
-$lang->program->authList['extend'] = '继承 (取项目权限与组织权限的并集)';
-$lang->program->authList['reset']  = '重新定义 (只取项目权限)';
+$lang->program->authList['extend'] = "继承 (取{$lang->projectCommon}权限与组织权限的并集)";
+$lang->program->authList['reset']  = "重新定义 (只取{$lang->projectCommon}权限)";
 
 $lang->program->statusList['wait']      = '未开始';
 $lang->program->statusList['doing']     = '进行中';
@@ -169,8 +169,8 @@ $lang->program->kanban->typeList['others'] = '其他项目集';
 
 $lang->program->kanban->openProducts    = '未关闭的产品';
 $lang->program->kanban->unexpiredPlans  = '未过期的计划';
-$lang->program->kanban->waitingProjects = '未开始的项目';
-$lang->program->kanban->doingProjects   = '进行中的项目';
+$lang->program->kanban->waitingProjects = '未开始的' . $lang->projectCommon;
+$lang->program->kanban->doingProjects   = '进行中的' . $lang->projectCommon;
 $lang->program->kanban->doingExecutions = '进行中的执行';
 $lang->program->kanban->normalReleases  = '正常的发布';
 
diff --git a/module/projectbuild/lang/de.php b/module/projectbuild/lang/de.php
index cd942be9ed..363921ed5d 100644
--- a/module/projectbuild/lang/de.php
+++ b/module/projectbuild/lang/de.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->projectbuild->common           = 'Project Build';
+$lang->projectbuild->common           = $lang->projectCommon . ' Build';
 $lang->projectbuild->browse           = 'Build List';
 $lang->projectbuild->create           = "Create Build";
 $lang->projectbuild->edit             = "Edit Build";
diff --git a/module/projectbuild/lang/en.php b/module/projectbuild/lang/en.php
index cd942be9ed..363921ed5d 100644
--- a/module/projectbuild/lang/en.php
+++ b/module/projectbuild/lang/en.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->projectbuild->common           = 'Project Build';
+$lang->projectbuild->common           = $lang->projectCommon . ' Build';
 $lang->projectbuild->browse           = 'Build List';
 $lang->projectbuild->create           = "Create Build";
 $lang->projectbuild->edit             = "Edit Build";
diff --git a/module/projectbuild/lang/fr.php b/module/projectbuild/lang/fr.php
index cd942be9ed..363921ed5d 100644
--- a/module/projectbuild/lang/fr.php
+++ b/module/projectbuild/lang/fr.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->projectbuild->common           = 'Project Build';
+$lang->projectbuild->common           = $lang->projectCommon . ' Build';
 $lang->projectbuild->browse           = 'Build List';
 $lang->projectbuild->create           = "Create Build";
 $lang->projectbuild->edit             = "Edit Build";
diff --git a/module/projectbuild/lang/zh-cn.php b/module/projectbuild/lang/zh-cn.php
index 7f35eb6097..9273c76f37 100644
--- a/module/projectbuild/lang/zh-cn.php
+++ b/module/projectbuild/lang/zh-cn.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->projectbuild->common           = '项目版本';
+$lang->projectbuild->common           = $lang->projectCommon . '版本';
 $lang->projectbuild->browse           = '版本列表';
 $lang->projectbuild->create           = "创建集成版本";
 $lang->projectbuild->edit             = "编辑集成版本";
diff --git a/module/projectstory/lang/de.php b/module/projectstory/lang/de.php
index 5229e4e638..0e72f35c67 100644
--- a/module/projectstory/lang/de.php
+++ b/module/projectstory/lang/de.php
@@ -1,16 +1,16 @@
 <?php
 /* Field. */
-$lang->projectstory->project = "Project ID";
+$lang->projectstory->project = "{$lang->projectCommon} ID";
 $lang->projectstory->product = "Product ID";
 $lang->projectstory->story   = "{$lang->SRCommon} List";
 $lang->projectstory->version = "Version";
 $lang->projectstory->order   = "Order";
 
-$lang->projectstory->storyCommon = 'Project Story';
-$lang->projectstory->storyList   = 'Project Story List';
-$lang->projectstory->storyView   = 'Project Story Detail';
+$lang->projectstory->storyCommon = $lang->projectCommon . ' Story';
+$lang->projectstory->storyList   = $lang->projectCommon . ' Story List';
+$lang->projectstory->storyView   = $lang->projectCommon . ' Story Detail';
 
-$lang->projectstory->common            = "Project {$lang->SRCommon}";
+$lang->projectstory->common            = "{$lang->projectCommon} {$lang->SRCommon}";
 $lang->projectstory->index             = "{$lang->SRCommon} Home";
 $lang->projectstory->view              = "{$lang->SRCommon} Detail";
 $lang->projectstory->story             = "{$lang->SRCommon} List";
@@ -23,8 +23,8 @@ $lang->projectstory->trackAction       = 'Matrix';
 $lang->projectstory->confirm           = 'Confirm';
 
 /* Notice. */
-$lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
+$lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->projectstory->batchUnlinkTip = "Other requirements are removed. The following requirements are linked to the execution of this {$lang->projectCommon}. Please remove them from the execution first.";
 
 $lang->projectstory->featureBar['story']['allstory']          = 'All';
 $lang->projectstory->featureBar['story']['unclosed']          = 'Open';
diff --git a/module/projectstory/lang/en.php b/module/projectstory/lang/en.php
index 99bfce676b..e508603335 100644
--- a/module/projectstory/lang/en.php
+++ b/module/projectstory/lang/en.php
@@ -1,16 +1,16 @@
 <?php
 /* Field. */
-$lang->projectstory->project = "Project ID";
+$lang->projectstory->project = "{$lang->projectCommon} ID";
 $lang->projectstory->product = "Product ID";
 $lang->projectstory->story   = "Story ID";
 $lang->projectstory->version = "Version";
 $lang->projectstory->order   = "Order";
 
-$lang->projectstory->storyCommon = 'Project Story';
-$lang->projectstory->storyList   = 'Project Story List';
-$lang->projectstory->storyView   = 'Project Story Detail';
+$lang->projectstory->storyCommon = $lang->projectCommon . ' Story';
+$lang->projectstory->storyList   = $lang->projectCommon . ' Story List';
+$lang->projectstory->storyView   = $lang->projectCommon . ' Story Detail';
 
-$lang->projectstory->common            = "Project {$lang->SRCommon}";
+$lang->projectstory->common            = "{$lang->projectCommon} {$lang->SRCommon}";
 $lang->projectstory->index             = "{$lang->SRCommon} Home";
 $lang->projectstory->view              = "{$lang->SRCommon} Detail";
 $lang->projectstory->story             = "{$lang->SRCommon} List";
@@ -23,8 +23,8 @@ $lang->projectstory->trackAction       = 'Matrix';
 $lang->projectstory->confirm           = 'Confirm';
 
 /* Notice. */
-$lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
+$lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->projectstory->batchUnlinkTip = "Other requirements are removed. The following requirements are linked to the execution of this {$lang->projectCommon}. Please remove them from the execution first.";
 
 $lang->projectstory->featureBar['story']['allstory']          = 'All';
 $lang->projectstory->featureBar['story']['unclosed']          = 'Open';
diff --git a/module/projectstory/lang/fr.php b/module/projectstory/lang/fr.php
index 5229e4e638..0e72f35c67 100644
--- a/module/projectstory/lang/fr.php
+++ b/module/projectstory/lang/fr.php
@@ -1,16 +1,16 @@
 <?php
 /* Field. */
-$lang->projectstory->project = "Project ID";
+$lang->projectstory->project = "{$lang->projectCommon} ID";
 $lang->projectstory->product = "Product ID";
 $lang->projectstory->story   = "{$lang->SRCommon} List";
 $lang->projectstory->version = "Version";
 $lang->projectstory->order   = "Order";
 
-$lang->projectstory->storyCommon = 'Project Story';
-$lang->projectstory->storyList   = 'Project Story List';
-$lang->projectstory->storyView   = 'Project Story Detail';
+$lang->projectstory->storyCommon = $lang->projectCommon . ' Story';
+$lang->projectstory->storyList   = $lang->projectCommon . ' Story List';
+$lang->projectstory->storyView   = $lang->projectCommon . ' Story Detail';
 
-$lang->projectstory->common            = "Project {$lang->SRCommon}";
+$lang->projectstory->common            = "{$lang->projectCommon} {$lang->SRCommon}";
 $lang->projectstory->index             = "{$lang->SRCommon} Home";
 $lang->projectstory->view              = "{$lang->SRCommon} Detail";
 $lang->projectstory->story             = "{$lang->SRCommon} List";
@@ -23,8 +23,8 @@ $lang->projectstory->trackAction       = 'Matrix';
 $lang->projectstory->confirm           = 'Confirm';
 
 /* Notice. */
-$lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in project which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->projectstory->batchUnlinkTip = 'Other requirements are removed. The following requirements are linked to the execution of this project. Please remove them from the execution first.';
+$lang->projectstory->whyNoStories   = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->projectstory->batchUnlinkTip = "Other requirements are removed. The following requirements are linked to the execution of this {$lang->projectCommon}. Please remove them from the execution first.";
 
 $lang->projectstory->featureBar['story']['allstory']          = 'All';
 $lang->projectstory->featureBar['story']['unclosed']          = 'Open';
diff --git a/module/projectstory/lang/zh-cn.php b/module/projectstory/lang/zh-cn.php
index f2b2feaedb..600d711814 100644
--- a/module/projectstory/lang/zh-cn.php
+++ b/module/projectstory/lang/zh-cn.php
@@ -1,16 +1,16 @@
 <?php
 /* Field. */
-$lang->projectstory->project = "项目ID";
+$lang->projectstory->project = "{$lang->projectCommon}ID";
 $lang->projectstory->product = "产品ID";
 $lang->projectstory->story   = "需求ID";
 $lang->projectstory->version = "版本";
 $lang->projectstory->order   = "排序";
 
-$lang->projectstory->storyCommon = '项目需求';
-$lang->projectstory->storyList   = '项目需求列表';
-$lang->projectstory->storyView   = '项目需求详情';
+$lang->projectstory->storyCommon = $lang->projectCommon . '需求';
+$lang->projectstory->storyList   = $lang->projectCommon . '需求列表';
+$lang->projectstory->storyView   = $lang->projectCommon . '需求详情';
 
-$lang->projectstory->common            = "项目{$lang->SRCommon}";
+$lang->projectstory->common            = "{$lang->projectCommon}{$lang->SRCommon}";
 $lang->projectstory->index             = "{$lang->SRCommon}主页";
 $lang->projectstory->view              = "{$lang->SRCommon}详情";
 $lang->projectstory->story             = "{$lang->SRCommon}列表";
@@ -23,8 +23,8 @@ $lang->projectstory->trackAction       = '跟踪矩阵';
 $lang->projectstory->confirm           = '确定';
 
 /* Notice. */
-$lang->projectstory->whyNoStories   = "看起来没有{$lang->SRCommon}可以关联。请检查下项目关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
-$lang->projectstory->batchUnlinkTip = '其他需求已经移除，如下需求已与该项目下执行相关联，请从执行中移除后再操作。';
+$lang->projectstory->whyNoStories   = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
+$lang->projectstory->batchUnlinkTip = "其他需求已经移除，如下需求已与该{$lang->projectCommon}下执行相关联，请从执行中移除后再操作。";
 
 $lang->projectstory->featureBar['story']['allstory']          = '全部';
 $lang->projectstory->featureBar['story']['unclosed']          = '未关闭';
diff --git a/module/tutorial/lang/de.php b/module/tutorial/lang/de.php
index ce2c47b4be..11500c9537 100644
--- a/module/tutorial/lang/de.php
+++ b/module/tutorial/lang/de.php
@@ -51,17 +51,17 @@ $lang->tutorial->tasks['createStory']         = array('title' => 'Story erstelle
 $lang->tutorial->tasks['createStory']['nav']  = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Story erstellen');
 $lang->tutorial->tasks['createStory']['desc'] = "<p>Story erstellen: </p><ul><li data-target='nav'>Öffnen <span class='task-nav'>Produkt <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Erstellen;</span></li><li data-target='form'>Tragen Sie die Informationen ein;</li><li data-target='submit'>Speichern</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => 'Projekt erstellen');
-$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Projekt erstellen');
-$lang->tutorial->tasks['createProject']['desc'] = "<p>Projekt erstellen: </p><ul><li data-target='nav'>Öffnen <span class='task-nav'> Projekt <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Tragen Sie die Projektinformationen ein;</li><li data-target='submit'>Speichern</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => 'Projektteam verwalten');
-$lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Projektteam verwalten');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Projektteam verwalten: </p><ul><li data-target='nav'>Öffnen <span class='task-nav'> Project <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Teammitglieder verwalten</span> Seite；</li><li data-target='form'>Wählen Sie Benutzer für das Team.</li><li data-target='submit'>Speichern</li></ul>";
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
+$lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1,accounts', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createProjectExecution']         = array('title' => 'Create a ' . $lang->executionCommon);
 $lang->tutorial->tasks['createProjectExecution']['nav']  = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create' . $lang->executionCommon);
-$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> Project <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
+$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => 'Story verknüpfen');
 $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Story verknüpfen');
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index e65ddad23e..9593b9fb4d 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -51,17 +51,17 @@ $lang->tutorial->tasks['createStory']         = array('title' => "Create a {$lan
 $lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "Create {$lang->SRCommon}");
 $lang->tutorial->tasks['createStory']['desc'] = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->executionCommon);
-$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create Project');
-$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a project: </p><ul><li data-target='nav'>Open <span class='task-nav'> Project <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with project information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage Project Team");
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
 $lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1,accounts', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage project team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> project <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createProjectExecution']         = array('title' => 'Create a ' . $lang->executionCommon);
 $lang->tutorial->tasks['createProjectExecution']['nav']  = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create' . $lang->executionCommon);
-$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> Project <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
+$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
 $lang->tutorial->tasks['linkStory']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],#navbar>.nav>li[data-id="story"],#executionTableList>tr:first>.c-name>a,.link-story-btn', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "Link {$lang->SRCommon}");
diff --git a/module/tutorial/lang/fr.php b/module/tutorial/lang/fr.php
index 27b8d1ff0a..b9d5298e63 100644
--- a/module/tutorial/lang/fr.php
+++ b/module/tutorial/lang/fr.php
@@ -51,17 +51,17 @@ $lang->tutorial->tasks['createStory']         = array('title' => 'Create a Story
 $lang->tutorial->tasks['createStory']['nav']  = array('module' => 'story', 'method' => 'create', 'menuModule' => 'product', 'menu' => 'story', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Story');
 $lang->tutorial->tasks['createStory']['desc'] = "<p>Create a story: </p><ul><li data-target='nav'>Open <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i>Story <i class='icon icon-angle-right'></i>Create;</span></li><li data-target='form'>Fill the form with story information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->executionCommon);
-$lang->tutorial->tasks['createProject']['nav']  = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon);
-$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->executionCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information;</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => 'Create a ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCommon}: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> New</span> Page;</li><li data-target='form'>Fill the form with {$lang->projectCommon} information;</li><li data-target='submit'>Save</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->executionCommon} Team");
-$lang->tutorial->tasks['manageTeam']['nav']  = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->executionCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
+$lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
+$lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1,accounts', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
 $lang->tutorial->tasks['createProjectExecution']         = array('title' => 'Create a ' . $lang->executionCommon);
 $lang->tutorial->tasks['createProjectExecution']['nav']  = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create' . $lang->executionCommon);
-$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> Project <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
+$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>Create a new {$lang->executionCommon}：</p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} list <i class='icon icon-angle-right'></i> Create {$lang->executionCommon}</span>;</li><li data-target='form'>Fill the form with {$lang->executionCommon} information；</li><li data-target='submit'>Save {$lang->executionCommon}</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => 'Link a Story');
 $lang->tutorial->tasks['linkStory']['nav']  = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story');
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index aaa9271cde..a7ebe68aa2 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -51,17 +51,17 @@ $lang->tutorial->tasks['createStory']         = array('title' => "创建{$lang->
 $lang->tutorial->tasks['createStory']['nav']  = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->SRCommon}");
 $lang->tutorial->tasks['createStory']['desc'] = "<p>在系统创建一个新的{$lang->SRCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'>{$lang->productCommon} <i class='icon icon-angle-right'></i> {$lang->SRCommon} <i class='icon icon-angle-right'></i> 提{$lang->SRCommon}</span> 页面；</li><li data-target='form'>在{$lang->productCommon}表单中填写要创建的{$lang->SRCommon}信息；</li><li data-target='submit'>保存{$lang->SRCommon}信息。</li></ul>";
 
-$lang->tutorial->tasks['createProject']         = array('title' => '创建项目');
-$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加项目');
-$lang->tutorial->tasks['createProject']['desc'] = "<p>在系统创建一个新的项目：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 项目 <i class='icon icon-angle-right'></i> 项目列表 <i class='icon icon-angle-right'></i> 创建项目</span> 页面；</li><li data-target='form'>在项目表单中填写要创建的项目信息；</li><li data-target='submit'>保存项目信息。</li></ul>";
+$lang->tutorial->tasks['createProject']         = array('title' => '创建' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon);
+$lang->tutorial->tasks['createProject']['desc'] = "<p>在系统创建一个新的{$lang->projectCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->projectCommon}列表 <i class='icon icon-angle-right'></i> 创建{$lang->projectCommon}</span> 页面；</li><li data-target='form'>在{$lang->projectCommon}表单中填写要创建的{$lang->projectCommon}信息；</li><li data-target='submit'>保存{$lang->projectCommon}信息。</li></ul>";
 
-$lang->tutorial->tasks['manageTeam']         = array('title' => "管理项目团队");
+$lang->tutorial->tasks['manageTeam']         = array('title' => "管理{$lang->projectCommon}团队");
 $lang->tutorial->tasks['manageTeam']['nav']  = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => '团队管理');
-$lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理项目团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 项目 <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入项目团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
+$lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入{$lang->projectCommon}团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
 
 $lang->tutorial->tasks['createProjectExecution']         = array('title' => '添加' . $lang->executionCommon);
 $lang->tutorial->tasks['createProjectExecution']['nav']  = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectForm td.c-name:first a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon);
-$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>在系统创建一个新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> 项目 <i class='icon icon-angle-right'></i> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 页面；</li><li data-target='form'>在{$lang->executionCommon}表单中填写要创建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
+$lang->tutorial->tasks['createProjectExecution']['desc'] = "<p>在系统创建一个新的{$lang->executionCommon}：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 添加{$lang->executionCommon}</span> 页面；</li><li data-target='form'>在{$lang->executionCommon}表单中填写要创建的{$lang->executionCommon}信息；</li><li data-target='submit'>保存{$lang->executionCommon}信息。</li></ul>";
 
 $lang->tutorial->tasks['linkStory']         = array('title' => "关联{$lang->SRCommon}");
 $lang->tutorial->tasks['linkStory']['nav']  = array('app' => 'execution', 'module' => 'execution', 'method' => 'linkStory', 'menuModule' => 'story', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],#navbar>.nav>li[data-id="story"],#executionTableList>tr:first>.c-name>a,.link-story-btn', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->SRCommon}");
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 9ecf3de871..f27713ce8e 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -74,7 +74,7 @@ $lang->user->clientStatus     = 'Client Status';
 $lang->user->clientLang       = 'Client Language';
 $lang->user->programs         = 'Program';
 $lang->user->products         = $lang->productCommon;
-$lang->user->projects         = 'Project';
+$lang->user->projects         = $lang->projectCommon;
 $lang->user->sprints          = $lang->execution->common;
 $lang->user->identity         = 'Identity';
 $lang->user->switchVision     = 'Switch to %s';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 62d6e01533..4715fc972f 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -74,7 +74,7 @@ $lang->user->clientStatus     = 'Client Status';
 $lang->user->clientLang       = 'Client Language';
 $lang->user->programs         = 'Program';
 $lang->user->products         = $lang->productCommon;
-$lang->user->projects         = 'Project';
+$lang->user->projects         = $lang->projectCommon;
 $lang->user->sprints          = $lang->execution->common;
 $lang->user->identity         = 'Identity';
 $lang->user->switchVision     = 'Switch to %s';
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 06d2ceb2c3..606d9d3426 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -74,7 +74,7 @@ $lang->user->clientStatus     = 'Client Status';
 $lang->user->clientLang       = 'Client Language';
 $lang->user->programs         = 'Program';
 $lang->user->products         = $lang->productCommon;
-$lang->user->projects         = 'Project';
+$lang->user->projects         = $lang->projectCommon;
 $lang->user->sprints          = $lang->execution->common;
 $lang->user->identity         = 'Identity';
 $lang->user->switchVision     = 'Switch to %s';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index fb0019e05a..6fd1d4d8d0 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -74,7 +74,7 @@ $lang->user->clientStatus     = '登录状态';
 $lang->user->clientLang       = '客户端语言';
 $lang->user->programs         = '项目集';
 $lang->user->products         = $lang->productCommon;
-$lang->user->projects         = '项目';
+$lang->user->projects         = $lang->projectCommon;
 $lang->user->sprints          = $lang->execution->common;
 $lang->user->identity         = '身份';
 $lang->user->switchVision     = '切换到 %s';
diff --git a/module/weekly/lang/de.php b/module/weekly/lang/de.php
index d6c1e67b38..459e38dc3c 100644
--- a/module/weekly/lang/de.php
+++ b/module/weekly/lang/de.php
@@ -9,28 +9,28 @@
  * @version     $Id
  * @link        http://www.zentao.net
  */
-$lang->weekly->common   = 'Project Weekly';
+$lang->weekly->common   = $lang->projectCommon . ' Weekly';
 $lang->weekly->index    = 'Weekly Overview';
 $lang->weekly->progress = 'Progress';
 $lang->weekly->workload = 'Workload';
 $lang->weekly->total    = 'Total';
 
-$lang->weekly->reportTtitle   = 'Project: % s Weekly (Week % s)';
-$lang->weekly->summary        = 'Project Progress';
+$lang->weekly->reportTtitle   = $lang->projectCommon . ': % s Weekly (Week % s)';
+$lang->weekly->summary        = $lang->projectCommon . ' Progress';
 $lang->weekly->finished       = 'Work finished this week (100% completed work)';
 $lang->weekly->postponed      = 'Work unfinished this week';
 $lang->weekly->nextWeek       = 'Work planned for next week';
 $lang->weekly->workloadByType = 'Workload Summary';
 
 $lang->weekly->term    = 'Reporting Cycle';
-$lang->weekly->project = 'Project Name';
+$lang->weekly->project = $lang->projectCommon . ' Name';
 $lang->weekly->master  = 'Project Manager ';
 $lang->weekly->staff   = 'Weekly Effort';
 
 $lang->weekly->weekDesc       = 'Week % s (% s ~% s)';
-$lang->weekly->progress       = 'Progress';
+$lang->weekly->progress       = 'Progress of the ' . $lang->projectCommon;
 $lang->weekly->analysisResult = 'Analysis';
-$lang->weekly->cost           = 'Project Cost';
+$lang->weekly->cost           = $lang->projectCommon . ' Cost';
 
 $lang->weekly->pv = 'Planned Value(PV)';
 $lang->weekly->ev = 'Earned Value(EV)';
diff --git a/module/weekly/lang/en.php b/module/weekly/lang/en.php
index 18dcdaa931..459e38dc3c 100644
--- a/module/weekly/lang/en.php
+++ b/module/weekly/lang/en.php
@@ -9,28 +9,28 @@
  * @version     $Id
  * @link        http://www.zentao.net
  */
-$lang->weekly->common   = 'Project Weekly';
+$lang->weekly->common   = $lang->projectCommon . ' Weekly';
 $lang->weekly->index    = 'Weekly Overview';
 $lang->weekly->progress = 'Progress';
 $lang->weekly->workload = 'Workload';
 $lang->weekly->total    = 'Total';
 
-$lang->weekly->reportTtitle   = 'Project: % s Weekly (Week % s)';
-$lang->weekly->summary        = 'Project Progress';
+$lang->weekly->reportTtitle   = $lang->projectCommon . ': % s Weekly (Week % s)';
+$lang->weekly->summary        = $lang->projectCommon . ' Progress';
 $lang->weekly->finished       = 'Work finished this week (100% completed work)';
 $lang->weekly->postponed      = 'Work unfinished this week';
 $lang->weekly->nextWeek       = 'Work planned for next week';
 $lang->weekly->workloadByType = 'Workload Summary';
 
 $lang->weekly->term    = 'Reporting Cycle';
-$lang->weekly->project = 'Project Name';
+$lang->weekly->project = $lang->projectCommon . ' Name';
 $lang->weekly->master  = 'Project Manager ';
 $lang->weekly->staff   = 'Weekly Effort';
 
 $lang->weekly->weekDesc       = 'Week % s (% s ~% s)';
-$lang->weekly->progress       = 'Progress of the project';
+$lang->weekly->progress       = 'Progress of the ' . $lang->projectCommon;
 $lang->weekly->analysisResult = 'Analysis';
-$lang->weekly->cost           = 'Project Cost';
+$lang->weekly->cost           = $lang->projectCommon . ' Cost';
 
 $lang->weekly->pv = 'Planned Value(PV)';
 $lang->weekly->ev = 'Earned Value(EV)';
diff --git a/module/weekly/lang/fr.php b/module/weekly/lang/fr.php
index d6c1e67b38..459e38dc3c 100644
--- a/module/weekly/lang/fr.php
+++ b/module/weekly/lang/fr.php
@@ -9,28 +9,28 @@
  * @version     $Id
  * @link        http://www.zentao.net
  */
-$lang->weekly->common   = 'Project Weekly';
+$lang->weekly->common   = $lang->projectCommon . ' Weekly';
 $lang->weekly->index    = 'Weekly Overview';
 $lang->weekly->progress = 'Progress';
 $lang->weekly->workload = 'Workload';
 $lang->weekly->total    = 'Total';
 
-$lang->weekly->reportTtitle   = 'Project: % s Weekly (Week % s)';
-$lang->weekly->summary        = 'Project Progress';
+$lang->weekly->reportTtitle   = $lang->projectCommon . ': % s Weekly (Week % s)';
+$lang->weekly->summary        = $lang->projectCommon . ' Progress';
 $lang->weekly->finished       = 'Work finished this week (100% completed work)';
 $lang->weekly->postponed      = 'Work unfinished this week';
 $lang->weekly->nextWeek       = 'Work planned for next week';
 $lang->weekly->workloadByType = 'Workload Summary';
 
 $lang->weekly->term    = 'Reporting Cycle';
-$lang->weekly->project = 'Project Name';
+$lang->weekly->project = $lang->projectCommon . ' Name';
 $lang->weekly->master  = 'Project Manager ';
 $lang->weekly->staff   = 'Weekly Effort';
 
 $lang->weekly->weekDesc       = 'Week % s (% s ~% s)';
-$lang->weekly->progress       = 'Progress';
+$lang->weekly->progress       = 'Progress of the ' . $lang->projectCommon;
 $lang->weekly->analysisResult = 'Analysis';
-$lang->weekly->cost           = 'Project Cost';
+$lang->weekly->cost           = $lang->projectCommon . ' Cost';
 
 $lang->weekly->pv = 'Planned Value(PV)';
 $lang->weekly->ev = 'Earned Value(EV)';
diff --git a/module/weekly/lang/zh-cn.php b/module/weekly/lang/zh-cn.php
index 617370172d..a5508a2bc4 100644
--- a/module/weekly/lang/zh-cn.php
+++ b/module/weekly/lang/zh-cn.php
@@ -9,28 +9,28 @@
  * @version     $Id
  * @link        http://www.zentao.net
  */
-$lang->weekly->common   = '项目周报';
+$lang->weekly->common   = $lang->projectCommon . '周报';
 $lang->weekly->index    = '周报总览';
 $lang->weekly->progress = '完成百分比';
 $lang->weekly->workload = '工作量';
 $lang->weekly->total    = '合计';
 
-$lang->weekly->reportTtitle   = '项目: %s 周报（第 %s 周）';
-$lang->weekly->summary        = '项目进展状况';
+$lang->weekly->reportTtitle   = $lang->projectCommon . ': %s 周报（第 %s 周）';
+$lang->weekly->summary        = $lang->projectCommon . '进展状况';
 $lang->weekly->finished       = '本周工作完成情况（100%完成的工作）';
 $lang->weekly->postponed      = '本周未完成工作';
 $lang->weekly->nextWeek       = '下周工作计划';
 $lang->weekly->workloadByType = '工作量统计';
 
 $lang->weekly->term    = '报告周期';
-$lang->weekly->project = '项目名称';
+$lang->weekly->project = $lang->projectCommon . '名称';
 $lang->weekly->master  = '项目经理 ';
 $lang->weekly->staff   = '本周投入人数';
 
 $lang->weekly->weekDesc       = '第 %s 周( %s ~ %s)';
-$lang->weekly->progress       = '项目当前进展状况';
+$lang->weekly->progress       = $lang->projectCommon . '当前进展状况';
 $lang->weekly->analysisResult = '分析结果';
-$lang->weekly->cost           = '项目成本';
+$lang->weekly->cost           = $lang->projectCommon . '成本';
 
 $lang->weekly->pv = '计划完成的工作(PV)';
 $lang->weekly->ev = '实际完成的工作(EV)';

From f996230e1fb518940198de53fa6231a545413e2c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 10:43:43 +0800
Subject: [PATCH 234/319] * Added Kanban Filter tag language entry.

---
 module/project/lang/de.php         |  7 +++++++
 module/project/lang/en.php         |  7 +++++++
 module/project/lang/fr.php         |  7 +++++++
 module/project/lang/zh-cn.php      | 10 ++++++++--
 module/project/view/index.html.php |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 64d48a7097..1e54c68ef3 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -281,6 +281,13 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['index']['all']       = 'All';
+$lang->project->featureBar['index']['undone']    = 'Unfinished';
+$lang->project->featureBar['index']['wait']      = 'Waiting';
+$lang->project->featureBar['index']['doing']     = 'Doing';
+$lang->project->featureBar['index']['suspended'] = 'Suspended';
+$lang->project->featureBar['index']['closed']    = 'Closed';
+
 $lang->project->featureBar['execution']['all']       = 'Alle';
 $lang->project->featureBar['execution']['undone']    = 'Geschlossen';
 $lang->project->featureBar['execution']['wait']      = 'Wartend';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 33a03508c7..b9f2ea7c2f 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -281,6 +281,13 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['index']['all']       = 'All';
+$lang->project->featureBar['index']['undone']    = 'Unfinished';
+$lang->project->featureBar['index']['wait']      = 'Waiting';
+$lang->project->featureBar['index']['doing']     = 'Doing';
+$lang->project->featureBar['index']['suspended'] = 'Suspended';
+$lang->project->featureBar['index']['closed']    = 'Closed';
+
 $lang->project->featureBar['execution']['all']       = 'All';
 $lang->project->featureBar['execution']['undone']    = 'Unfinished';
 $lang->project->featureBar['execution']['wait']      = 'Waiting';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 9526c1929d..f99f256337 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -281,6 +281,13 @@ $lang->project->featureBar['browse']['doing']     = 'En Cours';
 $lang->project->featureBar['browse']['suspended'] = 'Suspendues';
 $lang->project->featureBar['browse']['closed']    = 'Fermées';
 
+$lang->project->featureBar['index']['all']       = 'All';
+$lang->project->featureBar['index']['undone']    = 'Unfinished';
+$lang->project->featureBar['index']['wait']      = 'Waiting';
+$lang->project->featureBar['index']['doing']     = 'Doing';
+$lang->project->featureBar['index']['suspended'] = 'Suspended';
+$lang->project->featureBar['index']['closed']    = 'Closed';
+
 $lang->project->featureBar['execution']['all']       = "Tous les {$lang->executionCommon}s";
 $lang->project->featureBar['execution']['undone']    = 'Non Terminé';
 $lang->project->featureBar['execution']['wait']      = 'En attente';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index fe0f6ff9c8..8cd1ce8b89 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -281,6 +281,13 @@ $lang->project->featureBar['browse']['doing']     = '进行中';
 $lang->project->featureBar['browse']['suspended'] = '已挂起';
 $lang->project->featureBar['browse']['closed']    = '已关闭';
 
+$lang->project->featureBar['index']['all']       = '全部';
+$lang->project->featureBar['index']['undone']    = '未完成';
+$lang->project->featureBar['index']['wait']      = '未开始';
+$lang->project->featureBar['index']['doing']     = '进行中';
+$lang->project->featureBar['index']['suspended'] = '已挂起';
+$lang->project->featureBar['index']['closed']    = '已关闭';
+
 $lang->project->featureBar['execution']['all']       = '全部';
 $lang->project->featureBar['execution']['undone']    = '未完成';
 $lang->project->featureBar['execution']['wait']      = '未开始';
@@ -410,8 +417,7 @@ $lang->project->copyProject->daysTips           = '『可用工作日』应当
 
 $lang->project->linkBranchStoryByPlanTips = "项目按计划关联需求时，只导入本项目所关联%s的激活状态的需求。";
 $lang->project->linkNormalStoryByPlanTips = "项目按计划关联需求时，只导入激活状态的需求。";
-
-$lang->project->cannotManageProducts = "该项目为项目型项目，不能关联产品。";
+$lang->project->cannotManageProducts      = "该项目为项目型项目，不能关联产品。";
 
 $lang->project->featureBar['dynamic']['all']       = '全部';
 $lang->project->featureBar['dynamic']['today']     = '今天';
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index 31f4d7f858..45699feaee 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -16,7 +16,7 @@
 <div class='clearfix' id='mainMenu'>
   <div class='btn-toolbar pull-left'>
     <?php
-      foreach($lang->project->featureBar['browse'] as $label => $labelName)
+      foreach($lang->project->featureBar['index'] as $label => $labelName)
       {
           $active = $browseType == $label ? 'btn-active-text' : '';
           echo html::a($this->createLink('project', 'index', "projectID=$project->id&browseType=" . $label), '<span class="text">' . $labelName . '</span> ' . ($browseType == $label ? "<span class='label label-light label-badge'>" . (int)count($kanbanList) . '</span>' : ''), '', "class='btn btn-link $active'");

From 462e73743208c855ca74aea1eae463648aaa4d97 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 10:45:12 +0800
Subject: [PATCH 235/319] * Fixed the issue of initializing more drop-down
 language items.

---
 module/custom/model.php | 2 +-
 module/dev/control.php  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index f653a11289..b091e14b71 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -63,7 +63,7 @@ class customModel extends model
                 {
                     $sectionKey = key($sectionArr);
                     $sectionArr[$section] = $sectionArr;
-                    unset($sectionArr[$sectionKey]);
+                    if($sectionKey != $section) unset($sectionArr[$sectionKey]);
                 }
                 if(!empty($sectionArr)) $processedLang[$customLang->module] = array_merge_recursive($processedLang[$customLang->module], $sectionArr);
             }
diff --git a/module/dev/control.php b/module/dev/control.php
index b33cf1745a..a88a92a0ff 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -183,7 +183,9 @@ class dev extends control
         {
             if($this->config->vision == 'lite' and isset($this->config->dev->liteTagMethod["$module-$method"])) $method = $this->config->dev->liteTagMethod["$module-$method"];
             $section = str_replace('_', '-', "&section=featureBar-{$method}");
+            $this->dao->delete()->from(TABLE_LANG)->where('lang')->eq($language)->andWhere('module')->eq($module)->andWhere('section')->like("moreSelects-$method%")->andWhere('vision')->eq($this->config->vision)->exec();
         }
+
         $key = '';
         if($type == 'common') $key = '&key=projectCommon,productCommon,executionCommon';
 

From 69b58d1646099599ff5c88f31d3df50d482c8770 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 10:45:39 +0800
Subject: [PATCH 236/319] * Add logical judgment.

---
 module/my/view/testtask.html.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index b9ecacdf6c..f41c53e037 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -18,10 +18,13 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
-    $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    foreach($lang->my->featureBar[$app->rawMethod]['testtask'] as $typeKey => $name)
+    if($app->rawMethod == 'contribute')
     {
-        echo html::a(inlink($app->rawMethod, "mode=$mode&type=$typeKey"), "<span class='text'>{$name}</span>" . ($type == $typeKey ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey ? ' btn-active-text' : '') . "'");
+        $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+        foreach($lang->my->featureBar[$app->rawMethod]['testtask'] as $typeKey => $name)
+        {
+            echo html::a(inlink($app->rawMethod, "mode=$mode&type=$typeKey"), "<span class='text'>{$name}</span>" . ($type == $typeKey ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == $typeKey ? ' btn-active-text' : '') . "'");
+        }
     }
     ?>
   </div>

From 7c702fc97c39222c77eb500b392a577c90cfdd76 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 10:45:56 +0800
Subject: [PATCH 237/319] * Modify the logic of the constructor subtree.

---
 module/dev/model.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index f18e33f3ce..d5d0ccd9e1 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -773,7 +773,7 @@ class devModel extends model
                                 $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
                                 $subMenu->children = array();
 
-                                $menus[$subMenuKey] = $subMenu;
+                                $menus["$thisModule-$thisMethod"] = $subMenu;
                                 $hasFeatureBar = false;
                             }
                         }
@@ -851,7 +851,11 @@ class devModel extends model
             if($type == 'tag' and in_array($menuKey, $this->config->dev->projectMenus))
             {
                 if($menuKey != 'project') continue;
-                foreach($this->config->dev->projectMenus as $projectModule) $menuItem->children += $this->getTagMenus($projectModule, $module, $method);
+                foreach($this->config->dev->projectMenus as $projectModule)
+                {
+                    $children = $this->getTagMenus($projectModule, $module, $method);
+                    $menuItem->children = array_merge($menuItem->children, $children);
+                }
             }
             else
             {
@@ -975,7 +979,12 @@ class devModel extends model
         $section = '';
         if($type == 'common') $section = '&section=';
         if($type == 'first')  $section = '&section=mainNav';
-        if($type == 'tag')    $section = str_replace('_', '-', "&section=featureBar-{$method}");
+        if($type == 'tag')
+        {
+            $section = str_replace('_', '-', "&section=featureBar-{$method}");
+            $this->dao->delete()->from(TABLE_LANG)->where('lang')->eq($language)->andWhere('module')->eq($moduleName)->andWhere('section')->like("moreSelects-$method%")->andWhere('vision')->eq($this->config->vision)->exec();
+        }
+
         $key = '';
         if($type == 'common') $key = '&key=projectCommon,productCommon,executionCommon';
 

From 3326617ffd78da33962b12bcb5ec15841d4870c9 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 03:45:49 +0000
Subject: [PATCH 238/319] * Finish task #85646.

---
 module/project/js/edit.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index fdc708019d..cb2f850d72 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -205,7 +205,7 @@ function loadBranches(product)
         }
     });
 
-    (chosenProducts.length > 1 && model == 'waterfall' && model == 'waterfallplus') ? $('.division').removeClass('hide') : $('.division').addClass('hide');
+    (chosenProducts.length > 1 && (model == 'waterfall' || model == 'waterfallplus')) ? $('.division').removeClass('hide') : $('.division').addClass('hide');
 
     var $tableRow = $(product).closest('.table-row');
     var index     = $tableRow.find('select:first').attr('id').replace('products' , '');
@@ -301,5 +301,12 @@ function removeLine(obj)
 {
     $(obj).closest('tr').remove();
     disableSelectedProduct();
-    if($("select[name^='products']").length < 2) $('.division').addClass('hide');
+
+    var chosenProducts = 0;
+    $(".productsBox select[name^='products']").each(function()
+    {
+      if($(this).val() > 0) chosenProducts ++;
+    });
+
+    (chosenProducts.length > 1 && (model == 'waterfall' || model == 'waterfallplus')) ? $('.division').removeClass('hide') : $('.division').addClass('hide');
 }

From 10ed1c9cb14c05ad75e8449c8c47354f7dabcd41 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 13:34:12 +0800
Subject: [PATCH 239/319] * Get the three-level menu under the drop menu.

---
 module/dev/model.php | 75 +++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index d5d0ccd9e1..4cf249dd79 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -685,6 +685,7 @@ class devModel extends model
         if($this->config->vision == 'lite' and $module == 'execution') return $menus;
 
         $titleList = array();
+        /* Convenience secondary menu. */
         foreach(array('homeMenu', 'menu') as $menu)
         {
             if(!isset($this->lang->$module->$menu)) continue;
@@ -723,6 +724,7 @@ class devModel extends model
 
                 if(is_array($menuValue))
                 {
+                    /* Convenience third menu and secondary drop menu. */
                     foreach(array('subMenu', 'dropMenu') as $menu)
                     {
                         if(!isset($menuValue[$menu])) continue;
@@ -739,42 +741,57 @@ class devModel extends model
                             list($label, $thisModule, $thisMethod) = explode('|', $link);
                             if($label == '@branch@') $label = $this->lang->dev->branch;
 
-                            $this->app->loadLang($thisModule);
-                            if(isset($this->lang->$thisModule->featureBar[$menuKey][$subMenuKey]))
-                            {
-                                $titleList[] = $label;
+                            /* Get the three-level menu under the drop mene . */
+                            $moduleList = array($thisModule);
+                            if(isset($subMenuValue['subModule'])) $moduleList = array_merge($moduleList, explode(',', $subMenuValue['subModule']));
+                            $moduleList = array_unique($moduleList);
 
-                                $thirdMenu = new stdClass();
-                                $thirdMenu->title  = $label;
-                                $thirdMenu->key    = '';
-                                $thirdMenu->module = $thisModule;
-                                $thirdMenu->method = "{$thisMethod}_{$subMenuKey}";
-                                $thirdMenu->active = ($methodName == $thirdMenu->method and $moduleName == $thisModule) ? 1 : 0;
-
-                                $subMenu->active     = 0;
-                                $subMenu->children[] = $thirdMenu;
-                                $hasFeatureBar = true;
-                            }
-                            elseif(isset($this->lang->$thisModule->featureBar[$thisMethod]))
+                            foreach($moduleList as $moduleKey)
                             {
-                                if(is_array($this->lang->$thisModule->featureBar[$thisMethod]))
+                                if(empty($moduleKey)) continue;
+                                if(isset($menuList[$subMenuKey]) and isset($menuList[$subMenuKey]['subMenu']->$moduleKey))
                                 {
-                                    $arrayKey = key($this->lang->$thisModule->featureBar[$thisMethod]);
-                                    if(is_array($this->lang->$thisModule->featureBar[$thisMethod][$arrayKey])) continue;
+                                    $labelList = $this->getLinkTitle(array($moduleKey => $menuList[$subMenuKey]['subMenu']->$moduleKey));
+                                    $label     = zget($labelList, $moduleKey, $label);
                                 }
 
-                                $titleList[] = $label;
+                                $this->app->loadLang($moduleKey);
+                                if(isset($this->lang->$moduleKey->featureBar[$menuKey][$subMenuKey]))
+                                {
+                                    $titleList[] = $label;
 
-                                $subMenu = new stdClass();
-                                $subMenu->title    = $label;
-                                $subMenu->key      = '';
-                                $subMenu->module   = $thisModule;
-                                $subMenu->method   = $thisMethod;
-                                $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
-                                $subMenu->children = array();
+                                    $thirdMenu = new stdClass();
+                                    $thirdMenu->title  = $label;
+                                    $thirdMenu->key    = '';
+                                    $thirdMenu->module = $moduleKey;
+                                    $thirdMenu->method = "{$thisMethod}_{$subMenuKey}";
+                                    $thirdMenu->active = ($methodName == $thirdMenu->method and $moduleName == $moduleKey) ? 1 : 0;
 
-                                $menus["$thisModule-$thisMethod"] = $subMenu;
-                                $hasFeatureBar = false;
+                                    $subMenu->active     = 0;
+                                    $subMenu->children[] = $thirdMenu;
+                                    $hasFeatureBar = true;
+                                }
+                                elseif(isset($this->lang->$moduleKey->featureBar[$thisMethod]))
+                                {
+                                    if(is_array($this->lang->$moduleKey->featureBar[$thisMethod]))
+                                    {
+                                        $arrayKey = key($this->lang->$moduleKey->featureBar[$thisMethod]);
+                                        if(is_array($this->lang->$moduleKey->featureBar[$thisMethod][$arrayKey])) continue;
+                                    }
+
+                                    $titleList[] = $label;
+
+                                    $subMenu = new stdClass();
+                                    $subMenu->title  = $label;
+                                    $subMenu->key      = '';
+                                    $subMenu->module   = $moduleKey;
+                                    $subMenu->method   = $thisMethod;
+                                    $subMenu->active   = ($methodName == $thisMethod and $moduleName == $moduleKey) ? 1 : 0;
+                                    $subMenu->children = array();
+
+                                    $menus["$moduleKey-$thisMethod"] = $subMenu;
+                                    $hasFeatureBar = false;
+                                }
                             }
                         }
                     }

From e1b6e852af8088e1e075451e082f503f4309bbb3 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 14:02:09 +0800
Subject: [PATCH 240/319] * Unified filter label format.

---
 module/execution/lang/de.php            | 11 +++++++++++
 module/execution/lang/en.php            | 11 +++++++++++
 module/execution/lang/fr.php            | 11 +++++++++++
 module/execution/lang/zh-cn.php         | 11 +++++++++++
 module/execution/view/story.html.php    |  2 +-
 module/execution/view/testcase.html.php |  7 ++++++-
 module/execution/view/testtask.html.php |  4 +++-
 module/story/lang/de.php                |  4 ++--
 module/story/lang/en.php                |  4 ++--
 module/testreport/lang/de.php           |  2 ++
 module/testreport/lang/en.php           |  2 ++
 module/testreport/lang/fr.php           |  2 ++
 module/testreport/lang/zh-cn.php        |  2 ++
 module/testreport/view/browse.html.php  |  4 +++-
 14 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 993b5092e6..fce7bc4413 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -538,6 +538,17 @@ $lang->execution->featureBar['bug']['unresolved'] = 'Active';
 
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
+$lang->execution->featureBar['story']['all']       = 'All';
+$lang->execution->featureBar['story']['unclosed']  = 'Unclosed';
+$lang->execution->featureBar['story']['draft']     = 'Draft';
+$lang->execution->featureBar['story']['reviewing'] = 'Reviewing';
+
+$lang->execution->featureBar['testcase']['all'] = 'All';
+
+$lang->execution->featureBar['testtask']['browse'] = 'Test Request';
+
+$lang->execution->featureBar['testreport']['browse'] = 'Testing Reports';
+
 $lang->execution->myExecutions = 'Ich bin beteiligt.';
 $lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 4a54020911..74aa46c381 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -538,6 +538,17 @@ $lang->execution->featureBar['bug']['unresolved'] = 'Active';
 
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
+$lang->execution->featureBar['story']['all']       = 'All';
+$lang->execution->featureBar['story']['unclosed']  = 'Unclosed';
+$lang->execution->featureBar['story']['draft']     = 'Draft';
+$lang->execution->featureBar['story']['reviewing'] = 'Reviewing';
+
+$lang->execution->featureBar['testcase']['all'] = 'All';
+
+$lang->execution->featureBar['testtask']['browse'] = 'Test Request';
+
+$lang->execution->featureBar['testreport']['browse'] = 'Testing Reports';
+
 $lang->execution->myExecutions = 'Mine';
 $lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index edb6d956ed..9d432193fc 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -538,6 +538,17 @@ $lang->execution->featureBar['bug']['unresolved'] = 'Active';
 
 $lang->execution->featureBar['build']['all'] = 'Build List';
 
+$lang->execution->featureBar['story']['all']       = 'All';
+$lang->execution->featureBar['story']['unclosed']  = 'Unclosed';
+$lang->execution->featureBar['story']['draft']     = 'Draft';
+$lang->execution->featureBar['story']['reviewing'] = 'Reviewing';
+
+$lang->execution->featureBar['testcase']['all'] = 'All';
+
+$lang->execution->featureBar['testtask']['browse'] = 'Test Request';
+
+$lang->execution->featureBar['testreport']['browse'] = 'Testing Reports';
+
 $lang->execution->myExecutions = "J'étais impliqué";
 $lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index ed2fcaab23..9f79d65ce0 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -538,6 +538,17 @@ $lang->execution->featureBar['bug']['unresolved'] = '未解决';
 
 $lang->execution->featureBar['build']['all'] = '全部版本';
 
+$lang->execution->featureBar['story']['all']       = '全部';
+$lang->execution->featureBar['story']['unclosed']  = '未关闭';
+$lang->execution->featureBar['story']['draft']     = '草稿';
+$lang->execution->featureBar['story']['reviewing'] = '评审中';
+
+$lang->execution->featureBar['testcase']['all'] = '全部';
+
+$lang->execution->featureBar['testtask']['browse'] = '测试单列表';
+
+$lang->execution->featureBar['testreport']['browse'] = '报告列表';
+
 $lang->execution->myExecutions = '我参与的';
 $lang->execution->doingProject = "进行中的{$lang->projectCommon}";
 
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 4c13d81f1c..54cc115c73 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -62,7 +62,7 @@
     </div>
   </div>
   <div class="btn-toolbar pull-left">
-    <?php foreach($lang->story->featureBar['browse'] as $featureType => $label):?>
+    <?php foreach($lang->execution->featureBar['story'] as $featureType => $label):?>
     <?php $active = $type == $featureType ? 'btn-active-text' : '';?>
     <?php $label  = "<span class='text'>$label</span>";?>
     <?php if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index a6cff28246..462271a2d2 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -13,7 +13,12 @@
     </div>
   </div>
   <div class="btn-toolbar pull-left">
-    <?php echo html::a(inlink('testcase', "executionID=$executionID&productID=$productID&branchID=$branchID&type=$type&moduleID=$moduleID&orderBy=$orderBy"), "<span class='text'>{$lang->all}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
+    <?php
+     foreach($this->lang->execution->featureBar['testcase'] as $label)
+     {
+         echo html::a(inlink('testcase', "executionID=$executionID&productID=$productID&branchID=$branchID&type=$type&moduleID=$moduleID&orderBy=$orderBy"), "<span class='text'>{$label}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");
+     }
+    ?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('execution', $execution)) echo html::a(helper::createLink('testcase', 'create', "productID=$productID&branch=0&moduleID=0&from=execution&param=$execution->id", '', '', '', true), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary' data-app='{$this->app->tab}'");?>
diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php
index 58e4978310..4a94974021 100644
--- a/module/execution/view/testtask.html.php
+++ b/module/execution/view/testtask.html.php
@@ -26,10 +26,12 @@
     <?php endif;?>
     <?php $total = 0;?>
     <?php foreach($tasks as $productTasks) $total += count($productTasks);?>
+    <?php foreach($this->lang->execution->featureBar['testtask'] as $label):?>
     <a href='' class='btn btn-link btn-active-text'>
-      <span class='text'><?php echo $lang->testtask->browse;?></span>
+      <span class='text'><?php echo $label;?></span>
       <span class="label label-light label-badge"><?php echo $total;?></span>
     </a>
+    <?php endforeach;?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('execution', $execution)):?>
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 76ef39efd5..6ed399affb 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -485,8 +485,8 @@ $lang->story->subDivideTip['notWait']    = 'The Story has been %s and cannot be
 $lang->story->subDivideTip['notActive']  = "The %s is not active and cannot be subdivided.";
 $lang->story->subDivideTip['twinsSplit'] = 'The Twins Story cannot be subdivided.';
 
-$lang->story->featureBar['browse']['all']      = $lang->all;
-$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
+$lang->story->featureBar['browse']['all']       = $lang->all;
+$lang->story->featureBar['browse']['unclosed']  = $lang->story->unclosed;
 $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draft'];
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 839ba2053b..d9296e0e5a 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -485,8 +485,8 @@ $lang->story->subDivideTip['notWait']    = 'The Story has been %s and cannot be
 $lang->story->subDivideTip['notActive']  = "The %s is not active and cannot be subdivided.";
 $lang->story->subDivideTip['twinsSplit'] = 'The Twins Story cannot be subdivided.';
 
-$lang->story->featureBar['browse']['all']      = $lang->all;
-$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
+$lang->story->featureBar['browse']['all']       = $lang->all;
+$lang->story->featureBar['browse']['unclosed']  = $lang->story->unclosed;
 $lang->story->featureBar['browse']['draft']     = $lang->story->statusList['draft'];
 $lang->story->featureBar['browse']['reviewing'] = $lang->story->statusList['reviewing'];
 
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index 8a89fadb42..fb13505609 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -94,3 +94,5 @@ Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-war
 <strong>%s</strong> Bugs found from the running of cases<a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
 Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs-reported-from-cases rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
+
+$lang->testreport->featureBar['browse']['browse'] = 'Testing Reports';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index fd8d13c668..366cf93e44 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -94,3 +94,5 @@ Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-war
 <strong>%s</strong> Bugs found from the running of cases<a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
 Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs-reported-from-cases rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
+
+$lang->testreport->featureBar['browse']['browse'] = 'Testing Reports';
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index af4294d07a..8bc4903f38 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -94,3 +94,5 @@ Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-war
 <strong>%s</strong> Bugs found from the running of cases<a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
 Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs-reported-from-cases rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
+
+$lang->testreport->featureBar['browse']['browse'] = 'Testing Reports';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index f03d1f3853..21de010655 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -94,3 +94,5 @@ $lang->testreport->bugSummary = <<<EOD
 用例执行产生<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>。
 有效Bug率（方案为已解决或延期 / 状态为已解决或已关闭）：<strong>%s</strong>，用例发现Bug率（用例创建的Bug / 发现Bug数）：<strong>%s</strong>
 EOD;
+
+$lang->testreport->featureBar['browse']['browse'] = '报告列表';
diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php
index 91e5d1238e..d553ae28e6 100644
--- a/module/testreport/view/browse.html.php
+++ b/module/testreport/view/browse.html.php
@@ -14,10 +14,12 @@
 <?php if($config->global->flow == 'full'):?>
 <div id='mainMenu' class='clearfix'>
   <div class='pull-left btn-toolbar'>
+    <?php foreach($this->lang->{$app->rawModule}->featureBar[$app->rawMethod] as $label):?>
     <span class='btn btn-link btn-active-text'>
-      <span class='text'><?php echo $lang->testreport->browse;?></span>
+      <span class='text'><?php echo $label;?></span>
       <span class="label label-light label-badge"><?php echo $pager->recTotal;?></span>
     </span>
+    <?php endforeach;?>
   </div>
   <div class='pull-right btn-toolbar'>
     <?php if($objectType == 'product' and $canBeChanged) common::printLink('testreport', 'create', "objectID=0&objectType=testtask&productID=$objectID", "<i class='icon icon-plus'></i> " . $lang->testreport->create, '', "class='btn btn-primary'");?>

From fb0c24ee9eb20c5941d59de386f8bfa04f4e5011 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 14:46:56 +0800
Subject: [PATCH 241/319] * Modify project to variable.

---
 module/bug/lang/de.php           | 12 ++++++------
 module/bug/lang/en.php           | 10 +++++-----
 module/bug/lang/fr.php           | 12 ++++++------
 module/bug/lang/zh-cn.php        | 12 ++++++------
 module/kanban/lang/de.php        |  4 ++--
 module/kanban/lang/en.php        |  4 ++--
 module/kanban/lang/fr.php        |  4 ++--
 module/kanban/lang/zh-cn.php     |  4 ++--
 module/testreport/lang/de.php    |  2 +-
 module/testreport/lang/en.php    |  4 ++--
 module/testreport/lang/fr.php    |  4 ++--
 module/testreport/lang/zh-cn.php |  4 ++--
 module/testsuite/lang/de.php     |  4 ++--
 module/testsuite/lang/en.php     |  4 ++--
 module/testsuite/lang/fr.php     |  4 ++--
 module/testsuite/lang/zh-cn.php  |  4 ++--
 16 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index ad03e40bd5..dc55840478 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Modul';
 $lang->bug->moduleAB         = 'Modul';
-$lang->bug->project          = 'Project';
+$lang->bug->project          = $lang->projectCommon;
 $lang->bug->execution        = $lang->execution->common;
 $lang->bug->kanban           = 'Kanban';
 $lang->bug->story            = 'Story';
@@ -95,9 +95,9 @@ $lang->bug->toCase           = 'Zu Fall';
 $lang->bug->colorTag         = 'Farb Tag';
 $lang->bug->fixedRate        = 'Fixed Rate';
 $lang->bug->noticefeedbackBy = 'NoticeFeedbackBy';
-$lang->bug->selectProjects   = 'Select Projects';
+$lang->bug->selectProjects   = "Select {$lang->projectCommon}s";
 $lang->bug->nextStep         = 'Next Step';
-$lang->bug->noProject        = 'Haven’t chosen a project yet.';
+$lang->bug->noProject        = "Haven’t chosen a {$lang->projectCommon} yet.";
 $lang->bug->noExecution      = 'Haven’t chosen a ' . strtolower($lang->execution->common) . ' yet.';
 
 /* Method list. */
@@ -154,7 +154,7 @@ $lang->bug->overdueBugs        = 'Überfällig';
 $lang->bug->allBugs            = 'Alle';
 $lang->bug->byQuery            = 'Suche';
 $lang->bug->needConfirm        = 'Story geändert';
-$lang->bug->allProject         = 'All Projects';
+$lang->bug->allProject         = "All {$lang->projectCommon}s";
 $lang->bug->allProduct         = 'Alle' . $lang->productCommon;
 $lang->bug->my                 = 'Meine';
 $lang->bug->yesterdayResolved  = 'Gestern gelöst ';
@@ -192,8 +192,8 @@ global $config;
 /* Legend list. */
 $lang->bug->legendBasicInfo             = 'Basis Info';
 $lang->bug->legendAttatch               = 'Anlagen';
-$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
-$lang->bug->legendExecStoryTask         = 'Porject/Story/Task';
+$lang->bug->legendPRJExecStoryTask      = "{$lang->SRCommon}/{$lang->executionCommon}/Story/Task";
+$lang->bug->legendExecStoryTask         = "{$lang->SRCommon}/Story/Task";
 $lang->bug->lblTypeAndSeverity          = 'Typ/Schwere';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
 $lang->bug->legendSteps                 = 'Reproduktionsschritte';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 480117db33..2403820123 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branch/Platform';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->project          = 'Project';
+$lang->bug->project          = $lang->projectCommon;
 $lang->bug->execution        = $lang->execution->common;
 $lang->bug->kanban           = 'Kanban';
 $lang->bug->story            = 'Story';
@@ -95,9 +95,9 @@ $lang->bug->toCase           = 'To Case';
 $lang->bug->colorTag         = 'Color';
 $lang->bug->fixedRate        = 'Fixed Rate';
 $lang->bug->noticefeedbackBy = 'NoticeFeedbackBy';
-$lang->bug->selectProjects   = 'Select Projects';
+$lang->bug->selectProjects   = "Select {$lang->projectCommon}s";
 $lang->bug->nextStep         = 'Next Step';
-$lang->bug->noProject        = 'Haven’t chosen a project yet.';
+$lang->bug->noProject        = "Haven’t chosen a {$lang->projectCommon} yet.";
 $lang->bug->noExecution      = 'Haven’t chosen a ' . strtolower($lang->execution->common) . ' yet.';
 
 /* Method list. */
@@ -192,8 +192,8 @@ global $config;
 /* Legend list. */
 $lang->bug->legendBasicInfo             = 'Basic Info';
 $lang->bug->legendAttatch               = 'Files';
-$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
-$lang->bug->legendExecStoryTask         = 'Porject/Story/Task';
+$lang->bug->legendPRJExecStoryTask      = "{$lang->SRCommon}/{$lang->executionCommon}/Story/Task";
+$lang->bug->legendExecStoryTask         = "{$lang->SRCommon}/Story/Task";
 $lang->bug->lblTypeAndSeverity          = 'Type/Severity';
 $lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
 $lang->bug->legendSteps                 = 'Repro Steps';
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index 7e25a7dde0..4b02c3548b 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = 'Branche/Plateforme';
 $lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->moduleAB         = 'Module';
-$lang->bug->project          = 'Project';
+$lang->bug->project          = $lang->projectCommon;
 $lang->bug->execution        = $lang->execution->common;
 $lang->bug->kanban           = 'Kanban';
 $lang->bug->story            = 'Story';
@@ -95,9 +95,9 @@ $lang->bug->toCase           = 'vers CasTest';
 $lang->bug->colorTag         = 'Couleur';
 $lang->bug->fixedRate        = 'Repair Rate';
 $lang->bug->noticefeedbackBy = 'NoticeFeedbackBy';
-$lang->bug->selectProjects   = 'Select Projects';
+$lang->bug->selectProjects   = "Select {$lang->projectCommon}s";
 $lang->bug->nextStep         = 'Next Step';
-$lang->bug->noProject        = 'Haven’t chosen a project yet.';
+$lang->bug->noProject        = "Haven’t chosen a {$lang->projectCommon} yet.";
 $lang->bug->noExecution      = 'Haven’t chosen a ' . strtolower($lang->execution->common) . ' yet.';
 
 /* Method list. */
@@ -154,7 +154,7 @@ $lang->bug->overdueBugs        = 'Retard';
 $lang->bug->allBugs            = 'Tous';
 $lang->bug->byQuery            = 'Rechercher';
 $lang->bug->needConfirm        = 'Story Changée';
-$lang->bug->allProject         = 'All Projects';
+$lang->bug->allProject         = "All {$lang->projectCommon}s";
 $lang->bug->allProduct         = 'Tous les ' . $lang->productCommon . 's';
 $lang->bug->my                 = 'Mes';
 $lang->bug->yesterdayResolved  = 'Bugs Résolus Hier ';
@@ -192,8 +192,8 @@ global $config;
 /* Legend list. */
 $lang->bug->legendBasicInfo             = 'Infos de Base';
 $lang->bug->legendAttatch               = 'Fichiers';
-$lang->bug->legendPRJExecStoryTask      = 'Project/' . $lang->executionCommon . '/Story/Task';
-$lang->bug->legendExecStoryTask         = 'Porject/Story/Task';
+$lang->bug->legendPRJExecStoryTask      = "{$lang->SRCommon}/{$lang->executionCommon}/Story/Task";
+$lang->bug->legendExecStoryTask         = "{$lang->SRCommon}/Story/Task";
 $lang->bug->lblTypeAndSeverity          = 'Type/Severité';
 $lang->bug->lblSystemBrowserAndHardware = 'Système/Browser';
 $lang->bug->legendSteps                 = 'Etapes Repro';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index a573c9842a..71e1b41cb1 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -17,7 +17,7 @@ $lang->bug->branch           = '平台/分支';
 $lang->bug->productplan      = '所属' . '计划';
 $lang->bug->module           = '所属模块';
 $lang->bug->moduleAB         = '模块';
-$lang->bug->project          = '所属项目';
+$lang->bug->project          = '所属' . $lang->projectCommon;
 $lang->bug->execution        = '所属' . $lang->execution->common;
 $lang->bug->kanban           = '所属看板';
 $lang->bug->story            = "相关需求";
@@ -95,9 +95,9 @@ $lang->bug->toCase           = '生成用例';
 $lang->bug->colorTag         = '颜色标签';
 $lang->bug->fixedRate        = '修复率';
 $lang->bug->noticefeedbackBy = '通知反馈者';
-$lang->bug->selectProjects   = '选择项目';
+$lang->bug->selectProjects   = '选择' . $lang->projectCommon;
 $lang->bug->nextStep         = '下一步';
-$lang->bug->noProject        = '还没有选择项目！';
+$lang->bug->noProject        = "还没有选择{$lang->projectCommon}！";
 $lang->bug->noExecution      = "还没有选择{$lang->execution->common}！";
 
 /* 方法列表。*/
@@ -154,7 +154,7 @@ $lang->bug->overdueBugs        = '过期Bug';
 $lang->bug->allBugs            = '所有';
 $lang->bug->byQuery            = '搜索';
 $lang->bug->needConfirm        = "{$lang->SRCommon}变动";
-$lang->bug->allProject         = '所有项目';
+$lang->bug->allProject         = '所有' . $lang->projectCommon;
 $lang->bug->allProduct         = '所有' . $lang->productCommon;
 $lang->bug->my                 = '我的';
 $lang->bug->yesterdayResolved  = '昨天解决Bug数';
@@ -192,8 +192,8 @@ global $config;
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPRJExecStoryTask      = "项目/{$lang->executionCommon}/{$lang->SRCommon}/任务";
-$lang->bug->legendExecStoryTask         = "项目/{$lang->SRCommon}/任务";
+$lang->bug->legendPRJExecStoryTask      = "{$lang->projectCommon}/{$lang->executionCommon}/{$lang->SRCommon}/任务";
+$lang->bug->legendExecStoryTask         = "{$lang->projectCommon}/{$lang->SRCommon}/任务";
 $lang->bug->lblTypeAndSeverity          = '类型/严重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
 $lang->bug->legendSteps                 = '重现步骤';
diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index 33d6f7e8e2..46339cbab1 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -85,7 +85,7 @@ $lang->kanban->importExecution     = $lang->execution->common;
 $lang->kanban->importBuild         = 'Build';
 $lang->kanban->importTicket        = 'Ticket';
 $lang->kanban->allKanban           = 'All Kanban';
-$lang->kanban->allProjects         = 'All Projects';
+$lang->kanban->allProjects         = "All {$lang->projectCommon}s";
 $lang->kanban->allProducts         = 'All Products';
 $lang->kanban->mine                = 'Mine';
 $lang->kanban->alignment           = 'Alignment';
@@ -128,7 +128,7 @@ $lang->kanban->cardCountTip        = 'Please enter the number of cards';
 
 $lang->kanban->selectedKanban  = 'Please select Kanban';
 $lang->kanban->selectedProduct = 'Please select Product';
-$lang->kanban->selectedProject = 'Please select Project';
+$lang->kanban->selectedProject = 'Please select ' . $lang->projectCommon;
 $lang->kanban->selectedLane    = 'Target Lane';
 
 $lang->kanban->aclGroup['open']    = 'Open';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 7e5dc7a64e..4fb50848f1 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -85,7 +85,7 @@ $lang->kanban->importExecution     = $lang->execution->common;
 $lang->kanban->importBuild         = 'Build';
 $lang->kanban->importTicket        = 'Ticket';
 $lang->kanban->allKanban           = 'All Kanban';
-$lang->kanban->allProjects         = 'All Projects';
+$lang->kanban->allProjects         = "All {$lang->projectCommon}s";
 $lang->kanban->allProducts         = 'All Products';
 $lang->kanban->mine                = 'Mine';
 $lang->kanban->alignment           = 'Alignment';
@@ -128,7 +128,7 @@ $lang->kanban->cardCountTip        = 'Please enter the number of cards';
 
 $lang->kanban->selectedKanban  = 'Please select Kanban';
 $lang->kanban->selectedProduct = 'Please select Product';
-$lang->kanban->selectedProject = 'Please select Project';
+$lang->kanban->selectedProject = 'Please select ' . $lang->projectCommon;
 $lang->kanban->selectedLane    = 'Target Lane';
 
 $lang->kanban->aclGroup['open']    = 'Open';
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index 1d54a87353..f355a881f5 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -85,7 +85,7 @@ $lang->kanban->importExecution     = $lang->execution->common;
 $lang->kanban->importBuild         = 'Build';
 $lang->kanban->importTicket        = 'Ticket';
 $lang->kanban->allKanban           = 'All Kanban';
-$lang->kanban->allProjects         = 'All Projects';
+$lang->kanban->allProjects         = "All {$lang->projectCommon}s";
 $lang->kanban->allProducts         = 'All Products';
 $lang->kanban->mine                = 'Mine';
 $lang->kanban->alignment           = 'Alignment';
@@ -128,7 +128,7 @@ $lang->kanban->cardCountTip        = 'Please enter the number of cards';
 
 $lang->kanban->selectedKanban  = 'Please select Kanban';
 $lang->kanban->selectedProduct = 'Please select Product';
-$lang->kanban->selectedProject = 'Please select Project';
+$lang->kanban->selectedProject = 'Please select ' . $lang->projectCommon;
 $lang->kanban->selectedLane    = 'Target Lane';
 
 $lang->kanban->aclGroup['open']    = 'Open';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 2db24523b1..e42332e3b9 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -85,7 +85,7 @@ $lang->kanban->importExecution     = $lang->execution->common;
 $lang->kanban->importBuild         = '版本';
 $lang->kanban->importTicket        = '工单';
 $lang->kanban->allKanban           = '所有看板';
-$lang->kanban->allProjects         = '所有项目';
+$lang->kanban->allProjects         = '所有' . $lang->projectCommon;
 $lang->kanban->allProducts         = '所有产品';
 $lang->kanban->mine                = '我负责';
 $lang->kanban->alignment           = '列标题对齐方式';
@@ -128,7 +128,7 @@ $lang->kanban->cardCountTip        = '请输入卡片数量';
 
 $lang->kanban->selectedKanban  = '请选择看板';
 $lang->kanban->selectedProduct = '请选择产品';
-$lang->kanban->selectedProject = '请选择项目';
+$lang->kanban->selectedProject = '请选择' . $lang->projectCommon;
 $lang->kanban->selectedLane    = '目标泳道';
 
 $lang->kanban->aclGroup['open']    = '公开';
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index fb13505609..ce321fba03 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -14,7 +14,7 @@ $lang->testreport->title       = 'Titel';
 $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug Titel';
 $lang->testreport->storyTitle  = 'Story Titel';
-$lang->testreport->project     = 'Projekt';
+$lang->testreport->project     = $lang->projectCommon;
 $lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Test Build';
 $lang->testreport->tasks       = $lang->testreport->testtask;
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 366cf93e44..87c53a4aff 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -14,7 +14,7 @@ $lang->testreport->title       = 'Title';
 $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug';
 $lang->testreport->storyTitle  = 'Story';
-$lang->testreport->project     = 'Project';
+$lang->testreport->project     = $lang->projectCommon;
 $lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Test Build';
 $lang->testreport->tasks       = $lang->testreport->testtask;
@@ -26,7 +26,7 @@ $lang->testreport->end         = 'End';
 $lang->testreport->stories     = 'Story Tested';
 $lang->testreport->bugs        = 'Bug Tested';
 $lang->testreport->builds      = 'Build Info';
-$lang->testreport->goal        = 'Project Goal';
+$lang->testreport->goal        = $lang->projectCommon . ' Goal';
 $lang->testreport->cases       = 'Case';
 $lang->testreport->bugInfo     = 'Bug Distribution';
 $lang->testreport->report      = 'Summary';
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index 8bc4903f38..fb49e49d2b 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -14,7 +14,7 @@ $lang->testreport->title       = 'Titre';
 $lang->testreport->product     = $lang->productCommon;
 $lang->testreport->bugTitle    = 'Bug';
 $lang->testreport->storyTitle  = 'Story';
-$lang->testreport->project     = 'Projet';
+$lang->testreport->project     = $lang->projectCommon;
 $lang->testreport->execution   = 'Execution';
 $lang->testreport->testtask    = 'Campagne';
 $lang->testreport->tasks       = $lang->testreport->testtask;
@@ -26,7 +26,7 @@ $lang->testreport->end         = 'Fin';
 $lang->testreport->stories     = 'Story Testée';
 $lang->testreport->bugs        = 'Bug Testé';
 $lang->testreport->builds      = 'Info Build';
-$lang->testreport->goal        = 'But Projet';
+$lang->testreport->goal        = 'But ' . $lang->projectCommon;
 $lang->testreport->cases       = 'CasTest';
 $lang->testreport->bugInfo     = 'Distribution Bugs';
 $lang->testreport->report      = 'Résumé';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 21de010655..3e74246e91 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -14,7 +14,7 @@ $lang->testreport->title       = '标题';
 $lang->testreport->product     = "所属{$lang->productCommon}";
 $lang->testreport->bugTitle    = 'Bug 标题';
 $lang->testreport->storyTitle  = "{$lang->SRCommon}标题";
-$lang->testreport->project     = '所属项目';
+$lang->testreport->project     = '所属' . $lang->projectCommon;
 $lang->testreport->execution   = '所属执行';
 $lang->testreport->testtask    = '测试版本';
 $lang->testreport->tasks       = $lang->testreport->testtask;
@@ -26,7 +26,7 @@ $lang->testreport->end         = '结束时间';
 $lang->testreport->stories     = "测试的{$lang->SRCommon}";
 $lang->testreport->bugs        = '测试的Bug';
 $lang->testreport->builds      = '版本信息';
-$lang->testreport->goal        = '项目目标';
+$lang->testreport->goal        = $lang->projectCommon . '目标';
 $lang->testreport->cases       = '用例';
 $lang->testreport->bugInfo     = 'Bug分布';
 $lang->testreport->report      = '总结';
diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php
index c4d531e94b..c69d62e0b7 100644
--- a/module/testsuite/lang/de.php
+++ b/module/testsuite/lang/de.php
@@ -26,7 +26,7 @@ $lang->testsuite->successSaved     = 'Saved';
 $lang->testsuite->id             = 'ID';
 $lang->testsuite->pri            = 'Priority';
 $lang->testsuite->common         = 'Test Suite';
-$lang->testsuite->project        = 'Project';
+$lang->testsuite->project        = $lang->projectCommon;
 $lang->testsuite->product        = $lang->productCommon;
 $lang->testsuite->name           = 'Name';
 $lang->testsuite->type           = 'Type';
@@ -56,4 +56,4 @@ $lang->testsuite->lblUnlinkCase = 'Unverknüpfte Fälle';
 $lang->testsuite->authorList['private'] = 'Privat';
 $lang->testsuite->authorList['public']  = 'Öffentlich';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 9da75ae8fb..1098f29fa7 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -26,7 +26,7 @@ $lang->testsuite->successSaved     = 'Saved';
 $lang->testsuite->id             = 'ID';
 $lang->testsuite->pri            = 'Priority';
 $lang->testsuite->common         = 'Test Suite';
-$lang->testsuite->project        = 'Project';
+$lang->testsuite->project        = $lang->projectCommon;
 $lang->testsuite->product        = $lang->productCommon;
 $lang->testsuite->name           = 'Name';
 $lang->testsuite->type           = 'Type';
@@ -56,4 +56,4 @@ $lang->testsuite->lblUnlinkCase = 'Unlink Case';
 $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php
index a345f986af..c7916c96b1 100644
--- a/module/testsuite/lang/fr.php
+++ b/module/testsuite/lang/fr.php
@@ -26,7 +26,7 @@ $lang->testsuite->successSaved     = 'Sauvé';
 $lang->testsuite->id             = 'ID';
 $lang->testsuite->pri            = 'Priority';
 $lang->testsuite->common         = 'Cahier de Recette';
-$lang->testsuite->project        = 'Project';
+$lang->testsuite->project        = $lang->projectCommon;
 $lang->testsuite->product        = $lang->productCommon;
 $lang->testsuite->name           = 'Nom';
 $lang->testsuite->type           = 'Type';
@@ -56,4 +56,4 @@ $lang->testsuite->lblUnlinkCase = 'Retirer CasTest';
 $lang->testsuite->authorList['private'] = 'Privé';
 $lang->testsuite->authorList['public']  = 'Public';
 
-$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
\ No newline at end of file
+$lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index bcff85e3cc..d17880dcd8 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -26,7 +26,7 @@ $lang->testsuite->successSaved     = '保存成功';
 $lang->testsuite->id             = '编号';
 $lang->testsuite->pri            = '优先级';
 $lang->testsuite->common         = '套件';
-$lang->testsuite->project        = '所属项目';
+$lang->testsuite->project        = '所属' . $lang->projectCommon;
 $lang->testsuite->product        = '所属' . $lang->productCommon;
 $lang->testsuite->name           = '名称';
 $lang->testsuite->type           = '类型';
@@ -56,4 +56,4 @@ $lang->testsuite->lblUnlinkCase = '移除用例';
 $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公开';
 
-$lang->testsuite->featureBar['browse']['all'] = '套件列表';
\ No newline at end of file
+$lang->testsuite->featureBar['browse']['all'] = '套件列表';

From 42a77e1f7c71e7863cf91fca328b23350e86708f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 14:57:38 +0800
Subject: [PATCH 242/319] * Modify language item for execution page.

---
 module/dev/lang/de.php    | 2 ++
 module/dev/lang/en.php    | 2 ++
 module/dev/lang/fr.php    | 2 ++
 module/dev/lang/zh-cn.php | 2 ++
 module/dev/model.php      | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 0f756da39c..1e3781665b 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -201,3 +201,5 @@ $lang->dev->projectMenu['scrum']         = "Scrum / Scrum + {$lang->projectCommo
 $lang->dev->projectMenu['waterfall']     = "Waterfall / Waterfall + {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
+
+$this->lang->dev->replaceLable['project-execution'] = "{$lang->executionCommon} / Stage";
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index d6d66dece7..a5e680386d 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -201,3 +201,5 @@ $lang->dev->projectMenu['scrum']         = "Scrum / Scrum + {$lang->projectCommo
 $lang->dev->projectMenu['waterfall']     = "Waterfall / Waterfall + {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
+
+$this->lang->dev->replaceLable['project-execution'] = "{$lang->executionCommon} / Stage";
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index d6d66dece7..a5e680386d 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -201,3 +201,5 @@ $lang->dev->projectMenu['scrum']         = "Scrum / Scrum + {$lang->projectCommo
 $lang->dev->projectMenu['waterfall']     = "Waterfall / Waterfall + {$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "Kanban {$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
+
+$this->lang->dev->replaceLable['project-execution'] = "{$lang->executionCommon} / Stage";
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 7fe54b8e42..d1db87ec39 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -204,3 +204,5 @@ $lang->dev->projectMenu['scrum']         = "敏捷 / 融合敏捷{$lang->project
 $lang->dev->projectMenu['waterfall']     = "瀑布 / 融合瀑布{$lang->projectCommon}";
 $lang->dev->projectMenu['kanbanProject'] = "看板{$lang->projectCommon}";
 if($config->vision == 'lite') $lang->dev->projectMenu['kanbanProject'] = $lang->projectCommon;
+
+$this->lang->dev->replaceLable['project-execution'] = "{$lang->executionCommon} / 阶段";
diff --git a/module/dev/model.php b/module/dev/model.php
index 4cf249dd79..cb40b4c8ff 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -711,7 +711,7 @@ class devModel extends model
                 $titleList[] = $label;
 
                 $subMenu = new stdclass();
-                $subMenu->title    = $label;
+                $subMenu->title    = isset($this->lang->dev->replaceLable["$thisModule-$thisMethod"]) ? $this->lang->dev->replaceLable["$thisModule-$thisMethod"] : $label;
                 $subMenu->key      = '';
                 $subMenu->module   = $thisModule;
                 $subMenu->method   = $thisMethod;

From cd7d8f4ff645f0af017cfb3bf8326cba23103fab Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 15:27:45 +0800
Subject: [PATCH 243/319] * Modify language item for product common.

---
 module/execution/lang/de.php    | 14 +++++++-------
 module/execution/lang/en.php    | 14 +++++++-------
 module/execution/lang/fr.php    | 14 +++++++-------
 module/execution/lang/zh-cn.php | 14 +++++++-------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index fce7bc4413..45150c801a 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -286,7 +286,7 @@ $lang->execution->importPlanStory           = $lang->executionCommon . ' is crea
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
-$lang->execution->needLinkProducts          = 'The execution has not been linked with any product, and the related functions cannot be used. Please link the product first and try again.';
+$lang->execution->needLinkProducts          = "The execution has not been linked with any {$lang->productCommon}, and the related functions cannot be used. Please link the {$lang->productCommon} first and try again.";
 $lang->execution->iteration                 = 'Iteration';
 $lang->execution->iterationInfo             = '%s Iterationen';
 $lang->execution->viewAll                   = 'Alle anzeigen';
@@ -335,7 +335,7 @@ $lang->execution->aboveAllExecution = "Alle oberen {$lang->executionCommon}";
 
 /* Page prompt. */
 $lang->execution->linkStoryByPlanTips  = "This action will link all stories in this plan to the {$lang->executionCommon}.";
-$lang->execution->batchCreateStoryTips = "Please select the product that needs to be created in batches";
+$lang->execution->batchCreateStoryTips = "Please select the {$lang->productCommon} that needs to be created in batches";
 $lang->execution->selectExecution      = "Auswahl {$lang->executionCommon}";
 $lang->execution->beginAndEnd          = 'Dauer';
 $lang->execution->lblStats             = 'Mannstunden Summe(h) : ';
@@ -375,15 +375,15 @@ $lang->execution->noExecution          = 'Keine Projekte. ';
 $lang->execution->noExecutions         = "No {$lang->execution->common}.";
 $lang->execution->noPrintData          = "No data can be printed.";
 $lang->execution->noMembers            = 'Keine Mitglieder. ';
-$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current product is: %s";
-$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current {$lang->productCommon} is: %s";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the {$lang->productCommon} linked with the sprint/stage)";
 $lang->execution->copyTeamTitle        = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
 /* Interactive prompts. */
 $lang->execution->confirmDelete                = "Möchten Sie {$lang->executionCommon}[%s] löschen?";
 $lang->execution->confirmUnlinkMember          = "Möchten Sie den Benutzer vom {$lang->executionCommon} entfernen?";
 $lang->execution->confirmUnlinkStory           = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
+$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of {$lang->productCommon}s, {$lang->SRCommon}s, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
 $lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the {$lang->projectCommon}?";
 $lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the {$lang->projectCommon}. Remove it from the {$lang->executionCommon}, then try again.";
 $lang->execution->notAllowRemoveProducts       = "The story of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
@@ -430,7 +430,7 @@ $lang->execution->hasStartedTaskOrSubStage     = "Tasks or subphases under %s %s
 $lang->execution->hasSuspendedOrClosedChildren = "The sub-stages under stage %s are not all suspended or closed, cannot be modified, and have been filtered.";
 $lang->execution->hasNotClosedChildren         = "The sub-stages under stage %s are not all closed, cannot be modified, and have been filtered.";
 $lang->execution->hasStartedTask               = "The task under %s %s has already started, cannot be modified, and has been filtered.";
-$lang->execution->cannotManageProducts         = 'The ' . strtolower($lang->project->common). ' model of this ' . strtolower($lang->execution->common) . " is %s and this " . strtolower($lang->execution->common) . ' cannot be associated with products.';
+$lang->execution->cannotManageProducts         = 'The ' . strtolower($lang->project->common). ' model of this ' . strtolower($lang->execution->common) . " is %s and this " . strtolower($lang->execution->common) . " cannot be associated with {$lang->productCommon}.";
 
 /* Statistics. */
 $lang->execution->charts = new stdclass();
@@ -567,7 +567,7 @@ $lang->execution->action = new stdclass();
 $lang->execution->action->opened               = '$date, created by <strong>$actor</strong>. $extra' . "\n";
 $lang->execution->action->managed              = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
 $lang->execution->action->edited               = '$date, edited by <strong>$actor</strong>. $extra' . "\n";
-$lang->execution->action->extra                = 'Linked products is %s.';
+$lang->execution->action->extra                = "Linked {$lang->productCommon}s is %s.";
 $lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n";
 $lang->execution->action->waitbychilddelete    = '$date, deleting the sub stage sets the execution status as waitting.' . "\n";
 $lang->execution->action->closebychilddelete   = '$date, deleting the sub stage sets the execution status as closing.' . "\n";
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 74aa46c381..355abb24a6 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -286,7 +286,7 @@ $lang->execution->importPlanStory           = $lang->executionCommon . ' is crea
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
-$lang->execution->needLinkProducts          = 'The execution has not been linked with any product, and the related functions cannot be used. Please link the product first and try again.';
+$lang->execution->needLinkProducts          = "The execution has not been linked with any {$lang->productCommon}, and the related functions cannot be used. Please link the {$lang->productCommon} first and try again.";
 $lang->execution->iteration                 = 'Iterations';
 $lang->execution->iterationInfo             = '%s Iterations';
 $lang->execution->viewAll                   = 'View All';
@@ -335,7 +335,7 @@ $lang->execution->aboveAllExecution = "All the above {$lang->executionCommon}s";
 
 /* Page prompt. */
 $lang->execution->linkStoryByPlanTips  = "This action will link all stories in this plan to the {$lang->executionCommon}.";
-$lang->execution->batchCreateStoryTips = "Please select the product that needs to be created in batches";
+$lang->execution->batchCreateStoryTips = "Please select the {$lang->productCommon} that needs to be created in batches";
 $lang->execution->selectExecution      = "Select {$lang->executionCommon}";
 $lang->execution->beginAndEnd          = 'Duration';
 $lang->execution->lblStats             = 'Efforts';
@@ -375,15 +375,15 @@ $lang->execution->noExecution          = "No {$lang->executionCommon}. ";
 $lang->execution->noExecutions         = "No {$lang->execution->common}.";
 $lang->execution->noPrintData          = "No data can be printed.";
 $lang->execution->noMembers            = 'No team members yet. ';
-$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current product is: %s";
-$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current {$lang->productCommon} is: %s";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the {$lang->productCommon} linked with the sprint/stage)";
 $lang->execution->copyTeamTitle        = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
 /* Interactive prompts. */
 $lang->execution->confirmDelete                = "Do you want to delete the {$lang->executionCommon}[%s]?";
 $lang->execution->confirmUnlinkMember          = "Do you want to unlink this User from {$lang->executionCommon}?";
 $lang->execution->confirmUnlinkStory           = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
+$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of {$lang->productCommon}s, {$lang->SRCommon}s, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
 $lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the {$lang->projectCommon}?";
 $lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the {$lang->projectCommon}. Remove it from the {$lang->executionCommon}, then try again.";
 $lang->execution->notAllowRemoveProducts       = "The story %s of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
@@ -430,7 +430,7 @@ $lang->execution->hasStartedTaskOrSubStage     = "Tasks or subphases under %s %s
 $lang->execution->hasSuspendedOrClosedChildren = "The sub-stages under stage %s are not all suspended or closed, cannot be modified, and have been filtered.";
 $lang->execution->hasNotClosedChildren         = "The sub-stages under stage %s are not all closed, cannot be modified, and have been filtered.";
 $lang->execution->hasStartedTask               = "The task under %s %s has already started, cannot be modified, and has been filtered.";
-$lang->execution->cannotManageProducts         = 'The ' . strtolower($lang->project->common). ' model of this ' . strtolower($lang->execution->common) . " is %s and this " . strtolower($lang->execution->common) . ' cannot be associated with products.';
+$lang->execution->cannotManageProducts         = 'The ' . strtolower($lang->project->common). ' model of this ' . strtolower($lang->execution->common) . " is %s and this " . strtolower($lang->execution->common) . " cannot be associated with {$lang->productCommon}.";
 
 /* Statistics. */
 $lang->execution->charts = new stdclass();
@@ -567,7 +567,7 @@ $lang->execution->action = new stdclass();
 $lang->execution->action->opened               = '$date, created by <strong>$actor</strong>. $extra' . "\n";
 $lang->execution->action->managed              = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
 $lang->execution->action->edited               = '$date, edited by <strong>$actor</strong>. $extra' . "\n";
-$lang->execution->action->extra                = 'Linked products is %s.';
+$lang->execution->action->extra                = "Linked {$lang->productCommon}s is %s.";
 $lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n";
 $lang->execution->action->waitbychilddelete    = '$date, deleting the sub stage sets the execution status as waitting.' . "\n";
 $lang->execution->action->closebychilddelete   = '$date, deleting the sub stage sets the execution status as closing.' . "\n";
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 9d432193fc..ad414888c8 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -286,7 +286,7 @@ $lang->execution->importPlanStory           = $lang->executionCommon . ' is crea
 $lang->execution->importEditPlanStory       = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? The stories in the draft will be automatically filtered out when imported.';
 $lang->execution->importBranchPlanStory     = $lang->executionCommon . ' is created!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
 $lang->execution->importBranchEditPlanStory = $lang->executionCommon . ' is edited!\nDo you want to import stories that have been linked to the plan? Only the activation stories of the branch associated with this ' .$lang->executionCommon. ' will be associated with the import';
-$lang->execution->needLinkProducts          = 'The execution has not been linked with any product, and the related functions cannot be used. Please link the product first and try again.';
+$lang->execution->needLinkProducts          = "The execution has not been linked with any {$lang->productCommon}, and the related functions cannot be used. Please link the {$lang->productCommon} first and try again.";
 $lang->execution->iteration                 = 'Iterations';
 $lang->execution->iterationInfo             = '%s Iterations';
 $lang->execution->viewAll                   = 'View All';
@@ -335,7 +335,7 @@ $lang->execution->aboveAllExecution = "Tous les {$lang->executionCommon}s dépen
 
 /* Page prompt. */
 $lang->execution->linkStoryByPlanTips  = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->executionCommon}.";
-$lang->execution->batchCreateStoryTips = "Please select the product that needs to be created in batches";
+$lang->execution->batchCreateStoryTips = "Please select the {$lang->productCommon} that needs to be created in batches";
 $lang->execution->selectExecution      = "Sélectionner {$lang->executionCommon}";
 $lang->execution->beginAndEnd          = 'Durée';
 $lang->execution->lblStats             = 'Efforts';
@@ -375,15 +375,15 @@ $lang->execution->noExecution          = "Aucun {$lang->executionCommon}. ";
 $lang->execution->noExecutions         = "Aucun {$lang->execution->common}.";
 $lang->execution->noPrintData          = "No data can be printed.";
 $lang->execution->noMembers            = "Actuellement il n'y a aucun membre dans l'équipe. On ne va pas aller loin... ";
-$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current product is: %s";
-$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100%s, and the total workload under the current {$lang->productCommon} is: %s";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the {$lang->projectCommon}, and can be directly linked with {$lang->SRCommon} of the {$lang->productCommon} linked with the sprint/stage)";
 $lang->execution->copyTeamTitle        = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
 /* Interactive prompts. */
 $lang->execution->confirmDelete                = "Voulez-vous réellement supprimer le {$lang->executionCommon}[%s] ?";
 $lang->execution->confirmUnlinkMember          = "Voulez-vous retirer cet utilisateur du {$lang->executionCommon} ?";
 $lang->execution->confirmUnlinkStory           = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
+$lang->execution->confirmSync                  = "After modifying the {$lang->projectCommon}, in order to maintain the consistency of data, the data of {$lang->productCommon}s, {$lang->SRCommon}s, teams and whitelist associated with the implementation will be synchronized to the new {$lang->projectCommon}. Please know.";
 $lang->execution->confirmUnlinkExecutionStory  = "Do you want to unlink this Story from the {$lang->projectCommon}?";
 $lang->execution->notAllowedUnlinkStory        = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the {$lang->projectCommon}. Remove it from the {$lang->executionCommon}, then try again.";
 $lang->execution->notAllowRemoveProducts       = "The story of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
@@ -430,7 +430,7 @@ $lang->execution->hasStartedTaskOrSubStage     = "Tasks or subphases under %s %s
 $lang->execution->hasSuspendedOrClosedChildren = "The sub-stages under stage %s are not all suspended or closed, cannot be modified, and have been filtered.";
 $lang->execution->hasNotClosedChildren         = "The sub-stages under stage %s are not all closed, cannot be modified, and have been filtered.";
 $lang->execution->hasStartedTask               = "The task under %s %s has already started, cannot be modified, and has been filtered.";
-$lang->execution->cannotManageProducts         = 'The ' . strtolower($lang->project->common). ' model of this ' . strtolower($lang->execution->common) . " is %s and this " . strtolower($lang->execution->common) . ' cannot be associated with products.';
+$lang->execution->cannotManageProducts         = 'The ' . strtolower($lang->project->common). ' model of this ' . strtolower($lang->execution->common) . " is %s and this " . strtolower($lang->execution->common) . " cannot be associated with {$lang->productCommon}.";
 
 /* Statistics. */
 $lang->execution->charts = new stdclass();
@@ -567,7 +567,7 @@ $lang->execution->action = new stdclass();
 $lang->execution->action->opened               = '$date, created by <strong>$actor</strong>. $extra' . "\n";
 $lang->execution->action->managed              = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
 $lang->execution->action->edited               = '$date, edited by <strong>$actor</strong>. $extra' . "\n";
-$lang->execution->action->extra                = 'Linked products is %s.';
+$lang->execution->action->extra                = "Linked {$lang->productCommon}s is %s.";
 $lang->execution->action->startbychildactivate = '$date, activating the sub stage sets the execution status as Ongoing.' . "\n";
 $lang->execution->action->waitbychilddelete    = '$date, deleting the sub stage sets the execution status as waitting.' . "\n";
 $lang->execution->action->closebychilddelete   = '$date, deleting the sub stage sets the execution status as closing.' . "\n";
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 9f79d65ce0..880e233335 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -286,7 +286,7 @@ $lang->execution->importPlanStory           = '创建' . $lang->executionCommon
 $lang->execution->importEditPlanStory       = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将自动过滤掉草稿状态的' . $lang->SRCommon . '。';
 $lang->execution->importBranchPlanStory     = '创建' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将只关联本' . $lang->executionCommon . '所关联分支的激活需求。';
 $lang->execution->importBranchEditPlanStory = '编辑' . $lang->executionCommon . '成功！\n是否导入计划关联的相关' . $lang->SRCommon . '？导入时将只关联本' . $lang->executionCommon . '所关联分支的激活需求。';
-$lang->execution->needLinkProducts          = '该执行还未关联任何产品，相关功能无法使用，请先关联产品后再试。';
+$lang->execution->needLinkProducts          = "该执行还未关联任何{$lang->productCommon}，相关功能无法使用，请先关联{$lang->productCommon}后再试。";
 $lang->execution->iteration                 = '版本迭代';
 $lang->execution->iterationInfo             = '迭代%s次';
 $lang->execution->viewAll                   = '查看所有';
@@ -335,7 +335,7 @@ $lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}";
 
 /* 页面提示。*/
 $lang->execution->linkStoryByPlanTips  = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->executionCommon}中";
-$lang->execution->batchCreateStoryTips = '请选择需要批量新建研发需求的产品';
+$lang->execution->batchCreateStoryTips = "请选择需要批量新建研发需求的{$lang->productCommon}";
 $lang->execution->selectExecution      = "请选择{$lang->execution->common}";
 $lang->execution->beginAndEnd          = '起止时间';
 $lang->execution->lblStats             = '工时统计';
@@ -375,15 +375,15 @@ $lang->execution->noExecution          = "暂时没有{$lang->executionCommon}
 $lang->execution->noExecutions         = "暂时没有{$lang->execution->common}。";
 $lang->execution->noPrintData          = "暂无数据可打印";
 $lang->execution->noMembers            = '暂时没有团队成员。';
-$lang->execution->workloadTotal        = "工作量占比累计不应当超过100%s, 当前产品下的工作量之和为%s";
-$lang->execution->linkAllStoryTip      = "({$lang->projectCommon}下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
+$lang->execution->workloadTotal        = "工作量占比累计不应当超过100%s, 当前{$lang->productCommon}下的工作量之和为%s";
+$lang->execution->linkAllStoryTip      = "({$lang->projectCommon}下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联{$lang->productCommon}的{$lang->SRCommon})";
 $lang->execution->copyTeamTitle        = "选择一个{$lang->project->common}或{$lang->execution->common}团队";
 
 /* 交互提示。*/
 $lang->execution->confirmDelete                = "您确定删除{$lang->executionCommon}[%s]吗？";
 $lang->execution->confirmUnlinkMember          = "您确定从该{$lang->executionCommon}中移除该用户吗？";
 $lang->execution->confirmUnlinkStory           = "移除该{$lang->SRCommon}后，该{$lang->SRCommon}关联的用例将被移除，该{$lang->SRCommon}关联的任务将被取消，请确认。";
-$lang->execution->confirmSync                  = "修改所属{$lang->projectCommon}后,为了保持数据的一致性，该执行所关联的产品、需求、团队和白名单数据将会同步到新的{$lang->projectCommon}中，请知悉。";
+$lang->execution->confirmSync                  = "修改所属{$lang->projectCommon}后,为了保持数据的一致性，该执行所关联的{$lang->productCommon}、{$lang->SRCommon}、团队和白名单数据将会同步到新的{$lang->projectCommon}中，请知悉。";
 $lang->execution->confirmUnlinkExecutionStory  = "您确定从该{$lang->projectCommon}中移除该{$lang->SRCommon}吗？";
 $lang->execution->notAllowedUnlinkStory        = "该{$lang->SRCommon}已经与{$lang->projectCommon}下{$lang->executionCommon}相关联，请从{$lang->executionCommon}中移除后再操作。";
 $lang->execution->notAllowRemoveProducts       = "该{$lang->productCommon}中的{$lang->SRCommon}%s已与该{$lang->executionCommon}进行了关联，请取消关联后再操作。";
@@ -430,7 +430,7 @@ $lang->execution->hasStartedTaskOrSubStage     = "%s%s下的任务或子阶段
 $lang->execution->hasSuspendedOrClosedChildren = "阶段%s下的子阶段未全部挂起或关闭，无法修改，已过滤。";
 $lang->execution->hasNotClosedChildren         = "阶段%s下的子阶段未全部关闭，无法修改，已过滤。";
 $lang->execution->hasStartedTask               = "%s%s下的任务已经开始，无法修改，已过滤。";
-$lang->execution->cannotManageProducts         = "当前{$lang->execution->common}的{$lang->project->common}为%s{$lang->project->common}，不能关联产品。";
+$lang->execution->cannotManageProducts         = "当前{$lang->execution->common}的{$lang->project->common}为%s{$lang->project->common}，不能关联{$lang->productCommon}。";
 
 /* 统计。*/
 $lang->execution->charts = new stdclass();
@@ -567,7 +567,7 @@ $lang->execution->action = new stdclass();
 $lang->execution->action->opened               = '$date, 由 <strong>$actor</strong> 创建。$extra' . "\n";
 $lang->execution->action->managed              = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
 $lang->execution->action->edited               = '$date, 由 <strong>$actor</strong> 编辑。$extra' . "\n";
-$lang->execution->action->extra                = '相关产品为 %s。';
+$lang->execution->action->extra                = "相关{$lang->productCommon}为 %s。";
 $lang->execution->action->startbychildactivate = '$date, 系统判断由于子阶段激活，将' . $lang->executionCommon . '状态置为进行中。' . "\n";
 $lang->execution->action->waitbychilddelete    = '$date, 系统判断由于子阶段删除，将' . $lang->executionCommon . '状态置为未开始。' . "\n";
 $lang->execution->action->closebychilddelete   = '$date, 系统判断由于子阶段删除，将' . $lang->executionCommon . '状态置为已关闭。' . "\n";

From d3955d187a04649b515a95d44f88739146183de2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 15:29:53 +0800
Subject: [PATCH 244/319] * Modify language for project to variable.

---
 module/build/lang/de.php    |  4 ++--
 module/build/lang/en.php    |  2 +-
 module/build/lang/fr.php    |  4 ++--
 module/build/lang/zh-cn.php |  4 ++--
 module/my/lang/de.php       | 28 ++++++++++++++--------------
 module/my/lang/en.php       | 28 ++++++++++++++--------------
 module/my/lang/fr.php       | 28 ++++++++++++++--------------
 module/my/lang/zh-cn.php    | 30 +++++++++++++++---------------
 8 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index c00c38b999..5f7b91d30d 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -29,7 +29,7 @@ $lang->build->basicInfo = 'Basis Info';
 
 $lang->build->id             = 'ID';
 $lang->build->product        = $lang->productCommon;
-$lang->build->project        = 'Project';
+$lang->build->project        = $lang->projectCommon;
 $lang->build->branch         = 'Platform/Branch';
 $lang->build->branchAll      = 'All associated %s';
 $lang->build->branchName     = '%s';
@@ -64,7 +64,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "The {$lang->SRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
 $lang->build->notice->changeExecution = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "The version of the submitted test order cannot be modified builds";
-$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
+$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the {$lang->projectCommon} version";
 $lang->build->notice->createTest      = "The execution of this version has been deleted, and the test cannot be submitted";
 
 $lang->build->confirmChangeBuild = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 0bbbf5d650..f7665f55fc 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -29,7 +29,7 @@ $lang->build->basicInfo = 'Basic Info';
 
 $lang->build->id             = 'ID';
 $lang->build->product        = $lang->productCommon;
-$lang->build->project        = 'Project';
+$lang->build->project        = $lang->projectCommon;
 $lang->build->branch         = 'Platform/Branch';
 $lang->build->branchAll      = 'All associated %s';
 $lang->build->branchName     = '%s';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index ffd48a5ea4..311dba4b55 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -29,7 +29,7 @@ $lang->build->basicInfo = 'Infos de Base';
 
 $lang->build->id             = 'ID';
 $lang->build->product        = $lang->productCommon;
-$lang->build->project        = 'Project';
+$lang->build->project        = $lang->projectCommon;
 $lang->build->branch         = 'Plateforme/Branche';
 $lang->build->branchAll      = 'All associated %s';
 $lang->build->branchName     = '%s';
@@ -64,7 +64,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "The {$lang->SRCommon}, bug, or the version of the submitted test order has been linked, and its {$lang->productCommon} cannot be modified";
 $lang->build->notice->changeExecution = "The version of the submitted test order cannot be modified {$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "The version of the submitted test order cannot be modified builds";
-$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the project version";
+$lang->build->notice->autoRelation    = "The completed requirements, resolved bugs, and generated bugs under the relevant version will be automatically associated with the {$lang->projectCommon} version";
 $lang->build->notice->createTest      = "The execution of this version has been deleted, and the test cannot be submitted";
 
 $lang->build->confirmChangeBuild = "After branch『%s』disassociation,under the %s have %s {$lang->SRCommon} and %s Bug will remove synchronization from version, whether to cancel？";
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 68973937c4..6ae56cfc69 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -29,7 +29,7 @@ $lang->build->basicInfo = '基本信息';
 
 $lang->build->id             = 'ID';
 $lang->build->product        = '所属' . $lang->productCommon;
-$lang->build->project        = '所属项目';
+$lang->build->project        = '所属' . $lang->projectCommon;
 $lang->build->branch         = '平台/分支';
 $lang->build->branchAll      = '所有关联%s';
 $lang->build->branchName     = '所属%s';
@@ -64,7 +64,7 @@ $lang->build->notice = new stdclass();
 $lang->build->notice->changeProduct   = "已经关联{$lang->SRCommon}、Bug或提交测试单的版本，不能修改其所属{$lang->productCommon}";
 $lang->build->notice->changeExecution = "提交测试单的版本，不能修改其所属{$lang->executionCommon}";
 $lang->build->notice->changeBuilds    = "提交测试单的版本，不能修改关联版本";
-$lang->build->notice->autoRelation    = "相关版本下完成的需求、解决的Bug、产生的Bug将会自动关联到项目版本中";
+$lang->build->notice->autoRelation    = "相关版本下完成的需求、解决的Bug、产生的Bug将会自动关联到{$lang->projectCommon}版本中";
 $lang->build->notice->createTest      = "该版本所属执行已删除，不能提交测试";
 
 $lang->build->confirmChangeBuild = "%s『%s』解除关联后，%s下 %s个{$lang->SRCommon}和%s个Bug将同步从版本移除，是否解除？";
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 1951a53acd..d163bbc753 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -15,7 +15,7 @@ $lang->my->myTestCase      = 'My Cases';
 $lang->my->story           = 'My Stories';
 $lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
-$lang->my->project         = "My Projects";
+$lang->my->project         = "My {$lang->projectCommon}s";
 $lang->my->execution       = "My {$lang->executionCommon}s";
 $lang->my->audit           = 'Review';
 $lang->my->issue           = 'My Issues';
@@ -58,7 +58,7 @@ $lang->my->dynamicAction    = 'Dynamic';
 $lang->my->myExecutions = "My Executions";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
-$lang->my->projects     = 'Projects';
+$lang->my->projects     = "{$lang->projectCommon}s";
 $lang->my->executions   = 'Executions';
 
 $lang->my->taskMenu = new stdclass();
@@ -96,27 +96,27 @@ $lang->my->form->lblContact = 'Contact Info';
 $lang->my->form->lblAccount = 'Account Info';
 
 $lang->my->programLink   = 'Program Default Page';
-$lang->my->productLink   = 'Product Default Page';
-$lang->my->projectLink   = 'Project Default Page';
+$lang->my->productLink   = $lang->productCommon . ' Default Page';
+$lang->my->projectLink   = $lang->projectCommon . ' Default Page';
 $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'Project Set List/View all project sets';
 $lang->my->programLinkList['program-kanban']  = 'Project Set Kanban/You can visually view the progress of all project sets';
-$lang->my->programLinkList['program-project'] = 'Project list of the most recent project set/You can view all items under the current project set';
+$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent {$lang->projectCommon} set/You can view all items under the current {$lang->projectCommon} set";
 
 $lang->my->productLinkList = array();
-$lang->my->productLinkList['product-all']       = 'Product List/Can view all products';
-$lang->my->productLinkList['product-kanban']    = 'Product Kanban/You can visually view the progress of all products';
-$lang->my->productLinkList['product-index']     = 'All product dashboards/You can view the statistics of all products';
-$lang->my->productLinkList['product-dashboard'] = 'Last product dashboard/You can view the current product overview';
-$lang->my->productLinkList['product-browse']    = 'Demand list of the latest product/You can view the demand information under the current product';
+$lang->my->productLinkList['product-all']       = "{$lang->productCommon} List/Can view all {$lang->productCommon}s";
+$lang->my->productLinkList['product-kanban']    = "{$lang->productCommon} Kanban/You can visually view the progress of all {$lang->productCommon}s";
+$lang->my->productLinkList['product-index']     = "All {$lang->productCommon} dashboards/You can view the statistics of all {$lang->productCommon}s";
+$lang->my->productLinkList['product-dashboard'] = "Last {$lang->productCommon} dashboard/You can view the current {$lang->productCommon} overview";
+$lang->my->productLinkList['product-browse']    = "Demand list of the latest {$lang->productCommon}/You can view the demand information under the current {$lang->productCommon}";
 
 $lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse']    = 'Project List/Can view all items';
-$lang->my->projectLinkList['project-kanban']    = 'Project Kanban/The project board can visually view the progress of all projects';
-$lang->my->projectLinkList['project-execution'] = 'All execution lists under the project/View all execution information';
-$lang->my->projectLinkList['project-index']     = 'Recent Project Dashboard/You can view the current project overview';
+$lang->my->projectLinkList['project-browse']    = "{$lang->projectCommon} List/Can view all items";
+$lang->my->projectLinkList['project-kanban']    = "{$lang->projectCommon} Kanban/The {$lang->projectCommon} board can visually view the progress of all {$lang->projectCommon}s";
+$lang->my->projectLinkList['project-execution'] = "All execution lists under the {$lang->projectCommon}/View all execution information";
+$lang->my->projectLinkList['project-index']     = "Recent Project Dashboard/You can view the current {$lang->projectCommon} overview";
 
 $lang->my->executionLinkList = array();
 $lang->my->executionLinkList['execution-all']             = 'Execution list/You can view all executions';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 1951a53acd..d163bbc753 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -15,7 +15,7 @@ $lang->my->myTestCase      = 'My Cases';
 $lang->my->story           = 'My Stories';
 $lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
-$lang->my->project         = "My Projects";
+$lang->my->project         = "My {$lang->projectCommon}s";
 $lang->my->execution       = "My {$lang->executionCommon}s";
 $lang->my->audit           = 'Review';
 $lang->my->issue           = 'My Issues';
@@ -58,7 +58,7 @@ $lang->my->dynamicAction    = 'Dynamic';
 $lang->my->myExecutions = "My Executions";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
-$lang->my->projects     = 'Projects';
+$lang->my->projects     = "{$lang->projectCommon}s";
 $lang->my->executions   = 'Executions';
 
 $lang->my->taskMenu = new stdclass();
@@ -96,27 +96,27 @@ $lang->my->form->lblContact = 'Contact Info';
 $lang->my->form->lblAccount = 'Account Info';
 
 $lang->my->programLink   = 'Program Default Page';
-$lang->my->productLink   = 'Product Default Page';
-$lang->my->projectLink   = 'Project Default Page';
+$lang->my->productLink   = $lang->productCommon . ' Default Page';
+$lang->my->projectLink   = $lang->projectCommon . ' Default Page';
 $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'Project Set List/View all project sets';
 $lang->my->programLinkList['program-kanban']  = 'Project Set Kanban/You can visually view the progress of all project sets';
-$lang->my->programLinkList['program-project'] = 'Project list of the most recent project set/You can view all items under the current project set';
+$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent {$lang->projectCommon} set/You can view all items under the current {$lang->projectCommon} set";
 
 $lang->my->productLinkList = array();
-$lang->my->productLinkList['product-all']       = 'Product List/Can view all products';
-$lang->my->productLinkList['product-kanban']    = 'Product Kanban/You can visually view the progress of all products';
-$lang->my->productLinkList['product-index']     = 'All product dashboards/You can view the statistics of all products';
-$lang->my->productLinkList['product-dashboard'] = 'Last product dashboard/You can view the current product overview';
-$lang->my->productLinkList['product-browse']    = 'Demand list of the latest product/You can view the demand information under the current product';
+$lang->my->productLinkList['product-all']       = "{$lang->productCommon} List/Can view all {$lang->productCommon}s";
+$lang->my->productLinkList['product-kanban']    = "{$lang->productCommon} Kanban/You can visually view the progress of all {$lang->productCommon}s";
+$lang->my->productLinkList['product-index']     = "All {$lang->productCommon} dashboards/You can view the statistics of all {$lang->productCommon}s";
+$lang->my->productLinkList['product-dashboard'] = "Last {$lang->productCommon} dashboard/You can view the current {$lang->productCommon} overview";
+$lang->my->productLinkList['product-browse']    = "Demand list of the latest {$lang->productCommon}/You can view the demand information under the current {$lang->productCommon}";
 
 $lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse']    = 'Project List/Can view all items';
-$lang->my->projectLinkList['project-kanban']    = 'Project Kanban/The project board can visually view the progress of all projects';
-$lang->my->projectLinkList['project-execution'] = 'All execution lists under the project/View all execution information';
-$lang->my->projectLinkList['project-index']     = 'Recent Project Dashboard/You can view the current project overview';
+$lang->my->projectLinkList['project-browse']    = "{$lang->projectCommon} List/Can view all items";
+$lang->my->projectLinkList['project-kanban']    = "{$lang->projectCommon} Kanban/The {$lang->projectCommon} board can visually view the progress of all {$lang->projectCommon}s";
+$lang->my->projectLinkList['project-execution'] = "All execution lists under the {$lang->projectCommon}/View all execution information";
+$lang->my->projectLinkList['project-index']     = "Recent Project Dashboard/You can view the current {$lang->projectCommon} overview";
 
 $lang->my->executionLinkList = array();
 $lang->my->executionLinkList['execution-all']             = 'Execution list/You can view all executions';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index a3685d640f..c215a23c7c 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -15,7 +15,7 @@ $lang->my->myTestCase      = 'My Cases';
 $lang->my->story           = 'My Stories';
 $lang->my->doc             = "My Docs";
 $lang->my->createProgram   = 'Create Program';
-$lang->my->project         = "My Projects";
+$lang->my->project         = "My {$lang->projectCommon}s";
 $lang->my->execution       = "My {$lang->executionCommon}s";
 $lang->my->audit           = 'Review';
 $lang->my->issue           = 'My Issues';
@@ -58,7 +58,7 @@ $lang->my->dynamicAction    = 'Dynamic';
 $lang->my->myExecutions = "My Executions";
 $lang->my->name         = 'Name';
 $lang->my->code         = 'Code';
-$lang->my->projects     = 'Projects';
+$lang->my->projects     = "{$lang->projectCommon}s";
 $lang->my->executions   = 'Executions';
 
 $lang->my->taskMenu = new stdclass();
@@ -96,27 +96,27 @@ $lang->my->form->lblContact = 'Contact Info';
 $lang->my->form->lblAccount = 'Account Info';
 
 $lang->my->programLink   = 'Program Default Page';
-$lang->my->productLink   = 'Product Default Page';
-$lang->my->projectLink   = 'Project Default Page';
+$lang->my->productLink   = $lang->productCommon . ' Default Page';
+$lang->my->projectLink   = $lang->projectCommon . ' Default Page';
 $lang->my->executionLink = 'Execution Default Page';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = 'Project Set List/View all project sets';
 $lang->my->programLinkList['program-kanban']  = 'Project Set Kanban/You can visually view the progress of all project sets';
-$lang->my->programLinkList['program-project'] = 'Project list of the most recent project set/You can view all items under the current project set';
+$lang->my->programLinkList['program-project'] = "{$lang->projectCommon} list of the most recent {$lang->projectCommon} set/You can view all items under the current {$lang->projectCommon} set";
 
 $lang->my->productLinkList = array();
-$lang->my->productLinkList['product-all']       = 'Product List/Can view all products';
-$lang->my->productLinkList['product-kanban']    = 'Product Kanban/You can visually view the progress of all products';
-$lang->my->productLinkList['product-index']     = 'All product dashboards/You can view the statistics of all products';
-$lang->my->productLinkList['product-dashboard'] = 'Last product dashboard/You can view the current product overview';
-$lang->my->productLinkList['product-browse']    = 'Demand list of the latest product/You can view the demand information under the current product';
+$lang->my->productLinkList['product-all']       = "{$lang->productCommon} List/Can view all {$lang->productCommon}s";
+$lang->my->productLinkList['product-kanban']    = "{$lang->productCommon} Kanban/You can visually view the progress of all {$lang->productCommon}s";
+$lang->my->productLinkList['product-index']     = "All {$lang->productCommon} dashboards/You can view the statistics of all {$lang->productCommon}s";
+$lang->my->productLinkList['product-dashboard'] = "Last {$lang->productCommon} dashboard/You can view the current {$lang->productCommon} overview";
+$lang->my->productLinkList['product-browse']    = "Demand list of the latest {$lang->productCommon}/You can view the demand information under the current {$lang->productCommon}";
 
 $lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse']    = 'Project List/Can view all items';
-$lang->my->projectLinkList['project-kanban']    = 'Project Kanban/The project board can visually view the progress of all projects';
-$lang->my->projectLinkList['project-execution'] = 'All execution lists under the project/View all execution information';
-$lang->my->projectLinkList['project-index']     = 'Recent Project Dashboard/You can view the current project overview';
+$lang->my->projectLinkList['project-browse']    = "{$lang->projectCommon} List/Can view all items";
+$lang->my->projectLinkList['project-kanban']    = "{$lang->projectCommon} Kanban/The {$lang->projectCommon} board can visually view the progress of all {$lang->projectCommon}s";
+$lang->my->projectLinkList['project-execution'] = "All execution lists under the {$lang->projectCommon}/View all execution information";
+$lang->my->projectLinkList['project-index']     = "Recent Project Dashboard/You can view the current {$lang->projectCommon} overview";
 
 $lang->my->executionLinkList = array();
 $lang->my->executionLinkList['execution-all']             = 'Execution list/You can view all executions';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 22e1bd8eb5..273b7715a0 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -14,8 +14,8 @@ $lang->my->myTestTask      = '我的版本';
 $lang->my->myTestCase      = '我的用例';
 $lang->my->story           = "我的{$lang->SRCommon}";
 $lang->my->doc             = "我的文档";
-$lang->my->createProgram   = '添加项目';
-$lang->my->project         = "我的项目";
+$lang->my->createProgram   = '添加' . $lang->projectCommon;
+$lang->my->project         = '我的' . $lang->projectCommon;
 $lang->my->execution       = "我的{$lang->executionCommon}";
 $lang->my->audit           = '审批';
 $lang->my->issue           = '我的问题';
@@ -58,7 +58,7 @@ $lang->my->dynamicAction    = '动态';
 $lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
 $lang->my->name         = '名称';
 $lang->my->code         = '代号';
-$lang->my->projects     = '所属项目';
+$lang->my->projects     = '所属' . $lang->projectCommon;
 $lang->my->executions   = "所属{$lang->executionCommon}";
 
 $lang->my->taskMenu = new stdclass();
@@ -96,27 +96,27 @@ $lang->my->form->lblContact = '联系信息';
 $lang->my->form->lblAccount = '帐号信息';
 
 $lang->my->programLink   = '项目集默认着陆页';
-$lang->my->productLink   = '产品默认着陆页';
-$lang->my->projectLink   = '项目默认着陆页';
+$lang->my->productLink   = $lang->productCommon .'默认着陆页';
+$lang->my->projectLink   = $lang->projectCommon . '默认着陆页';
 $lang->my->executionLink = '执行默认着陆页';
 
 $lang->my->programLinkList = array();
 $lang->my->programLinkList['program-browse']  = '项目集列表/可以查看所有的项目集';
 $lang->my->programLinkList['program-kanban']  = '项目集看板/可以可视化的查看到所有项目集的进展情况';
-$lang->my->programLinkList['program-project'] = '最近一个项目集的项目列表/可以查看当前项目集下所有项目';
+$lang->my->programLinkList['program-project'] = "最近一个项目集的{$lang->projectCommon}列表/可以查看当前项目集下所有{$lang->projectCommon}";
 
 $lang->my->productLinkList = array();
-$lang->my->productLinkList['product-all']       = '产品列表/可以查看所有产品';
-$lang->my->productLinkList['product-kanban']    = '产品看板/以可视化的方式查看到所有产品的整体情况';
-$lang->my->productLinkList['product-index']     = '所有产品仪表盘/可以查看所有产品的统计,概况，总览等';
-$lang->my->productLinkList['product-dashboard'] = '最近一个产品仪表盘/可以查看最近查看过的一个产品仪表盘';
-$lang->my->productLinkList['product-browse']    = '最近一个产品的需求列表/可以进入最近查看过的一个产品下的研发需求列表';
+$lang->my->productLinkList['product-all']       = "{$lang->productCommon}列表/可以查看所有{$lang->productCommon}";
+$lang->my->productLinkList['product-kanban']    = "{$lang->productCommon}看板/以可视化的方式查看到所有{$lang->productCommon}的整体情况";
+$lang->my->productLinkList['product-index']     = "所有{$lang->productCommon}仪表盘/可以查看所有{$lang->productCommon}的统计,概况，总览等";
+$lang->my->productLinkList['product-dashboard'] = "最近一个{$lang->productCommon}仪表盘/可以查看最近查看过的一个{$lang->productCommon}仪表盘";
+$lang->my->productLinkList['product-browse']    = "最近一个{$lang->productCommon}的需求列表/可以进入最近查看过的一个{$lang->productCommon}下的研发需求列表";
 
 $lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse']    = '项目列表/可以查看所有项目';
-$lang->my->projectLinkList['project-kanban']    = '项目看板/以可视化的查看到所有项目的整体情况';
-$lang->my->projectLinkList['project-execution'] = '最近一个项目执行列表/可以查看项目下所有的执行列表';
-$lang->my->projectLinkList['project-index']     = '最近一个项目仪表盘/可以进入最近查看过的一个项目的仪表盘';
+$lang->my->projectLinkList['project-browse']    = "{$lang->projectCommon}列表/可以查看所有{$lang->projectCommon}";
+$lang->my->projectLinkList['project-kanban']    = "{$lang->projectCommon}看板/以可视化的查看到所有{$lang->projectCommon}的整体情况";
+$lang->my->projectLinkList['project-execution'] = "最近一个{$lang->projectCommon}执行列表/可以查看{$lang->projectCommon}下所有的执行列表";
+$lang->my->projectLinkList['project-index']     = "最近一个{$lang->projectCommon}仪表盘/可以进入最近查看过的一个{$lang->projectCommon}的仪表盘";
 
 $lang->my->executionLinkList = array();
 $lang->my->executionLinkList['execution-all']             = '执行列表/可以查看所有执行';

From cd7cd916737c3917c61d4ddf0046bfb8983d6dd6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 15:30:33 +0800
Subject: [PATCH 245/319] * Modify language items for product common.

---
 module/testcase/lang/de.php    | 2 +-
 module/testcase/lang/en.php    | 2 +-
 module/testcase/lang/fr.php    | 2 +-
 module/testcase/lang/zh-cn.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index af0ecc3446..3be2de9479 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -186,7 +186,7 @@ $lang->testcase->summary               = "Fälle auf dieser Seite: <strong>%s</s
 $lang->testcase->confirmDelete         = 'Möchten Sie diesen Testfall schließen?';
 $lang->testcase->confirmBatchDelete    = 'Möchten Sie diese Testfälle schließen?';
 $lang->testcase->ditto                 = 'Dito';
-$lang->testcase->dittoNotice           = 'Dieser Fall gehört nicht zu den Produkt!';
+$lang->testcase->dittoNotice           = "This Case is not linked to the {$lang->productCommon} as the last one is!";
 $lang->testcase->confirmUnlinkTesttask = 'The case [%s] is already associated in the testtask order of the previous branch/platform, after adjusting the branch/platform, it will be removed from the test list of the previous branch/platform, please confirm whether to continue to modify.';
 
 $lang->testcase->reviewList[0] = 'Nein';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index e15801e6e1..d4d32c0c7e 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -186,7 +186,7 @@ $lang->testcase->summary               = "Total <strong>%s</strong> cases on thi
 $lang->testcase->confirmDelete         = 'Do you want to delete this case?';
 $lang->testcase->confirmBatchDelete    = 'Do you want to batch delete cases?';
 $lang->testcase->ditto                 = 'Ditto';
-$lang->testcase->dittoNotice           = 'This Case is not linked to the Product as the last one is!';
+$lang->testcase->dittoNotice           = "This Case is not linked to the {$lang->productCommon} as the last one is!";
 $lang->testcase->confirmUnlinkTesttask = 'The case [%s] is already associated in the testtask order of the previous branch/platform, after adjusting the branch/platform, it will be removed from the test list of the previous branch/platform, please confirm whether to continue to modify.';
 
 $lang->testcase->reviewList[0] = 'NO';
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index cb92d66759..0f3cb44993 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -186,7 +186,7 @@ $lang->testcase->summary               = "Total <strong>%s</strong> CasTests sur
 $lang->testcase->confirmDelete         = 'Voulez-vous supprimer ce CasTest ?';
 $lang->testcase->confirmBatchDelete    = 'Voulez-vous supprimer des Castests par Lot ?';
 $lang->testcase->ditto                 = 'Idem';
-$lang->testcase->dittoNotice           = "Ce CasTest n'est pas associé au Product alors que le précédent l'était !";
+$lang->testcase->dittoNotice           = "This Case is not linked to the {$lang->productCommon} as the last one is!";
 $lang->testcase->confirmUnlinkTesttask = 'The case [%s] is already associated in the testtask order of the previous branch/platform, after adjusting the branch/platform, it will be removed from the test list of the previous branch/platform, please confirm whether to continue to modify.';
 
 $lang->testcase->reviewList[0] = 'NON';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index df0c267883..66feb53548 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -186,7 +186,7 @@ $lang->testcase->summary               = "本页共 <strong>%s</strong> 个用
 $lang->testcase->confirmDelete         = '您确认要删除该测试用例吗？';
 $lang->testcase->confirmBatchDelete    = '您确认要批量删除这些测试用例吗？';
 $lang->testcase->ditto                 = '同上';
-$lang->testcase->dittoNotice           = '该用例与上一用例不属于同一产品！';
+$lang->testcase->dittoNotice           = "该用例与上一用例不属于同一{$lang->productCommon}！";
 $lang->testcase->confirmUnlinkTesttask = '用例[%s]已关联在之前所属平台/分支的测试单中，调整平台/分支后，将从之前所属平台/分支的测试单中移除，请确认是否继续修改。';
 
 $lang->testcase->reviewList[0] = '否';

From b2eafe01062c4a3319ed9edbd7bf38244c822669 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 15:43:55 +0800
Subject: [PATCH 246/319] * Modify language items for product common.

---
 module/action/lang/de.php    | 4 ++--
 module/action/lang/en.php    | 4 ++--
 module/action/lang/fr.php    | 4 ++--
 module/action/lang/zh-cn.php | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 792a8c88b0..e68cd357ef 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -237,7 +237,7 @@ $lang->action->desc->boot                 = '$date, the ZenAgent Node is boot by
 $lang->action->desc->relieved             = '$date, relieved by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->switchtolight        = '$date, Switch from ALM mode to light mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
 $lang->action->desc->getvnc               = '$date, Remote control <strong>$extra</strong> by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->unlinkproduct        = '$date, the project is disassociated from the $extra, synchronization disassociates the ' . $lang->executionCommon . 's of the project from the $extra.' . "\n";
+$lang->action->desc->unlinkproduct        = '$date, the ' . $lang->projectCommon . ' is disassociated from the $extra, synchronization disassociates the ' . $lang->executionCommon . 's of the ' . $lang->projectCommon . ' from the $extra.' . "\n";
 $lang->action->desc->createdsnapshot      = '$date, <strong>$actor</strong> creates a snapshot <strong>$extra</strong>。' . "\n";
 $lang->action->desc->restoredsnapshot     = '$date, <strong>$actor</strong> restored a snapshot <strong>$extra</strong>。' . "\n";
 $lang->action->desc->editsnapshot         = '$date, <strong>$actor</strong> edited the snapshot <strong>$extra</strong>。' . "\n";
@@ -423,7 +423,7 @@ $lang->action->label->relieved              = 'relieved';
 $lang->action->label->switchtolight         = 'switch from ALM mode to light mode';
 $lang->action->label->linkedrepo            = 'Linked Code Repo';
 $lang->action->label->unlinkedrepo          = 'Unlinked Code Repo';
-$lang->action->label->unlinkproduct         = 'Unlinked Product';
+$lang->action->label->unlinkproduct         = "Unlinked {$lang->productCommon}";
 $lang->action->label->createdsnapshot       = 'create snapshot';
 $lang->action->label->restoredsnapshot      = 'create snapshot';
 $lang->action->label->editsnapshot          = 'edit snapshot';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 4467cd45e0..8a272d697e 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -237,7 +237,7 @@ $lang->action->desc->boot                 = '$date, the ZenAgent Node is boot by
 $lang->action->desc->relieved             = '$date, relieved by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->switchtolight        = '$date, Switch from ALM mode to light mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
 $lang->action->desc->getvnc               = '$date, Remote control <strong>$extra</strong> by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->unlinkproduct        = '$date, the project is disassociated from the $extra, synchronization disassociates the ' . $lang->executionCommon . 's of the project from the $extra.' . "\n";
+$lang->action->desc->unlinkproduct        = '$date, the ' . $lang->projectCommon . ' is disassociated from the $extra, synchronization disassociates the ' . $lang->executionCommon . 's of the ' . $lang->projectCommon . ' from the $extra.' . "\n";
 $lang->action->desc->createdsnapshot      = '$date, <strong>$actor</strong> creates a snapshot <strong>$extra</strong>。' . "\n";
 $lang->action->desc->restoredsnapshot     = '$date, <strong>$actor</strong> restored a snapshot <strong>$extra</strong>。' . "\n";
 $lang->action->desc->editsnapshot         = '$date, <strong>$actor</strong> edited the snapshot <strong>$extra</strong>。' . "\n";
@@ -423,7 +423,7 @@ $lang->action->label->relieved              = 'relieved';
 $lang->action->label->switchtolight         = 'switch from ALM mode to light mode';
 $lang->action->label->linkedrepo            = 'Linked Code Repo';
 $lang->action->label->unlinkedrepo          = 'Unlinked Code Repo';
-$lang->action->label->unlinkproduct         = 'Unlinked Product';
+$lang->action->label->unlinkproduct         = "Unlinked {$lang->productCommon}";
 $lang->action->label->createdsnapshot       = 'create snapshot';
 $lang->action->label->restoredsnapshot      = 'create snapshot';
 $lang->action->label->editsnapshot          = 'edit snapshot';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 70f3bf9d56..2dac56f632 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -237,7 +237,7 @@ $lang->action->desc->boot                 = '$date, the ZenAgent Node is boot by
 $lang->action->desc->relieved             = '$date, relieved by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->switchtolight        = '$date, Switch from ALM mode to light mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
 $lang->action->desc->getvnc               = '$date, Remote control <strong>$extra</strong> by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->unlinkproduct        = '$date, the project is disassociated from the $extra, synchronization disassociates the ' . $lang->executionCommon . 's of the project from the $extra.' . "\n";
+$lang->action->desc->unlinkproduct        = '$date, the ' . $lang->projectCommon . ' is disassociated from the $extra, synchronization disassociates the ' . $lang->executionCommon . 's of the ' . $lang->projectCommon . ' from the $extra.' . "\n";
 $lang->action->desc->createdsnapshot      = '$date, <strong>$actor</strong> creates a snapshot <strong>$extra</strong>。' . "\n";
 $lang->action->desc->restoredsnapshot     = '$date, <strong>$actor</strong> restored a snapshot <strong>$extra</strong>。' . "\n";
 $lang->action->desc->editsnapshot         = '$date, <strong>$actor</strong> edited the snapshot <strong>$extra</strong>。' . "\n";
@@ -423,7 +423,7 @@ $lang->action->label->relieved              = 'relieved';
 $lang->action->label->switchtolight         = 'switch from ALM mode to light mode';
 $lang->action->label->linkedrepo            = 'Linked Code Repo';
 $lang->action->label->unlinkedrepo          = 'Unlinked Code Repo';
-$lang->action->label->unlinkproduct         = 'Unlinked Product';
+$lang->action->label->unlinkproduct         = "Unlinked {$lang->productCommon}";
 $lang->action->label->createdsnapshot       = 'create snapshot';
 $lang->action->label->restoredsnapshot      = 'create snapshot';
 $lang->action->label->editsnapshot          = 'edit snapshot';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index b5e846f1be..a10c166bba 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -216,8 +216,8 @@ $lang->action->desc->importfromgitlab     = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->archived             = '$date, 由 <strong>$actor</strong> 归档。' . "\n";
 $lang->action->desc->restore              = '$date, 由 <strong>$actor</strong> 还原。' . "\n";
 $lang->action->desc->importedcard         = '$date, 由 <strong>$actor</strong> 从看板 <strong>$extra</strong> 导入。' . "\n";
-$lang->action->desc->importedproductplan  = '$date, 由 <strong>$actor</strong> 从产品计划 <strong>$extra</strong> 导入。' . "\n";
-$lang->action->desc->importedrelease      = '$date, 由 <strong>$actor</strong> 从产品发布 <strong>$extra</strong> 导入。' . "\n";
+$lang->action->desc->importedproductplan  = '$date, 由 <strong>$actor</strong> 从' . $lang->productCommon . '计划 <strong>$extra</strong> 导入。' . "\n";
+$lang->action->desc->importedrelease      = '$date, 由 <strong>$actor</strong> 从' . $lang->productCommon . '发布 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->importedexecution    = '$date, 由 <strong>$actor</strong> 从项目执行 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->importedbuild        = '$date, 由 <strong>$actor</strong> 从项目版本 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->importedticket       = '$date, 由 <strong>$actor</strong> 从反馈工单 <strong>$extra</strong> 导入。' . "\n";
@@ -237,7 +237,7 @@ $lang->action->desc->boot                 = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->relieved             = '$date, 由 <strong>$actor</strong> 解除孪生需求关系。' . "\n";
 $lang->action->desc->switchtolight        = '$date, 由于 <strong>'. $lang->admin->system .'</strong> 从全生命周期管理模式切换为轻量管理模式，项目访问控制由项目集内公开调整为私有。' . "\n";
 $lang->action->desc->getvnc               = '$date, <strong>$actor</strong>对执行节点 <strong>$extra</strong> 进行了远程操控。' . "\n";
-$lang->action->desc->unlinkproduct        = '$date, 系统判断由于' . $lang->executionCommon . '所属项目与$extra取消关联，同步将' . $lang->executionCommon . '与$extra取消关联。' . "\n";
+$lang->action->desc->unlinkproduct        = '$date, 系统判断由于' . $lang->executionCommon . '所属' . $lang->projectCommon . '与$extra取消关联，同步将' . $lang->executionCommon . '与$extra取消关联。' . "\n";
 $lang->action->desc->createdsnapshot      = '$date, <strong>$actor</strong> 创建了快照 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->restoredsnapshot     = '$date, <strong>$actor</strong> 还原了快照 <strong>$extra</strong>。' . "\n";
 $lang->action->desc->editsnapshot         = '$date, <strong>$actor</strong> 编辑了快照 <strong>$extra</strong>。' . "\n";
@@ -423,7 +423,7 @@ $lang->action->label->relieved              = '解除了';
 $lang->action->label->switchtolight         = '从全生命周期管理模式切换为轻量管理模式';
 $lang->action->label->linkedrepo            = '关联代码库到';
 $lang->action->label->unlinkedrepo          = '取消了项目与代码库的关联';
-$lang->action->label->unlinkproduct         = '取消了与产品的关联';
+$lang->action->label->unlinkproduct         = "取消了与{$lang->productCommon}的关联";
 $lang->action->label->createdsnapshot       = '创建了快照';
 $lang->action->label->restoredsnapshot      = '还原了快照';
 $lang->action->label->editsnapshot          = '编辑了快照';

From 87cff2d9a5a9fde11f19934ee74aa223a9939999 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 15:53:24 +0800
Subject: [PATCH 247/319] * Modify language items for product common.

---
 module/block/lang/de.php    | 10 +++++-----
 module/block/lang/en.php    | 10 +++++-----
 module/block/lang/fr.php    | 10 +++++-----
 module/block/lang/zh-cn.php | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 8da269b3dd..04422a62d9 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -76,7 +76,7 @@ $lang->block->consumedHours       = 'Cost';
 $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->month               = 'Month';
-$lang->block->selectProduct       = 'Product selection';
+$lang->block->selectProduct       = "{$lang->productCommon} selection";
 $lang->block->of                  = ' von ';
 $lang->block->remain              = 'Left';
 $lang->block->allStories          = 'All';
@@ -572,9 +572,9 @@ $lang->block->gridOptions[4] = 'Rechts';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('Administrator', 'Add Departments', 'Benutzer erstellen', 'Rechte pflegen');
-if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', "Link {$lang->productCommon}", "Create {$lang->projectCommon}", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Besitzer', $lang->productCommon . ' erstellen', 'Module pflegen', 'Pläne pflegen', 'Storys pflegen', 'Release erstellen');
-$lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->execution->common . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
+$lang->block->flowchart['project'] = array('Project Manager', "Add {$lang->productCommon}s and " . $lang->execution->common . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['dev']     = array('Entwickler', 'Aufgabe/Bugs anfordern', 'Update Status', 'Aufgaben/Bugs abschließen');
 $lang->block->flowchart['tester']  = array('QS Team', 'Fälle erstellen', 'Fälle ausführen', 'Bug Berichte', 'Bugs überprüfen', 'Bugs schließen');
 
@@ -587,7 +587,7 @@ $lang->block->zentaoapp->allStorySum          = 'Total Stories';
 $lang->block->zentaoapp->storyCompleteRate    = 'Story CompleteRate';
 $lang->block->zentaoapp->latestExecution      = 'Latest Execution';
 $lang->block->zentaoapp->involvedExecution    = 'Involved Execution';
-$lang->block->zentaoapp->mangedProduct        = 'Manged Product';
+$lang->block->zentaoapp->mangedProduct        = "Manged {$lang->productCommon}";
 $lang->block->zentaoapp->involvedProject      = 'Involved Project';
 $lang->block->zentaoapp->customIndexCard      = 'Custom Index Cards';
 $lang->block->zentaoapp->createStory          = 'Story Create';
@@ -632,7 +632,7 @@ $lang->block->visionTitle            = 'The user interface of ZenTao is divided
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = 'Full feature interface';
-$lang->block->visions['rnd']->text   = 'Integrate the program, product, project, execution, test, etc., and provide the lifecycle project management solution.';
+$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle project management solution.";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = 'Operation Management Interface';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 52ad95e84c..5d5ddacb78 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -76,7 +76,7 @@ $lang->block->consumedHours       = 'Cost';
 $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->month               = 'Month';
-$lang->block->selectProduct       = 'Product selection';
+$lang->block->selectProduct       = "{$lang->productCommon} selection";
 $lang->block->of                  = ' of ';
 $lang->block->remain              = 'Left';
 $lang->block->allStories          = 'All';
@@ -572,9 +572,9 @@ $lang->block->gridOptions[4] = 'Right';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
-if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', "Link {$lang->productCommon}", "Create {$lang->projectCommon}", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
-$lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->execution->common . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
+$lang->block->flowchart['project'] = array('Project Manager', "Add {$lang->productCommon}s and " . $lang->execution->common . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['dev']     = array('Dev Team', 'Claim Tasks/Bugs', 'Design', 'Update Status', 'Finish Tasks/Bugs', 'Commit Code');
 $lang->block->flowchart['tester']  = array('Test Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
 
@@ -587,7 +587,7 @@ $lang->block->zentaoapp->allStorySum          = 'Total Stories';
 $lang->block->zentaoapp->storyCompleteRate    = 'Story CompleteRate';
 $lang->block->zentaoapp->latestExecution      = 'Latest Execution';
 $lang->block->zentaoapp->involvedExecution    = 'Involved Execution';
-$lang->block->zentaoapp->mangedProduct        = 'Manged Product';
+$lang->block->zentaoapp->mangedProduct        = "Manged {$lang->productCommon}";
 $lang->block->zentaoapp->involvedProject      = 'Involved Project';
 $lang->block->zentaoapp->customIndexCard      = 'Custom Index Cards';
 $lang->block->zentaoapp->createStory          = 'Story Create';
@@ -632,7 +632,7 @@ $lang->block->visionTitle            = 'The user interface of ZenTao is divided
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = 'Full feature interface';
-$lang->block->visions['rnd']->text   = 'Integrate the program, product, project, execution, test, etc., and provide the lifecycle project management solution.';
+$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle project management solution.";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = 'Operation Management Interface';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index fa7f693d87..9fd05f8828 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -76,7 +76,7 @@ $lang->block->consumedHours       = 'Cost';
 $lang->block->time                = 'No';
 $lang->block->week                = 'Week';
 $lang->block->month               = 'Month';
-$lang->block->selectProduct       = 'Product selection';
+$lang->block->selectProduct       = "{$lang->productCommon} selection";
 $lang->block->of                  = ' di ';
 $lang->block->remain              = 'Left';
 $lang->block->allStories          = 'All';
@@ -572,9 +572,9 @@ $lang->block->gridOptions[4] = 'Right';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('Administrateur', 'Add Departments', 'Ajoute Utilisateurs', 'Administre Privilèges');
-if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', "Link {$lang->productCommon}", "Create {$lang->projectCommon}", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->executionCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases');
-$lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->execution->common . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
+$lang->block->flowchart['project'] = array('Project Manager', "Add {$lang->productCommon}s and " . $lang->execution->common . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['dev']     = array('Développeurs', 'Réclament Tâches/Bugs', 'Effectuent Tâches', 'Corrigent Bugs', 'MàJ Statuts', 'Terminent Tâches/Bugs');
 $lang->block->flowchart['tester']  = array('Testeurs', 'Rédigent CasTests', 'Jouent CasTests', 'Détectent Bugs', 'Vérifient Corrections', 'Ferment Bugs');
 
@@ -587,7 +587,7 @@ $lang->block->zentaoapp->allStorySum          = 'Total Stories';
 $lang->block->zentaoapp->storyCompleteRate    = 'Story CompleteRate';
 $lang->block->zentaoapp->latestExecution      = 'Latest Execution';
 $lang->block->zentaoapp->involvedExecution    = 'Involved Execution';
-$lang->block->zentaoapp->mangedProduct        = 'Manged Product';
+$lang->block->zentaoapp->mangedProduct        = "Manged {$lang->productCommon}";
 $lang->block->zentaoapp->involvedProject      = 'Involved Project';
 $lang->block->zentaoapp->customIndexCard      = 'Custom Index Cards';
 $lang->block->zentaoapp->createStory          = 'Story Create';
@@ -632,7 +632,7 @@ $lang->block->visionTitle            = 'The user interface of ZenTao is divided
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = 'Full feature interface';
-$lang->block->visions['rnd']->text   = 'Integrate the program, product, project, execution, test, etc., and provide the lifecycle project management solution.';
+$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle project management solution.";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = 'Operation Management Interface';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index d110b596ca..d27055f926 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -76,7 +76,7 @@ $lang->block->consumedHours       = '已消耗';
 $lang->block->time                = '第';
 $lang->block->week                = '周';
 $lang->block->month               = '月';
-$lang->block->selectProduct       = '选择产品';
+$lang->block->selectProduct       = "选择{$lang->productCommon}";
 $lang->block->of                  = '的';
 $lang->block->remain              = '剩余工时';
 $lang->block->allStories          = '总需求';
@@ -572,9 +572,9 @@ $lang->block->gridOptions[4] = '右侧';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('管理员', '维护部门', '添加用户', '维护权限');
-if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('项目集负责人', '创建项目集', '关联产品', "创建项目", "制定预算和规划", '添加干系人');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('项目集负责人', '创建项目集', "关联{$lang->productCommon}", "创建{$lang->projectCommon}", "制定预算和规划", '添加干系人');
 $lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', "维护计划", "维护需求", '创建发布');
-$lang->block->flowchart['project'] = array('项目经理', '创建项目、' . $lang->execution->common, '维护团队', "关联需求", '分解任务', '跟踪进度');
+$lang->block->flowchart['project'] = array('项目经理', "创建{$lang->productCommon}、" . $lang->execution->common, '维护团队', "关联需求", '分解任务', '跟踪进度');
 $lang->block->flowchart['dev']     = array('研发人员', '领取任务和Bug', '设计实现方案', '更新状态', '完成任务和Bug', '提交代码');
 $lang->block->flowchart['tester']  = array('测试人员', '撰写用例', '执行用例', '提交Bug', '验证Bug', '关闭Bug');
 
@@ -587,7 +587,7 @@ $lang->block->zentaoapp->allStorySum          = '需求总数';
 $lang->block->zentaoapp->storyCompleteRate    = '需求完成率';
 $lang->block->zentaoapp->latestExecution      = '近期执行';
 $lang->block->zentaoapp->involvedExecution    = '我参与的执行';
-$lang->block->zentaoapp->mangedProduct        = '负责产品';
+$lang->block->zentaoapp->mangedProduct        = "负责{$lang->productCommon}";
 $lang->block->zentaoapp->involvedProject      = '参与项目';
 $lang->block->zentaoapp->customIndexCard      = '定制首页卡片';
 $lang->block->zentaoapp->createStory          = '提需求';
@@ -632,7 +632,7 @@ $lang->block->visionTitle            = '禅道使用界面分为【研发综合
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = '研发综合界面';
-$lang->block->visions['rnd']->text   = '集项目集、产品、项目、执行、测试等多维度管理于一体，提供全过程项目管理解决方案。';
+$lang->block->visions['rnd']->text   = "集项目集、{$lang->productCommon}、项目、执行、测试等多维度管理于一体，提供全过程项目管理解决方案。";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = '运营管理界面';

From 9ed0c9a4f33399d649e961ae51018361317c7418 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 15:53:45 +0800
Subject: [PATCH 248/319] * Modify language for project common.

---
 module/product/lang/de.php    | 26 +++++++++++++-------------
 module/product/lang/en.php    | 24 ++++++++++++------------
 module/product/lang/fr.php    | 26 +++++++++++++-------------
 module/product/lang/zh-cn.php | 30 +++++++++++++++---------------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index 7e7686b8b8..a8db2f4d34 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -44,7 +44,7 @@ $lang->product->indexAction  = "All {$lang->productCommon}";
 $lang->product->closeAction  = "Close {$lang->productCommon}";
 $lang->product->orderAction  = "Rank {$lang->productCommon}";
 $lang->product->exportAction = "Export {$lang->productCommon}";
-$lang->product->link2Project = "Link Project";
+$lang->product->link2Project = "Link {$lang->projectCommon}";
 
 $lang->product->basicInfo = 'Basis Info';
 $lang->product->otherInfo = 'Andere Info';
@@ -62,7 +62,7 @@ $lang->product->doc         = 'Dok';
 $lang->product->project     = $lang->executionCommon . 'Liste';
 $lang->product->build       = 'Build';
 $lang->product->moreProduct = "More Product";
-$lang->product->projectInfo = "Projects that are linked to this {$lang->productCommon} are listed below.";
+$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
 $lang->product->progress    = "Progress";
 
 $lang->product->currentExecution      = "Aktuelle Execution";
@@ -93,15 +93,15 @@ $lang->product->unfoldClosed          = 'Unfold Closed';
 $lang->product->confirmDelete        = " Möchten Sie {$lang->productCommon} löschen?";
 $lang->product->errorNoProduct       = "Kein {$lang->productCommon} erstellt!";
 $lang->product->accessDenied         = "Sie haben keinen Zugriff auf {$lang->productCommon}.";
-$lang->product->programChangeTip     = "The projects linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
-$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please cancel the link before proceeding";
-$lang->product->confirmChangeProgram = "The projects linked with this {$lang->productCommon}: %s is also linked with other products, whether to transfer projects to the modified program set.";
-$lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding";
-$lang->product->changeLineError      = "Products already exist under the product line, so the program within them cannot be modified.";
+$lang->product->programChangeTip     = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
+$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following {$lang->projectCommon}s, please cancel the link before proceeding";
+$lang->product->confirmChangeProgram = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s is also linked with other {$lang->productCommon}s, whether to transfer {$lang->projectCommon}s to the modified program set.";
+$lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the {$lang->projectCommon}, please unlink it before proceeding";
+$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the {$lang->productCommon} line, so the program within them cannot be modified.";
 $lang->product->programEmpty         = 'Program should not be empty!';
-$lang->product->nameIsDuplicate      = "『%s』 product line already exists, please reset!";
-$lang->product->nameIsDuplicated     = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
-$lang->product->reviewStory          = 'You are not a reviewer for needs " %s %s", and cannot review. This operation has been filtered';
+$lang->product->nameIsDuplicate      = "『%s』 {$lang->productCommon} line already exists, please reset!";
+$lang->product->nameIsDuplicated     = "{$lang->productCommon} Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
+$lang->product->reviewStory          = 'You are not a reviewer for needs "%s" , and cannot review. This operation has been filtered';
 
 $lang->product->id             = 'ID';
 $lang->product->program        = "Program";
@@ -163,7 +163,7 @@ $lang->product->otherProduct          = 'Other Products';
 $lang->product->unclosedProduct       = 'Open Products';
 $lang->product->unexpiredPlan         = 'Unexpired Plans';
 $lang->product->doing                 = 'Doing';
-$lang->product->doingProject          = 'Ongoing Projects';
+$lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
 $lang->product->doingExecution        = 'Ongoing Executions';
 $lang->product->doingClassicExecution = 'Ongoing ' . $lang->executionCommon;
 $lang->product->normalRelease         = 'Normal Releases';
@@ -192,11 +192,11 @@ $lang->product->statusList['closed'] = 'Geschlossen';
 global $config;
 if($config->systemMode == 'ALM')
 {
-    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated {$lang->projectCommon} can access)";
 }
 else
 {
-    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Team members and stakeholders of the associated project can access)";
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Team members and stakeholders of the associated {$lang->projectCommon} can access)";
 }
 $lang->product->aclList['open']    = "Standard (Benutzer mit Rechten für {$lang->productCommon} können zugreifen.)";
 //$lang->product->aclList['custom']  = 'Benutzerdefiniert (Teammitglieder und Whitelist Benutzer haben Zugriff.)';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index cd0e20087a..7747725006 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -44,7 +44,7 @@ $lang->product->indexAction  = "All {$lang->productCommon}";
 $lang->product->closeAction  = "Close {$lang->productCommon}";
 $lang->product->orderAction  = "Sort {$lang->productCommon}";
 $lang->product->exportAction = "Export {$lang->productCommon}";
-$lang->product->link2Project = "Link Project";
+$lang->product->link2Project = "Link {$lang->projectCommon}";
 
 $lang->product->basicInfo = 'Basic Info';
 $lang->product->otherInfo = 'Other Info';
@@ -62,7 +62,7 @@ $lang->product->doc         = "{$lang->productCommon} Documents";
 $lang->product->project     = $lang->executionCommon . ' List';
 $lang->product->build       = 'Build List';
 $lang->product->moreProduct = "More Product";
-$lang->product->projectInfo = "Projects that are linked to this {$lang->productCommon} are listed below.";
+$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
 $lang->product->progress    = "Progress";
 
 $lang->product->currentExecution      = "Current Execution";
@@ -93,14 +93,14 @@ $lang->product->unfoldClosed          = 'Unfold Closed';
 $lang->product->confirmDelete        = " Do you want to delete the {$lang->productCommon}?";
 $lang->product->errorNoProduct       = "No {$lang->productCommon} is created yet!";
 $lang->product->accessDenied         = "You have no access to the {$lang->productCommon}.";
-$lang->product->programChangeTip     = "The projects linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
-$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please click the project name to enter the {$lang->SRCommon} list to cancel the link before proceeding";
-$lang->product->confirmChangeProgram = "The projects linked with this {$lang->productCommon}: %s is also linked with other products, whether to transfer projects to the modified program set.";
-$lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding";
-$lang->product->changeLineError      = "Products already exist under the product line, so the program within them cannot be modified.";
+$lang->product->programChangeTip     = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
+$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following {$lang->projectCommon}s, please cancel the link before proceeding";
+$lang->product->confirmChangeProgram = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s is also linked with other {$lang->productCommon}s, whether to transfer {$lang->projectCommon}s to the modified program set.";
+$lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the {$lang->projectCommon}, please unlink it before proceeding";
+$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the {$lang->productCommon} line, so the program within them cannot be modified.";
 $lang->product->programEmpty         = 'Program should not be empty!';
-$lang->product->nameIsDuplicate      = "『%s』 product line already exists, please reset!";
-$lang->product->nameIsDuplicated     = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
+$lang->product->nameIsDuplicate      = "『%s』 {$lang->productCommon} line already exists, please reset!";
+$lang->product->nameIsDuplicated     = "{$lang->productCommon} Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
 $lang->product->reviewStory          = 'You are not a reviewer for needs "%s" , and cannot review. This operation has been filtered';
 
 $lang->product->id             = 'ID';
@@ -163,7 +163,7 @@ $lang->product->otherProduct          = 'Other Products';
 $lang->product->unclosedProduct       = 'Open Products';
 $lang->product->unexpiredPlan         = 'Unexpired Plans';
 $lang->product->doing                 = 'Doing';
-$lang->product->doingProject          = 'Ongoing Projects';
+$lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
 $lang->product->doingExecution        = 'Ongoing Executions';
 $lang->product->doingClassicExecution = 'Ongoing ' . $lang->executionCommon;
 $lang->product->normalRelease         = 'Normal Releases';
@@ -192,11 +192,11 @@ $lang->product->statusList['closed'] = 'Closed';
 global $config;
 if($config->systemMode == 'ALM')
 {
-    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated {$lang->projectCommon} can access)";
 }
 else
 {
-    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Team members and stakeholders of the associated project can access)";
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Team members and stakeholders of the associated {$lang->projectCommon} can access)";
 }
 $lang->product->aclList['open']    = "Default (Users with privileges to {$lang->productCommon} can access it.)";
 //$lang->product->aclList['custom']  = 'Custom (Team members and Whitelist members can access it.)';
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 1855f2a7f9..98db26ad0e 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -44,7 +44,7 @@ $lang->product->indexAction  = "All {$lang->productCommon}";
 $lang->product->closeAction  = "Fermer {$lang->productCommon}";
 $lang->product->orderAction  = "Rang {$lang->productCommon}";
 $lang->product->exportAction = "Export {$lang->productCommon}";
-$lang->product->link2Project = "Link Project";
+$lang->product->link2Project = "Link {$lang->projectCommon}";
 
 $lang->product->basicInfo = 'Infos de Base';
 $lang->product->otherInfo = 'Autres Infos';
@@ -53,7 +53,7 @@ $lang->product->plans       = 'Plans';
 $lang->product->releases    = 'Releases';
 $lang->product->docs        = 'Doc';
 $lang->product->bugs        = 'Bug Liés';
-$lang->product->projects    = "Linked Project";
+$lang->product->projects    = "Linked {$lang->projectCommon}";
 $lang->product->executions  = "{$lang->execution->common}s Liés";
 $lang->product->cases       = 'CasTests';
 $lang->product->builds      = 'Build';
@@ -62,7 +62,7 @@ $lang->product->doc         = "Documents {$lang->productCommon}";
 $lang->product->project     = ' Liste ' . $lang->executionCommon;
 $lang->product->build       = 'Liste Builds';
 $lang->product->moreProduct = "More Product";
-$lang->product->projectInfo = "Les Projects qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
+$lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
 $lang->product->progress    = "Progress";
 
 $lang->product->currentExecution      = "Current Execution";
@@ -93,14 +93,14 @@ $lang->product->unfoldClosed          = 'Unfold Closed';
 $lang->product->confirmDelete        = "Voulez-vous vraiment supprimer le {$lang->productCommon} ?";
 $lang->product->errorNoProduct       = "Aucun {$lang->productCommon} n'est créé pour l'instant !";
 $lang->product->accessDenied         = "Vous n'avez pas accès au {$lang->productCommon}.";
-$lang->product->programChangeTip     = "The projects linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
-$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following projects, please cancel the link before proceeding";
-$lang->product->confirmChangeProgram = "The projects linked with this {$lang->productCommon}: %s is also linked with other products, whether to transfer projects to the modified program set.";
-$lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the project, please unlink it before proceeding";
-$lang->product->changeLineError      = "Products already exist under the product line, so the program within them cannot be modified.";
+$lang->product->programChangeTip     = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s will be transferred to the modified program set together.";
+$lang->product->notChangeProgramTip  = "The {$lang->SRCommon} of {$lang->productCommon} has been linked to the following {$lang->projectCommon}s, please cancel the link before proceeding";
+$lang->product->confirmChangeProgram = "The {$lang->projectCommon}s linked with this {$lang->productCommon}: %s is also linked with other {$lang->productCommon}s, whether to transfer {$lang->projectCommon}s to the modified program set.";
+$lang->product->changeProgramError   = "The {$lang->SRCommon} of this {$lang->productCommon} has been linked to the {$lang->projectCommon}, please unlink it before proceeding";
+$lang->product->changeLineError      = "{$lang->productCommon}s already exist under the {$lang->productCommon} line, so the program within them cannot be modified.";
 $lang->product->programEmpty         = 'Program should not be empty!';
-$lang->product->nameIsDuplicate      = "『%s』 product line already exists, please reset!";
-$lang->product->nameIsDuplicated     = "Product Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
+$lang->product->nameIsDuplicate      = "『%s』 {$lang->productCommon} line already exists, please reset!";
+$lang->product->nameIsDuplicated     = "{$lang->productCommon} Line『%s』 exists. Go to Admin->System->Data->Recycle Bin to restore it, if you are sure it is deleted.";
 $lang->product->reviewStory          = 'You are not a reviewer for needs "%s" , and cannot review. This operation has been filtered';
 
 $lang->product->id             = 'ID';
@@ -163,7 +163,7 @@ $lang->product->otherProduct          = 'Other Products';
 $lang->product->unclosedProduct       = 'Open Products';
 $lang->product->unexpiredPlan         = 'Unexpired Plans';
 $lang->product->doing                 = 'Doing';
-$lang->product->doingProject          = 'Ongoing Projects';
+$lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
 $lang->product->doingExecution        = 'Ongoing Executions';
 $lang->product->doingClassicExecution = 'Ongoing ' . $lang->executionCommon;
 $lang->product->normalRelease         = 'Normal Releases';
@@ -192,11 +192,11 @@ $lang->product->statusList['closed'] = 'Fermé';
 global $config;
 if($config->systemMode == 'ALM')
 {
-    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated {$lang->projectCommon} can access)";
 }
 else
 {
-    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Team members and stakeholders of the associated project can access)";
+    $lang->product->aclList['private'] = "Private {$lang->productCommon} (Team members and stakeholders of the associated {$lang->projectCommon} can access)";
 }
 $lang->product->aclList['open']    = "Défaut (Les utilisateurs ayant des droits sur {$lang->productCommon} peuvent accéder à ce {$lang->productCommon}.)";
 //$lang->product->aclList['custom']  = "Personnalisé (les membres de l'équipe et les membres de la Liste blanche peuvent y accéder.)";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index ed511328a7..e42d35a01c 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -44,7 +44,7 @@ $lang->product->indexAction  = "所有{$lang->productCommon}仪表盘";
 $lang->product->closeAction  = "关闭{$lang->productCommon}";
 $lang->product->orderAction  = "{$lang->productCommon}排序";
 $lang->product->exportAction = "导出{$lang->productCommon}";
-$lang->product->link2Project = "关联项目";
+$lang->product->link2Project = "关联{$lang->projectCommon}";
 
 $lang->product->basicInfo = '基本信息';
 $lang->product->otherInfo = '其他信息';
@@ -53,7 +53,7 @@ $lang->product->plans       = "计划数";
 $lang->product->releases    = '发布数';
 $lang->product->docs        = '文档数';
 $lang->product->bugs        = '相关Bug';
-$lang->product->projects    = "关联项目数";
+$lang->product->projects    = "关联{$lang->projectCommon}数";
 $lang->product->executions  = "关联{$lang->execution->common}数";
 $lang->product->cases       = '用例数';
 $lang->product->builds      = '版本数';
@@ -62,7 +62,7 @@ $lang->product->doc         = '文档列表';
 $lang->product->project     = $lang->executionCommon . '列表';
 $lang->product->build       = '版本列表';
 $lang->product->moreProduct = "更多产品";
-$lang->product->projectInfo = "所有与此产品关联的项目";
+$lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}";
 $lang->product->progress    = "产品完成度";
 
 $lang->product->currentExecution      = "当前执行";
@@ -93,14 +93,14 @@ $lang->product->unfoldClosed          = '展开已关闭';
 $lang->product->confirmDelete        = " 您确定删除该{$lang->productCommon}吗？";
 $lang->product->errorNoProduct       = "还没有创建{$lang->productCommon}！";
 $lang->product->accessDenied         = "您无权访问该{$lang->productCommon}";
-$lang->product->programChangeTip     = "如下项目只关联了该{$lang->productCommon}， 将直接转移至新项目集下。";
-$lang->product->notChangeProgramTip  = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下项目，请点击项目名称进入{$lang->SRCommon}列表取消关联后再操作";
-$lang->product->confirmChangeProgram = "如下项目既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新项目集下。";
-$lang->product->changeProgramError   = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到项目，请取消关联后再操作";
-$lang->product->changeLineError      = "产品线下已有产品，不可修改所属项目集。";
-$lang->product->programEmpty         = '项目集不能为空';
-$lang->product->nameIsDuplicate      = "『%s』产品线已经存在，请重新设置！";
-$lang->product->nameIsDuplicated     = "产品线已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。";
+$lang->product->programChangeTip     = "如下{$lang->projectCommon}只关联了该{$lang->productCommon}， 将直接转移至新{$lang->projectCommon}集下。";
+$lang->product->notChangeProgramTip  = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下{$lang->projectCommon}，请点击{$lang->projectCommon}名称进入{$lang->SRCommon}列表取消关联后再操作";
+$lang->product->confirmChangeProgram = "如下{$lang->projectCommon}既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新{$lang->projectCommon}集下。";
+$lang->product->changeProgramError   = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到{$lang->projectCommon}，请取消关联后再操作";
+$lang->product->changeLineError      = "{$lang->productCommon}线下已有{$lang->productCommon}，不可修改所属{$lang->projectCommon}集。";
+$lang->product->programEmpty         = '{$lang->projectCommon}集不能为空';
+$lang->product->nameIsDuplicate      = "『%s』{$lang->productCommon}线已经存在，请重新设置！";
+$lang->product->nameIsDuplicated     = "{$lang->productCommon}线已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。";
 $lang->product->reviewStory          = '您不是研发需求 "%s" 的评审人，无法评审，本次操作已被过滤。';
 
 $lang->product->id             = '编号';
@@ -163,7 +163,7 @@ $lang->product->otherProduct          = '其他' . $lang->productCommon;
 $lang->product->unclosedProduct       = '未关闭的' . $lang->productCommon;
 $lang->product->unexpiredPlan         = '未过期的计划';
 $lang->product->doing                 = '进行中';
-$lang->product->doingProject          = '进行中的项目';
+$lang->product->doingProject          = '进行中的' . $lang->projectCommon;
 $lang->product->doingExecution        = '进行中的执行';
 $lang->product->doingClassicExecution = '进行中的' . $lang->executionCommon;
 $lang->product->normalRelease         = '正常的发布';
@@ -192,11 +192,11 @@ $lang->product->statusList['closed'] = '结束';
 global $config;
 if($config->systemMode == 'ALM')
 {
-    $lang->product->aclList['private'] = "私有({$lang->productCommon}相关负责人、所属项目集的负责人及干系人、相关联项目的团队成员和干系人可访问)";
+    $lang->product->aclList['private'] = "私有({$lang->productCommon}相关负责人、所属项目集的负责人及干系人、相关联{$lang->projectCommon}的团队成员和干系人可访问)";
 }
 else
 {
-    $lang->product->aclList['private'] = "私有({$lang->productCommon}相关负责人、相关联项目的团队成员和关系人可访问)";
+    $lang->product->aclList['private'] = "私有({$lang->productCommon}相关负责人、相关联{$lang->projectCommon}的团队成员和关系人可访问)";
 }
 $lang->product->aclList['open']    = "公开(有{$lang->productCommon}视图权限，即可访问)";
 //$lang->product->aclList['custom']  = '自定义白名单(团队成员和白名单的成员可以访问)';
@@ -205,7 +205,7 @@ $lang->product->acls['private'] = '私有';
 $lang->product->acls['open']    = "公开";
 
 $lang->product->aclTips['open']    = "有{$lang->productCommon}视图权限，即可访问";
-$lang->product->aclTips['private'] = "{$lang->productCommon}相关负责人、所属项目集的干系人、相关联项目的团队成员和干系人可访问";
+$lang->product->aclTips['private'] = "{$lang->productCommon}相关负责人、所属项目集的干系人、相关联{$lang->projectCommon}的团队成员和干系人可访问";
 
 $lang->product->storySummary   = "本页共 <strong>%s</strong> 个%s，预计 <strong>%s</strong> 个{$lang->hourCommon}，用例覆盖率 <strong>%s</strong>。";
 $lang->product->checkedSummary = "选中 <strong>%total%</strong> 个%storyCommon%，预计 <strong>%estimate%</strong> 个{$lang->hourCommon}，用例覆盖率 <strong>%rate%</strong>。";

From fc83e59848505f13de039591645f7fda7e7fcb49 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 6 Mar 2023 08:28:50 +0000
Subject: [PATCH 249/319] * Fix feedback #2393.

---
 module/search/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/search/model.php b/module/search/model.php
index 69ac1589bb..695a4ab088 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -29,6 +29,7 @@ class searchModel extends model
         {
             $flowModule = $module;
             if($module == 'projectStory' || $module == 'executionStory') $flowModule = 'story';
+            if($module == 'projectBuild' || $module == 'executionBuild') $flowModule = 'build';
             if($module == 'projectBug') $flowModule = 'bug';
 
             $buildin = false;

From 903c858cf139daabbaafcd361e1e5fe1619117b7 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 6 Mar 2023 16:36:06 +0800
Subject: [PATCH 250/319] * Implement custom use case filter tags.

---
 module/dev/config.php                    | 3 +++
 module/dev/css/langitem.css              | 2 +-
 module/dev/model.php                     | 1 +
 module/project/lang/de.php               | 2 +-
 module/project/lang/en.php               | 2 +-
 module/project/lang/fr.php               | 2 +-
 module/project/lang/zh-cn.php            | 2 +-
 module/testcase/lang/de.php              | 1 -
 module/testcase/lang/en.php              | 1 -
 module/testcase/lang/fr.php              | 1 -
 module/testcase/lang/zh-cn.php           | 1 -
 module/testcase/view/caseheader.html.php | 8 ++++----
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module/dev/config.php b/module/dev/config.php
index 387e1e3393..c6c5f439a0 100644
--- a/module/dev/config.php
+++ b/module/dev/config.php
@@ -295,3 +295,6 @@ if(!helper::hasFeature('meeting'))      $config->dev->skipMenus['execution']['me
 $config->dev->liteTagMethod['my-contribute'] = 'contribute_task';
 
 $config->dev->onlyMainMenu = array('kanban');
+
+$config->dev->skipTags['project-testcase'] = array('suite', 'autocase');
+$config->dev->skipTags['testcase-browse']  = array('casetype', 'suite', 'autocase');
diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css
index ff8ca82ccd..0feb0d824b 100644
--- a/module/dev/css/langitem.css
+++ b/module/dev/css/langitem.css
@@ -28,7 +28,7 @@
 .form-item-content > .form-item.w-expand {width: 700px;}
 .form-item-content > .form-item >  .label {flex: 0 0 160px; padding-left: 40px; background: #F8F8F8; display: flex; align-items: center; color: currentColor;}
 .form-item-content > .form-item >  .input-group {margin-left: 20px; width:200px; height:32px;}
-.form-item-content > .form-item >  .input-group > .input-group-addon {flex: 1 1 30%; border-left: 1px solid #dcdcdc;}
+.form-item-content > .form-item >  .input-group > .input-group-addon {flex: 1 1 30%;}
 .form-item-content > .form-item >  .input-control > input {margin-left: 40px;}
 .form-item-content > .form-item.active .icon {display: unset;}
 .form-item-content > .form-item .icon {display: none; position: absolute; left: -50px; top: 2px; font-size: 25px;}
diff --git a/module/dev/model.php b/module/dev/model.php
index cb40b4c8ff..9a1dfb64be 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -448,6 +448,7 @@ class devModel extends model
 
             foreach($featureBars as $feature => $featureName)
             {
+                if(isset($this->config->dev->skipTags["$module-$method"]) and in_array($feature, $this->config->dev->skipTags["$module-$method"])) continue;
                 $moreSelectsTags = isset($defaultLang->{$module}->moreSelects[$method][$feature]) ? $defaultLang->{$module}->moreSelects[$method][$feature] : '';
                 if($moreSelectsTags)
                 {
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 1e54c68ef3..3073db4a48 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all']         = 'Alle';
 $lang->project->featureBar['testcase']['wait']        = 'Wartend';
 $lang->project->featureBar['testcase']['needconfirm'] = "Story geändert";
 $lang->project->featureBar['testcase']['group']       = 'Group View';
-$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case {$lang->SRCommon}";
 $lang->project->featureBar['testcase']['suite']       = 'Suite';
 $lang->project->featureBar['testcase']['autocase']    = 'Automated';
 
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index b9f2ea7c2f..79d1e6abb9 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all']         = 'All';
 $lang->project->featureBar['testcase']['wait']        = 'Waiting';
 $lang->project->featureBar['testcase']['needconfirm'] = "Story Changed";
 $lang->project->featureBar['testcase']['group']       = 'Group View';
-$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case {$lang->SRCommon}";
 $lang->project->featureBar['testcase']['suite']       = 'Suite';
 $lang->project->featureBar['testcase']['autocase']    = 'Automated';
 
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index f99f256337..d5edf94f69 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all']         = 'Tous';
 $lang->project->featureBar['testcase']['wait']        = 'En Attente';
 $lang->project->featureBar['testcase']['needconfirm'] = "Story Changée";
 $lang->project->featureBar['testcase']['group']       = 'Group View';
-$lang->project->featureBar['testcase']['zerocase']    = "Zero Case Story";
+$lang->project->featureBar['testcase']['zerocase']    = "Zero Case {$lang->SRCommon}";
 $lang->project->featureBar['testcase']['suite']       = 'Suite';
 $lang->project->featureBar['testcase']['autocase']    = 'Automated';
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 8cd1ce8b89..370f6d6741 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -302,7 +302,7 @@ $lang->project->featureBar['testcase']['all']         = '所有';
 $lang->project->featureBar['testcase']['wait']        = '待评审';
 $lang->project->featureBar['testcase']['needconfirm'] = "需求变动";
 $lang->project->featureBar['testcase']['group']       = '分组查看';
-$lang->project->featureBar['testcase']['zerocase']    = "零用例需求";
+$lang->project->featureBar['testcase']['zerocase']    = "零用例{$lang->SRCommon}";
 $lang->project->featureBar['testcase']['suite']       = '套件';
 $lang->project->featureBar['testcase']['autocase']    = '自动化';
 
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 3be2de9479..999168bb67 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
-$lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index d4d32c0c7e..81b547240b 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
-$lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 0f3cb44993..3d027a8e0d 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
-$lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 66feb53548..825452b53c 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -266,4 +266,3 @@ $lang->testcase->featureBar['browse']['group']       = '分组查看';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
 $lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
-$lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 91a8b52a71..49b5fea2d3 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -84,8 +84,8 @@
     $rawMethod = $this->app->rawMethod;
     if(!isset($lang->{$rawModule}->featureBar[$rawMethod]))
     {
-        $rawModule = 'testcase';
-        $rawMethod = 'browse';
+        $rawModule = $app->tab == 'project' ? 'project' : 'testcase';
+        $rawMethod = $rawModule == 'testcase' ? 'browse' : 'testcase';
     }
     ?>
     <?php foreach(customModel::getFeatureMenu($rawModule, $rawMethod) as $menuItem):?>
@@ -184,13 +184,13 @@
         $active  = !empty($groupBy) ? 'btn-active-text' : '';
 
         echo "<div id='groupTab' class='btn-group'>";
-        echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active' data-app='{$this->app->tab}'");
+        echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link $active' data-app='{$this->app->tab}'");
         echo '</div>';
     }
     elseif($hasZeroPriv and $menuType == 'zerocase')
     {
         $projectID = $isProjectApp ? $this->session->project : 0;
-        echo html::a($this->createLink('testcase', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "<span class='text'>{$lang->testcase->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->tab}'");
+        echo html::a($this->createLink('testcase', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->tab}'");
     }
 
     ?>

From 758a1e2da0b8bee3e9947e68f1f9a4fa6c7d05b8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 08:36:21 +0800
Subject: [PATCH 251/319] * Modify test case for dev module.

---
 test/model/dev/getcustomedlang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/model/dev/getcustomedlang.php b/test/model/dev/getcustomedlang.php
index a4c73f8c3a..60320ecdbf 100644
--- a/test/model/dev/getcustomedlang.php
+++ b/test/model/dev/getcustomedlang.php
@@ -39,8 +39,8 @@ $devTester = new devTest();
 r($devTester->getCustomedLangTest('test'))   && p()                && e("0");     // 错误的类型返回数据
 r($devTester->getCustomedLangTest('common')) && p('productCommon') && e("测试1"); // 正确的类型返回数据
 
-r($devTester->getCustomedLangTest('second', $failModule)) && p()             && e("0");     // 正确的类型，错误的模块返回数据
-r($devTester->getCustomedLangTest('second', $realModule)) && p('menu_index') && e("测试2"); // 正确的类型，正确的模块返回数据
+r($devTester->getCustomedLangTest('second', $failModule)) && p()        && e("0");     // 正确的类型，错误的模块返回数据
+r($devTester->getCustomedLangTest('second', $realModule)) && p('index') && e("测试2"); // 正确的类型，正确的模块返回数据
 
 r($devTester->getCustomedLangTest('tag', $realModule, $failMethod)) && p()                      && e("0");     // 正确的类型，正确的模块，错误的方法返回数据
 r($devTester->getCustomedLangTest('tag', $realModule, $realMethod)) && p('featureBar-todo_all') && e("测试3"); // 正确的类型，正确的模块，正确的方法返回数据

From 37a87a6682fc1b98b849c3c7aff40d9ef0de11d8 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Tue, 7 Mar 2023 00:50:14 +0000
Subject: [PATCH 252/319] Fix bug #86289.

---
 module/execution/control.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/execution/control.php b/module/execution/control.php
index 0c473b3597..f8da167db9 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -126,6 +126,8 @@ class execution extends control
 
         if(!isset($_SESSION['limitedExecutions'])) $this->execution->getLimitedExecution();
 
+	if($executionID) $this->session->set("storyList",$this->createLink("execution","story","&executionID=".$executionID));
+
         /* Set browse type. */
         $browseType = strtolower($status);
 

From 66e6e8f48e2894443edc5e05bc8692376d79f785 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 08:57:37 +0800
Subject: [PATCH 253/319] * Added custom filter tag language entries.

---
 module/execution/lang/de.php        | 11 ++++++++++-
 module/execution/lang/en.php        | 11 ++++++++++-
 module/execution/lang/fr.php        | 11 ++++++++++-
 module/execution/lang/zh-cn.php     | 11 ++++++++++-
 module/execution/view/task.html.php |  7 ++++---
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 45150c801a..d7d33bb011 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -524,7 +524,16 @@ $lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assigne
 $lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
 $lang->execution->featureBar['task']['assignedbyme'] = $lang->execution->assignedByMe;
 $lang->execution->featureBar['task']['needconfirm']  = 'Story geändert';
-$lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
+$lang->execution->featureBar['task']['status']       = $lang->more;
+
+$lang->execution->moreSelects['task']['status']['wait']         = 'Waiting';
+$lang->execution->moreSelects['task']['status']['doing']        = 'Doing';
+$lang->execution->moreSelects['task']['status']['undone']       = 'Unfinished';
+$lang->execution->moreSelects['task']['status']['finishedbyme'] = 'FinishedByMe';
+$lang->execution->moreSelects['task']['status']['done']         = 'Done';
+$lang->execution->moreSelects['task']['status']['closed']       = 'Closed';
+$lang->execution->moreSelects['task']['status']['cancel']       = 'Cancelled';
+$lang->execution->moreSelects['task']['status']['delayed']      = 'Delayed';
 
 $lang->execution->featureBar['all']['all']       = $lang->execution->all;
 $lang->execution->featureBar['all']['undone']    = $lang->execution->undone;
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 355abb24a6..a83b1fd492 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -524,7 +524,16 @@ $lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assigne
 $lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
 $lang->execution->featureBar['task']['assignedbyme'] = $lang->execution->assignedByMe;
 $lang->execution->featureBar['task']['needconfirm']  = 'Changed';
-$lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
+$lang->execution->featureBar['task']['status']       = $lang->more;
+
+$lang->execution->moreSelects['task']['status']['wait']         = 'Waiting';
+$lang->execution->moreSelects['task']['status']['doing']        = 'Doing';
+$lang->execution->moreSelects['task']['status']['undone']       = 'Unfinished';
+$lang->execution->moreSelects['task']['status']['finishedbyme'] = 'FinishedByMe';
+$lang->execution->moreSelects['task']['status']['done']         = 'Done';
+$lang->execution->moreSelects['task']['status']['closed']       = 'Closed';
+$lang->execution->moreSelects['task']['status']['cancel']       = 'Cancelled';
+$lang->execution->moreSelects['task']['status']['delayed']      = 'Delayed';
 
 $lang->execution->featureBar['all']['all']       = $lang->execution->all;
 $lang->execution->featureBar['all']['undone']    = $lang->execution->undone;
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index ad414888c8..996c1dd684 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -524,7 +524,16 @@ $lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assigne
 $lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
 $lang->execution->featureBar['task']['assignedbyme'] = $lang->execution->assignedByMe;
 $lang->execution->featureBar['task']['needconfirm']  = 'Changed';
-$lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
+$lang->execution->featureBar['task']['status']       = $lang->more;
+
+$lang->execution->moreSelects['task']['status']['wait']         = 'Waiting';
+$lang->execution->moreSelects['task']['status']['doing']        = 'Doing';
+$lang->execution->moreSelects['task']['status']['undone']       = 'Unfinished';
+$lang->execution->moreSelects['task']['status']['finishedbyme'] = 'FinishedByMe';
+$lang->execution->moreSelects['task']['status']['done']         = 'Done';
+$lang->execution->moreSelects['task']['status']['closed']       = 'Closed';
+$lang->execution->moreSelects['task']['status']['cancel']       = 'Cancelled';
+$lang->execution->moreSelects['task']['status']['delayed']      = 'Delayed';
 
 $lang->execution->featureBar['all']['all']       = $lang->execution->all;
 $lang->execution->featureBar['all']['undone']    = $lang->execution->undone;
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 880e233335..cc83363168 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -524,7 +524,16 @@ $lang->execution->featureBar['task']['assignedtome'] = $lang->execution->assigne
 $lang->execution->featureBar['task']['myinvolved']   = $lang->execution->myInvolved;
 $lang->execution->featureBar['task']['assignedbyme'] = $lang->execution->assignedByMe;
 $lang->execution->featureBar['task']['needconfirm']  = "{$lang->SRCommon}变更";
-$lang->execution->featureBar['task']['status']       = $lang->execution->statusSelects[''];
+$lang->execution->featureBar['task']['status']       = $lang->more;
+
+$lang->execution->moreSelects['task']['status']['wait']         = '未开始';
+$lang->execution->moreSelects['task']['status']['doing']        = '进行中';
+$lang->execution->moreSelects['task']['status']['undone']       = '未完成';
+$lang->execution->moreSelects['task']['status']['finishedbyme'] = '我完成';
+$lang->execution->moreSelects['task']['status']['done']         = '已完成';
+$lang->execution->moreSelects['task']['status']['closed']       = '已关闭';
+$lang->execution->moreSelects['task']['status']['cancel']       = '已取消';
+$lang->execution->moreSelects['task']['status']['delayed']      = '已延期';
 
 $lang->execution->featureBar['all']['all']       = '全部';
 $lang->execution->featureBar['all']['undone']    = $lang->execution->undone;
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 07f31e9c53..81ccde26f1 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -86,14 +86,15 @@ body {margin-bottom: 25px;}
             $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
             $current        = $menuItem->text;
             $active         = '';
-            if(isset($lang->execution->statusSelects[$taskBrowseType]))
+            $statusSelects  = isset($lang->execution->moreSelects['task']['status']) ? $lang->execution->moreSelects['task']['status'] : array();
+            if(isset($statusSelects[$taskBrowseType]))
             {
-                $current = "<span class='text'>{$lang->execution->statusSelects[$taskBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+                $current = "<span class='text'>{$statusSelects[$taskBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
                 $active  = 'btn-active-text';
             }
             echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $active'");
             echo "<ul class='dropdown-menu'>";
-            foreach($lang->execution->statusSelects as $key => $value)
+            foreach($statusSelects as $key => $value)
             {
                 if($key == '') continue;
                 echo '<li' . ($key == $taskBrowseType ? " class='active'" : '') . '>';

From 97cab90076d8d473faa3ec3bdc518c5cbcc12758 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 10:44:37 +0800
Subject: [PATCH 254/319] * Modify tag setting page menu tree.

---
 module/dev/model.php | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 9a1dfb64be..f217e1e606 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -685,7 +685,8 @@ class devModel extends model
         $menus = array();
         if($this->config->vision == 'lite' and $module == 'execution') return $menus;
 
-        $titleList = array();
+        $titleList  = array();
+        $tagMethods = array();
         /* Convenience secondary menu. */
         foreach(array('homeMenu', 'menu') as $menu)
         {
@@ -709,7 +710,8 @@ class devModel extends model
                     list($thisModule, $thisMethod) = $this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"];
                 }
 
-                $titleList[] = $label;
+                $titleList[]  = $label;
+                $tagMethods[] = $thisMethod;
 
                 $subMenu = new stdclass();
                 $subMenu->title    = isset($this->lang->dev->replaceLable["$thisModule-$thisMethod"]) ? $this->lang->dev->replaceLable["$thisModule-$thisMethod"] : $label;
@@ -759,7 +761,8 @@ class devModel extends model
                                 $this->app->loadLang($moduleKey);
                                 if(isset($this->lang->$moduleKey->featureBar[$menuKey][$subMenuKey]))
                                 {
-                                    $titleList[] = $label;
+                                    $titleList[]  = $label;
+                                    $tagMethods[] = $thisMethod;
 
                                     $thirdMenu = new stdClass();
                                     $thirdMenu->title  = $label;
@@ -780,7 +783,8 @@ class devModel extends model
                                         if(is_array($this->lang->$moduleKey->featureBar[$thisMethod][$arrayKey])) continue;
                                     }
 
-                                    $titleList[] = $label;
+                                    $titleList[]  = $label;
+                                    $tagMethods[] = $thisMethod;
 
                                     $subMenu = new stdClass();
                                     $subMenu->title  = $label;
@@ -802,21 +806,28 @@ class devModel extends model
             }
         }
 
-        if(in_array($module, $this->config->dev->onlyMainMenu))
+        $this->app->loadLang($module);
+        if(isset($this->lang->$module->featureBar))
         {
-            $mainNav = strip_tags($this->lang->mainNav->$module);
-            list($label, $thisModule, $thisMethod) = explode('|', $mainNav);
-            $titleList[] = $label;
+            foreach($this->lang->$module->featureBar as $method => $tags)
+            {
+                if(in_array($method, $tagMethods)) continue;
 
-            $subMenu = new stdClass();
-            $subMenu->title    = $label;
-            $subMenu->key      = '';
-            $subMenu->module   = $thisModule;
-            $subMenu->method   = $thisMethod;
-            $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
-            $subMenu->children = array();
+                $label = zget($this->lang->$module, $method, $this->lang->$module->common);
 
-            $menus[] = $subMenu;
+                $titleList[]  = $label;
+                $tagMethods[] = $method;
+
+                $subMenu = new stdClass();
+                $subMenu->title    = $label;
+                $subMenu->key      = '';
+                $subMenu->module   = $module;
+                $subMenu->method   = $method;
+                $subMenu->active   = ($methodName == $method and $moduleName == $module) ? 1 : 0;
+                $subMenu->children = array();
+
+                $menus[] = $subMenu;
+            }
         }
 
         $titlePinYin = common::convert2Pinyin($titleList);

From 53e7b9a748a04c2ba791ace38381b65cdec8822f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 11:01:55 +0800
Subject: [PATCH 255/319] * Added bug filter tag custom language item feature.

---
 module/bug/lang/de.php          | 16 ++++++++--------
 module/bug/lang/en.php          | 16 ++++++++--------
 module/bug/lang/fr.php          | 16 ++++++++--------
 module/bug/lang/zh-cn.php       | 14 +++++++-------
 module/bug/view/browse.html.php |  9 +++++----
 5 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index dc55840478..a8f0e551d5 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -426,11 +426,11 @@ $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
 $lang->bug->featureBar['browse']['unresolved']   = $lang->bug->unResolved;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
-$lang->bug->moreSelects['assignedbyme']  = $lang->bug->assignedByMe;
-$lang->bug->moreSelects['unconfirmed']   = $lang->bug->unconfirmed;
-$lang->bug->moreSelects['assigntonull']  = $lang->bug->assignToNull;
-$lang->bug->moreSelects['longlifebugs']  = $lang->bug->longLifeBugs;
-$lang->bug->moreSelects['toclosed']      = $lang->bug->toClosed;
-$lang->bug->moreSelects['postponedbugs'] = $lang->bug->postponedBugs;
-$lang->bug->moreSelects['overduebugs']   = $lang->bug->overdueBugs;
-$lang->bug->moreSelects['needconfirm']   = $lang->bug->needConfirm;
+$lang->bug->moreSelects['browse']['more']['assignedbyme']  = $lang->bug->assignedByMe;
+$lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
+$lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
+$lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
+$lang->bug->moreSelects['browse']['more']['toclosed']      = $lang->bug->toClosed;
+$lang->bug->moreSelects['browse']['more']['postponedbugs'] = $lang->bug->postponedBugs;
+$lang->bug->moreSelects['browse']['more']['overduebugs']   = $lang->bug->overdueBugs;
+$lang->bug->moreSelects['browse']['more']['needconfirm']   = $lang->bug->needConfirm;
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 2403820123..71da5d016e 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -426,11 +426,11 @@ $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
 $lang->bug->featureBar['browse']['unresolved']   = $lang->bug->unResolved;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
-$lang->bug->moreSelects['assignedbyme']  = $lang->bug->assignedByMe;
-$lang->bug->moreSelects['unconfirmed']   = $lang->bug->unconfirmed;
-$lang->bug->moreSelects['assigntonull']  = $lang->bug->assignToNull;
-$lang->bug->moreSelects['longlifebugs']  = $lang->bug->longLifeBugs;
-$lang->bug->moreSelects['toclosed']      = $lang->bug->toClosed;
-$lang->bug->moreSelects['postponedbugs'] = $lang->bug->postponedBugs;
-$lang->bug->moreSelects['overduebugs']   = $lang->bug->overdueBugs;
-$lang->bug->moreSelects['needconfirm']   = $lang->bug->needConfirm;
+$lang->bug->moreSelects['browse']['more']['assignedbyme']  = $lang->bug->assignedByMe;
+$lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
+$lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
+$lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
+$lang->bug->moreSelects['browse']['more']['toclosed']      = $lang->bug->toClosed;
+$lang->bug->moreSelects['browse']['more']['postponedbugs'] = $lang->bug->postponedBugs;
+$lang->bug->moreSelects['browse']['more']['overduebugs']   = $lang->bug->overdueBugs;
+$lang->bug->moreSelects['browse']['more']['needconfirm']   = $lang->bug->needConfirm;
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index 4b02c3548b..d4978f3f53 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -426,11 +426,11 @@ $lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
 $lang->bug->featureBar['browse']['unresolved']   = $lang->bug->unResolved;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
-$lang->bug->moreSelects['assignedbyme']  = $lang->bug->assignedByMe;
-$lang->bug->moreSelects['unconfirmed']   = $lang->bug->unconfirmed;
-$lang->bug->moreSelects['assigntonull']  = $lang->bug->assignToNull;
-$lang->bug->moreSelects['longlifebugs']  = $lang->bug->longLifeBugs;
-$lang->bug->moreSelects['toclosed']      = $lang->bug->toClosed;
-$lang->bug->moreSelects['postponedbugs'] = $lang->bug->postponedBugs;
-$lang->bug->moreSelects['overduebugs']   = $lang->bug->overdueBugs;
-$lang->bug->moreSelects['needconfirm']   = $lang->bug->needConfirm;
+$lang->bug->moreSelects['browse']['more']['assignedbyme']  = $lang->bug->assignedByMe;
+$lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
+$lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
+$lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
+$lang->bug->moreSelects['browse']['more']['toclosed']      = $lang->bug->toClosed;
+$lang->bug->moreSelects['browse']['more']['postponedbugs'] = $lang->bug->postponedBugs;
+$lang->bug->moreSelects['browse']['more']['overduebugs']   = $lang->bug->overdueBugs;
+$lang->bug->moreSelects['browse']['more']['needconfirm']   = $lang->bug->needConfirm;
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 71e1b41cb1..ccef9854e8 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -427,10 +427,10 @@ $lang->bug->featureBar['browse']['unresolved']   = $lang->bug->unResolved;
 $lang->bug->featureBar['browse']['more']         = $lang->more;
 
 
-$lang->bug->moreSelects['unconfirmed']   = $lang->bug->unconfirmed;
-$lang->bug->moreSelects['assigntonull']  = $lang->bug->assignToNull;
-$lang->bug->moreSelects['longlifebugs']  = $lang->bug->longLifeBugs;
-$lang->bug->moreSelects['toclosed']      = $lang->bug->toClosed;
-$lang->bug->moreSelects['postponedbugs'] = $lang->bug->postponedBugs;
-$lang->bug->moreSelects['overduebugs']   = $lang->bug->overdueBugs;
-$lang->bug->moreSelects['needconfirm']   = $lang->bug->needConfirm;
+$lang->bug->moreSelects['browse']['more']['unconfirmed']   = $lang->bug->unconfirmed;
+$lang->bug->moreSelects['browse']['more']['assigntonull']  = $lang->bug->assignToNull;
+$lang->bug->moreSelects['browse']['more']['longlifebugs']  = $lang->bug->longLifeBugs;
+$lang->bug->moreSelects['browse']['more']['toclosed']      = $lang->bug->toClosed;
+$lang->bug->moreSelects['browse']['more']['postponedbugs'] = $lang->bug->postponedBugs;
+$lang->bug->moreSelects['browse']['more']['overduebugs']   = $lang->bug->overdueBugs;
+$lang->bug->moreSelects['browse']['more']['needconfirm']   = $lang->bug->needConfirm;
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index c5cae3cf28..232098bfdf 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -66,18 +66,19 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
         }
         elseif($menuItem->name == 'more')
         {
-            if(!empty($lang->bug->moreSelects))
+            $moreSelects = isset($lang->bug->moreSelects[$app->rawMethod]['more']) ? $lang->bug->moreSelects[$app->rawMethod]['more'] : array();
+            if(!empty($moreSelects))
             {
                 $moreLabel       = $lang->more;
                 $moreLabelActive = '';
-                if(isset($lang->bug->moreSelects[$this->session->bugBrowseType]))
+                if(isset($moreSelects[$this->session->bugBrowseType]))
                 {
-                    $moreLabel       = "<span class='text'>{$lang->bug->moreSelects[$this->session->bugBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+                    $moreLabel       = "<span class='text'>{$moreSelects[$this->session->bugBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
                     $moreLabelActive = 'btn-active-text';
                 }
                 echo "<div class='btn-group'><a href='javascript:;' data-toggle='dropdown' class='btn btn-link {$moreLabelActive}'>{$moreLabel} <span class='caret'></span></a>";
                 echo "<ul class='dropdown-menu'>";
-                foreach($lang->bug->moreSelects as $menuBrowseType => $label)
+                foreach($moreSelects as $menuBrowseType => $label)
                 {
                     $active = $menuBrowseType == $this->session->bugBrowseType ? 'btn-active-text' : '';
                     echo '<li>' . html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), "<span class='text'>{$label}</span>", '', "class='btn btn-link $active'") . '</li>';

From ae929617b0b736f1ef4fe90757201281de46fc83 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:13:50 +0800
Subject: [PATCH 256/319] * Modify language items for product common.

---
 module/product/lang/de.php    | 12 ++++++------
 module/product/lang/en.php    | 12 ++++++------
 module/product/lang/fr.php    | 12 ++++++------
 module/product/lang/zh-cn.php | 18 +++++++++---------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index a8db2f4d34..f26eaac21c 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -24,7 +24,7 @@ $lang->product->select           = "Auswahl {$lang->productCommon}";
 $lang->product->mine             = 'Meine Zuständigkeiten';
 $lang->product->other            = 'Andere';
 $lang->product->closed           = 'Geschlossen';
-$lang->product->closedProduct    = 'Closed Product';
+$lang->product->closedProduct    = "Closed {$lang->productCommon}";
 $lang->product->updateOrder      = 'Ranking';
 $lang->product->all              = "{$lang->productCommon} List";
 $lang->product->manageLine       = "Manage {$lang->productCommon} Line";
@@ -36,9 +36,9 @@ $lang->product->changeProgramTip = "%s > Change Program";
 $lang->product->addWhitelist     = 'Add Whitelist';
 $lang->product->unbindWhitelist  = 'Remove Whitelist';
 $lang->product->track            = 'View Stories Matrix';
-$lang->product->checkedProducts  = '%s products selected';
-$lang->product->pageSummary      = 'Total products: %s.';
-$lang->product->lineSummary      = 'Total product lines: %s, Total products: %s.';
+$lang->product->checkedProducts  = "%s {$lang->productCommon}s selected";
+$lang->product->pageSummary      = "Total {$lang->productCommon}s: %s.";
+$lang->product->lineSummary      = "Total product lines: %s, Total {$lang->productCommon}s: %s.";
 
 $lang->product->indexAction  = "All {$lang->productCommon}";
 $lang->product->closeAction  = "Close {$lang->productCommon}";
@@ -61,7 +61,7 @@ $lang->product->roadmap     = 'Roadmap';
 $lang->product->doc         = 'Dok';
 $lang->product->project     = $lang->executionCommon . 'Liste';
 $lang->product->build       = 'Build';
-$lang->product->moreProduct = "More Product";
+$lang->product->moreProduct = "More {$lang->productCommon}";
 $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
 $lang->product->progress    = "Progress";
 
@@ -167,7 +167,7 @@ $lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
 $lang->product->doingExecution        = 'Ongoing Executions';
 $lang->product->doingClassicExecution = 'Ongoing ' . $lang->executionCommon;
 $lang->product->normalRelease         = 'Normal Releases';
-$lang->product->emptyProgram          = 'Independent Products';
+$lang->product->emptyProgram          = "Independent {$lang->productCommon}s";
 
 $lang->product->allStory             = 'Alle';
 $lang->product->allProduct           = 'Alle' . $lang->productCommon;
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 7747725006..1ba4200b89 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -24,7 +24,7 @@ $lang->product->select           = "Select {$lang->productCommon}";
 $lang->product->mine             = 'Mine';
 $lang->product->other            = 'Others';
 $lang->product->closed           = 'Closed';
-$lang->product->closedProduct    = 'Closed Product';
+$lang->product->closedProduct    = "Closed {$lang->productCommon}";
 $lang->product->updateOrder      = 'Order';
 $lang->product->all              = "{$lang->productCommon} List";
 $lang->product->manageLine       = "Manage {$lang->productCommon} Line";
@@ -36,9 +36,9 @@ $lang->product->changeProgramTip = "%s > Change Program";
 $lang->product->addWhitelist     = 'Add Whitelist';
 $lang->product->unbindWhitelist  = 'Unbind Whitelist';
 $lang->product->track            = 'View Stories Matrix';
-$lang->product->checkedProducts  = '%s products selected';
-$lang->product->pageSummary      = 'Total products: %s.';
-$lang->product->lineSummary      = 'Total product lines: %s, Total products: %s.';
+$lang->product->checkedProducts  = "%s {$lang->productCommon}s selected";
+$lang->product->pageSummary      = "Total {$lang->productCommon}s: %s.";
+$lang->product->lineSummary      = "Total product lines: %s, Total {$lang->productCommon}s: %s.";
 
 $lang->product->indexAction  = "All {$lang->productCommon}";
 $lang->product->closeAction  = "Close {$lang->productCommon}";
@@ -61,7 +61,7 @@ $lang->product->roadmap     = "{$lang->productCommon} Roadmap";
 $lang->product->doc         = "{$lang->productCommon} Documents";
 $lang->product->project     = $lang->executionCommon . ' List';
 $lang->product->build       = 'Build List';
-$lang->product->moreProduct = "More Product";
+$lang->product->moreProduct = "More {$lang->productCommon}";
 $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
 $lang->product->progress    = "Progress";
 
@@ -167,7 +167,7 @@ $lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
 $lang->product->doingExecution        = 'Ongoing Executions';
 $lang->product->doingClassicExecution = 'Ongoing ' . $lang->executionCommon;
 $lang->product->normalRelease         = 'Normal Releases';
-$lang->product->emptyProgram          = 'Independent Products';
+$lang->product->emptyProgram          = "Independent {$lang->productCommon}s";
 
 $lang->product->allStory             = 'All ';
 $lang->product->allProduct           = 'All';
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 98db26ad0e..4d167eabb3 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -24,7 +24,7 @@ $lang->product->select           = "Choisir {$lang->productCommon}";
 $lang->product->mine             = 'Les miens';
 $lang->product->other            = 'Autres';
 $lang->product->closed           = 'Fermés';
-$lang->product->closedProduct    = 'Closed Product';
+$lang->product->closedProduct    = "Closed {$lang->productCommon}";
 $lang->product->updateOrder      = 'Ordre';
 $lang->product->all              = "{$lang->productCommon} List";
 $lang->product->manageLine       = "Manage {$lang->productCommon} Line";
@@ -36,9 +36,9 @@ $lang->product->changeProgramTip = "%s > Change Program";
 $lang->product->addWhitelist     = 'Add Whitelist';
 $lang->product->unbindWhitelist  = 'Remove Whitelist';
 $lang->product->track            = 'Consulter Stories Matrice';
-$lang->product->checkedProducts  = '%s produits s électionnés';
-$lang->product->pageSummary      = 'Total products: %s.';
-$lang->product->lineSummary      = 'Total product lines: %s, Total products: %s.';
+$lang->product->checkedProducts  = "%s {$lang->productCommon}s selected";
+$lang->product->pageSummary      = "Total {$lang->productCommon}s: %s.";
+$lang->product->lineSummary      = "Total product lines: %s, Total {$lang->productCommon}s: %s.";
 
 $lang->product->indexAction  = "All {$lang->productCommon}";
 $lang->product->closeAction  = "Fermer {$lang->productCommon}";
@@ -61,7 +61,7 @@ $lang->product->roadmap     = "Roadmap {$lang->productCommon}";
 $lang->product->doc         = "Documents {$lang->productCommon}";
 $lang->product->project     = ' Liste ' . $lang->executionCommon;
 $lang->product->build       = 'Liste Builds';
-$lang->product->moreProduct = "More Product";
+$lang->product->moreProduct = "More {$lang->productCommon}";
 $lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
 $lang->product->progress    = "Progress";
 
@@ -167,7 +167,7 @@ $lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
 $lang->product->doingExecution        = 'Ongoing Executions';
 $lang->product->doingClassicExecution = 'Ongoing ' . $lang->executionCommon;
 $lang->product->normalRelease         = 'Normal Releases';
-$lang->product->emptyProgram          = 'Independent Products';
+$lang->product->emptyProgram          = "Independent {$lang->productCommon}s";
 
 $lang->product->allStory             = 'Toutes les Stories ';
 $lang->product->allProduct           = 'Tous';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index e42d35a01c..829bd67f93 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -24,7 +24,7 @@ $lang->product->select           = "请选择{$lang->productCommon}";
 $lang->product->mine             = '我负责';
 $lang->product->other            = '其他';
 $lang->product->closed           = '已关闭';
-$lang->product->closedProduct    = '已关闭的产品';
+$lang->product->closedProduct    = "已关闭的{$lang->productCommon}";
 $lang->product->updateOrder      = '排序';
 $lang->product->all              = "所有{$lang->productCommon}";
 $lang->product->manageLine       = "维护{$lang->productCommon}线";
@@ -36,9 +36,9 @@ $lang->product->changeProgramTip = "%s > 修改项目集";
 $lang->product->addWhitelist     = '添加白名单';
 $lang->product->unbindWhitelist  = '移除白名单';
 $lang->product->track            = "查看需求矩阵";
-$lang->product->checkedProducts  = '已选择%s项产品';
-$lang->product->pageSummary      = '本页共%s个产品。';
-$lang->product->lineSummary      = '本页共%s个产品线，%s个产品。';
+$lang->product->checkedProducts  = "已选择%s项{$lang->productCommon}";
+$lang->product->pageSummary      = "本页共%s个{$lang->productCommon}。";
+$lang->product->lineSummary      = "本页共%s个产品线，%s个{$lang->productCommon}。";
 
 $lang->product->indexAction  = "所有{$lang->productCommon}仪表盘";
 $lang->product->closeAction  = "关闭{$lang->productCommon}";
@@ -61,9 +61,9 @@ $lang->product->roadmap     = "{$lang->productCommon}路线图";
 $lang->product->doc         = '文档列表';
 $lang->product->project     = $lang->executionCommon . '列表';
 $lang->product->build       = '版本列表';
-$lang->product->moreProduct = "更多产品";
-$lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}";
-$lang->product->progress    = "产品完成度";
+$lang->product->moreProduct = "更多{$lang->productCommon}";
+$lang->product->projectInfo = "所有与此{$lang->productCommon}关联的{$lang->projectCommon}";
+$lang->product->progress    = "{$lang->productCommon}完成度";
 
 $lang->product->currentExecution      = "当前执行";
 $lang->product->activeStories         = "激活{$lang->SRCommon}";
@@ -111,7 +111,7 @@ $lang->product->shadow         = "是否影子{$lang->productCommon}";
 $lang->product->line           = "{$lang->productCommon}线";
 $lang->product->lineName       = "{$lang->productCommon}线名称";
 $lang->product->order          = '排序';
-$lang->product->bind           = '是否独立产品';
+$lang->product->bind           = "是否独立{$lang->productCommon}";
 $lang->product->type           = "{$lang->productCommon}类型";
 $lang->product->typeAB         = "类型";
 $lang->product->status         = '状态';
@@ -167,7 +167,7 @@ $lang->product->doingProject          = '进行中的' . $lang->projectCommon;
 $lang->product->doingExecution        = '进行中的执行';
 $lang->product->doingClassicExecution = '进行中的' . $lang->executionCommon;
 $lang->product->normalRelease         = '正常的发布';
-$lang->product->emptyProgram          = '无项目集归属产品';
+$lang->product->emptyProgram          = "无项目集归属{$lang->productCommon}";
 
 $lang->product->allStory             = '所有';
 $lang->product->allProduct           = '全部' . $lang->productCommon;

From 53a33552fe61ed8d652b986445f5adde7067bb97 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:16:43 +0800
Subject: [PATCH 257/319] * Modify language items for product common.

---
 module/todo/lang/de.php    | 6 +++---
 module/todo/lang/en.php    | 6 +++---
 module/todo/lang/fr.php    | 6 +++---
 module/todo/lang/zh-cn.php | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 889e40d24a..9dff94babf 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -32,8 +32,8 @@ $lang->todo->import       = "Importieren";
 $lang->todo->legendBasic  = "Basis Info";
 $lang->todo->cycle        = "Wiederkehrend";
 $lang->todo->cycleConfig  = "Wiederkehrend setzen";
-$lang->todo->project      = "Project";
-$lang->todo->product      = "Product";
+$lang->todo->project      = $lang->projectCommon;
+$lang->todo->product      = $lang->productCommon;
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
 $lang->todo->future       = 'TBD';
@@ -118,7 +118,7 @@ $lang->todo->noTodo         = 'Keine ToDos dieses Typs.';
 $lang->todo->noAssignedTo   = "Zuordung an darf nicht leer sein.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 $lang->todo->today          = 'Todo Today';
-$lang->todo->selectProduct  = "Please select a product";
+$lang->todo->selectProduct  = "Please select a {$lang->productCommon}";
 
 $lang->todo->periods['all']             = 'Assigned To Yourself';
 $lang->todo->periods['before']          = 'Unfinished';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 05ec3dbf24..2ef3a1f8a2 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -32,8 +32,8 @@ $lang->todo->import       = "Import";
 $lang->todo->legendBasic  = "Basic Info";
 $lang->todo->cycle        = "Recur";
 $lang->todo->cycleConfig  = "Recurrence";
-$lang->todo->project      = "Project";
-$lang->todo->product      = "Product";
+$lang->todo->project      = $lang->projectCommon;
+$lang->todo->product      = $lang->productCommon;
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
 $lang->todo->future       = 'TBD';
@@ -118,7 +118,7 @@ $lang->todo->noTodo         = 'No todos of this type.';
 $lang->todo->noAssignedTo   = "The AssignedTo should not be empty.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 $lang->todo->today          = 'Todo Today';
-$lang->todo->selectProduct  = "Please select a product";
+$lang->todo->selectProduct  = "Please select a {$lang->productCommon}";
 
 $lang->todo->periods['all']             = 'Assigned To Yourself';
 $lang->todo->periods['before']          = 'Unfinished';
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index e1b89eb757..f55595253e 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -32,8 +32,8 @@ $lang->todo->import       = "Importer";
 $lang->todo->legendBasic  = "Infos de Base";
 $lang->todo->cycle        = "Rendre Récurrent";
 $lang->todo->cycleConfig  = "Récurrence";
-$lang->todo->project      = "Project";
-$lang->todo->product      = "Product";
+$lang->todo->project      = $lang->projectCommon;
+$lang->todo->product      = $lang->productCommon;
 $lang->todo->execution    = $lang->executionCommon;
 $lang->todo->changeDate   = "Change Date";
 $lang->todo->future       = 'TBD';
@@ -118,7 +118,7 @@ $lang->todo->noTodo         = 'Aucune entrée de ce type.';
 $lang->todo->noAssignedTo   = "Le champ Assigné à ne doit pas être vide.";
 $lang->todo->unfinishedTodo = "Les entrées de l'ID %s ne sont pas terminés et ne peuvent pas se fermer.";
 $lang->todo->today          = 'Todo Today';
-$lang->todo->selectProduct  = "Please select a product";
+$lang->todo->selectProduct  = "Please select a {$lang->productCommon}";
 
 $lang->todo->periods['all']             = 'Assigned To Yourself';
 $lang->todo->periods['before']          = 'Unfinished';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 83c9adbe62..5870fffa1b 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -32,8 +32,8 @@ $lang->todo->import       = "导入";
 $lang->todo->legendBasic  = "基本信息";
 $lang->todo->cycle        = "周期";
 $lang->todo->cycleConfig  = "周期设置";
-$lang->todo->project      = "所属项目";
-$lang->todo->product      = "所属产品";
+$lang->todo->project      = "所属{$lang->projectCommon}";
+$lang->todo->product      = "所属{$lang->productCommon}";
 $lang->todo->execution    = "所属{$lang->execution->common}";
 $lang->todo->changeDate   = "修改日期";
 $lang->todo->future       = '待定';
@@ -118,7 +118,7 @@ $lang->todo->noTodo         = '该类型没有待办事务';
 $lang->todo->noAssignedTo   = '被指派人不能为空';
 $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。';
 $lang->todo->today          = '今日待办';
-$lang->todo->selectProduct  = "请选择产品";
+$lang->todo->selectProduct  = "请选择{$lang->productCommon}";
 
 $lang->todo->periods['all']             = '指派自己';
 $lang->todo->periods['before']          = '未完';

From abeb1db6591a1bebf94b881187a3c25555e7188c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:19:42 +0800
Subject: [PATCH 258/319] * Modify language items for product common.

---
 module/gitlab/lang/de.php    | 2 +-
 module/gitlab/lang/en.php    | 2 +-
 module/gitlab/lang/fr.php    | 2 +-
 module/gitlab/lang/zh-cn.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php
index 905a04cbea..cf37e4bbec 100644
--- a/module/gitlab/lang/de.php
+++ b/module/gitlab/lang/de.php
@@ -7,7 +7,7 @@ $lang->gitlab->edit              = 'Edit GitLab';
 $lang->gitlab->view              = 'View GitLab';
 $lang->gitlab->bindUser          = 'Bind User';
 $lang->gitlab->webhook           = 'Webhook';
-$lang->gitlab->bindProduct       = 'Import Product';
+$lang->gitlab->bindProduct       = "Import {$lang->productCommon}";
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 905a04cbea..cf37e4bbec 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -7,7 +7,7 @@ $lang->gitlab->edit              = 'Edit GitLab';
 $lang->gitlab->view              = 'View GitLab';
 $lang->gitlab->bindUser          = 'Bind User';
 $lang->gitlab->webhook           = 'Webhook';
-$lang->gitlab->bindProduct       = 'Import Product';
+$lang->gitlab->bindProduct       = "Import {$lang->productCommon}";
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php
index 905a04cbea..cf37e4bbec 100644
--- a/module/gitlab/lang/fr.php
+++ b/module/gitlab/lang/fr.php
@@ -7,7 +7,7 @@ $lang->gitlab->edit              = 'Edit GitLab';
 $lang->gitlab->view              = 'View GitLab';
 $lang->gitlab->bindUser          = 'Bind User';
 $lang->gitlab->webhook           = 'Webhook';
-$lang->gitlab->bindProduct       = 'Import Product';
+$lang->gitlab->bindProduct       = "Import {$lang->productCommon}";
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index 8412e6ff18..8483edf40c 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -7,7 +7,7 @@ $lang->gitlab->edit              = '编辑GitLab';
 $lang->gitlab->view              = '查看GitLab';
 $lang->gitlab->bindUser          = '绑定用户';
 $lang->gitlab->webhook           = 'Webhook';
-$lang->gitlab->bindProduct       = '关联产品';
+$lang->gitlab->bindProduct       = "关联{$lang->productCommon}";
 $lang->gitlab->importIssue       = '关联issue';
 $lang->gitlab->delete            = '删除GitLab';
 $lang->gitlab->confirmDelete     = '确认删除该GitLab吗？';

From dd8f436b8fe12343b7f75cc6a895811d1878831a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:30:04 +0800
Subject: [PATCH 259/319] * Modify language item for product common.

---
 module/branch/lang/de.php            | 4 ++--
 module/branch/lang/en.php            | 4 ++--
 module/branch/lang/fr.php            | 4 ++--
 module/branch/lang/zh-cn.php         | 4 ++--
 module/projectrelease/lang/de.php    | 2 +-
 module/projectrelease/lang/en.php    | 2 +-
 module/projectrelease/lang/fr.php    | 2 +-
 module/projectrelease/lang/zh-cn.php | 2 +-
 module/release/lang/zh-cn.php        | 2 +-
 module/transfer/lang/de.php          | 4 ++--
 module/transfer/lang/en.php          | 4 ++--
 module/transfer/lang/fr.php          | 4 ++--
 module/transfer/lang/zh-cn.php       | 4 ++--
 13 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/module/branch/lang/de.php b/module/branch/lang/de.php
index c75f2eb77f..581f013394 100644
--- a/module/branch/lang/de.php
+++ b/module/branch/lang/de.php
@@ -27,7 +27,7 @@ $lang->branch->mergeBranch       = 'Merge branch';
 $lang->branch->mergeBranchAction = 'Merge branch';
 
 $lang->branch->id          = 'ID';
-$lang->branch->product     = 'Produkt';
+$lang->branch->product     = $lang->productCommon;
 $lang->branch->name        = 'Name';
 $lang->branch->status      = 'Status';
 $lang->branch->createdDate = 'Created Date';
@@ -51,7 +51,7 @@ $lang->branch->targetBranchTips  = 'You can merge it into an existing branch, me
 $lang->branch->confirmMerge      = 'The data of "mergedBranch" will be merged into "targetBranch", please confirm whether you want to perform the branch merge operation, the data will not be restored after the merge!';
 
 $lang->branch->noData     = 'No branches.';
-$lang->branch->mainBranch = 'The default main branch of the product.';
+$lang->branch->mainBranch = "The default main %s of the {$lang->productCommon}.";
 
 $lang->branch->statusList = array();
 $lang->branch->statusList['active'] = 'Active';
diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php
index de6a6dd0fa..432566089d 100644
--- a/module/branch/lang/en.php
+++ b/module/branch/lang/en.php
@@ -27,7 +27,7 @@ $lang->branch->mergeBranch       = 'Merge branch';
 $lang->branch->mergeBranchAction = 'Merge branch';
 
 $lang->branch->id          = 'ID';
-$lang->branch->product     = 'Product';
+$lang->branch->product     = $lang->productCommon;
 $lang->branch->name        = 'Name';
 $lang->branch->status      = 'Status';
 $lang->branch->createdDate = 'Created Date';
@@ -51,7 +51,7 @@ $lang->branch->targetBranchTips  = 'You can merge it into an existing branch, me
 $lang->branch->confirmMerge      = 'The data of "mergedBranch" will be merged into "targetBranch", please confirm whether you want to perform the branch merge operation, the data will not be restored after the merge!';
 
 $lang->branch->noData     = 'No branches.';
-$lang->branch->mainBranch = 'The default main %s of the product.';
+$lang->branch->mainBranch = "The default main %s of the {$lang->productCommon}.";
 
 $lang->branch->statusList = array();
 $lang->branch->statusList['active'] = 'Active';
diff --git a/module/branch/lang/fr.php b/module/branch/lang/fr.php
index 7d33096926..bbd6e6196a 100644
--- a/module/branch/lang/fr.php
+++ b/module/branch/lang/fr.php
@@ -27,7 +27,7 @@ $lang->branch->mergeBranch       = 'Merge branch';
 $lang->branch->mergeBranchAction = 'Merge branch';
 
 $lang->branch->id          = 'ID';
-$lang->branch->product     = 'Product';
+$lang->branch->product     = $lang->productCommon;
 $lang->branch->name        = 'Nom';
 $lang->branch->status      = 'Status';
 $lang->branch->createdDate = 'Created Date';
@@ -51,7 +51,7 @@ $lang->branch->targetBranchTips  = 'You can merge it into an existing branch, me
 $lang->branch->confirmMerge      = 'The data of "mergedBranch" will be merged into "targetBranch", please confirm whether you want to perform the branch merge operation, the data will not be restored after the merge!';
 
 $lang->branch->noData     = 'No branches.';
-$lang->branch->mainBranch = 'The default main branch of the product.';
+$lang->branch->mainBranch = "The default main %s of the {$lang->productCommon}.";
 
 $lang->branch->statusList = array();
 $lang->branch->statusList['active'] = 'Active';
diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php
index aa1fcaf3dd..c2a7e52d53 100644
--- a/module/branch/lang/zh-cn.php
+++ b/module/branch/lang/zh-cn.php
@@ -27,7 +27,7 @@ $lang->branch->mergeBranch       = '合并@branch@';
 $lang->branch->mergeBranchAction = '合并分支';
 
 $lang->branch->id          = 'ID';
-$lang->branch->product     = '所属产品';
+$lang->branch->product     = "所属{$lang->productCommon}";
 $lang->branch->name        = '%s名称';
 $lang->branch->status      = '状态';
 $lang->branch->createdDate = '创建时间';
@@ -51,7 +51,7 @@ $lang->branch->targetBranchTips  = '您可以将其合并到已有的一个@bran
 $lang->branch->confirmMerge      = '"mergedBranch"的数据将被合并到"targetBranch",请确认是否要执行分支合并操作，合并后数据将不可再恢复！';
 
 $lang->branch->noData     = '暂时没有分支。';
-$lang->branch->mainBranch = '产品默认主干%s。';
+$lang->branch->mainBranch = "{$lang->productCommon}默认主干%s。";
 
 $lang->branch->statusList = array();
 $lang->branch->statusList['active'] = '激活';
diff --git a/module/projectrelease/lang/de.php b/module/projectrelease/lang/de.php
index 0dbd65069a..e3569b219f 100644
--- a/module/projectrelease/lang/de.php
+++ b/module/projectrelease/lang/de.php
@@ -27,7 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
-$lang->projectrelease->product          = "Product";
+$lang->projectrelease->product          = $lang->productCommon;
 
 $lang->projectrelease->featureBar['browse']['all']       = 'All';
 $lang->projectrelease->featureBar['browse']['normal']    = 'Active';
diff --git a/module/projectrelease/lang/en.php b/module/projectrelease/lang/en.php
index c1cbe698e5..b2b38cacf4 100644
--- a/module/projectrelease/lang/en.php
+++ b/module/projectrelease/lang/en.php
@@ -27,7 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export as HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
-$lang->projectrelease->product          = "Product";
+$lang->projectrelease->product          = $lang->productCommon;
 
 $lang->projectrelease->featureBar['browse']['all']       = 'All';
 $lang->projectrelease->featureBar['browse']['normal']    = 'Active';
diff --git a/module/projectrelease/lang/fr.php b/module/projectrelease/lang/fr.php
index d3898cde08..a05ca8516b 100644
--- a/module/projectrelease/lang/fr.php
+++ b/module/projectrelease/lang/fr.php
@@ -27,7 +27,7 @@ $lang->projectrelease->unlinkBug        = 'Unlink Bug';
 $lang->projectrelease->export           = 'Export HTML';
 $lang->projectrelease->browseAction     = "Release List";
 $lang->projectrelease->notify           = 'notify';
-$lang->projectrelease->product          = "Product";
+$lang->projectrelease->product          = $lang->productCommon;
 
 $lang->projectrelease->featureBar['browse']['all']       = 'All';
 $lang->projectrelease->featureBar['browse']['normal']    = 'Active';
diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php
index 9a47475d09..e015d22931 100644
--- a/module/projectrelease/lang/zh-cn.php
+++ b/module/projectrelease/lang/zh-cn.php
@@ -27,7 +27,7 @@ $lang->projectrelease->unlinkBug        = '移除Bug';
 $lang->projectrelease->export           = '导出HTML';
 $lang->projectrelease->browseAction     = "发布列表";
 $lang->projectrelease->notify           = "通知";
-$lang->projectrelease->product          = "所属产品";
+$lang->projectrelease->product          = "所属{$lang->productCommon}";
 
 $lang->projectrelease->featureBar['browse']['all']       = '全部';
 $lang->projectrelease->featureBar['browse']['normal']    = '正常';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index a3952f1253..fa0e150c04 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -33,7 +33,7 @@ $lang->release->errorDate          = '发布日期不能大于今天。';
 $lang->release->basicInfo = '基本信息';
 
 $lang->release->id             = 'ID';
-$lang->release->product        = '所属产品';
+$lang->release->product        = "所属{$lang->productCommon}";
 $lang->release->branch         = '平台/分支';
 $lang->release->project        = '所属项目';
 $lang->release->build          = '版本';
diff --git a/module/transfer/lang/de.php b/module/transfer/lang/de.php
index 6bc5d749f5..690f77c7e5 100644
--- a/module/transfer/lang/de.php
+++ b/module/transfer/lang/de.php
@@ -3,9 +3,9 @@ $lang->transfer = new stdclass();
 
 $lang->transfer->reservedWord['id']        = 'ID';
 $lang->transfer->reservedWord['type']      = 'Type';
-$lang->transfer->reservedWord['project']   = 'Project';
+$lang->transfer->reservedWord['project']   = $lang->projectCommon;
 $lang->transfer->reservedWord['execution'] = 'Execution';
-$lang->transfer->reservedWord['product']   = 'Project';
+$lang->transfer->reservedWord['product']   = $lang->productCommon;
 $lang->transfer->reservedWord['code']      = 'CODE';
 $lang->transfer->reservedWord['name']      = 'Name';
 $lang->transfer->reservedWord['title']     = 'Title';
diff --git a/module/transfer/lang/en.php b/module/transfer/lang/en.php
index 6bc5d749f5..690f77c7e5 100644
--- a/module/transfer/lang/en.php
+++ b/module/transfer/lang/en.php
@@ -3,9 +3,9 @@ $lang->transfer = new stdclass();
 
 $lang->transfer->reservedWord['id']        = 'ID';
 $lang->transfer->reservedWord['type']      = 'Type';
-$lang->transfer->reservedWord['project']   = 'Project';
+$lang->transfer->reservedWord['project']   = $lang->projectCommon;
 $lang->transfer->reservedWord['execution'] = 'Execution';
-$lang->transfer->reservedWord['product']   = 'Project';
+$lang->transfer->reservedWord['product']   = $lang->productCommon;
 $lang->transfer->reservedWord['code']      = 'CODE';
 $lang->transfer->reservedWord['name']      = 'Name';
 $lang->transfer->reservedWord['title']     = 'Title';
diff --git a/module/transfer/lang/fr.php b/module/transfer/lang/fr.php
index 6bc5d749f5..690f77c7e5 100644
--- a/module/transfer/lang/fr.php
+++ b/module/transfer/lang/fr.php
@@ -3,9 +3,9 @@ $lang->transfer = new stdclass();
 
 $lang->transfer->reservedWord['id']        = 'ID';
 $lang->transfer->reservedWord['type']      = 'Type';
-$lang->transfer->reservedWord['project']   = 'Project';
+$lang->transfer->reservedWord['project']   = $lang->projectCommon;
 $lang->transfer->reservedWord['execution'] = 'Execution';
-$lang->transfer->reservedWord['product']   = 'Project';
+$lang->transfer->reservedWord['product']   = $lang->productCommon;
 $lang->transfer->reservedWord['code']      = 'CODE';
 $lang->transfer->reservedWord['name']      = 'Name';
 $lang->transfer->reservedWord['title']     = 'Title';
diff --git a/module/transfer/lang/zh-cn.php b/module/transfer/lang/zh-cn.php
index 37533401ee..85e3e5d51c 100644
--- a/module/transfer/lang/zh-cn.php
+++ b/module/transfer/lang/zh-cn.php
@@ -3,9 +3,9 @@ $lang->transfer = new stdclass();
 
 $lang->transfer->reservedWord['id']        = '编号';
 $lang->transfer->reservedWord['type']      = '类型';
-$lang->transfer->reservedWord['project']   = '所属项目';
+$lang->transfer->reservedWord['project']   = "所属项目{$lang->projectCommon}";
 $lang->transfer->reservedWord['execution'] = '所属执行';
-$lang->transfer->reservedWord['product']   = '所属产品';
+$lang->transfer->reservedWord['product']   = "所属{$lang->productCommon}";
 $lang->transfer->reservedWord['code']      = '代号';
 $lang->transfer->reservedWord['name']      = '名称';
 $lang->transfer->reservedWord['title']     = '标题';

From ee0919e61f981456fd22f7da0f98415da8ff100b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:37:17 +0800
Subject: [PATCH 260/319] * Modify language items for product common.

---
 module/doc/lang/de.php    | 14 +++++++-------
 module/doc/lang/en.php    | 14 +++++++-------
 module/doc/lang/fr.php    | 14 +++++++-------
 module/doc/lang/zh-cn.php | 16 ++++++++--------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 99fd338763..ae37b277a0 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -47,7 +47,7 @@ $lang->doclib->nameList['custom'] = 'Custom Name';
 $lang->doc->common       = 'Dok';
 $lang->doc->id           = 'ID';
 $lang->doc->product      = $lang->productCommon;
-$lang->doc->project      = 'Project';
+$lang->doc->project      = $lang->projectCommon;
 $lang->doc->execution    = $lang->execution->common;
 $lang->doc->lib          = 'Bibliothek';
 $lang->doc->module       = 'Modul';
@@ -251,12 +251,12 @@ $lang->doc->selectLibType        = 'Please select a type of doc library.';
 $lang->doc->noLibreOffice        = 'You does not have access to office conversion settings!';
 $lang->doc->errorParentChapter   = 'The parent chapter cannot be its own chapter or sub chapter!';
 
-$lang->doc->noticeAcl['lib']['product']['default']   = 'Users who can access the selected product can access it.';
-$lang->doc->noticeAcl['lib']['product']['custom']    = 'Users who can access the selected product or users in the whiltelist can access it.';
-$lang->doc->noticeAcl['lib']['project']['default']   = 'Users who can access the selected project can access it.';
-$lang->doc->noticeAcl['lib']['project']['open']      = 'Users who can access the selected project can access it.';
-$lang->doc->noticeAcl['lib']['project']['private']   = 'Users who can access the selected project or users in the whiltelist can access it.';
-$lang->doc->noticeAcl['lib']['project']['custom']    = 'Users who can access the selected project or users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['product']['default']   = "Users who can access the selected {$lang->productCommon} can access it.";
+$lang->doc->noticeAcl['lib']['product']['custom']    = "Users who can access the selected {$lang->productCommon} or users in the whiltelist can access it.";
+$lang->doc->noticeAcl['lib']['project']['default']   = "Users who can access the selected {$lang->projectCommon} can access it.";
+$lang->doc->noticeAcl['lib']['project']['open']      = "Users who can access the selected {$lang->projectCommon} can access it.";
+$lang->doc->noticeAcl['lib']['project']['private']   = "Users who can access the selected {$lang->projectCommon} or users in the whiltelist can access it.";
+$lang->doc->noticeAcl['lib']['project']['custom']    = "Users who can access the selected {$lang->projectCommon} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['execution']['default'] = "Users who can access the selected {$lang->execution->common} can access it.";
 $lang->doc->noticeAcl['lib']['execution']['custom']  = "Users who can access the selected {$lang->execution->common} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['api']['open']          = 'All users can access it.';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 5ab1ee88ea..134e0dda8e 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -47,7 +47,7 @@ $lang->doclib->nameList['custom'] = 'Custom Name';
 $lang->doc->common       = 'Document';
 $lang->doc->id           = 'ID';
 $lang->doc->product      = $lang->productCommon;
-$lang->doc->project      = 'Project';
+$lang->doc->project      = $lang->projectCommon;
 $lang->doc->execution    = $lang->execution->common;
 $lang->doc->lib          = 'Library';
 $lang->doc->module       = 'Catalog';
@@ -251,12 +251,12 @@ $lang->doc->selectLibType        = 'Please select a type of doc library.';
 $lang->doc->noLibreOffice        = 'You does not have access to office conversion settings!';
 $lang->doc->errorParentChapter   = 'The parent chapter cannot be its own chapter or sub chapter!';
 
-$lang->doc->noticeAcl['lib']['product']['default']   = 'Users who can access the selected product can access it.';
-$lang->doc->noticeAcl['lib']['product']['custom']    = 'Users who can access the selected product or users in the whiltelist can access it.';
-$lang->doc->noticeAcl['lib']['project']['default']   = 'Users who can access the selected project can access it.';
-$lang->doc->noticeAcl['lib']['project']['open']      = 'Users who can access the selected project can access it.';
-$lang->doc->noticeAcl['lib']['project']['private']   = 'Users who can access the selected project or users in the whiltelist can access it.';
-$lang->doc->noticeAcl['lib']['project']['custom']    = 'Users in the whiltelist can access it.';
+$lang->doc->noticeAcl['lib']['product']['default']   = "Users who can access the selected {$lang->productCommon} can access it.";
+$lang->doc->noticeAcl['lib']['product']['custom']    = "Users who can access the selected {$lang->productCommon} or users in the whiltelist can access it.";
+$lang->doc->noticeAcl['lib']['project']['default']   = "Users who can access the selected {$lang->projectCommon} can access it.";
+$lang->doc->noticeAcl['lib']['project']['open']      = "Users who can access the selected {$lang->projectCommon} can access it.";
+$lang->doc->noticeAcl['lib']['project']['private']   = "Users who can access the selected {$lang->projectCommon} or users in the whiltelist can access it.";
+$lang->doc->noticeAcl['lib']['project']['custom']    = "Users who can access the selected {$lang->projectCommon} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['execution']['default'] = "Users who can access the selected {$lang->execution->common} can access it.";
 $lang->doc->noticeAcl['lib']['execution']['custom']  = "Users who can access the selected {$lang->execution->common} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['api']['open']          = 'All users can access it.';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 144311558b..d88ae22836 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -47,7 +47,7 @@ $lang->doclib->nameList['custom'] = 'Nom personnalisé';
 $lang->doc->common       = 'Gestion Documentaire';
 $lang->doc->id           = 'ID';
 $lang->doc->product      = $lang->productCommon;
-$lang->doc->project      = 'Project';
+$lang->doc->project      = $lang->projectCommon;
 $lang->doc->execution    = $lang->execution->common;
 $lang->doc->lib          = 'Bibliothèque';
 $lang->doc->module       = 'Catégorie';
@@ -251,12 +251,12 @@ $lang->doc->selectLibType        = 'Please select a type of doc library.';
 $lang->doc->noLibreOffice        = 'You does not have access to office conversion settings!';
 $lang->doc->errorParentChapter   = 'The parent chapter cannot be its own chapter or sub chapter!';
 
-$lang->doc->noticeAcl['lib']['product']['default']   = 'Les utilisateurs qui ont accès au Product peuvent y accéder.';
-$lang->doc->noticeAcl['lib']['product']['custom']    = 'Les utilisateurs qui ont accès au Product ou les utilisateurs de la Liste Blanche peuvent y accéder.';
-$lang->doc->noticeAcl['lib']['project']['default']   = 'Les utilisateurs qui ont accès au Projet peuvent y accéder.';
-$lang->doc->noticeAcl['lib']['project']['open']      = 'Users who can access the selected project can access it.';
-$lang->doc->noticeAcl['lib']['project']['private']   = 'Users who can access the selected project or users in the whiltelist can access it.';
-$lang->doc->noticeAcl['lib']['project']['custom']    = 'Les utilisateurs qui ont accès au Projet ou les utilisateurs de la Liste Blanche peuvent y accéder.';
+$lang->doc->noticeAcl['lib']['product']['default']   = "Users who can access the selected {$lang->productCommon} can access it.";
+$lang->doc->noticeAcl['lib']['product']['custom']    = "Users who can access the selected {$lang->productCommon} or users in the whiltelist can access it.";
+$lang->doc->noticeAcl['lib']['project']['default']   = "Users who can access the selected {$lang->projectCommon} can access it.";
+$lang->doc->noticeAcl['lib']['project']['open']      = "Users who can access the selected {$lang->projectCommon} can access it.";
+$lang->doc->noticeAcl['lib']['project']['private']   = "Users who can access the selected {$lang->projectCommon} or users in the whiltelist can access it.";
+$lang->doc->noticeAcl['lib']['project']['custom']    = "Users who can access the selected {$lang->projectCommon} or users in the whiltelist can access it.";
 $lang->doc->noticeAcl['lib']['execution']['default'] = "Les utilisateurs qui ont accès au {$lang->execution->common} peuvent y accéder.";
 $lang->doc->noticeAcl['lib']['execution']['custom']  = "Les utilisateurs qui ont accès au {$lang->execution->common} ou les utilisateurs de la Liste Blanche peuvent y accéder.";
 $lang->doc->noticeAcl['lib']['api']['open']          = 'All users can access it.';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 57e8382161..8633007239 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -34,7 +34,7 @@ $lang->doclib->create['execution'] = '创建' . $lang->executionCommon . '文档
 $lang->doclib->create['custom']    = '创建自定义文档库';
 
 $lang->doclib->main['product']   = $lang->productCommon . '主库';
-$lang->doclib->main['project']   = '项目主库';
+$lang->doclib->main['project']   = "{$lang->projectCommon}主库";
 $lang->doclib->main['execution'] = $lang->executionCommon . '主库';
 
 $lang->doclib->tabList['product']   = $lang->productCommon;
@@ -47,7 +47,7 @@ $lang->doclib->nameList['custom'] = '自定义文档库名称';
 $lang->doc->common       = '文档';
 $lang->doc->id           = '文档编号';
 $lang->doc->product      = '所属' . $lang->productCommon;
-$lang->doc->project      = '所属项目';
+$lang->doc->project      = "所属{$lang->projectCommon}";
 $lang->doc->execution    = '所属' . $lang->execution->common;
 $lang->doc->lib          = '所属文档库';
 $lang->doc->module       = '所属目录';
@@ -165,7 +165,7 @@ $lang->doc->allExecutions = '所有' . $lang->executionCommon;
 $lang->doc->allProjects   = '所有' . $lang->projectCommon;
 
 $lang->doc->libTypeList['product']   = $lang->productCommon . '文档库';
-$lang->doc->libTypeList['project']   = '项目文档库';
+$lang->doc->libTypeList['project']   = "{$lang->projectCommon}文档库";
 $lang->doc->libTypeList['execution'] = $lang->execution->common . '文档库';
 $lang->doc->libTypeList['api']       = '接口库';
 $lang->doc->libTypeList['custom']    = '自定义文档库';
@@ -251,11 +251,11 @@ $lang->doc->selectLibType        = '请选择文档库类型';
 $lang->doc->noLibreOffice        = '您还没有office转换设置访问权限!';
 $lang->doc->errorParentChapter   = '父章节不能是自身章节及子章节！';
 
-$lang->doc->noticeAcl['lib']['product']['default']   = '有所选产品访问权限的用户可以访问。';
-$lang->doc->noticeAcl['lib']['product']['custom']    = '有所选产品访问权限或白名单里的用户可以访问。';
-$lang->doc->noticeAcl['lib']['project']['default']   = "有所选项目访问权限的用户可以访问。";
-$lang->doc->noticeAcl['lib']['project']['open']      = "有所选项目访问权限的用户可以访问。";
-$lang->doc->noticeAcl['lib']['project']['private']   = "有所选项目访问权限或白名单里的用户可以访问。";
+$lang->doc->noticeAcl['lib']['product']['default']   = "有所选{$lang->productCommon}访问权限的用户可以访问。";
+$lang->doc->noticeAcl['lib']['product']['custom']    = "有所选{$lang->productCommon}访问权限或白名单里的用户可以访问。";
+$lang->doc->noticeAcl['lib']['project']['default']   = "有所选{$lang->projectCommon}访问权限的用户可以访问。";
+$lang->doc->noticeAcl['lib']['project']['open']      = "有所选{$lang->projectCommon}访问权限的用户可以访问。";
+$lang->doc->noticeAcl['lib']['project']['private']   = "有所选{$lang->projectCommon}访问权限或白名单里的用户可以访问。";
 $lang->doc->noticeAcl['lib']['project']['custom']    = "白名单的用户可以访问。";
 $lang->doc->noticeAcl['lib']['execution']['default'] = "有所选{$lang->execution->common}访问权限的用户可以访问。";
 $lang->doc->noticeAcl['lib']['execution']['custom']  = "有所选{$lang->execution->common}访问权限或白名单里的用户可以访问。";

From 99f3ccee790cb6e061a3e23c6dc3c8835ef5f931 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:49:20 +0800
Subject: [PATCH 261/319] * Modify language item for product common.

---
 module/projectstory/lang/de.php    |  2 +-
 module/projectstory/lang/en.php    |  2 +-
 module/projectstory/lang/fr.php    |  2 +-
 module/projectstory/lang/zh-cn.php |  2 +-
 module/story/lang/de.php           | 14 +++++++-------
 module/story/lang/en.php           | 14 +++++++-------
 module/story/lang/fr.php           | 14 +++++++-------
 module/story/lang/zh-cn.php        | 16 ++++++++--------
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/module/projectstory/lang/de.php b/module/projectstory/lang/de.php
index 0e72f35c67..b394c8aeb2 100644
--- a/module/projectstory/lang/de.php
+++ b/module/projectstory/lang/de.php
@@ -1,7 +1,7 @@
 <?php
 /* Field. */
 $lang->projectstory->project = "{$lang->projectCommon} ID";
-$lang->projectstory->product = "Product ID";
+$lang->projectstory->product = "{$lang->productCommon} ID";
 $lang->projectstory->story   = "{$lang->SRCommon} List";
 $lang->projectstory->version = "Version";
 $lang->projectstory->order   = "Order";
diff --git a/module/projectstory/lang/en.php b/module/projectstory/lang/en.php
index e508603335..602ab99355 100644
--- a/module/projectstory/lang/en.php
+++ b/module/projectstory/lang/en.php
@@ -1,7 +1,7 @@
 <?php
 /* Field. */
 $lang->projectstory->project = "{$lang->projectCommon} ID";
-$lang->projectstory->product = "Product ID";
+$lang->projectstory->product = "{$lang->productCommon} ID";
 $lang->projectstory->story   = "Story ID";
 $lang->projectstory->version = "Version";
 $lang->projectstory->order   = "Order";
diff --git a/module/projectstory/lang/fr.php b/module/projectstory/lang/fr.php
index 0e72f35c67..b394c8aeb2 100644
--- a/module/projectstory/lang/fr.php
+++ b/module/projectstory/lang/fr.php
@@ -1,7 +1,7 @@
 <?php
 /* Field. */
 $lang->projectstory->project = "{$lang->projectCommon} ID";
-$lang->projectstory->product = "Product ID";
+$lang->projectstory->product = "{$lang->productCommon} ID";
 $lang->projectstory->story   = "{$lang->SRCommon} List";
 $lang->projectstory->version = "Version";
 $lang->projectstory->order   = "Order";
diff --git a/module/projectstory/lang/zh-cn.php b/module/projectstory/lang/zh-cn.php
index 600d711814..6e80e3d30a 100644
--- a/module/projectstory/lang/zh-cn.php
+++ b/module/projectstory/lang/zh-cn.php
@@ -1,7 +1,7 @@
 <?php
 /* Field. */
 $lang->projectstory->project = "{$lang->projectCommon}ID";
-$lang->projectstory->product = "产品ID";
+$lang->projectstory->product = "{$lang->productCommon}ID";
 $lang->projectstory->story   = "需求ID";
 $lang->projectstory->version = "版本";
 $lang->projectstory->order   = "排序";
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 6ed399affb..9c01116c01 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -103,18 +103,18 @@ $lang->story->float            = "『%s』should be positive number, decimals in
 $lang->story->saveDraftSuccess = 'Save as draft succeeded.';
 
 $lang->story->changeSyncTip       = "The modification of this story will be synchronized to the following twin requirements";
-$lang->story->syncTip             = "The twin story are synchronized except for product, branch, module, plan, and stage. After the twin relationship is dissolved, they are no longer synchronized.";
+$lang->story->syncTip             = "The twin story are synchronized except for {$lang->productCommon}, branch, module, plan, and stage. After the twin relationship is dissolved, they are no longer synchronized.";
 $lang->story->relievedTip         = "The twin relationship cannot be restored after dissolving, the content of the demand is no longer synchronized, whether to dissolving?";
 $lang->story->assignSyncTip       = "Both twin stories modify the assignor synchronously";
 $lang->story->closeSyncTip        = "Twin stories are closed synchronously";
 $lang->story->activateSyncTip     = "Twin stories are activated synchronously";
-$lang->story->relievedTwinsTip    = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?";
+$lang->story->relievedTwinsTip    = "After {$lang->productCommon} adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?";
 $lang->story->batchEditTip        = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered.";
 
 $lang->story->id               = 'ID';
 $lang->story->parent           = 'Parent';
 $lang->story->product          = $lang->productCommon;
-$lang->story->project          = 'Project';
+$lang->story->project          = $lang->projectCommon;
 $lang->story->branch           = "Branch/Platform";
 $lang->story->module           = 'Module';
 $lang->story->moduleAB         = 'Module';
@@ -200,7 +200,7 @@ $lang->story->linkMR           = 'Related MRs';
 $lang->story->linkCommit       = 'Related Commits';
 
 $lang->story->ditto       = 'Dito';
-$lang->story->dittoNotice = 'Die Story gehört nicht zum Projekt wie die vorherige!';
+$lang->story->dittoNotice = "This story is not linked to the same {$lang->productCommon} as the last one is!";
 
 $lang->story->needNotReviewList[0] = 'Need Review';
 $lang->story->needNotReviewList[1] = 'Need Not Review';
@@ -316,7 +316,7 @@ $lang->story->noStory              = 'Keine Storys. ';
 $lang->story->noRequirement        = 'No Requirements';
 $lang->story->ignoreChangeStage    = 'The status of %s is Draft or Closed. This operation has been filtered.';
 $lang->story->cannotDeleteParent   = "Can not delete parent {$lang->SRCommon}";
-$lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
+$lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected {$lang->productCommon} when editing the linked {$lang->productCommon} of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
 $lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';
@@ -349,8 +349,8 @@ $lang->story->action->unlinkedfromplan      = array('main' => '$date, Verknüpfu
 $lang->story->action->linked2execution      = array('main' => '$date, verknüpft von <strong>$actor</strong> mit ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->unlinkedfromexecution = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> mit ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->linked2kanban         = array('main' => '$date, linked by <strong>$actor</strong> to Kanban <strong>$extra</strong>.');
-$lang->story->action->linked2project        = array('main' => '$date, verknüpft von <strong>$actor</strong> mit project <strong>$extra</strong>.');
-$lang->story->action->unlinkedfromproject   = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> mit project <strong>$extra</strong>.');
+$lang->story->action->linked2project        = array('main' => '$date, linked by <strong>$actor</strong> ' . "to {$lang->projectCommon}" . ' <strong>$extra</strong>.');
+$lang->story->action->unlinkedfromproject   = array('main' => '$date, unlinked by <strong>$actor</strong> ' . "from {$lang->projectCommon}" . ' <strong>$extra</strong>.');
 $lang->story->action->linked2build          = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Build <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild     = array('main' => '$date, Verknüpfung aufgelöst durch <strong>$actor</strong> von Build <strong>$extra</strong>.');
 $lang->story->action->linked2release        = array('main' => '$date, verknüpft von <strong>$actor</strong> mit Release <strong>$extra</strong>');
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index d9296e0e5a..8a58aeeab6 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -103,18 +103,18 @@ $lang->story->float            = "『%s』should have positive number, or decima
 $lang->story->saveDraftSuccess = 'Save as draft succeeded.';
 
 $lang->story->changeSyncTip       = "The modification of this story will be synchronized to the following twin requirements";
-$lang->story->syncTip             = "The twin story are synchronized except for product, branch, module, plan, and stage. After the twin relationship is dissolved, they are no longer synchronized.";
+$lang->story->syncTip             = "The twin story are synchronized except for {$lang->productCommon}, branch, module, plan, and stage. After the twin relationship is dissolved, they are no longer synchronized.";
 $lang->story->relievedTip         = "The twin relationship cannot be restored after dissolving, the content of the demand is no longer synchronized, whether to dissolving?";
 $lang->story->assignSyncTip       = "Both twin stories modify the assignor synchronously";
 $lang->story->closeSyncTip        = "Twin stories are closed synchronously";
 $lang->story->activateSyncTip     = "Twin stories are activated synchronously";
-$lang->story->relievedTwinsTip    = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?";
+$lang->story->relievedTwinsTip    = "After {$lang->productCommon} adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?";
 $lang->story->batchEditTip        = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered.";
 
 $lang->story->id               = 'ID';
 $lang->story->parent           = 'Parent';
 $lang->story->product          = $lang->productCommon;
-$lang->story->project          = 'Project';
+$lang->story->project          = $lang->projectCommon;
 $lang->story->branch           = "Branch/Platform";
 $lang->story->module           = 'Module';
 $lang->story->moduleAB         = 'Module';
@@ -200,7 +200,7 @@ $lang->story->linkMR           = 'Related MRs';
 $lang->story->linkCommit       = 'Related Commits';
 
 $lang->story->ditto       = 'Ditto';
-$lang->story->dittoNotice = 'This story is not linked to the same product as the last one is!';
+$lang->story->dittoNotice = "This story is not linked to the same {$lang->productCommon} as the last one is!";
 
 $lang->story->needNotReviewList[0] = 'Need Review';
 $lang->story->needNotReviewList[1] = 'No Review';
@@ -316,7 +316,7 @@ $lang->story->noStory              = 'No stories yet. ';
 $lang->story->noRequirement        = 'No requirements yet. ';
 $lang->story->ignoreChangeStage    = 'The status of %s is Draft or Closed. This operation has been filtered.';
 $lang->story->cannotDeleteParent   = "Can not delete parent {$lang->SRCommon}";
-$lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
+$lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected {$lang->productCommon} when editing the linked {$lang->productCommon} of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
 $lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';
@@ -349,8 +349,8 @@ $lang->story->action->unlinkedfromplan      = array('main' => '$date, unlinked b
 $lang->story->action->linked2execution      = array('main' => '$date, linked by <strong>$actor</strong> to ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->unlinkedfromexecution = array('main' => '$date, unlinked by <strong>$actor</strong> from ' . $lang->executionCommon . ' <strong>$extra</strong>.');
 $lang->story->action->linked2kanban         = array('main' => '$date, linked by <strong>$actor</strong> to Kanban <strong>$extra</strong>.');
-$lang->story->action->linked2project        = array('main' => '$date, linked by <strong>$actor</strong> to project <strong>$extra</strong>.');
-$lang->story->action->unlinkedfromproject   = array('main' => '$date, unlinked by <strong>$actor</strong> from project <strong>$extra</strong>.');
+$lang->story->action->linked2project        = array('main' => '$date, linked by <strong>$actor</strong> ' . "to {$lang->projectCommon}" . ' <strong>$extra</strong>.');
+$lang->story->action->unlinkedfromproject   = array('main' => '$date, unlinked by <strong>$actor</strong> ' . "from {$lang->projectCommon}" . ' <strong>$extra</strong>.');
 $lang->story->action->linked2build          = array('main' => '$date, linked by <strong>$actor</strong> to Build <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild     = array('main' => '$date, unlinked by <strong>$actor</strong> from Build <strong>$extra</strong>.');
 $lang->story->action->linked2release        = array('main' => '$date, linked by <strong>$actor</strong> to Release <strong>$extra</strong>');
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index b8c403b42f..a74699d0b2 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -103,18 +103,18 @@ $lang->story->float            = "『 %s 』doit avoir des nombres positifs ou d
 $lang->story->saveDraftSuccess = 'Save as draft succeeded.';
 
 $lang->story->changeSyncTip       = "The modification of this story will be synchronized to the following twin requirements";
-$lang->story->syncTip             = "The twin story are synchronized except for product, branch, module, plan, and stage. After the twin relationship is dissolved, they are no longer synchronized.";
+$lang->story->syncTip             = "The twin story are synchronized except for {$lang->productCommon}, branch, module, plan, and stage. After the twin relationship is dissolved, they are no longer synchronized.";
 $lang->story->relievedTip         = "The twin relationship cannot be restored after dissolving, the content of the demand is no longer synchronized, whether to dissolving?";
 $lang->story->assignSyncTip       = "Both twin stories modify the assignor synchronously";
 $lang->story->closeSyncTip        = "Twin stories are closed synchronously";
 $lang->story->activateSyncTip     = "Twin stories are activated synchronously";
-$lang->story->relievedTwinsTip    = "After product adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?";
+$lang->story->relievedTwinsTip    = "After {$lang->productCommon} adjustment, the twin relationship of this story will be automatically removed, and the story will no longer be synchronized. Do you want to save?";
 $lang->story->batchEditTip        = "{$lang->SRCommon} %sis twin stories, and this operation has been filtered.";
 
 $lang->story->id               = 'ID';
 $lang->story->parent           = 'Parent';
 $lang->story->product          = $lang->productCommon;
-$lang->story->project          = 'Project';
+$lang->story->project          = $lang->projectCommon;
 $lang->story->branch           = "Branche/Plateforme";
 $lang->story->module           = 'Module';
 $lang->story->moduleAB         = 'Module';
@@ -200,7 +200,7 @@ $lang->story->linkMR           = 'Related MRs';
 $lang->story->linkCommit       = 'Related Commits';
 
 $lang->story->ditto       = 'Idem';
-$lang->story->dittoNotice = "La story n'est pas associée au même product que la précédente !";
+$lang->story->dittoNotice = "This story is not linked to the same {$lang->productCommon} as the last one is!";
 
 $lang->story->needNotReviewList[0] = 'Need Review';
 $lang->story->needNotReviewList[1] = 'Need Not Review';
@@ -316,7 +316,7 @@ $lang->story->noStory              = "Aucune story pour l'instant. ";
 $lang->story->noRequirement        = 'No Requirements';
 $lang->story->ignoreChangeStage    = 'The status of %s is Draft or Closed. This operation has been filtered.';
 $lang->story->cannotDeleteParent   = "Impossible de supprimer {$lang->SRCommon} parent";
-$lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->SRCommon}.";
+$lang->story->moveChildrenTips     = "Its Child {$lang->SRCommon} will be moved to the selected {$lang->productCommon} when editing the linked {$lang->productCommon} of Parent {$lang->SRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 $lang->story->estimateMustBeNumber = 'Estimate value must be number.';
 $lang->story->estimateMustBePlus   = 'Estimated value cannot be negative';
@@ -349,8 +349,8 @@ $lang->story->action->unlinkedfromplan      = array('main' => '$date, déplanifi
 $lang->story->action->linked2execution      = array('main' => '$date, associée au ' . $lang->executionCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
 $lang->story->action->unlinkedfromexecution = array('main' => '$date, dissociée du ' . $lang->executionCommon . ' <strong>$extra</strong> par <strong>$actor</strong>.');
 $lang->story->action->linked2kanban         = array('main' => '$date, linked by <strong>$actor</strong> to Kanban <strong>$extra</strong>.');
-$lang->story->action->linked2project        = array('main' => '$date, associée au project <strong>$extra</strong> par <strong>$actor</strong>.');
-$lang->story->action->unlinkedfromproject   = array('main' => '$date, dissociée d uproject <strong>$extra</strong> par <strong>$actor</strong>.');
+$lang->story->action->linked2project        = array('main' => '$date, linked by <strong>$actor</strong> ' . "to {$lang->projectCommon}" . ' <strong>$extra</strong>.');
+$lang->story->action->unlinkedfromproject   = array('main' => '$date, unlinked by <strong>$actor</strong> ' . "from {$lang->projectCommon}" . ' <strong>$extra</strong>.');
 $lang->story->action->linked2build          = array('main' => '$date, intégrée par <strong>$actor</strong> au Build <strong>$extra</strong>');
 $lang->story->action->unlinkedfrombuild     = array('main' => '$date, retirée par <strong>$actor</strong> du Build <strong>$extra</strong>.');
 $lang->story->action->linked2release        = array('main' => '$date, ajoutée par <strong>$actor</strong> à la Release <strong>$extra</strong>');
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index f32aba2b12..b3469e5c2f 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -103,18 +103,18 @@ $lang->story->float            = "『%s』应当是正数，可以是小数。";
 $lang->story->saveDraftSuccess = '存为草稿成功';
 
 $lang->story->changeSyncTip       = "该需求的修改会同步到如下的孪生需求";
-$lang->story->syncTip             = "孪生需求间除产品、分支 、模块、计划、阶段外均同步，孪生关系解除后不再同步";
+$lang->story->syncTip             = "孪生需求间除{$lang->productCommon}、分支 、模块、计划、阶段外均同步，孪生关系解除后不再同步";
 $lang->story->relievedTip         = "孪生关系解除后无法恢复，需求的内容不再同步，是否解除？";
 $lang->story->assignSyncTip       = "孪生需求均同步修改指派人";
 $lang->story->closeSyncTip        = "孪生需求均同步关闭";
 $lang->story->activateSyncTip     = "孪生需求均同步激活";
-$lang->story->relievedTwinsTip    = '产品调整后，本需求自动解除孪生关系，需求不再同步，是否保存？';
+$lang->story->relievedTwinsTip    = "{$lang->productCommon}调整后，本需求自动解除孪生关系，需求不再同步，是否保存？";
 $lang->story->batchEditTip        = "{$lang->SRCommon} %s为孪生需求，本次操作已被过滤。";
 
 $lang->story->id               = '编号';
 $lang->story->parent           = '父需求';
 $lang->story->product          = "所属{$lang->productCommon}";
-$lang->story->project          = "所属项目";
+$lang->story->project          = "所属{$lang->projectCommon}";
 $lang->story->branch           = "平台/分支";
 $lang->story->module           = '所属模块';
 $lang->story->moduleAB         = '模块';
@@ -200,7 +200,7 @@ $lang->story->linkMR           = '相关合并请求';
 $lang->story->linkCommit       = '相关代码版本';
 
 $lang->story->ditto       = '同上';
-$lang->story->dittoNotice = "该{$lang->SRCommon}与上一{$lang->SRCommon}不属于同一产品！";
+$lang->story->dittoNotice = "该{$lang->SRCommon}与上一{$lang->SRCommon}不属于同一{$lang->productCommon}！";
 
 $lang->story->needNotReviewList[0] = '需要评审';
 $lang->story->needNotReviewList[1] = '不需要评审';
@@ -316,7 +316,7 @@ $lang->story->noStory               = "暂时没有{$lang->SRCommon}。";
 $lang->story->noRequirement         = "暂时没有{$lang->URCommon}。";
 $lang->story->ignoreChangeStage     = "{$lang->SRCommon} %s 状态为草稿或已关闭，本次操作已被过滤。";
 $lang->story->cannotDeleteParent    = "不能删除父{$lang->SRCommon}";
-$lang->story->moveChildrenTips      = "修改父{$lang->SRCommon}的所属产品会将其下的子{$lang->SRCommon}也移动到所选产品下。";
+$lang->story->moveChildrenTips      = "修改父{$lang->SRCommon}的所属{$lang->productCommon}会将其下的子{$lang->SRCommon}也移动到所选{$lang->productCommon}下。";
 $lang->story->changeTips            = '该软件需求关联的用户需求有变更，点击“不变更”忽略此条变更，点击“变更”来进行该软件需求的变更。';
 $lang->story->estimateMustBeNumber  = '估算值必须是数字';
 $lang->story->estimateMustBePlus    = '估算值不能是负数';
@@ -349,8 +349,8 @@ $lang->story->action->unlinkedfromplan      = array('main' => '$date, 由 <stron
 $lang->story->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->story->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 $lang->story->action->linked2kanban         = array('main' => '$date, 由 <strong>$actor</strong> 关联到看板 <strong>$extra</strong>。');
-$lang->story->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。');
-$lang->story->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。');
+$lang->story->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> ' . "关联到{$lang->projectCommon}" . ' <strong>$extra</strong>。');
+$lang->story->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> ' . "从{$lang->projectCommon}" . '<strong>$extra</strong> 移除。');
 $lang->story->action->linked2build          = array('main' => '$date, 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>。');
 $lang->story->action->unlinkedfrombuild     = array('main' => '$date, 由 <strong>$actor</strong> 从版本 <strong>$extra</strong> 移除。');
 $lang->story->action->linked2release        = array('main' => '$date, 由 <strong>$actor</strong> 关联到发布 <strong>$extra</strong>。');
@@ -528,7 +528,7 @@ $lang->requirement->linkStory          = "关联{$lang->SRCommon}";
 
 $lang->story->addBranch      = '添加%s';
 $lang->story->deleteBranch   = '删除%s';
-$lang->story->notice->branch = '每个分支会建立一个需求，需求间互为孪生关系。孪生需求间除产品、分支、模块、计划、阶段字段外均保持同步，后期您可以手动解除孪生关系。';
+$lang->story->notice->branch = "每个分支会建立一个需求，需求间互为孪生关系。孪生需求间除{$lang->productCommon}、分支、模块、计划、阶段字段外均保持同步，后期您可以手动解除孪生关系。";
 
 $lang->story->relievedTwinsRelation     = '解除孪生关系';
 $lang->story->relievedTwinsRelationTips = '孪生关系解除后无法恢复，需求的关闭将不再同步。';

From 661cd28506a1d33c63dc95110944aa5831bbee52 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 13:52:47 +0800
Subject: [PATCH 262/319] * Modify language items for product common.

---
 module/kanban/lang/de.php    | 4 ++--
 module/kanban/lang/en.php    | 4 ++--
 module/kanban/lang/fr.php    | 4 ++--
 module/kanban/lang/zh-cn.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index 46339cbab1..67a92e700d 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -86,7 +86,7 @@ $lang->kanban->importBuild         = 'Build';
 $lang->kanban->importTicket        = 'Ticket';
 $lang->kanban->allKanban           = 'All Kanban';
 $lang->kanban->allProjects         = "All {$lang->projectCommon}s";
-$lang->kanban->allProducts         = 'All Products';
+$lang->kanban->allProducts         = "All {$lang->productCommon}s";
 $lang->kanban->mine                = 'Mine';
 $lang->kanban->alignment           = 'Alignment';
 $lang->kanban->allUsers            = 'Alle Benutzer laden';
@@ -127,7 +127,7 @@ $lang->kanban->confirmDeleteKanban = 'Do you want to delete this Kanban?';
 $lang->kanban->cardCountTip        = 'Please enter the number of cards';
 
 $lang->kanban->selectedKanban  = 'Please select Kanban';
-$lang->kanban->selectedProduct = 'Please select Product';
+$lang->kanban->selectedProduct = "Please select {$lang->productCommon}";
 $lang->kanban->selectedProject = 'Please select ' . $lang->projectCommon;
 $lang->kanban->selectedLane    = 'Target Lane';
 
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 4fb50848f1..c3163bf29f 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -86,7 +86,7 @@ $lang->kanban->importBuild         = 'Build';
 $lang->kanban->importTicket        = 'Ticket';
 $lang->kanban->allKanban           = 'All Kanban';
 $lang->kanban->allProjects         = "All {$lang->projectCommon}s";
-$lang->kanban->allProducts         = 'All Products';
+$lang->kanban->allProducts         = "All {$lang->productCommon}s";
 $lang->kanban->mine                = 'Mine';
 $lang->kanban->alignment           = 'Alignment';
 $lang->kanban->allUsers            = 'Load All Users';
@@ -127,7 +127,7 @@ $lang->kanban->confirmDeleteKanban = 'Do you want to delete this Kanban?';
 $lang->kanban->cardCountTip        = 'Please enter the number of cards';
 
 $lang->kanban->selectedKanban  = 'Please select Kanban';
-$lang->kanban->selectedProduct = 'Please select Product';
+$lang->kanban->selectedProduct = "Please select {$lang->productCommon}";
 $lang->kanban->selectedProject = 'Please select ' . $lang->projectCommon;
 $lang->kanban->selectedLane    = 'Target Lane';
 
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index f355a881f5..dc18c7f5bb 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -86,7 +86,7 @@ $lang->kanban->importBuild         = 'Build';
 $lang->kanban->importTicket        = 'Ticket';
 $lang->kanban->allKanban           = 'All Kanban';
 $lang->kanban->allProjects         = "All {$lang->projectCommon}s";
-$lang->kanban->allProducts         = 'All Products';
+$lang->kanban->allProducts         = "All {$lang->productCommon}s";
 $lang->kanban->mine                = 'Mine';
 $lang->kanban->alignment           = 'Alignment';
 $lang->kanban->allUsers            = 'Charger Tous';
@@ -127,7 +127,7 @@ $lang->kanban->confirmDeleteKanban = 'Do you want to delete this Kanban?';
 $lang->kanban->cardCountTip        = 'Please enter the number of cards';
 
 $lang->kanban->selectedKanban  = 'Please select Kanban';
-$lang->kanban->selectedProduct = 'Please select Product';
+$lang->kanban->selectedProduct = "Please select {$lang->productCommon}";
 $lang->kanban->selectedProject = 'Please select ' . $lang->projectCommon;
 $lang->kanban->selectedLane    = 'Target Lane';
 
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index e42332e3b9..ee10648b55 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -86,7 +86,7 @@ $lang->kanban->importBuild         = '版本';
 $lang->kanban->importTicket        = '工单';
 $lang->kanban->allKanban           = '所有看板';
 $lang->kanban->allProjects         = '所有' . $lang->projectCommon;
-$lang->kanban->allProducts         = '所有产品';
+$lang->kanban->allProducts         = "所有{$lang->productCommon}";
 $lang->kanban->mine                = '我负责';
 $lang->kanban->alignment           = '列标题对齐方式';
 $lang->kanban->allUsers            = '加载所有用户';
@@ -127,7 +127,7 @@ $lang->kanban->confirmDeleteKanban = '您确认要删除该看板吗？';
 $lang->kanban->cardCountTip        = '请输入卡片数量';
 
 $lang->kanban->selectedKanban  = '请选择看板';
-$lang->kanban->selectedProduct = '请选择产品';
+$lang->kanban->selectedProduct = "请选择{$lang->productCommon}";
 $lang->kanban->selectedProject = '请选择' . $lang->projectCommon;
 $lang->kanban->selectedLane    = '目标泳道';
 

From 056f6a2414b3c237c0c2eba3a427727de3a71bd8 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 14:00:03 +0800
Subject: [PATCH 263/319] * Optimize codes.

---
 module/dev/model.php | 93 ++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 60 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index f217e1e606..503853c807 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -621,17 +621,7 @@ class devModel extends model
         if($menu == 'project')
         {
             $menusPinYin = common::convert2Pinyin($this->lang->dev->projectMenu);
-            foreach($this->config->dev->projectMenus as $subMenuKey)
-            {
-                $subMenu = new stdClass();
-                $subMenu->title  = $this->lang->dev->projectMenu[$subMenuKey];
-                $subMenu->key    = zget($menusPinYin, $this->lang->dev->projectMenu[$subMenuKey], '');
-                $subMenu->module = $subMenuKey;
-                $subMenu->method = '';
-                $subMenu->active = ($module == $subMenuKey and $method == '') ? 1 : 0;
-
-                $menus[] = $subMenu;
-            }
+            foreach($this->config->dev->projectMenus as $subMenuKey) $menus[] = $this->getMenuObject($this->lang->dev->projectMenu[$subMenuKey], $subMenuKey, '', ($module == $subMenuKey and $method == ''), $menusPinYin);
         }
 
         return $menus;
@@ -658,14 +648,7 @@ class devModel extends model
         {
             if(!isset($this->lang->$menu->menu->{$menuKey}['subMenu']) or (is_object($this->lang->$menu->menu->{$menuKey}['subMenu']) and !get_object_vars($this->lang->$menu->menu->{$menuKey}['subMenu']))) continue;
 
-            $subMenu = new stdClass();
-            $subMenu->title  = $menuName;
-            $subMenu->key    = zget($menusPinYin, $menuName, '');
-            $subMenu->module = $menu;
-            $subMenu->method = $menuKey;
-            $subMenu->active = ($method == $menuKey and $module == $menu) ? 1 : 0;
-
-            $menus[] = $subMenu;
+            $menus[] = $this->getMenuObject($menuName, $menu, $menuKey, ($module == $menu and $method == $menuKey), $menusPinYin);
         }
 
         return $menus;
@@ -710,17 +693,10 @@ class devModel extends model
                     list($thisModule, $thisMethod) = $this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"];
                 }
 
-                $titleList[]  = $label;
+                $subMenu      = $this->getMenuObject($label, $thisModule, $thisMethod, ($methodName == $thisMethod and $moduleName == $thisModule));
+                $titleList[]  = $subMenu->title;
                 $tagMethods[] = $thisMethod;
 
-                $subMenu = new stdclass();
-                $subMenu->title    = isset($this->lang->dev->replaceLable["$thisModule-$thisMethod"]) ? $this->lang->dev->replaceLable["$thisModule-$thisMethod"] : $label;
-                $subMenu->key      = '';
-                $subMenu->module   = $thisModule;
-                $subMenu->method   = $thisMethod;
-                $subMenu->active   = ($methodName == $thisMethod and $moduleName == $thisModule) ? 1 : 0;
-                $subMenu->children = array();
-
                 $this->app->loadLang($thisModule);
                 $hasFeatureBar = false;
                 if(isset($this->lang->$thisModule->featureBar[$thisMethod])) $hasFeatureBar = true;
@@ -764,13 +740,8 @@ class devModel extends model
                                     $titleList[]  = $label;
                                     $tagMethods[] = $thisMethod;
 
-                                    $thirdMenu = new stdClass();
-                                    $thirdMenu->title  = $label;
-                                    $thirdMenu->key    = '';
-                                    $thirdMenu->module = $moduleKey;
-                                    $thirdMenu->method = "{$thisMethod}_{$subMenuKey}";
-                                    $thirdMenu->active = ($methodName == $thirdMenu->method and $moduleName == $moduleKey) ? 1 : 0;
-
+                                    $methodKey = "{$thisMethod}_{$subMenuKey}";
+                                    $thirdMenu = $this->getMenuObject($label, $moduleKey, $methodKey, ($methodName == $methodKey and $moduleName == $moduleKey));
                                     $subMenu->active     = 0;
                                     $subMenu->children[] = $thirdMenu;
                                     $hasFeatureBar = true;
@@ -786,14 +757,7 @@ class devModel extends model
                                     $titleList[]  = $label;
                                     $tagMethods[] = $thisMethod;
 
-                                    $subMenu = new stdClass();
-                                    $subMenu->title  = $label;
-                                    $subMenu->key      = '';
-                                    $subMenu->module   = $moduleKey;
-                                    $subMenu->method   = $thisMethod;
-                                    $subMenu->active   = ($methodName == $thisMethod and $moduleName == $moduleKey) ? 1 : 0;
-                                    $subMenu->children = array();
-
+                                    $subMenu = $this->getMenuObject($label, $moduleKey, $thisMethod, ($methodName == $thisMethod and $moduleName == $moduleKey));
                                     $menus["$moduleKey-$thisMethod"] = $subMenu;
                                     $hasFeatureBar = false;
                                 }
@@ -818,15 +782,7 @@ class devModel extends model
                 $titleList[]  = $label;
                 $tagMethods[] = $method;
 
-                $subMenu = new stdClass();
-                $subMenu->title    = $label;
-                $subMenu->key      = '';
-                $subMenu->module   = $module;
-                $subMenu->method   = $method;
-                $subMenu->active   = ($methodName == $method and $moduleName == $module) ? 1 : 0;
-                $subMenu->children = array();
-
-                $menus[] = $subMenu;
+                $menus[] = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
             }
         }
 
@@ -865,16 +821,10 @@ class devModel extends model
         }
 
         $mainNav       = $this->getLinkTitle($mainNav);
-        $maimNavPinYin = common::convert2Pinyin($mainNav);
+        $mainNavPinYin = common::convert2Pinyin($mainNav);
         foreach($mainNav as $menuKey => $menu)
         {
-            $menuItem = new stdclass();
-            $menuItem->title    = $menu;
-            $menuItem->module   = $menuKey;
-            $menuItem->method   = '';
-            $menuItem->active   = ($module == $menuKey and $method == '') ? 1 : 0;
-            $menuItem->key      = zget($maimNavPinYin, $menu, '');
-            $menuItem->children = array();
+            $menuItem = $this->getMenuObject($menu, $menuKey, '', ($module == $menuKey and $method == ''), $mainNavPinYin);
 
             $childFunc = 'get' . ucfirst($type) . 'Menus';
             if($type == 'tag' and in_array($menuKey, $this->config->dev->projectMenus))
@@ -1053,4 +1003,27 @@ class devModel extends model
             $_POST = $post;
         }
     }
+
+    /**
+     * Get tree menu object.
+     *
+     * @param  string $label
+     * @param  string $module
+     * @param  string $method
+     * @param  bool   $active
+     * @param  array  $titlePinYin
+     * @access public
+     * @return object
+     */
+    public function getMenuObject($label, $module, $method, $active = false, $titlePinYin = array())
+    {
+        $menu = new stdclass();
+        $menu->title    = isset($this->lang->dev->replaceLable["$module-$method"]) ? $this->lang->dev->replaceLable["$module-$method"] : $label;
+        $menu->key      = zget($titlePinYin, $menu->title, '');
+        $menu->module   = $module;
+        $menu->method   = $method;
+        $menu->active   = (int)$active;
+        $menu->children = array();
+        return $menu;
+    }
 }

From b9fc578dd75addf599bd758c9ff93f2eea774e30 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 14:43:04 +0800
Subject: [PATCH 264/319] * Adjust codes.

---
 module/dev/model.php | 80 ++++++++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 25 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 503853c807..f42d6d641c 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -670,10 +670,12 @@ class devModel extends model
 
         $titleList  = array();
         $tagMethods = array();
+
         /* Convenience secondary menu. */
         foreach(array('homeMenu', 'menu') as $menu)
         {
             if(!isset($this->lang->$module->$menu)) continue;
+            /* Sort menu. */
             $menuList = $this->lang->$module->$menu;
             if($menu == 'menu' and isset($this->lang->$module->menuOrder))
             {
@@ -681,13 +683,15 @@ class devModel extends model
                 $menuList = $this->sortMenus($menuList);
             }
 
+            /* Construct menu tree. */
             foreach($menuList as $menuKey => $menuValue)
             {
-                if(is_array($menuValue) and !isset($menuValue['link'])) continue;
-                $link = is_array($menuValue) ? $menuValue['link'] : $menuValue;
-                if(strpos($link, '|') === false) continue;
-                list($label, $thisModule, $thisMethod) = explode('|', $link);
+                $link = $this->getLinkParams($menuValue);
+                if(!$link) continue;
 
+                list($label, $thisModule, $thisMethod) = $link;
+
+                /* Replace menu params. */
                 if(isset($this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"]))
                 {
                     list($thisModule, $thisMethod) = $this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"];
@@ -697,6 +701,7 @@ class devModel extends model
                 $titleList[]  = $subMenu->title;
                 $tagMethods[] = $thisMethod;
 
+                /* Set three-level menu.  */
                 $this->app->loadLang($thisModule);
                 $hasFeatureBar = false;
                 if(isset($this->lang->$thisModule->featureBar[$thisMethod])) $hasFeatureBar = true;
@@ -712,12 +717,14 @@ class devModel extends model
                             $menuValue[$menu]->menuOrder = $menuValue['menuOrder'];
                             $menuValue[$menu] = $this->sortMenus($menuValue[$menu]);
                         }
+
                         foreach($menuValue[$menu] as $subMenuKey => $subMenuValue)
                         {
-                            if(is_array($subMenuValue) and !isset($subMenuValue['link'])) continue;
-                            $link = is_array($subMenuValue) ? $subMenuValue['link'] : $subMenuValue;
-                            if(strpos($link, '|') === false) continue;
-                            list($label, $thisModule, $thisMethod) = explode('|', $link);
+                            $link = $this->getLinkParams($subMenuValue);
+                            if(!$link) continue;
+
+                            list($label, $thisModule, $thisMethod) = $link;
+
                             if($label == '@branch@') $label = $this->lang->dev->branch;
 
                             /* Get the three-level menu under the drop mene . */
@@ -735,18 +742,8 @@ class devModel extends model
                                 }
 
                                 $this->app->loadLang($moduleKey);
-                                if(isset($this->lang->$moduleKey->featureBar[$menuKey][$subMenuKey]))
-                                {
-                                    $titleList[]  = $label;
-                                    $tagMethods[] = $thisMethod;
-
-                                    $methodKey = "{$thisMethod}_{$subMenuKey}";
-                                    $thirdMenu = $this->getMenuObject($label, $moduleKey, $methodKey, ($methodName == $methodKey and $moduleName == $moduleKey));
-                                    $subMenu->active     = 0;
-                                    $subMenu->children[] = $thirdMenu;
-                                    $hasFeatureBar = true;
-                                }
-                                elseif(isset($this->lang->$moduleKey->featureBar[$thisMethod]))
+                                /* Replace secondary menu. */
+                                if(isset($this->lang->$moduleKey->featureBar[$thisMethod]))
                                 {
                                     if(is_array($this->lang->$moduleKey->featureBar[$thisMethod]))
                                     {
@@ -761,6 +758,17 @@ class devModel extends model
                                     $menus["$moduleKey-$thisMethod"] = $subMenu;
                                     $hasFeatureBar = false;
                                 }
+
+                                /* Construct secondary menu subitems. */
+                                if(isset($this->lang->$moduleKey->featureBar[$menuKey][$subMenuKey]))
+                                {
+                                    $titleList[]  = $label;
+                                    $tagMethods[] = $thisMethod;
+
+                                    $methodKey = "{$thisMethod}_{$subMenuKey}";
+                                    $subMenu->children[] = $this->getMenuObject($label, $moduleKey, $methodKey, ($methodName == $methodKey and $moduleName == $moduleKey));
+                                    $hasFeatureBar = true;
+                                }
                             }
                         }
                     }
@@ -770,6 +778,7 @@ class devModel extends model
             }
         }
 
+        /* Merge other feature bar menu tree. */
         $this->app->loadLang($module);
         if(isset($this->lang->$module->featureBar))
         {
@@ -777,12 +786,10 @@ class devModel extends model
             {
                 if(in_array($method, $tagMethods)) continue;
 
-                $label = zget($this->lang->$module, $method, $this->lang->$module->common);
-
+                $label        = zget($this->lang->$module, $method, $this->lang->$module->common);
                 $titleList[]  = $label;
                 $tagMethods[] = $method;
-
-                $menus[] = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
+                $menus[]      = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
             }
         }
 
@@ -809,6 +816,7 @@ class devModel extends model
         $mainNav = $type == 'second' ? $this->lang->mainNav : array();
         if($type != 'second')
         {
+            /* Set main nav list. */
             foreach($this->lang->mainNav as $menuKey => $menu)
             {
                 if($menuKey == 'project')
@@ -820,6 +828,7 @@ class devModel extends model
             }
         }
 
+        /* Get menu tree by menu setting. */
         $mainNav       = $this->getLinkTitle($mainNav);
         $mainNavPinYin = common::convert2Pinyin($mainNav);
         foreach($mainNav as $menuKey => $menu)
@@ -827,7 +836,7 @@ class devModel extends model
             $menuItem = $this->getMenuObject($menu, $menuKey, '', ($module == $menuKey and $method == ''), $mainNavPinYin);
 
             $childFunc = 'get' . ucfirst($type) . 'Menus';
-            if($type == 'tag' and in_array($menuKey, $this->config->dev->projectMenus))
+            if($type == 'tag1' and in_array($menuKey, $this->config->dev->projectMenus))
             {
                 if($menuKey != 'project') continue;
                 foreach($this->config->dev->projectMenus as $projectModule)
@@ -895,6 +904,27 @@ class devModel extends model
         return $linksTitle;
     }
 
+    /**
+     * Get link params.
+     *
+     * @param  string $link
+     * @access public
+     * @return array|bool
+     */
+    public function getLinkParams($link)
+    {
+        if(is_array($link))
+        {
+            if(!isset($link['link'])) return false;
+
+            $link = $link['link'];
+        }
+
+        if(strpos($link, '|') === false) return false;
+
+        return  explode('|', $link);
+    }
+
     /**
      * Parse lang that with commonLang.
      *

From b25022e3b036bd57b214d0fb63bdde1bceee0646 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 06:52:09 +0000
Subject: [PATCH 265/319] * Fix bug #31827.

---
 module/project/control.php | 4 ++--
 module/project/model.php   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 260801420f..f6f57af86a 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2190,7 +2190,7 @@ class project extends control
             }
 
             $oldProducts = $this->product->getProducts($projectID);
-            if($project->multiple and $project->model != 'waterfall') $oldExecutionProducts = $this->dao->select('project,product')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($executions))->fetchGroup('project', 'product');
+            if($project->multiple and $project->model != 'waterfall' and $project->model != 'waterfallplus') $oldExecutionProducts = $this->dao->select('project,product')->from(TABLE_PROJECTPRODUCT)->where('project')->in(array_keys($executions))->fetchGroup('project', 'product');
 
             $this->project->updateProducts($projectID);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -2216,7 +2216,7 @@ class project extends control
                 }
             }
 
-            if($project->multiple and $project->model != 'waterfall')
+            if($project->multiple and $project->model != 'waterfall' and $project->model != 'waterfallplus')
             {
                 $unlinkedProducts = array_diff($oldProductIDs, $newProductIDs);
                 if(!empty($unlinkedProducts))
diff --git a/module/project/model.php b/module/project/model.php
index ce5b643326..eae3191b79 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2502,6 +2502,13 @@ class projectModel extends model
                 $this->dao->update(TABLE_PROJECT)->set('division')->eq('1')->where('id')->eq((int)$projectID)->exec();
                 $this->dao->update(TABLE_EXECUTION)->set('division')->eq('1')->where('project')->eq((int)$projectID)->exec();
             }
+
+            $project = $this->getByID($projectID);
+            if(!empty($project) and ($project->model == 'waterfall' or $project->model == 'waterfallplus') and empty($project->division) and !empty($executions))
+            {
+                $this->loadModel('execution');
+                foreach($executions as $executionID) $this->execution->updateProducts($executionID);
+            }
         }
 
         $oldProductKeys = array_keys($oldProjectProducts);

From a646532bcb2177868486847a94e1e1ed0378ae61 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 14:56:59 +0800
Subject: [PATCH 266/319] * Add test case.

---
 test/model/dev/getlinkparams.php | 27 +++++++++++++++++++++++++++
 test/model/dev/getmenuobject.php | 18 ++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 test/model/dev/getlinkparams.php
 create mode 100644 test/model/dev/getmenuobject.php

diff --git a/test/model/dev/getlinkparams.php b/test/model/dev/getlinkparams.php
new file mode 100644
index 0000000000..75bb73d1cf
--- /dev/null
+++ b/test/model/dev/getlinkparams.php
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getLinkParams();
+cid=1
+pid=1
+
+获取空数据         >> 0
+获取字符串类型信息 >> index
+获取数组类型信息   >> my
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+$links = array(
+    'empty'  => '',
+    'string' => '仪表盘|index|',
+    'array'  => array('link' => '地盘|my|index|')
+);
+r($tester->dev->getLinkParams($links['empty']))  && p()    && e('0');      //获取空数据
+r($tester->dev->getLinkParams($links['string'])) && p('1') && e('index'); //获取字符串类型信息
+r($tester->dev->getLinkParams($links['array']))  && p('1') && e('my');    //获取数组类型信息
diff --git a/test/model/dev/getmenuobject.php b/test/model/dev/getmenuobject.php
new file mode 100644
index 0000000000..3b1fdc9b65
--- /dev/null
+++ b/test/model/dev/getmenuobject.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/dev.class.php';
+
+/**
+
+title=测试 devModel::getMenuObject();
+cid=1
+pid=1
+
+获取菜单对象 >> my
+
+*/
+
+global $tester;
+$tester->loadModel('dev');
+r($tester->dev->getMenuObject('标题', 'my', 'index'))  && p('module') && e('my'); //获取菜单对象

From 5cf439e0e7ccd835819e3bedab671d9696365a46 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 14:58:20 +0800
Subject: [PATCH 267/319] * Modify language items for product common.

---
 module/datatable/lang/de.php    | 2 +-
 module/datatable/lang/en.php    | 2 +-
 module/datatable/lang/fr.php    | 2 +-
 module/datatable/lang/zh-cn.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/datatable/lang/de.php b/module/datatable/lang/de.php
index 3034fb390d..97c64cdef5 100644
--- a/module/datatable/lang/de.php
+++ b/module/datatable/lang/de.php
@@ -22,7 +22,7 @@ $lang->datatable->moduleSetting          = 'Set Module';
 $lang->datatable->displaySetting         = 'Set list';
 $lang->datatable->showModule             = 'Anzeigen/Verstecken des Modul Names';
 $lang->datatable->showBranch             = 'Show branches in the list';
-$lang->datatable->showAllModule          = 'Show product modules';
+$lang->datatable->showAllModule          = "Show {$lang->productCommon} modules";
 $lang->datatable->showModuleList['0']    = 'N/A';
 $lang->datatable->showModuleList['base'] = 'Basisknoten';
 $lang->datatable->showModuleList['end']  = 'Endknoten';
diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php
index 9c4b86de8d..fbf07e6f86 100644
--- a/module/datatable/lang/en.php
+++ b/module/datatable/lang/en.php
@@ -22,7 +22,7 @@ $lang->datatable->moduleSetting          = 'Set Module';
 $lang->datatable->displaySetting         = 'Set List';
 $lang->datatable->showModule             = 'Show modules in the list';
 $lang->datatable->showBranch             = 'Show branches in the list';
-$lang->datatable->showAllModule          = 'Show product modules';
+$lang->datatable->showAllModule          = "Show {$lang->productCommon} modules";
 $lang->datatable->showModuleList['0']    = 'N/A';
 $lang->datatable->showModuleList['base'] = 'Base Node';
 $lang->datatable->showModuleList['end']  = 'End Node';
diff --git a/module/datatable/lang/fr.php b/module/datatable/lang/fr.php
index 33a98bd90a..d9163e32c7 100644
--- a/module/datatable/lang/fr.php
+++ b/module/datatable/lang/fr.php
@@ -22,7 +22,7 @@ $lang->datatable->moduleSetting          = 'Set Module';
 $lang->datatable->displaySetting         = 'Set list';
 $lang->datatable->showModule             = 'Montrer les noms des modules dans la page de listes';
 $lang->datatable->showBranch             = 'Show branches in the list';
-$lang->datatable->showAllModule          = 'Afficher les modules de produits';
+$lang->datatable->showAllModule          = "Show {$lang->productCommon} modules";
 $lang->datatable->showModuleList['0']    = 'N/A';
 $lang->datatable->showModuleList['base'] = 'Base Node';
 $lang->datatable->showModuleList['end']  = 'End Node';
diff --git a/module/datatable/lang/zh-cn.php b/module/datatable/lang/zh-cn.php
index b4d63aeb80..b96bb7c735 100644
--- a/module/datatable/lang/zh-cn.php
+++ b/module/datatable/lang/zh-cn.php
@@ -22,7 +22,7 @@ $lang->datatable->moduleSetting          = '模块设置';
 $lang->datatable->displaySetting         = '显示设置';
 $lang->datatable->showModule             = '列表页是否显示模块名';
 $lang->datatable->showBranch             = '列表页是否显示%s名';
-$lang->datatable->showAllModule          = '是否显示完整产品模块';
+$lang->datatable->showAllModule          = "是否显示完整{$lang->productCommon}模块";
 $lang->datatable->showModuleList['0']    = '不显示';
 $lang->datatable->showModuleList['base'] = '只显示一级模块';
 $lang->datatable->showModuleList['end']  = '只显示最后一级模块';

From 8f922378803c0265481f4e29fe45b25f5544d0cf Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 7 Mar 2023 15:02:29 +0800
Subject: [PATCH 268/319]  * code for editor unit test.

---
 module/editor/control.php                |   2 +
 module/editor/model.php                  |  68 +++-
 test/class/editor.class.php              | 398 +++++++++++++++++++++++
 test/model/editor/addlink4dir.php        |  18 +
 test/model/editor/addlink4file.php       |  18 +
 test/model/editor/analysis.php           |  18 +
 test/model/editor/extendcontrol.php      |  18 +
 test/model/editor/extendmodel.php        |  18 +
 test/model/editor/getapilink.php         |  18 +
 test/model/editor/getclassnamebypath.php |  18 +
 test/model/editor/getextendlink.php      |  18 +
 test/model/editor/getextensionfiles.php  |  18 +
 test/model/editor/getmethodcode.php      |  18 +
 test/model/editor/getmodulefiles.php     |  18 +
 test/model/editor/getparam.php           |  18 +
 test/model/editor/getsavepath.php        |  18 +
 test/model/editor/gettwogradefiles.php   |  18 +
 test/model/editor/newcontrol.php         |  18 +
 test/model/editor/printtree.php          |  18 +
 19 files changed, 741 insertions(+), 15 deletions(-)
 create mode 100644 test/class/editor.class.php
 create mode 100644 test/model/editor/addlink4dir.php
 create mode 100644 test/model/editor/addlink4file.php
 create mode 100644 test/model/editor/analysis.php
 create mode 100644 test/model/editor/extendcontrol.php
 create mode 100644 test/model/editor/extendmodel.php
 create mode 100644 test/model/editor/getapilink.php
 create mode 100644 test/model/editor/getclassnamebypath.php
 create mode 100644 test/model/editor/getextendlink.php
 create mode 100644 test/model/editor/getextensionfiles.php
 create mode 100644 test/model/editor/getmethodcode.php
 create mode 100644 test/model/editor/getmodulefiles.php
 create mode 100644 test/model/editor/getparam.php
 create mode 100644 test/model/editor/getsavepath.php
 create mode 100644 test/model/editor/gettwogradefiles.php
 create mode 100644 test/model/editor/newcontrol.php
 create mode 100644 test/model/editor/printtree.php

diff --git a/module/editor/control.php b/module/editor/control.php
index 9e96b7c09f..5ea09122ec 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -114,6 +114,8 @@ class editor extends control
 
             $fileName  = basename($filePath);
             if(strpos($fileName, '.') !== false) $extension = substr($fileName, strpos($fileName, '.') + 1);
+            if(strtolower($action) == 'newjs')  $extension = 'js';
+            if(strtolower($action) == 'newcss') $extension = 'css';
         }
         $this->view->fileContent   = $fileContent;
         $this->view->filePath      = $filePath;
diff --git a/module/editor/model.php b/module/editor/model.php
index 002113b724..df5ef584e4 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -14,6 +14,7 @@ class editorModel extends model
     /**
      * Get module files, contain control's methods and model's method but except ext.
      *
+     * @param  string    $moduleName
      * @access public
      * @return array
      */
@@ -45,9 +46,9 @@ class editorModel extends model
     /**
      * Get extension files.
      *
-     * @param  int    $extPath
+     * @param  string    $moduleName
      * @access public
-     * @return void
+     * @return array
      */
     public function getExtensionFiles($moduleName)
     {
@@ -68,9 +69,22 @@ class editorModel extends model
                 {
                     foreach(glob($extensionFullDir . '*') as $extensionFullFile)
                     {
-                        $fileName = basename($extensionFullFile);
-                        if($fileName == 'index.html') continue;
-                        $extensionList[$extType][$extensionFullDir][$extensionFullFile] = $fileName;
+                        if($ext == 'model' and is_dir($extensionFullFile))
+                        {
+                            $extModelDir = $extensionFullFile;
+                            foreach(glob($extModelDir . '/*') as $extModelFile)
+                            {
+                                $fileName = basename($extModelFile);
+                                if($fileName == 'index.html') continue;
+                                $extensionList[$extType][$extensionFullDir][$extensionFullFile][$extModelFile] = $fileName;
+                            }
+                        }
+                        else
+                        {
+                            $fileName = basename($extensionFullFile);
+                            if($fileName == 'index.html') continue;
+                            $extensionList[$extType][$extensionFullDir][$extensionFullFile] = $fileName;
+                        }
                     }
                 }
             }
@@ -135,9 +149,10 @@ class editorModel extends model
     /**
      * Print tree from module files.
      *
-     * @param  int    $files
+     * @param  array    $files
+     * @param  bool     $isRoot
      * @access public
-     * @return void
+     * @return string
      */
     public function printTree($files, $isRoot = true)
     {
@@ -195,12 +210,22 @@ class editorModel extends model
 
         if(strpos($filePath, DS . 'ext' . DS) !== false)
         {
-            switch($fileName)
+            $parentName = basename(dirname($filePath));
+            if($fileName == 'lang' or $fileName == 'js' or $fileName == 'css')
             {
-            case 'lang': $tree .= $file; break;
-            case 'js':   $tree .= "$file " . html::a($this->getExtendLink($filePath, "newJS"), $this->lang->editor->newExtend, 'editWin'); break;
-            case 'css':  $tree .= "$file " . html::a($this->getExtendLink($filePath, "newCSS"), $this->lang->editor->newExtend, 'editWin'); break;
-            default:     $tree .= "$file " . html::a($this->getExtendLink($filePath, "newExtend"), $this->lang->editor->newExtend, 'editWin');
+                $tree .= $file;
+            }
+            elseif($parentName == 'js')
+            {
+                $tree .= "$file " . html::a($this->getExtendLink($filePath, "newJS"), $this->lang->editor->newExtend, 'editWin');
+            }
+            elseif($parentName == 'css')
+            {
+                $tree .= "$file " . html::a($this->getExtendLink($filePath, "newCSS"), $this->lang->editor->newExtend, 'editWin');
+            }
+            else
+            {
+                $tree .= "$file " . html::a($this->getExtendLink($filePath, "newExtend"), $this->lang->editor->newExtend, 'editWin');
             }
         }
         elseif($fileName == 'model.php')
@@ -468,10 +493,23 @@ EOD;
     {
         $fileExtension  = 'php';
         $sourceFileName = basename($filePath);
-        if(strpos($sourceFileName, '.') !== false) $fileExtension = substr($sourceFileName, strpos($sourceFileName, '.') + 1);
+        if(strrpos($sourceFileName, '.') !== false) $fileExtension = substr($sourceFileName, strrpos($sourceFileName, '.') + 1);
 
         $fileName   = empty($_POST['fileName']) ? '' : trim($this->post->fileName);
         $moduleName = $this->getClassNameByPath($filePath);
+
+        $methodName = '';
+        if(strtolower($action) == 'newjs')
+        {
+            if($fileExtension != 'js') $fileExtension = 'js';
+            $methodName = basename($filePath);
+        }
+        if(strtolower($action) == 'newcss')
+        {
+            if($fileExtension != 'css') $fileExtension = 'css';
+            $methodName = basename($filePath);
+        }
+
         $extPath    = $this->app->getExtensionRoot() . 'custom' . DS . $moduleName . DS . 'ext' . DS;
         if($fileName and (strpos($fileName, '.' . $fileExtension) !== (strlen($fileName) - strlen($fileExtension) - 1))) $fileName .= '.' . $fileExtension;
         switch($action)
@@ -499,8 +537,8 @@ EOD;
             if($action == 'method') return $extPath . basename($filePath, ".{$fileExtension}") . DS . $fileName;
             if($action == 'extend') return $filePath . DS . $fileName;
             if($action == 'config') return $extPath . 'config' . DS . $fileName;
-            if($action == 'js')     return $extPath . 'js' . DS . basename($fileName, ".{$fileExtension}") . DS . $fileName;
-            if($action == 'css')    return $extPath . 'css' . DS . basename($fileName, ".{$fileExtension}") . DS . $fileName;
+            if($action == 'js')     return $extPath . 'js'  . DS . $methodName . DS . $fileName;
+            if($action == 'css')    return $extPath . 'css' . DS . $methodName . DS . $fileName;
             return $extPath . 'lang' . DS . str_replace('_', '-', $action) . DS . $fileName;
         }
     }
diff --git a/test/class/editor.class.php b/test/class/editor.class.php
new file mode 100644
index 0000000000..4081adfd1f
--- /dev/null
+++ b/test/class/editor.class.php
@@ -0,0 +1,398 @@
+<?php
+class editorTest
+{
+
+    /**
+     * Construct
+     *
+     * @access public
+     * @return void
+     */
+    public function __construct()
+    {
+        global $tester;
+        $this->objectModel = $tester->loadModel('editor');
+    }
+
+    /**
+     * Test for get module files.
+     *
+     * @param  string    $moduleName
+     * @access public
+     * @return 1|0
+     */
+    public function getModuleFilesTest($moduleName)
+    {
+        $moduleFiles = $this->objectModel->getModuleFiles($moduleName);
+        $modulePath  = $this->objectModel->app->getModulePath('', $moduleName);
+        if(!isset($moduleFiles[$modulePath])) return 0;
+        if(!isset($moduleFiles[$modulePath][$modulePath . 'model.php'])) return 0;
+        if(!isset($moduleFiles[$modulePath][$modulePath . 'model.php'][$modulePath . 'model.php/create'])) return 0;
+        return 1;
+    }
+
+    /**
+     * Test for get extension files.
+     *
+     * @param  string    $moduleName
+     * @access public
+     * @return 1|0
+     */
+    public function getExtensionFilesTest($moduleName)
+    {
+        $files   = $this->objectModel->getExtensionFiles($moduleName);
+        $edition = $this->objectModel->config->edition;
+
+        if($edition == 'open') return 1;
+
+        $extensionRoot = $this->objectModel->app->getExtensionRoot();
+        $extensionPath = $extensionRoot . $edition . DS . $moduleName . DS . 'ext' . DS . 'control' . DS;
+        if(!isset($files[$edition][$extensionPath])) return 0;
+        return 1;
+    }
+
+    /**
+     * Test for get two grade files.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function getTwoGradeFilesTest()
+    {
+        $extensionFullDir = $this->objectModel->app->getModulePath('', 'todo');
+        $files = $this->objectModel->getTwoGradeFiles($extensionFullDir);
+        if(!isset($files[$extensionFullDir . 'lang'])) return 0;
+        if(!isset($files[$extensionFullDir . 'lang'][$extensionFullDir . 'lang' . DS . 'zh-cn.php'])) return 0;
+        return 1;
+    }
+
+    /**
+     * Test for analysis.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function analysisTest()
+    {
+        $fileName = $this->objectModel->app->getModulePath('', 'todo') . 'control.php';
+        $objects  = $this->objectModel->analysis($fileName);
+        if(!isset($objects[$fileName . '/create'])) return 0;
+        return 1;
+    }
+
+    /**
+     * Test for print tree.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function printTreeTest()
+    {
+        $files = $this->objectModel->getModuleFiles('todo');
+        $tree  = $this->objectModel->printTree($files);
+        if(strpos($tree, 'extendTree') === false) return 0;
+        if(strpos($tree, 'L2hvbWUvei9zaXRlcy96ZW50YW9tYXgvbW9kdWxlL3RvZG8vbW9kZWwucGhw') === false) return 0;
+        if(strpos($tree, 'L2hvbWUvei9zaXRlcy96ZW50YW9tYXgvbW9kdWxlL3RvZG8vbW9kZWwucGhwL2JhdGNoQ3JlYXRl') === false) return 0;
+        if(strpos($tree, "target='editWin'") === false) return 0;
+        return 1;
+    }
+
+    /**
+     * Test for add link for dir.
+     *
+     * @access public
+     * @return string
+     */
+    public function addLink4DirTest()
+    {
+        $result     = '';
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+
+        $controlPath = $modulePath . 'control.php';
+        $link        = $this->objectModel->addLink4Dir($controlPath);
+        $result     .= (strpos($link, 'newPage') === false ? 0 : 1) . ',';
+
+        $modelPath = $modulePath . 'model.php';
+        $link      = $this->objectModel->addLink4Dir($modelPath);
+        $result   .= (strpos($link, 'newMethod') === false ? 0 : 1) . ',';
+
+        $langPath = $modulePath . 'lang';
+        $link     = $this->objectModel->addLink4Dir($langPath);
+        $result  .= (strpos($link, 'lang') === false ? 0 : 1) . ',';
+
+        $edition = $this->objectModel->config->edition;
+        if($edition == 'open') return $result . '1,1,1,1,1';
+
+        $extensionRoot  = $this->objectModel->app->getExtensionRoot();
+        $extensionPath  = $extensionRoot . $edition . DS . 'todo' . DS . 'ext' . DS;
+        $extControlPath = $extensionPath . 'control';
+        $link           = $this->objectModel->addLink4Dir($extControlPath);
+        $result        .= (strpos($link, 'newExtend') === false ? 0 : 1) . ',';
+
+        $extModelPath = $extensionPath . 'model';
+        $link         = $this->objectModel->addLink4Dir($extModelPath);
+        $result      .= (strpos($link, 'newExtend') === false ? 0 : 1) . ',';
+
+        $extJSPath = $extensionPath . 'js';
+        $link      = $this->objectModel->addLink4Dir($extJSPath);
+        $result   .= (strpos($link, 'newJS') === false ? 0 : 1) . ',';
+
+        $extCSSPath = $extensionPath . 'css';
+        $link       = $this->objectModel->addLink4Dir($extCSSPath);
+        $result    .= (strpos($link, 'newCSS') === false ? 0 : 1) . ',';
+
+        $extLangPath = $extensionPath . 'lang';
+        $link        = $this->objectModel->addLink4Dir($extLangPath);
+        $result     .= (strpos($link, 'lang') === false ? 0 : 1);
+        return $result;
+    }
+
+    /**
+     * Test for add link for file.
+     *
+     * @access public
+     * @return string
+     */
+    public function addLink4FileTest()
+    {
+        $result     = '';
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+
+        $viewPath = $modulePath . 'view' . DS . 'create.html.php';
+        $link     = $this->objectModel->addLink4File($viewPath, 'create.html.php');
+        $result  .= ((strpos($link, 'override') === false || strpos($link, 'newHook') === false) ? 0 : 1) . ',';
+
+        $controlPath = $modulePath . 'control.php' . DS . 'create';
+        $link      = $this->objectModel->addLink4File($controlPath, 'create');
+        $result   .= (strpos($link, 'extendControl') === false ? 0 : 1) . ',';
+
+        $modelPath = $modulePath . 'model.php' . DS . 'create';
+        $link      = $this->objectModel->addLink4File($modelPath, 'create');
+        $result   .= (strpos($link, 'extendModel') === false ? 0 : 1) . ',';
+
+        $langPath = $modulePath . 'lang' . DS . 'zh-cn.php';
+        $link     = $this->objectModel->addLink4File($langPath, 'zh-cn.php');
+        $result  .= ((strpos($link, 'newzh_cn') === false || strpos($link, 'extendOther') === false) ? 0 : 1) . ',';
+
+        $configPath = $modulePath . 'config.php';
+        $link       = $this->objectModel->addLink4File($configPath, 'config.php');
+        $result    .= ((strpos($link, 'newConfig') === false || strpos($link, 'extendOther') === false) ? 0 : 1) . ',';
+
+        $edition = $this->objectModel->config->edition;
+        if($edition == 'open') return $result . '1,1,1,1,1,1';
+
+        $extensionRoot  = $this->objectModel->app->getExtensionRoot();
+        $extensionPath  = $extensionRoot . $edition . DS . 'todo' . DS . 'ext' . DS;
+        $extControlPath = $extensionPath . 'control' . DS . 'create.php';
+        $link           = $this->objectModel->addLink4File($extControlPath, 'create.php');
+        $result        .= ((strpos($link, 'delete') === false || strpos($link, 'edit') === false) ? 0 : 1) . ',';
+
+        $extModelPath = $extensionPath . 'model' . DS . 'zentaobiz.class.php';
+        $link         = $this->objectModel->addLink4File($extModelPath, 'zentaobiz.class.php');
+        $result      .= ((strpos($link, 'delete') === false || strpos($link, 'edit') === false) ? 0 : 1) . ',';
+
+        $extJSPath = $extensionPath . 'js' . DS . 'create' . DS . 'zentaobiz.js';
+        $link      = $this->objectModel->addLink4File($extJSPath, 'zentaobiz.js');
+        $result   .= ((strpos($link, 'delete') === false || strpos($link, 'edit') === false) ? 0 : 1) . ',';
+
+        $extCSSPath = $extensionPath . 'css' . DS . 'create' . DS . 'zentaobiz.css';
+        $link       = $this->objectModel->addLink4File($extCSSPath, 'zentaobiz.css');
+        $result    .= ((strpos($link, 'delete') === false || strpos($link, 'edit') === false) ? 0 : 1) . ',';
+
+        $extLangPath = $extensionPath . 'lang' . DS . 'zh-cn' . DS . 'zentaobiz.php';
+        $link        = $this->objectModel->addLink4File($extLangPath, 'zentaobiz.php');
+        $result     .= ((strpos($link, 'delete') === false || strpos($link, 'edit') === false) ? 0 : 1) . ',';
+
+        $extConfigPath = $extensionPath . 'config' . DS . 'zentaobiz.php';
+        $link          = $this->objectModel->addLink4File($extConfigPath, 'zentaobiz.php');
+        $result       .= ((strpos($link, 'delete') === false || strpos($link, 'edit') === false) ? 0 : 1);
+        return $result;
+    }
+
+    /**
+     * Test for get extend link.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function getExtendLinkTest()
+    {
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+        $viewPath   = $modulePath . 'view' . DS . 'create.html.php';
+        $link       = $this->objectModel->getExtendLink($viewPath, 'extendOther');
+        return (strpos($link, 'edit') !== false && strpos($link, 'extendOther') !== false) ? 1 : 0;
+    }
+
+    /**
+     * Test for get api link.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function getAPILinkTest()
+    {
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+        $modelPath  = $modulePath . 'model.php' . DS . 'create';
+        $link       = $this->objectModel->getAPILink($modelPath, 'extendModel');
+        return (strpos($link, 'debug') !== false && strpos($link, 'extendModel') !== false) ? 1 : 0;
+    }
+
+    /**
+     * Test for extend model.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function extendModelTest()
+    {
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+        $modelPath  = $modulePath . 'model.php' . DS . 'create';
+        $content    = $this->objectModel->extendModel($modelPath);
+        return strpos($content, 'public function create(') === false ? 0 : 1;
+    }
+
+    /**
+     * Test for extend control.
+     *
+     * @access public
+     * @return string
+     */
+    public function extendControlTest()
+    {
+        $result     = '';
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+        $filePath   = $modulePath . 'control.php' . DS . 'create';
+        $content    = $this->objectModel->extendControl($filePath, 'yes');
+        $result    .= strpos($content, 'class mytodo extends todo') !== false ? '1,' : '0,';
+
+        $content = $this->objectModel->extendControl($filePath, 'no');
+        $result .= strpos($content, 'class todo extends control') !== false ? 1 : 0;
+        return $result;
+    }
+
+    /**
+     * Test for new control.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function newControlTest()
+    {
+        $filePath = $this->objectModel->app->getModulePath('', 'todo') . 'control.php' . DS . 'create';
+        $content  = $this->objectModel->newControl($filePath);
+        return (strpos($content, 'class todo extends control') !== false && strpos($content, 'public function create(') !== false) ? 1 : 0;
+    }
+
+    /**
+     * Test for get param.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function getParamTest()
+    {
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo') . 'control.php';
+        include $modulePath;
+        $params = $this->objectModel->getParam('todo', 'create');
+        return $params == "\$date='today', \$userID='', \$from='todo'" ? 1 : 0;
+    }
+
+    /**
+     * Test for get method code.
+     *
+     * @access public
+     * @return 1|0
+     */
+    public function getMethodCodeTest()
+    {
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo') . 'control.php';
+        include $modulePath;
+        $code = $this->objectModel->getMethodCode('todo', 'create');
+        return strpos($code, "public function create(\$date = 'today', \$userID = '', \$from = 'todo')") !== false ? 1 : 0;
+    }
+
+    /**
+     * Test for get save path.
+     *
+     * @access public
+     * @return string
+     */
+    public function getSavePathTest()
+    {
+        $_POST['fileName'] = 'test.php';
+        $result     = '';
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+        $extPath    = $this->objectModel->app->getExtensionRoot() . 'custom' . DS;
+
+        $filePath = $modulePath . 'model.php' . DS . 'create';
+        $path     = $this->objectModel->getSavePath($filePath, 'extendModel');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'model' . DS . 'test.php' ? '1,' : '0,';
+
+        $filePath = $modulePath . 'control.php' . DS . 'create';
+        $path     = $this->objectModel->getSavePath($filePath, 'extendControl');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'control' . DS . 'create.php' ? '1,' : '0,';
+
+        $filePath = $modulePath . 'view' . DS . 'create.html.php';
+        $path     = $this->objectModel->getSavePath($filePath, 'override');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'view' . DS . 'create.html.php' ? '1,' : '0,';
+
+        $filePath = $modulePath . 'config.php';
+        $path     = $this->objectModel->getSavePath($filePath, 'extendOther');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'config' . DS . 'test.php' ? '1,' : '0,';
+
+        $filePath = $modulePath . 'lang' . DS . 'zh-cn.php';
+        $path     = $this->objectModel->getSavePath($filePath, 'extendOther');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'lang' . DS . 'zh-cn' . DS . 'test.php' ? '1,' : '0,';
+
+        $_POST['fileName'] = 'create.html.hook.php';
+        $filePath = $modulePath . 'view' . DS . 'create.html.php';
+        $path     = $this->objectModel->getSavePath($filePath, 'newhook');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'view' . DS . 'create.html.hook.php' ? '1,' : '0,';
+
+        $_POST['fileName'] = 'test.php';
+        $filePath = $modulePath . 'control.php';
+        $path     = $this->objectModel->getSavePath($filePath, 'newmethod');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'control' . DS . 'test.php' ? '1,' : '0,';
+
+        $filePath = $extPath . 'todo' . DS . 'ext' . DS . 'control';
+        $path     = $this->objectModel->getSavePath($filePath, 'newextend');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'control' . DS . 'test.php' ? '1,' : '0,';
+
+        $filePath = $modulePath . 'config.php';
+        $path     = $this->objectModel->getSavePath($filePath, 'newconfig');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'config' . DS . 'test.php' ? '1,' : '0,';
+
+        $_POST['fileName'] = 'test.js';
+        $filePath = $extPath . 'todo' . DS . 'ext' . DS . 'js' . DS . 'create' . DS;
+        $path     = $this->objectModel->getSavePath($filePath, 'newJS');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'js' . DS . 'create' . DS . 'test.js' ? '1,' : '0,';
+
+        $_POST['fileName'] = 'test.css';
+        $filePath = $extPath . 'todo' . DS . 'ext' . DS . 'css' . DS . 'create' . DS;
+        $path     = $this->objectModel->getSavePath($filePath, 'newCSS');
+        $result  .= $path == $extPath . 'todo' . DS . 'ext' . DS . 'css' . DS . 'create' . DS . 'test.css' ? '1' : '0';
+
+        return $result;
+    }
+
+    /**
+     * Test for get class name by path.
+     *
+     * @access public
+     * @return string
+     */
+    public function getClassNameByPathTest()
+    {
+        $modulePath = $this->objectModel->app->getModulePath('', 'todo');
+        $extPath    = $this->objectModel->app->getExtensionRoot() . 'custom' . DS;
+
+        $result    = '';
+        $filePath  = $modulePath . 'model.php' . DS . 'create';
+        $className = $this->objectModel->getClassNameByPath($filePath);
+        $result   .= $className == 'todo' ? '1,' : '0,';
+        $filePath  = $extPath . 'todo' . DS . 'ext' . DS . 'control';
+        $className = $this->objectModel->getClassNameByPath($filePath);
+        $result   .= $className == 'todo' ? '1' : '0';
+        return $result;
+    }
+}
diff --git a/test/model/editor/addlink4dir.php b/test/model/editor/addlink4dir.php
new file mode 100644
index 0000000000..f0a6915147
--- /dev/null
+++ b/test/model/editor/addlink4dir.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::addLink4Dir();
+cid=1
+pid=1
+
+添加todo模块的链接 >> 1,1,1,1,1,1,1,1
+
+*/
+
+$editor = new editorTest();
+r($editor->addLink4DirTest()) && p() && e('1,1,1,1,1,1,1,1');    //添加todo模块的链接
diff --git a/test/model/editor/addlink4file.php b/test/model/editor/addlink4file.php
new file mode 100644
index 0000000000..cb614697bd
--- /dev/null
+++ b/test/model/editor/addlink4file.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::addLink4File();
+cid=1
+pid=1
+
+添加todo模块的链接 >> 1,1,1,1,1,1,1,1,1,1,1
+
+*/
+
+$editor = new editorTest();
+r($editor->addLink4FileTest()) && p() && e('1,1,1,1,1,1,1,1,1,1,1');    //添加todo模块的链接
diff --git a/test/model/editor/analysis.php b/test/model/editor/analysis.php
new file mode 100644
index 0000000000..a486828eaa
--- /dev/null
+++ b/test/model/editor/analysis.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::analysis();
+cid=1
+pid=1
+
+获取todo模块的文件列表 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->analysisTest()) && p() && e(1);    //获取todo模块的文件列表
diff --git a/test/model/editor/extendcontrol.php b/test/model/editor/extendcontrol.php
new file mode 100644
index 0000000000..14db6f52c1
--- /dev/null
+++ b/test/model/editor/extendcontrol.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::extendControl();
+cid=1
+pid=1
+
+获取todo模块的control扩展内容 >> 1,1
+
+*/
+
+$editor = new editorTest();
+r($editor->extendControlTest()) && p() && e('1,1');    //获取todo模块的control扩展内容
diff --git a/test/model/editor/extendmodel.php b/test/model/editor/extendmodel.php
new file mode 100644
index 0000000000..6d681855c8
--- /dev/null
+++ b/test/model/editor/extendmodel.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::extendModel();
+cid=1
+pid=1
+
+获取todo模块的model扩展内容 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->extendModelTest()) && p() && e(1);    //获取todo模块的model扩展内容
diff --git a/test/model/editor/getapilink.php b/test/model/editor/getapilink.php
new file mode 100644
index 0000000000..3b52df5da8
--- /dev/null
+++ b/test/model/editor/getapilink.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getAPILink();
+cid=1
+pid=1
+
+获取todo模块的debug链接 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getAPILinkTest()) && p() && e(1);    //获取todo模块的debug链接
diff --git a/test/model/editor/getclassnamebypath.php b/test/model/editor/getclassnamebypath.php
new file mode 100644
index 0000000000..d3dd6a1a9d
--- /dev/null
+++ b/test/model/editor/getclassnamebypath.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getClassNameByPath();
+cid=1
+pid=1
+
+根据文件路径获取类名 >> 1,1
+
+*/
+
+$editor = new editorTest();
+r($editor->getClassNameByPathTest()) && p() && e('1,1');    //根据文件路径获取类名
diff --git a/test/model/editor/getextendlink.php b/test/model/editor/getextendlink.php
new file mode 100644
index 0000000000..524f8060be
--- /dev/null
+++ b/test/model/editor/getextendlink.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getExtendLink();
+cid=1
+pid=1
+
+获取todo模块的扩展链接 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getExtendLinkTest()) && p() && e(1);    //获取todo模块的扩展链接
diff --git a/test/model/editor/getextensionfiles.php b/test/model/editor/getextensionfiles.php
new file mode 100644
index 0000000000..f223d851ba
--- /dev/null
+++ b/test/model/editor/getextensionfiles.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getExtensionFiles();
+cid=1
+pid=1
+
+获取misc模块的扩展文件列表 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getExtensionFilesTest('misc')) && p() && e(1);    //获取misc模块的扩展文件列表
diff --git a/test/model/editor/getmethodcode.php b/test/model/editor/getmethodcode.php
new file mode 100644
index 0000000000..858b6b4df7
--- /dev/null
+++ b/test/model/editor/getmethodcode.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getMethodCode();
+cid=1
+pid=1
+
+获取todo模块的create方法的参数 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getMethodCodeTest()) && p() && e(1);    //获取todo模块的create方法的参数
diff --git a/test/model/editor/getmodulefiles.php b/test/model/editor/getmodulefiles.php
new file mode 100644
index 0000000000..562fd5f361
--- /dev/null
+++ b/test/model/editor/getmodulefiles.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getModuleFiles();
+cid=1
+pid=1
+
+获取todo模块的文件列表 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getModuleFilesTest('todo')) && p() && e(1);    //获取todo模块的文件列表
diff --git a/test/model/editor/getparam.php b/test/model/editor/getparam.php
new file mode 100644
index 0000000000..670088c0cd
--- /dev/null
+++ b/test/model/editor/getparam.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getParam();
+cid=1
+pid=1
+
+获取todo模块的create方法的参数 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getParamTest()) && p() && e(1);    //获取todo模块的create方法的参数
diff --git a/test/model/editor/getsavepath.php b/test/model/editor/getsavepath.php
new file mode 100644
index 0000000000..c5521a5fbf
--- /dev/null
+++ b/test/model/editor/getsavepath.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getSavePath();
+cid=1
+pid=1
+
+获取todo模块的扩展文件存储路径 >> 1,1,1,1,1,1,1,1,1,1,1
+
+*/
+
+$editor = new editorTest();
+r($editor->getSavePathTest()) && p() && e('1,1,1,1,1,1,1,1,1,1,1');    //获取todo模块的扩展文件存储路径
diff --git a/test/model/editor/gettwogradefiles.php b/test/model/editor/gettwogradefiles.php
new file mode 100644
index 0000000000..2f44eafec4
--- /dev/null
+++ b/test/model/editor/gettwogradefiles.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::getTwoGradeFiles();
+cid=1
+pid=1
+
+获取todo模块的文件列表 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->getTwoGradeFilesTest()) && p() && e(1);    //获取todo模块的文件列表
diff --git a/test/model/editor/newcontrol.php b/test/model/editor/newcontrol.php
new file mode 100644
index 0000000000..4f3f77880f
--- /dev/null
+++ b/test/model/editor/newcontrol.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::newControl();
+cid=1
+pid=1
+
+获取todo模块的control新扩展内容 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->newControlTest()) && p() && e(1);    //获取todo模块的control新扩展内容
diff --git a/test/model/editor/printtree.php b/test/model/editor/printtree.php
new file mode 100644
index 0000000000..91a912b9eb
--- /dev/null
+++ b/test/model/editor/printtree.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/editor.class.php';
+su('admin');
+
+/**
+
+title=测试 editorModel::printTree();
+cid=1
+pid=1
+
+获取todo模块的文件列表 >> 1
+
+*/
+
+$editor = new editorTest();
+r($editor->printTreeTest()) && p() && e(1);    //获取todo模块的文件列表

From 2c07064619a569fecbc02d3cdc00c713b96773b4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 15:02:47 +0800
Subject: [PATCH 269/319] * Modify language items for product common.

---
 module/testtask/lang/de.php    | 6 +++---
 module/testtask/lang/en.php    | 6 +++---
 module/testtask/lang/fr.php    | 6 +++---
 module/testtask/lang/zh-cn.php | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 7e0dd2b034..5b7a904710 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = 'Case Report';
 $lang->testtask->id                = 'ID';
 $lang->testtask->common            = 'Testaufgabe';
 $lang->testtask->product           = $lang->productCommon;
-$lang->testtask->project           = 'Project';
+$lang->testtask->project           = $lang->projectCommon;
 $lang->testtask->execution         = $lang->execution->common;
 $lang->testtask->type              = 'Typ';
 $lang->testtask->build             = 'Build';
@@ -145,9 +145,9 @@ $lang->testtask->showFail      = 'Fehlgeschlagen <span class="text-danger">%s</s
 
 $lang->testtask->confirmDelete     = 'Möchten Sie dieses Build löschen?';
 $lang->testtask->confirmUnlinkCase = 'Möchten Sie die Verknüpfung zu dem Fall aufheben?';
-$lang->testtask->noticeNoOther     = 'Es existieren keine weiteren Testaufgaben für dieses Produkt';
+$lang->testtask->noticeNoOther     = "No test builds for this {$lang->productCommon}.";
 $lang->testtask->noTesttask        = 'Keine Testaufgaben. ';
-$lang->testtask->checkLinked       = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
+$lang->testtask->checkLinked       = "Please check whether the {$lang->productCommon} that the test request is linked to has been linked to a {$lang->executionCommon}.";
 $lang->testtask->noImportData      = 'The imported XML does not parse the data.';
 $lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
 $lang->testtask->titleOfAuto       = "%s automated testing";
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index e40067f21b..8140644ec1 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = 'Report';
 $lang->testtask->id                = 'ID';
 $lang->testtask->common            = 'Request';
 $lang->testtask->product           = $lang->productCommon;
-$lang->testtask->project           = 'Project';
+$lang->testtask->project           = $lang->projectCommon;
 $lang->testtask->execution         = $lang->execution->common;
 $lang->testtask->type              = 'Type';
 $lang->testtask->build             = 'Build';
@@ -145,9 +145,9 @@ $lang->testtask->showFail      = 'Failed <span class="text-danger">%s</span> tim
 
 $lang->testtask->confirmDelete     = 'Do you want to delete this build?';
 $lang->testtask->confirmUnlinkCase = 'Do you want to unlink this case?';
-$lang->testtask->noticeNoOther     = 'No test builds for this product.';
+$lang->testtask->noticeNoOther     = "No test builds for this {$lang->productCommon}.";
 $lang->testtask->noTesttask        = 'No requests. ';
-$lang->testtask->checkLinked       = "Please check whether the product that the test request is linked to has been linked to a {$lang->executionCommon}.";
+$lang->testtask->checkLinked       = "Please check whether the {$lang->productCommon} that the test request is linked to has been linked to a {$lang->executionCommon}.";
 $lang->testtask->noImportData      = 'The imported XML does not parse the data.';
 $lang->testtask->unitXMLFormat     = 'Please select a file in JUnit XML format.';
 $lang->testtask->titleOfAuto       = "%s automated testing";
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 9aca9a6aa9..afc45f5b70 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = 'Rapport CasTests';
 $lang->testtask->id                = 'ID';
 $lang->testtask->common            = 'Recette';
 $lang->testtask->product           = $lang->productCommon;
-$lang->testtask->project           = 'Project';
+$lang->testtask->project           = $lang->projectCommon;
 $lang->testtask->execution         = $lang->execution->common;
 $lang->testtask->type              = 'Type';
 $lang->testtask->build             = 'Build';
@@ -145,9 +145,9 @@ $lang->testtask->showFail      = 'Echouée <span class="text-danger">%s</span> f
 
 $lang->testtask->confirmDelete     = 'Voulez-vous supprimer ce build ?';
 $lang->testtask->confirmUnlinkCase = 'Voulez-vous détacher ce CasTest ?';
-$lang->testtask->noticeNoOther     = "Il n'y a pas de Campagnes de Recette pour ce product.";
+$lang->testtask->noticeNoOther     = "No test builds for this {$lang->productCommon}.";
 $lang->testtask->noTesttask        = 'Pas de campagne. ';
-$lang->testtask->checkLinked       = "Vérifiez si le product auquel la campagne de recette est associée est bien lié à un projet.";
+$lang->testtask->checkLinked       = "Please check whether the {$lang->productCommon} that the test request is linked to has been linked to a {$lang->executionCommon}.";
 $lang->testtask->noImportData      = "Le XML importé ne parse pas les données.";
 $lang->testtask->unitXMLFormat     = 'Veuillez sélectionner un fichier au format XML JUnit.';
 $lang->testtask->titleOfAuto       = "%s tests automatisés";
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 7f92d053d7..f8d4da0927 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = '用例报表统计';
 $lang->testtask->id                = '编号';
 $lang->testtask->common            = '测试单';
 $lang->testtask->product           = '所属' . $lang->productCommon;
-$lang->testtask->project           = '所属项目';
+$lang->testtask->project           = "所属{$lang->projectCommon}";
 $lang->testtask->execution         = '所属' . $lang->execution->common;
 $lang->testtask->type              = '测试类型';
 $lang->testtask->build             = '版本';
@@ -145,9 +145,9 @@ $lang->testtask->showFail      = '失败<span class="text-danger">%s</span>次';
 
 $lang->testtask->confirmDelete     = '您确认要删除该测试单吗？';
 $lang->testtask->confirmUnlinkCase = '您确认要移除该用例吗？';
-$lang->testtask->noticeNoOther     = '该产品还没有其他测试单';
+$lang->testtask->noticeNoOther     = "该{$lang->productCommon}还没有其他测试单";
 $lang->testtask->noTesttask        = '暂时没有测试单。';
-$lang->testtask->checkLinked       = "请检查测试单的产品是否与{$lang->executionCommon}相关联";
+$lang->testtask->checkLinked       = "请检查测试单的{$lang->productCommon}是否与{$lang->executionCommon}相关联";
 $lang->testtask->noImportData      = '导入的XML没有解析出数据。';
 $lang->testtask->unitXMLFormat     = '请选择Junit XML 格式的文件。';
 $lang->testtask->titleOfAuto       = "%s 自动化测试";

From 0185b7df0b59ffefa0e5ea90680539af10d8f26a Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 7 Mar 2023 15:28:41 +0800
Subject: [PATCH 270/319] * Code for zui: css refactors .

---
 www/theme/green/style.css | 4 ++--
 www/theme/zui/css/min.css | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/theme/green/style.css b/www/theme/green/style.css
index 8003b7c4b1..a2c6a2c19b 100644
--- a/www/theme/green/style.css
+++ b/www/theme/green/style.css
@@ -1,6 +1,6 @@
 /*!
- * ZUI: Zentao Theme - Green - v1.10.0 - 2023-03-01
+ * ZUI: Zentao Theme - Green - v1.10.0 - 2023-03-07
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2023 cnezsoft.com; Licensed MIT
- */a{color:#313c52}a:focus,a:hover{color:#29aa93}.btn{color:#313c52;background-color:#fff;border-color:#d8dbde;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-warning{color:#fff;background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-danger{color:#fff;background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-success{color:#fff;background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-link{color:#313c52;background-color:transparent}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover,.btn-link[disabled],fieldset[disabled] .btn-link{border-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link:focus,.btn-link:hover{color:#29aa93}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#c4c4c4}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#29aa93}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#1f816f}.label-primary.label-outline{color:#29aa93;background:0 0;border:1px solid #29aa93}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#1f816f}.label-success{background-color:#22c98d}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#1b9d6e}.label-success.label-outline{color:#22c98d;background:0 0;border:1px solid #22c98d}.label-success[href]:focus,.label-success[href]:hover{background-color:#1b9d6e}.label-info{background-color:#37b2fe}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#049efe}.label-info.label-outline{color:#37b2fe;background:0 0;border:1px solid #37b2fe}.label-info[href]:focus,.label-info[href]:hover{background-color:#049efe}.label-warning{background-color:#ffba34}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#ffa901}.label-warning.label-outline{color:#ffba34;background:0 0;border:1px solid #ffba34}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ffa901}.label-danger{background-color:#fc5959}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#fb2727}.label-danger.label-outline{color:#fc5959;background:0 0;border:1px solid #fc5959}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#fb2727}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#60d9c3}.text-primary{color:#29aa93}.text-primary:hover{color:#1f816f}.text-warning{color:#ffba34}.text-warning:hover{color:#ffa901}.text-danger{color:#fc5959}.text-danger:hover{color:#fb2727}.text-success{color:#22c98d}.text-success:hover{color:#1b9d6e}.text-info{color:#37b2fe}.text-info:hover{color:#049efe}.text-important{color:#ff6f42}.text-important:hover{color:#ff480f}.text-special{color:#8166ee}.text-special:hover{color:#5b38e9}.text-muted a:active,.text-muted a:hover{color:#313c52}.text-link:active,.text-link:hover{color:#313c52}.bg-primary{background-color:#29aa93}a.bg-primary:hover{background-color:#1f816f}.hl-primary{background-color:#f0fdfb}a.hl-primary:hover{background-color:#c3f7ef}.progress{background-color:#f0fdfb;border-radius:3px}.progress-bar{color:#fff;background-color:#29aa93;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#29aa93;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-control:focus{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#29aa93;border-color:#29aa93}.switch input:focus+label{color:#29aa93}.switch input:focus+label:before{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border-color:#838a9d}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.checked>label:before,.checkbox-primary>input:checked+label:before,.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{color:#fff}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 8px #29aa93;box-shadow:0 0 8px #29aa93}.checkbox-primary input:disabled+label:after,.checkbox-primary.disabled>label:after,.radio-primary input:disabled+label:after,.radio-primary.disabled>label:after{background-color:#e5e5e5;border-color:#bbb}.checkbox-primary input:disabled:checked+label:after,.checkbox-primary.checked.disabled>label:after,.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#bbb}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#fff;border-color:#29aa93}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93}.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#fff;border-color:#bbb}.radio-primary input:disabled:checked+label:before,.radio-primary.checked.disabled>label:before{background-color:#bbb}.form-control:focus+.input-control-label-left{color:#23c8ec}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.input-group-addon{background-color:#eee}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon{border-radius:4px}.input-group-btn.fix-border>.btn{border-radius:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.list-group-item{background-color:#fff;border:1px solid #c4c4c4}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#313c52;text-decoration:none;background-color:#f0fdfb}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.list-group-item.active .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#e6e6e6}.list-group-item-heading{color:#313c52}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#23c8ec;border-color:#11a9cb}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#14bde2}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#52d4f0}.navbar-inverse .navbar-toggle{border-color:#52d4f0}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#14bde2}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#13b5d9}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#52d4f0}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#11a9cb}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{background-color:#52d4f0}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #52d4f0;-webkit-box-shadow:inset 0 -1px 0 #11a9cb;box-shadow:inset 0 -1px 0 #11a9cb}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#d1d1d1;background-color:#12b1d4}.nav>li>a:focus,.nav>li>a:hover{color:#29aa93}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#313c52}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#29aa93}.nav-primary>li:first-child>a{border-top-left-radius:4px;border-bottom-left-radius:4px}.nav-primary>li:last-child>a{border-top-right-radius:4px;border-bottom-right-radius:4px}.nav-primary>li>a{border:1px solid #c4c4c4}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#29aa93;border-bottom-color:#29aa93}.nav-stacked.nav-primary>li,.nav-stacked.nav-primary>li>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li:first-child.nav-heading,.nav-stacked.nav-primary>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.nav-stacked.nav-primary>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.nav-stacked.nav-primary>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.nav-stacked.nav-secondary>li>a{border-top-right-radius:4px;border-bottom-right-radius:4px;-webkit-box-shadow:inset 2px 0 0 #f5f5f5;box-shadow:inset 2px 0 0 #f5f5f5}.nav-stacked.nav-secondary>li>a:hover{-webkit-box-shadow:inset 2px 0 0 #eee;box-shadow:inset 2px 0 0 #eee}.nav-stacked.nav-secondary>li.active>a,.nav-stacked.nav-secondary>li.active>a:focus,.nav-stacked.nav-secondary>li.active>a:hover{background-color:#f5f5f5;-webkit-box-shadow:inset 2px 0 0 #29aa93;box-shadow:inset 2px 0 0 #29aa93}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #c4c4c4}.nav-tabs>li>a{border-radius:4px 4px 0 0}.pager{border-radius:4px}.pager>li>a,.pager>li>span{background-color:#fff;border:1px solid #c4c4c4}.pager>li:first-child>a,.pager>li:first-child>span{border-top-left-radius:4px;border-bottom-left-radius:4px}.pager>li:last-child>a,.pager>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pager>li>a:focus,.pager>li>a:hover,.pager>li>span:focus,.pager>li>span:hover{background-color:#eee}.pager>li.active>a,.pager>li.active>a:hover,.pager>li.active>span,.pager>li.active>span:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.pager>li.disabled>a,.pager>li.disabled>a:focus,.pager>li.disabled>a:hover,.pager>li.disabled>span,.pager>li.disabled>span:focus,.pager>li.disabled>span:hover{color:#c4c4c4;background-color:#fff;border-color:#c4c4c4}.panel{border-radius:4px}.panel>.panel-heading{background-image:none;border-top-left-radius:4px;border-top-right-radius:4px}.panel-group .panel{border-radius:4px}.dashboard .panel{-webkit-box-shadow:none;box-shadow:none}.panel-primary{border-color:#29aa93}.panel-primary>.panel-heading{color:#fff;background-color:#29aa93;border-color:#29aa93}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#29aa93}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#29aa93}.panel-danger>.panel-body,.panel-info>.panel-body,.panel-primary>.panel-body,.panel-success>.panel-body,.panel-warning>.panel-body{-webkit-box-shadow:none;box-shadow:none}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f0fdfb}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe7d0}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#313c52!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#29aa93!important}.chosen-container-single .chosen-single{border-radius:2px!important}.chosen-container-single.chosen-with-drop .chosen-single{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-single.chosen-with-drop.chosen-up .chosen-single{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container .chosen-results li.highlighted{background-color:#29aa93!important}.chosen-container-active .chosen-single{border-color:#29aa93!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b2b2b2!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#29aa93!important}.chosen-container-multi .chosen-choices{border-radius:2px!important}.chosen-container-multi.chosen-with-drop .chosen-choices{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-multi.chosen-with-drop.chosen-up .chosen-choices{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container.chosen-highlight-selected .result-selected{color:#29aa93;background:#f0fdfb}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #c4c4c4}.menu>.nav>li>.nav>li>a:focus,.menu>.nav>li>.nav>li>a:hover{background-color:#e4e4e4}.menu>.nav>li>.nav>li.active>a,.menu>.nav>li>.nav>li.active>a:focus,.menu>.nav>li>.nav>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.menu>.nav>li.show>a,.menu>.nav>li.show>a:focus,.menu>.nav>li.show>a:hover{color:#313c52;background-color:#fff;border-color:#c4c4c4}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#313c52}.menu>.nav>li.show>a:hover{background-color:#f1f1f1}.menu>.nav>li.show:last-child>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li.show:last-child>.nav>li:last-child>a{border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#29aa93}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#29aa93}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#29aa93}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ffba34!important;border-color:#ffba34!important}.datetimepicker td.day.active{background-color:#29aa93!important;border-color:#1f816f!important}.datetimepicker td.day.active:hover{background-color:#1f816f!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#ffa901!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.ke-menu-item-on{background-color:#29aa93!important}.ke-colorpicker-cell-on{background-color:#29aa93!important}.ke-input-text:focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#29aa93}.messager-success{background-color:#22c98d}.messager-info{background-color:#37b2fe}.messager-warning{background-color:#ffba34}.messager-danger{background-color:#fc5959}.messager-important{background-color:#ff6f42}.messager-special{background-color:#8166ee}.comment:hover>.content>.actions>a{color:#313c52}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#273042;background-color:#f0fdfb}.alert-primary hr{border-top-color:#d1f9f3}.alert-primary .alert-link{color:#1a202c}.alert-success{color:#1eb37e;background-color:#ecfff8}.alert-success hr{border-top-color:#b9ffda}.alert-success .alert-link{color:#199568}.alert-info{color:#1ea8fe;background-color:#e7f6ff}.alert-info hr{border-top-color:#9beaff}.alert-info .alert-link{color:#0199f7}.alert-warning{color:#ffb11a;background-color:#fff4ea}.alert-warning hr{border-top-color:#ffdfd0}.alert-warning .alert-link{color:#f6a200}.alert-danger{color:#fc4040;background-color:#ffebeb}.alert-danger hr{border-top-color:#ffd1d9}.alert-danger .alert-link{color:#fb1d1d}.alert-primary-inverse{color:#fff;background-color:#29aa93;border-color:#29aa93}.alert-primary-inverse hr{border-top-color:#c4c4c4;border-top-color:rgba(196,196,196,.25)}.alert-primary-inverse .alert-link{color:rgba(255,255,255,.8)}.modal-dialog{border-radius:6px}.card{border-radius:4px;-webkit-box-shadow:none;box-shadow:none}pre{border-radius:4px}.datagrid .datagrid-hover-col .datagrid-cell.hover,.datagrid .datagrid-hover-col .datagrid-row-cell.active .datagrid-cell.hover,.datagrid .datagrid-hover-row .datagrid-row-cell:hover .datagrid-cell{background-color:#f0fdfb}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#29aa93}.tree-drag-holder{background-color:#f0fdfb}.tree-menu li.active>a{color:#fff;background-color:#29aa93;border-color:#29aa93}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#23c8ec}a.text-primary{color:#29aa93}.nav-primary>li.active>a{color:#27988a}.nav-primary>li.active>a:hover{color:#27988a}.bg-primary,.m-user-login{background:#23c8ec -webkit-gradient(linear,right top,left top,from(#29aa93),to(#23c8ec))!important;background:#23c8ec -webkit-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec -o-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec linear-gradient(-90deg,#29aa93 0,#23c8ec 100%)!important}.bg-primary-pure{color:#fff;background-color:#29aa93}.bg-primary-pale{color:#29aa93;background-color:#f0fdfb}.bg-secondary{background:#23c8ec}.alert-info{color:#29aa93;background:#f0fdfb}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary.hover,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:rgba(41,170,147,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#249581;background-image:none;border-color:rgba(0,0,0,0)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{color:rgba(255,255,255,.3);background-color:#29aa93;border-color:transparent}.btn-secondary{color:#fff;background-color:#23c8ec;border-color:transparent}.btn-secondary.active,.btn-secondary.hover,.btn-secondary:active,.btn-secondary:focus,.btn-secondary:hover,.open .dropdown-toggle.btn-secondary{color:#fff;background-color:rgba(35,200,236,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#14bde2;background-image:none;border-color:rgba(0,0,0,0)}.btn-secondary.disabled,.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary[disabled],.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:focus,.btn-secondary[disabled]:hover,fieldset[disabled] .btn-secondary,fieldset[disabled] .btn-secondary.active,fieldset[disabled] .btn-secondary:active,fieldset[disabled] .btn-secondary:focus,fieldset[disabled] .btn-secondary:hover{color:rgba(255,255,255,.3);background-color:#23c8ec;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:rgba(240,253,251,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#dafaf5;background-image:none;border-color:rgba(0,0,0,0)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{color:rgba(41,170,147,.3);background-color:#f0fdfb;border-color:transparent}.btn-icon-left>.icon{color:#23c8ec;background:#f0fdfb}.btn-active-line{color:#29aa93}.btn-active-line:after{border-bottom-color:#29aa93}.btn-active-line:hover{color:#29aa93}.btn-active-text .text{color:#27988a}.btn-active-text .text:after{border-bottom-color:#27988a}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(41,170,147,.8)}.label-primary{background:#29aa93!important}.label-pale{background:#c3f7ef!important}.label-outline.label-primary{background:#f0fdfb!important;border-color:rgba(41,170,147,.25)!important}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 0 3px rgba(41,170,147,.2);box-shadow:0 0 0 3px rgba(41,170,147,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#29aa93}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#29aa93!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#29aa93!important}.nav-tabs>li.active>a:before{background:#29aa93}.nav-tabs-primary>li.active>a{color:#29aa93!important}.panel-actions .btn.text-primary{color:#29aa93}.picker-focus .picker-selections{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.status-bars .bar{background:#29aa93}.status-bars-h .bar{background:#29aa93}.messagger-zt .messager-content>.icon{color:#29aa93}.tree li.active>a{color:#29aa93}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#29aa93}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#23c8ec}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#313c52;background-color:#f0fdfb}.dropdown-submenu:hover>a:after{border-left-color:#29aa93}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#23c8ec}.timeline>li>a:after,.timeline>li>div:after{background-color:#29aa93}.timeline>li.active:before{background-color:rgba(41,170,147,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#29aa93!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#29aa93!important}#mainHeader{background:#33c6ab;border-top-color:#29aa93;border-bottom-color:#f0fdfb}#searchGo{background-color:#23c8ec}#searchGo:hover{background-color:#29aa93}#subNavbar{margin-top:7px;text-align:center}#subNavbar .nav>li.active>a{color:#29aa93}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a:after{border-color:#29aa93}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#29aa93}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn.active:before,.btn-toolbar>.angle-btn:last-child:after,.btn-toolbar>.angle-btn:last-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn:last-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn,.btn-toolbar>.angle-btn.normal{border-color:#c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#313c52}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.active+.angle-btn:before,.btn-toolbar>.angle-btn.normal:after,.btn-toolbar>.angle-btn.normal:before{border-color:transparent transparent transparent #c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.normal:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before,.btn-toolbar>.angle-btn.normal>.btn-group:first-child:before{border-color:transparent transparent transparent #c4c4c4!important}#sidebarHeader{border-left:3px solid #29aa93}#sidebarHeader .title{color:#29aa93}#sidebar>.sidebar-toggle>.icon{background:#81dff4}#main .querybox-toggle.querybox-opened{color:#29aa93}#contentNav .nav>li.active>a{color:#29aa93}#contentNav .nav>li.active>a:before{background:#29aa93}td.c-actions .btn{color:#23c8ec}td.c-actions .btn:hover{color:#29aa93;background-color:#dafaf5}td.c-actions .btn-link{color:#313c52;background:0 0}td.c-actions .btn-link:hover{color:#29aa93;background:#f0fdfb}.main-table table .btn-icon-left:hover>.icon{background:#f0fdfb}.main-table tbody>tr:hover{background:#f0fdfb}.main-table tbody>tr.checked:hover{background:#ffe6c6}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#29aa93}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f9fefd}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f9fefd}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#2f8a8f}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#0b2f28}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover,.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down,.table.has-sort-head thead>tr>th>a.sort-up,.table.has-sort-head thead>tr>th>a:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#29aa93}.table.fixed-header-copy thead>tr>th>a.sort-down,.table.fixed-header-copy thead>tr>th>a.sort-down:after,.table.fixed-header-copy thead>tr>th>a.sort-up,.table.fixed-header-copy thead>tr>th>a.sort-up:before,.table.fixed-header-copy thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover:after,.table.fixed-header-copy thead>tr>th>a:hover:before{color:#f0fdfb}.table-nest-toggle:hover{color:#29aa93}.table-footer .checkbox-primary.checked label:after{border-color:#29aa93!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#37cfb4!important;border-color:#37cfb4!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffe6c6}.files-list>li>a:hover{color:#29aa93}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#29aa93;border-color:#29aa93}.article-content a{color:#29aa93}.article-content a:focus,.article-content a:hover{color:#23c8ec}.list-group{overflow-y:auto}.list-group>a.selected{color:#f0fdfb;background-color:#29aa93}.list-group>a.active{color:#29aa93;background-color:#f0fdfb}.list-group>a.active:hover,.list-group>a:hover{background-color:#29aa93}.list-group.tab-menu a.active:hover,.list-group.tab-menu a:hover{color:#29aa93}#swapper #dropMenu .tree li>.selected{color:#29aa93!important;background:#f0fdfb!important}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .list-group>a.selected,#swapper #dropMenu .list-group>a.selected:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu .tree li>.clickable:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#29aa93!important}#pageNav #dropMenu .list-group>a.active{color:inherit;background-color:inherit}#pageNav #dropMenu .list-group>a.active:hover,#pageNav #dropMenu.searchbox-focus .list-group>a.active:hover{color:#29aa93!important;background:#f0fdfb!important}#pageNav #dropMenu .list-group>a.active.selected,#pageNav #dropMenu .list-group>a.active.selected:hover{color:#fff!important;background:#29aa93!important}.release-line>li>a:hover:before{background-color:#f0fdfb}.release-line>li>a:hover .title{color:#29aa93}.release-line>li.active>a:before{border-color:#29aa93}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#23c8ec}#poweredBy .icon-zentao{color:#23c8ec}#poweredBy a:hover{color:#29aa93}#poweredBy a:hover .icon-zentao{color:#29aa93}#poweredBy a.text-primary{color:#29aa93}#poweredBy a.text-primary:hover{color:#23c8ec}.block-guide .nav-secondary>li.active>a:before,.block-statistic .nav-secondary>li.active>a:before{background:#29aa93!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#23c8ec!important}.dynamic.active .dynamic-date:before{background-color:#23c8ec!important}.tablesorter-header-inner:hover,table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after,table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{color:#29aa93!important}.table td.has-child>.task-toggle:hover{color:#29aa93!important}#openTaskPage.open:hover,#task .task-nav{color:#29aa93!important;background:#f0fdfb!important}#tasksProgress>.progress-bar{background:#29aa93!important}#tasksProgress .progress-text{color:#29aa93!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#29aa93!important;background:#f0fdfb!important;border-left-color:#29aa93!important;-webkit-box-shadow:inset 4px 0 0 #29aa93!important;box-shadow:inset 4px 0 0 #29aa93!important}#copyProjectModal a:hover{border-color:#23c8ec!important}#zeroTaskStory.checked{background:#f0fdfb!important;border-color:#23c8ec!important}.cols-list .col:hover{background:#f0fdfb!important}.files-grid .actions,.files-grid .col:hover .file{background:#f0fdfb!important}.dashboard .panel,.panel-default{-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}#menu .nav>li.active>a{background:#23c8ec!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#23c8ec!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#29aa93!important}#bars>li.active:after{background:#f0fdfb!important}#userNav>li>a>.icon{filter:none;opacity:1;-webkit-filter:none}#menu{background:#415a72}#mainMenu>.btn-toobar .btn-active-text,#mainMenu>.btn-toolBar .btn-active-text,#mainMenu>.btn-toolbar .btn-active-text{color:#27988a;background:#e7eded}#mainMenu>.btn-toobar .btn-active-text .text,#mainMenu>.btn-toolBar .btn-active-text .text,#mainMenu>.btn-toolbar .btn-active-text .text{top:0}#mainMenu>.btn-toobar .btn-active-text .text:after,#mainMenu>.btn-toolBar .btn-active-text .text:after,#mainMenu>.btn-toolbar .btn-active-text .text:after{border:none}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text:after{border-color:#29aa93}td.c-actions .btn{color:#29aa93}.main-table tbody>tr:hover{background:rgba(240,253,251,.8)}.main-table tbody>tr>td.c-name a{color:#2f8a8f}.main-table tbody>tr>td.c-name a:hover{color:#27988a}.table.table-data tbody>tr:hover,.table.table-form tbody>tr:hover{background:0 0}#programTableList>tr:hover{background:#e6f0ff;opacity:.8}#programTableList>tr>.c-name:hover>a{color:#29aa93!important}.assigned-none{color:#27988a!important}.assigned-current{color:#faae1a!important}a.assigned-current:hover,a.assigned-none:hover,a.assigned-other:hover{color:#27988a!important}a.assigned-current:hover .icon,a.assigned-none:hover .icon,a.assigned-other:hover .icon{color:#27988a!important}#dashboard .block-welcome .progress{background:#edeef2}#dashboard .block-welcome .progress>.progress-bar{background:#33c6ab}#assigntomeBlock .nav>li.active>a{color:#27988a}.consumedTotally{color:#29aa93;background:#f0fdfb}#toggleFoldIcon .icon-border{border:1px solid #d4eee9}#createEffort .table tbody .date-group .input-group-addon .icon,#recordForm .table tbody .date-group .input-group-addon .icon,#toggleFoldIcon{color:#29aa93}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.nav-steps>ul>li.active>a{background-color:#23c8ec}.nav-steps>ul>li.active>a:focus{background-color:#29aa93}.nav-steps>ul>li.active+li:after{border-left-color:#23c8ec}.nav-steps>ul>li.active:hover+li:after{border-left-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{background-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{color:#fff}.shadow-primary-hover:hover{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.border-primary-hover:hover{border:1px solid #29aa93}.menu-hover-primary>li>a:hover{color:#27988a!important;background-color:#d4eee9!important}.menu-active-primary>li.active>a{color:#29aa93!important;background-color:unset}.menu-active-primary>li.disabled>a:hover{color:#c4c4c4!important;background-color:unset!important}.bg-primary-100{background-color:#d4eee9!important}.form-active-primary .active .label,.form-active-primary .hover .label{color:#29aa93!important}.form-active-primary .active .form-control,.form-active-primary .hover .form-control{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#faae1a;border-color:#faae1a}#mainHeader{color:#313c52;background:#fff;border-bottom:1px solid #eee}#heading .header-btn .btn,#navbar .nav>li>a,#userNav>li>a{color:#313c52}#navbar .nav>li.active>a{position:relative;font-weight:500;color:#27988a;background:0 0}#navbar .nav>li.active>a:before{position:absolute;right:10px;bottom:0;left:10px;display:block;height:2px;content:' ';background-color:#27988a}#navbar .nav>li>a.active:hover,#navbar .nav>li>a:hover{background-color:rgba(0,0,0,.1)}#navbar .nav>li.divider{background-color:#f1f1f1}#visionSwitcher .dropdown-toggle>div,#visionSwitcher>div{background-color:rgba(0,0,0,.1)}#menu{position:relative;background:#248f83!important}#menu::after{position:absolute;bottom:0;left:0;z-index:-1;width:100%;height:108px;content:'';background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABsCAYAAACVWrdDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAA7dSURBVHgB7V1Nc9vGGV4QBL8pSjLp2LUddWK3jWvVOdjptMk4Mzl0euk1/gnN78ifyEzPuSk9J9PpIZlm6saTpJ00VJQ2jhJaiiOLFKkvghS/0H2ABQ1RILEgdkEi1ePBQCJpgXiffT/33YVCBMMwjAQ9pemR0Ikex2sZkhnQ0wkORVFa5BxDKEQQqOCz9JSjQo9N+hwlo0dPx+dEWAhMABvxeSr4hJ//R4kAAQeUCIP8HyMQAVT4C1TwWTIlKAnQhCP2txTzJUKS9NCgScx0denR+rFqzFQEUGGp9FSgQkqSgKBCPqAnmK3sJPPFTFedEtEnPyL4JoCZnILtYMMEyKIE6ExblujRpL+fkAjDlxDhaKngF8js0GPCX2Y+J0l/P6IkHJOIgosAdtP5IPZeEJJkxOHTn/P0+5GokuBpgpi9X/Qb5YQNap4iqQkTCSiXy4nSTzNLMSXGnGOWZBCnmMHK/CGKJIwlgI58CJ2aqHXy9GlfSyRy8XrnOBlXNWgEyZpMgJD5IoOSUI+SY54mClIbjc3cvJJhEGOQJdlaVMLVqRMxEFGtrqd1JZZ3vg4yMpkSmSWQZVMC9kkEIKIUoW4frhf6ndippGzWRNCrVykJPTLnEFaM290t50a1AZgVEVFxyMIIALa2ttL91NGi23thExEVMxQjAnHt2rWW2s673nRT10m1ViEhIhJVVqEaYGOSJgBhaAO9wm4UIiGhGmADmpAxBkfj3oc26HqVyAIVvh6VMFQKAcDFi6vHamIwNiGSbJJOzR3QSC1w2VwWpBEAXF24dWAYg4m2WDQJAzLo09Hfwc8ondMDldNlep7L+olUAmAGaPnUMxQECTrVCBHIkVyLCltjgr9gTxrRc4HNZcwVpBIAvP32n3UvLQCa1CcIIgHTmcUxs3UFVlqfG4TyZb7e+3hBGyxwzSWUiitEJpzz0PMA6RoAnPyQa/N+VnauQDUjN0+mKBQCbt265SskDCFhy5E5QSgEvPXWW76zUpkkwD9QLUiTOUBoDmnroLw8WjH1gsyMGW0u1BfIywY5EYoGADw5wSisjFlMeDoKtNXMgxaERgBygr3H7b1ev+vLHzR1qYN05gQINUEsxo6xv4szWgv7zv5PTOA8qj/Mxvu5jKLEuK8vKzylpmjPzpxlYW1tTX3jjZKyvZ3U6tpRTI0lzPvuDzp8SQkTLOZ/NXZ2HjZiZLxGDXs86dGBNuBvbm9vp+icSaaX9A4Ls9QXyJhzFp0XWPf1j1QzNYgbJ1qipxnxk1ZnrKVRxv0RYvWeaOwQ3YbY2zneIc4qxUm763kNGVqA2lFeye+SAIC81tc/zJJCMtHu97gDDa2n9hWXP4ZRvUzEC/0MarUaaRJ+Gy8rKpp27gCm5YU7SzmiJqdSzefU+L6bkAskBOEDxWIR4Qi3o0VUJKnzBffLTQBG/MNH7+fjWm7qVs1+vNO5dvW11hnb9OjRw55O5IR+bihmiqZ954WkBI07GiyX1xL/2vmoGET4wE+MjO564Rs3HjepPTNqenjzt35JkJUbeOHzz/+SbecuXaDTTIEsBGz/tWuvmJNGZwhQlPv9WHt779tv141KbYOEBZDA23MqITfwND8PttbS3UJaSGt+bjk5nCl0Vb27d9/svnyrWT14stXfqHxEoA1hjLrS7LTAk4Br5CoRhReWNofh3/j4lGrC7dsHe4Pj+Eml8hUBERXJVUrE+bymSJQWdEm3zRMBvff0CyFddksLaBi4P7zeROeDD66uvlInagdJFKlVvyKyHbRlivgQVAuQAxRI4dDtPcP4II4w0/79TWoVBkY/cK9Ra2nzVMMAn/c/+uFgMLAuXql8Jp2EMLQAGTCdP66Ojn5EOeWtB8ufVdTSC7++dPHTb/5asInIxJOBShYIPVeV+6f+BnctBhFAVzNMJwRTsbJyBzdBZIE3ACgVQRb/92Dt6w23+s/HX7+34BZe0iJ6r01z91g7pwUJP1MrO3ujBHDHvy+99Hta3kiaNROovmxN4NUCXW8SP1CIgnsuOEvRSKww6scJF2Fnon9psZC+oJEp4Tb6AV/l6NXV14/DIoHXFzSn8AOYC6DHIhX8IswLEiueGk6zdzL1XHL2St214Od7PgAkaF3lED5hSIKkELWU4Su+Td/m+KRz496l5aCJlRcQ+biNfiDACpk19YsvMgudeDyF34ul581qpWi/wFuw818p1cl/djZ6soUP3FnZ2XWGnk4EnpDBSsqmupNXjV7CqtdTCrJF0zmKIgMaVjVH+XhN8+uMK5UNEkbNK5XpH61efH1sd6DA7WrW1M3NpVzjpG8tZJUQKdX02tjQ00+pGgW9WrNGZAM1n5duvDpxrkHYnDBU7Pr13x2cdtJia0lwzOP8Aq8zDkv4wO3r3+95feYUAQjH6GF2C7Ajy4406zT2tJdw0ktJ1ZSGTkcsDpGAZo0jwTsYoEanGU4l9bKGjUXue5Y44mz6EfFvgmf7mabRhFmBR0dtBOfOaDb5zjt/P/rD/d+YtqdSrZCbK/zlBR6YNSNScjFHyAnGm7xKpRKa3b9y8S7XhRQq0MskICghKK8OJ9zxWrn8YLkdOzQJvXnznpSs2SoOnr7PcdEQQtVK9TERAdSEYh3S02MtJaPl4vg9mU4MkqrR6hUXT1aVVe6ShZAQjGmOKWyqUSCi9fDh+734AuuEg4wkVC1Qvq6emThyv1gqk8LAUIkAxBRViS0Q5d6lNC1pvBaoSiq8MYuSkcaKlOu/+uUwra9Kml1zK1+PK03kyHP7KTUubA8J5A8o2JXLHwRq9A2lM64mSPXdMFqyOB0NWZFY/fBbbJfZ6WtHwjfxaOfUPCqm0y78kEZAJnO6riU6GnLCvXCnD53u00Y9+c8f/lZSa1e6RAI0I0NN7btTydLVB1jhXNNqjnWJGuBQrcQnS8Yb94xpIuzQUEY05Pw+TsODa5pLnhzfHSajnatfIBKgXi/sK8qrUy2LZQTopu2sYpQ2iWeohvdr7I4z2YwpALdSAN6zCYAGYG65mBHf3Qai4w2lgxZHdGD3BwcDmmwJcbheMEsNPqKeUSjfVb+8jORERHwMgSNJsns4zdCPzicP35c7kYPtL+EQjz578mGWdNWpa/e84Ck1eCGGtFxUcgIiK9UNNpulm7UZZ0OtLndxtinwRmMzEYbwEfvzlBq8IMUJg4gNGn1A2CVapnYCEZEkhwxz2tvv6ikSAi7Hk1ylBi/EctnYsZZqHT63Et/HAZuG1zCFFrQLANpVrdbOtJVDSySUBEybX281pIfWkI/d2RYUnrFr2Sgn0o12+rh+kuzG+9M5NpciGSZwVoo3iUB0G41Gd/Ow7MvBZEjR9F2AzmOOT/rdu794XZgKe1c3LQ9vevmtrQfp+omR900ENGCEBCs5o05ZXM+/0SCbXB80o7bSypkkzqwsNR8PSbGCk2eyhtO9/fOdBhEIX7UgpnatqYhwJeErGjVht0Uh+UGn1ex4Ot9i9vmxpNutkcP32ddCULF7/NTo7m/Q2s+bQrfBmcpeggiEX/AXJCA2xE3qd7w6GzCyJ2mcGSa7vI9MuxevHty588cemx/JsXPgXCOQw8JcJyacoZpc/2HM6gr0nQYkgV7/3YlVySC5R2qQ6v/26htoSblEDzSn5dn5IsggASBsTri8+0Gurat5rg+PEXax9OK0PuFofX29M1pqKGatdQe2rUdofHNFqOMfXn/aHRqFhWzQBu2gdcj14TGaAJ8wxZoELIM9rmY/Gd4L7PydlXtmlOV0tKWStH3q8tNuCCV8q4JPP/2Tpi2uLnE56DGa4KNkgTzFbLBFYNBPLS46SyFnL6fL3l7Z95pjKXtFoEXl399cucAdJY01SUVWW3KNkiB83LBZYt7f318qFAqhZMETgPXQvvatlrZZxzQkQNBuZQqMWsTlWfq+WV+yNAM7Ix5Y1zK7tmf9cAkbmPyp835Y6m4pfkmwnaZZyzfbR0Y1AwmURYK9wJo9v2yWj1Vxg/msG54PSt+uBiR88l2phIlsns8XzbZGvkgIC6yJlS6FtukIJ2CKdnmekSb9i5urLvf+y122tbrWvAcPNIBY9f95Ez5gPpaL94PSgVWX3CEqsRqovGAQAwTMo/BtZHkm6kO7Aayw4c2YUQLzmrjJ42FKhPhbHhMuIFvPBR2hPoxNbRf2u5wT4zBF41rOmfnB8lI6yAy0moSxNTHsOQi3WzIHozbesV+SHXR4dmGEvonpuIVwbkC4ueJSOsDDGYg1eAx2lrkNJcjel7WpUyidA05cvfCz7s9ffj5JBjHPa3fpv2xCI5p2mi8Nm+NaBTF7AylZQH1nX+ZO7DPZxtdvfmAV0DKm6YmRmMo0gK/w5/OrESuEBFph7LA7kyjC3Abh+vd7vE65WrPa0HMkt0eFj/8jy+bDru+yI5TtjWcWxtkk8DTMYjaKPUkVwh+QZ6NUNEKXx1zsJI5K5hNFz6i9xClnqqXUfqK33H/xyouGXV+hkQZ29IKgRBfeQG7DLu6Fhbnayt3c/I6sm/O6X5Iv+/eplrCNtvHs4F0WdiL7ReQDAkR9fwh/bxaPPQn9ocyTwOLqzshrHRZfa+w9CCnFfhbhCzDiG7N65sw8p/JOQNi2eQJJiJ5E9PrbZmdmD/yJIgF2DSiorbYndGb6tKWoEID03+75sSMgCM6vFoA0u9TamodHXc2VD5gAaECM9eHY9Rf4BWSq8ANtdvZyygabRTsgc4JIaAAVmrkJOD0S7GcbpjOmr8GO77DXkECBEJA2948zjIoGADAfdukCgoVJgl8wTQp7AjjQcvbosAgK96mQOQu7gSgR4FznOyDPdnO3O+IUx3tDsNA21OTKD6LihAEI0emIMXgGjjKxSQ7PPOw8IUoEYKQ7NSBNno1+4ng9UogSARBubKQj2Zk1414iNfqByBDgiNlh6+2fnQTg9XMNkAwIXhv53YYzR4gMokYAbP4wlKRaMeoDIvEQZyeiqAF218GosM81ICRA0Cg7uBFwrgGSYc8FAG5Lks6dsGTAxIz7znafUKQQNQImjXDcy7kJkoxJI/w8DwgBrgJ2ZMfnJihEjCZhZB5muPzifzvaxdIXFrNVAAAAAElFTkSuQmCC) no-repeat}#userNav>li>a>.icon{color:#23c8ec}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:-webkit-gradient(linear,left top,right top,from(rgba(229,244,169,.4)),to(rgba(237,254,171,.036)))!important;background:-webkit-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:-o-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:linear-gradient(90deg,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;border-radius:4px;opacity:1}#featurebar .nav li.active a{color:#27988a!important}#featurebar .nav li.active a:after{border-bottom:2px solid #27988a!important}.btn.btn-action,.c-actions .btn,td.c-name a{color:#29aa93}#logForm .table .versions a,#mainMenu .page-title strong a,#readOnlyOfKanban i{color:#29aa93!important}.picker-drop-menu .picker-option-list .picker-option.picker-option-active,.picker-drop-menu .picker-option-list .picker-single .picker-option.picker-option-selected.picker-option-active{color:#29aa93}.table-actions .btn{background:#29aa93!important;border-color:#29aa93!important}.table-actions .btn:hover{color:#fff;background:#27988a;border-color:#27988a}.table-actions>.btn-group:first-child>.btn:first-child{border-right:1px solid rgba(255,255,255,.2)!important}a.programName:focus,a.programName:hover{background:#29aa93!important}#guideDialog .project-type-img:hover,#guideDialog .project-type.active img,.kanbans .panel:hover{border-color:#29aa93!important}.btn.btn-action:hover,.c-actions .btn:hover{color:#29aa93;background:#f0fdfb}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.main-table table tr{border-color:#f2f6f8!important}#mainHeader #headerActions .btn-group>.btn{color:#313c52!important}.c-manager .avatar.avatar-top{border-color:#faae1a}#programTableList>tr:hover{background:#f0fdfbcc}#programTableList>tr:hover>.c-name>a{color:#27988a!important}#programTableList>tr[data-type=project]>.c-name>a{color:#2f8a8f!important}.m-product-all #mainMenu>div.btn-toolbar.pull-right>a.btn.btn-link.iframe{color:#00c4d0!important}#featuresNav.nav-simple>li.active>a,.nav-simple>li.active>a,.nav-simple>li.active>a:focus,.nav-simple>li.active>a:hover{color:#29aa93}#featuresCarousel .carousel-indicators .active{background-color:#29aa93!important;border-color:#29aa93!important}#dashboard .block-welcome .progress{background:#eee}
\ No newline at end of file
+ */a{color:#313c52}a:focus,a:hover{color:#29aa93}.btn{color:#313c52;background-color:#fff;border-color:#d8dbde;border-radius:4px}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn.active,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:#ebebeb;border-color:#b7bcc2;-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#d9d9d9;background-image:none;border-color:#bcc2c7;-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{background-color:#fff;border-color:#d8dbde}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#218977;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#1a6c5e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#29aa93;border-color:transparent}.btn-warning{color:#fff;background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-warning.active,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ffac0b;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#e69800;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#ffba34;border-color:transparent}.btn-danger{color:#fff;background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#fb3131;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fb0e0e;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#fc5959;border-color:transparent}.btn-success{color:#fff;background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:#1ca675;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#17885f;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#22c98d;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:#ccf8f1;border-color:rgba(0,0,0,0);-webkit-box-shadow:0 2px 1px rgba(0,0,0,.1);box-shadow:0 2px 1px rgba(0,0,0,.1)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#acf4e9;background-image:none;border-color:rgba(0,0,0,0);-webkit-box-shadow:inset 0 4px 6px rgba(0,0,0,.15);box-shadow:inset 0 4px 6px rgba(0,0,0,.15)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#f0fdfb;border-color:transparent}.btn-link{color:#313c52;background-color:transparent}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover,.btn-link[disabled],fieldset[disabled] .btn-link{border-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link:focus,.btn-link:hover{color:#29aa93}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#c4c4c4}.popover,.tooltip-inner{border-radius:4px}.label{border-radius:3px}.label-badge{border-radius:9px}.label-dot{border-radius:5px}.label-primary{background-color:#29aa93}.label-primary[href]:focus,.label-primary[href]:hover{color:#fff;background-color:#1f816f}.label-primary.label-outline{color:#29aa93;background:0 0;border:1px solid #29aa93}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#1f816f}.label-success{background-color:#22c98d}.label-success[href]:focus,.label-success[href]:hover{color:#fff;background-color:#1b9d6e}.label-success.label-outline{color:#22c98d;background:0 0;border:1px solid #22c98d}.label-success[href]:focus,.label-success[href]:hover{background-color:#1b9d6e}.label-info{background-color:#37b2fe}.label-info[href]:focus,.label-info[href]:hover{color:#fff;background-color:#049efe}.label-info.label-outline{color:#37b2fe;background:0 0;border:1px solid #37b2fe}.label-info[href]:focus,.label-info[href]:hover{background-color:#049efe}.label-warning{background-color:#ffba34}.label-warning[href]:focus,.label-warning[href]:hover{color:#fff;background-color:#ffa901}.label-warning.label-outline{color:#ffba34;background:0 0;border:1px solid #ffba34}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ffa901}.label-danger{background-color:#fc5959}.label-danger[href]:focus,.label-danger[href]:hover{color:#fff;background-color:#fb2727}.label-danger.label-outline{color:#fc5959;background:0 0;border:1px solid #fc5959}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#fb2727}.btn-primary .label-badge,.btn-primary .label-dot{background-color:#60d9c3}.text-primary{color:#29aa93}.text-primary:hover{color:#1f816f}.text-warning{color:#ffba34}.text-warning:hover{color:#ffa901}.text-danger{color:#fc5959}.text-danger:hover{color:#fb2727}.text-success{color:#22c98d}.text-success:hover{color:#1b9d6e}.text-info{color:#37b2fe}.text-info:hover{color:#049efe}.text-important{color:#ff6f42}.text-important:hover{color:#ff480f}.text-special{color:#8166ee}.text-special:hover{color:#5b38e9}.text-muted a:active,.text-muted a:hover{color:#313c52}.text-link:active,.text-link:hover{color:#313c52}.bg-primary{background-color:#29aa93}a.bg-primary:hover{background-color:#1f816f}.hl-primary{background-color:#f0fdfb}a.hl-primary:hover{background-color:#c3f7ef}.progress{background-color:#f0fdfb;border-radius:3px}.progress-bar{color:#fff;background-color:#29aa93;border-radius:3px}.form-control{border-radius:2px}.form-control.focus,.form-control:focus{border-color:#29aa93;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-control:focus{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.form-condensed .btn,.form-condensed .form-control{border-radius:4px}.switch>input:checked+label:before{background-color:#29aa93;border-color:#29aa93}.switch input:focus+label{color:#29aa93}.switch input:focus+label:before{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px #29aa93}.checkbox-primary>label:after,.radio-primary>label:after{background:#fff;border-color:#838a9d}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.checked>label:before,.checkbox-primary>input:checked+label:before,.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{color:#fff}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 8px #29aa93;box-shadow:0 0 8px #29aa93}.checkbox-primary input:disabled+label:after,.checkbox-primary.disabled>label:after,.radio-primary input:disabled+label:after,.radio-primary.disabled>label:after{background-color:#e5e5e5;border-color:#bbb}.checkbox-primary input:disabled:checked+label:after,.checkbox-primary.checked.disabled>label:after,.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#bbb}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#fff;border-color:#29aa93}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93}.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#fff;border-color:#bbb}.radio-primary input:disabled:checked+label:before,.radio-primary.checked.disabled>label:before{background-color:#bbb}.form-control:focus+.input-control-label-left{color:#23c8ec}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.input-group-addon{background-color:#eee}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon{border-radius:4px}.input-group-btn.fix-border>.btn{border-radius:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.list-group-item{background-color:#fff;border:1px solid #c4c4c4}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#313c52;text-decoration:none;background-color:#f0fdfb}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.list-group-item.active .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#e6e6e6}.list-group-item-heading{color:#313c52}.navbar-toggle{border-radius:4px}@media (min-width:768px){.navbar{border-radius:4px}}.navbar-inverse{background-color:#23c8ec;border-color:#11a9cb}.navbar-inverse .navbar-nav>li.nav-heading{background-color:#14bde2}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{background-color:#52d4f0}.navbar-inverse .navbar-toggle{border-color:#52d4f0}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#14bde2}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#13b5d9}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#52d4f0}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#11a9cb}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{background-color:#3fcfee}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{background-color:#52d4f0}}.navbar-fixed-left.navbar-inverse .navbar-header,.navbar-fixed-left.navbar-inverse .navbar-nav{border-bottom:1px solid #52d4f0;-webkit-box-shadow:inset 0 -1px 0 #11a9cb;box-shadow:inset 0 -1px 0 #11a9cb}.navbar-fixed-left.navbar-inverse.navbar-collapsed .navbar-nav>li.nav-heading:hover{color:#d1d1d1;background-color:#12b1d4}.nav>li>a:focus,.nav>li>a:hover{color:#29aa93}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{border-color:#313c52}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{background-color:#29aa93}.nav-primary>li:first-child>a{border-top-left-radius:4px;border-bottom-left-radius:4px}.nav-primary>li:last-child>a{border-top-right-radius:4px;border-bottom-right-radius:4px}.nav-primary>li>a{border:1px solid #c4c4c4}.nav-primary>li.active>a,.nav-primary>li.active>a:focus,.nav-primary>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.nav-secondary>li.active>a,.nav-secondary>li.active>a:focus,.nav-secondary>li.active>a:hover{color:#29aa93;border-bottom-color:#29aa93}.nav-stacked.nav-primary>li,.nav-stacked.nav-primary>li>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.nav-stacked.nav-primary>li:first-child.nav-heading,.nav-stacked.nav-primary>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.nav-stacked.nav-primary>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.nav-stacked.nav-primary>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.nav-stacked.nav-secondary>li>a{border-top-right-radius:4px;border-bottom-right-radius:4px;-webkit-box-shadow:inset 2px 0 0 #f5f5f5;box-shadow:inset 2px 0 0 #f5f5f5}.nav-stacked.nav-secondary>li>a:hover{-webkit-box-shadow:inset 2px 0 0 #eee;box-shadow:inset 2px 0 0 #eee}.nav-stacked.nav-secondary>li.active>a,.nav-stacked.nav-secondary>li.active>a:focus,.nav-stacked.nav-secondary>li.active>a:hover{background-color:#f5f5f5;-webkit-box-shadow:inset 2px 0 0 #29aa93;box-shadow:inset 2px 0 0 #29aa93}.nav-stacked.nav-secondary>li.nav-heading{border-bottom:1px solid #c4c4c4}.nav-tabs>li>a{border-radius:4px 4px 0 0}.pager{border-radius:4px}.pager>li>a,.pager>li>span{background-color:#fff;border:1px solid #c4c4c4}.pager>li:first-child>a,.pager>li:first-child>span{border-top-left-radius:4px;border-bottom-left-radius:4px}.pager>li:last-child>a,.pager>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pager>li>a:focus,.pager>li>a:hover,.pager>li>span:focus,.pager>li>span:hover{background-color:#eee}.pager>li.active>a,.pager>li.active>a:hover,.pager>li.active>span,.pager>li.active>span:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.pager>li.disabled>a,.pager>li.disabled>a:focus,.pager>li.disabled>a:hover,.pager>li.disabled>span,.pager>li.disabled>span:focus,.pager>li.disabled>span:hover{color:#c4c4c4;background-color:#fff;border-color:#c4c4c4}.panel{border-radius:4px}.panel>.panel-heading{background-image:none;border-top-left-radius:4px;border-top-right-radius:4px}.panel-group .panel{border-radius:4px}.dashboard .panel{-webkit-box-shadow:none;box-shadow:none}.panel-primary{border-color:#29aa93}.panel-primary>.panel-heading{color:#fff;background-color:#29aa93;border-color:#29aa93}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#29aa93}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#29aa93}.panel-danger>.panel-body,.panel-info>.panel-body,.panel-primary>.panel-body,.panel-success>.panel-body,.panel-warning>.panel-body{-webkit-box-shadow:none;box-shadow:none}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f0fdfb}.table tr.active>td,.table tr.active>th,.table tr>td.active,.table tr>th.active{background-color:#ffe7d0}table.tablesorter thead tr .headerSortDown:after,table.tablesorter thead tr .headerSortUp:after{color:#313c52!important}.chosen-container-single .chosen-search input[type=text]:focus,.chosen-container-single .chosen-search:focus{border-color:#29aa93!important}.chosen-container-single .chosen-single{border-radius:2px!important}.chosen-container-single.chosen-with-drop .chosen-single{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-single.chosen-with-drop.chosen-up .chosen-single{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container .chosen-results li.highlighted{background-color:#29aa93!important}.chosen-container-active .chosen-single{border-color:#29aa93!important}.chosen-container-active.chosen-with-drop .chosen-single{border-color:#b2b2b2!important;border-color:rgba(0,0,0,.15)!important}.chosen-container-active .chosen-choices{border-color:#29aa93!important}.chosen-container-multi .chosen-choices{border-radius:2px!important}.chosen-container-multi.chosen-with-drop .chosen-choices{border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.chosen-container-multi.chosen-with-drop.chosen-up .chosen-choices{border-top-left-radius:0!important;border-top-right-radius:0!important;border-bottom-right-radius:#29aa93!important;border-bottom-left-radius:#29aa93!important}.chosen-container.chosen-highlight-selected .result-selected{color:#29aa93;background:#f0fdfb}.menu>.nav>li>.nav{background-color:#f6f6f6}.menu>.nav>li>.nav>li>a{border:1px solid #c4c4c4}.menu>.nav>li>.nav>li>a:focus,.menu>.nav>li>.nav>li>a:hover{background-color:#e4e4e4}.menu>.nav>li>.nav>li.active>a,.menu>.nav>li>.nav>li.active>a:focus,.menu>.nav>li>.nav>li.active>a:hover{color:#fff;background-color:#29aa93;border-color:#29aa93}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li:last-child>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li:first-child.nav-heading,.menu>.nav>li:first-child>a{border-top-left-radius:4px;border-top-right-radius:4px}.menu>.nav>li.show>a,.menu>.nav>li.show>a:focus,.menu>.nav>li.show>a:hover{color:#313c52;background-color:#fff;border-color:#c4c4c4}.menu>.nav>li.show>a:focus>[class*=icon-],.menu>.nav>li.show>a:hover>[class*=icon-],.menu>.nav>li.show>a>[class*=icon-]{color:#313c52}.menu>.nav>li.show>a:hover{background-color:#f1f1f1}.menu>.nav>li.show:last-child>a{border-bottom-right-radius:0;border-bottom-left-radius:0}.menu>.nav>li.show:last-child>.nav>li:last-child>a{border-bottom-right-radius:4px;border-bottom-left-radius:4px}.menu>.nav>li.nav-heading{background-color:#f1f1f1;border:1px solid #c4c4c4}.dropdown-menu{border-radius:4px}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#29aa93}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#29aa93}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{background-color:#29aa93}.dropdown-submenu:hover>a:after{border-left-color:#fff}.datetimepicker td.day.today{background-color:#ffba34!important;border-color:#ffba34!important}.datetimepicker td.day.active{background-color:#29aa93!important;border-color:#1f816f!important}.datetimepicker td.day.active:hover{background-color:#1f816f!important}.datetimepicker td.day.today.active:hover,.datetimepicker td.day.today:hover{background-color:#ffa901!important}.ke-container{border-radius:4px!important}.ke-container.focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.ke-menu-item-on{background-color:#29aa93!important}.ke-colorpicker-cell-on{background-color:#29aa93!important}.ke-input-text:focus{border-color:#29aa93!important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)!important}.messager{border-radius:4px}.messager-primary{background-color:#29aa93}.messager-success{background-color:#22c98d}.messager-info{background-color:#37b2fe}.messager-warning{background-color:#ffba34}.messager-danger{background-color:#fc5959}.messager-important{background-color:#ff6f42}.messager-special{background-color:#8166ee}.comment:hover>.content>.actions>a{color:#313c52}.alert:not(.alert-block){border-radius:3px}.alert-primary{color:#273042;background-color:#f0fdfb}.alert-primary hr{border-top-color:#d1f9f3}.alert-primary .alert-link{color:#1a202c}.alert-success{color:#1eb37e;background-color:#ecfff8}.alert-success hr{border-top-color:#b9ffda}.alert-success .alert-link{color:#199568}.alert-info{color:#1ea8fe;background-color:#e7f6ff}.alert-info hr{border-top-color:#9beaff}.alert-info .alert-link{color:#0199f7}.alert-warning{color:#ffb11a;background-color:#fff4ea}.alert-warning hr{border-top-color:#ffdfd0}.alert-warning .alert-link{color:#f6a200}.alert-danger{color:#fc4040;background-color:#ffebeb}.alert-danger hr{border-top-color:#ffd1d9}.alert-danger .alert-link{color:#fb1d1d}.alert-primary-inverse{color:#fff;background-color:#29aa93;border-color:#29aa93}.alert-primary-inverse hr{border-top-color:#c4c4c4;border-top-color:rgba(196,196,196,.25)}.alert-primary-inverse .alert-link{color:rgba(255,255,255,.8)}.modal-dialog{border-radius:6px}.card{border-radius:4px;-webkit-box-shadow:none;box-shadow:none}pre{border-radius:4px}.datagrid .datagrid-hover-col .datagrid-cell.hover,.datagrid .datagrid-hover-col .datagrid-row-cell.active .datagrid-cell.hover,.datagrid .datagrid-hover-row .datagrid-row-cell:hover .datagrid-cell{background-color:#f0fdfb}.datagrid .datagrid-loading>.content>.icon,.datagrid .datagrid-sort-down>.icon-sort:before,.datagrid .datagrid-sort-up>.icon-sort:before{color:#29aa93}.tree-drag-holder{background-color:#f0fdfb}.tree-menu li.active>a{color:#fff;background-color:#29aa93;border-color:#29aa93}.tree-menu li.active>.list-toggle{color:#fff}.text-secondary{color:#23c8ec}a.text-primary{color:#29aa93}.nav-primary>li.active>a{color:#27988a}.nav-primary>li.active>a:hover{color:#27988a}.bg-primary,.m-user-login{background:#23c8ec -webkit-gradient(linear,right top,left top,from(#29aa93),to(#23c8ec))!important;background:#23c8ec -webkit-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec -o-linear-gradient(right,#29aa93 0,#23c8ec 100%)!important;background:#23c8ec linear-gradient(-90deg,#29aa93 0,#23c8ec 100%)!important}.bg-primary-pure{color:#fff;background-color:#29aa93}.bg-primary-pale{color:#29aa93;background-color:#f0fdfb}.bg-secondary{background:#23c8ec}.alert-info{color:#29aa93;background:#f0fdfb}.btn-primary{color:#fff;background-color:#29aa93;border-color:transparent}.btn-primary.active,.btn-primary.hover,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:rgba(41,170,147,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#249581;background-image:none;border-color:rgba(0,0,0,0)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{color:rgba(255,255,255,.3);background-color:#29aa93;border-color:transparent}.btn-secondary{color:#fff;background-color:#23c8ec;border-color:transparent}.btn-secondary.active,.btn-secondary.hover,.btn-secondary:active,.btn-secondary:focus,.btn-secondary:hover,.open .dropdown-toggle.btn-secondary{color:#fff;background-color:rgba(35,200,236,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#14bde2;background-image:none;border-color:rgba(0,0,0,0)}.btn-secondary.disabled,.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary[disabled],.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:focus,.btn-secondary[disabled]:hover,fieldset[disabled] .btn-secondary,fieldset[disabled] .btn-secondary.active,fieldset[disabled] .btn-secondary:active,fieldset[disabled] .btn-secondary:focus,fieldset[disabled] .btn-secondary:hover{color:rgba(255,255,255,.3);background-color:#23c8ec;border-color:transparent}.btn-info{color:#29aa93;background-color:#f0fdfb;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#29aa93;background-color:rgba(240,253,251,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#dafaf5;background-image:none;border-color:rgba(0,0,0,0)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{color:rgba(41,170,147,.3);background-color:#f0fdfb;border-color:transparent}.btn-icon-left>.icon{color:#23c8ec;background:#f0fdfb}.btn-active-line{color:#29aa93}.btn-active-line:after{border-bottom-color:#29aa93}.btn-active-line:hover{color:#29aa93}.btn-active-text .text{color:#27988a}.btn-active-text .text:after{border-bottom-color:#27988a}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(41,170,147,.8)}.label-primary{background:#29aa93!important}.label-pale{background:#c3f7ef!important}.label-outline.label-primary{background:#f0fdfb!important;border-color:rgba(41,170,147,.25)!important}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#29aa93;border-color:#29aa93}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#29aa93;-webkit-box-shadow:0 0 0 3px rgba(41,170,147,.2);box-shadow:0 0 0 3px rgba(41,170,147,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#29aa93}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{border-color:#29aa93!important}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#29aa93!important}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#29aa93!important}.nav-tabs>li.active>a:before{background:#29aa93}.nav-tabs-primary>li.active>a{color:#29aa93!important}.panel-actions .btn.text-primary{color:#29aa93}.picker-focus .picker-selections{border-color:#29aa93;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(41,170,147,.6)}.status-bars .bar{background:#29aa93}.status-bars-h .bar{background:#29aa93}.messagger-zt .messager-content>.icon{color:#29aa93}.tree li.active>a{color:#29aa93}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#29aa93}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{background-color:#23c8ec}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#313c52;background-color:#f0fdfb}.dropdown-submenu:hover>a:after{border-left-color:#29aa93}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager>li.active>a{background-color:#23c8ec}.timeline>li>a:after,.timeline>li>div:after{background-color:#29aa93}.timeline>li.active:before{background-color:rgba(41,170,147,.2)}.ke-container{border-color:#dcdcdc!important}.ke-container.focus{border-color:#29aa93!important}.input-group .chosen-container-active .chosen-choices,.input-group .form-control:focus{border-color:#29aa93!important}#mainHeader{background:#33c6ab;border-top-color:#29aa93;border-bottom-color:#f0fdfb}#searchGo{background-color:#23c8ec}#searchGo:hover{background-color:#29aa93}#subNavbar{margin-top:7px;text-align:center}#subNavbar .nav>li.active>a{color:#29aa93}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a:after{border-color:#29aa93}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#29aa93}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn.active:before,.btn-toolbar>.angle-btn:last-child:after,.btn-toolbar>.angle-btn:last-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn:last-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before{border-color:transparent transparent transparent #29aa93}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn,.btn-toolbar>.angle-btn.normal{border-color:#c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#313c52}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.active+.angle-btn:before,.btn-toolbar>.angle-btn.normal:after,.btn-toolbar>.angle-btn.normal:before{border-color:transparent transparent transparent #c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.normal:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before,.btn-toolbar>.angle-btn.normal>.btn-group:first-child:before{border-color:transparent transparent transparent #c4c4c4!important}#sidebarHeader{border-left:3px solid #29aa93}#sidebarHeader .title{color:#29aa93}#sidebar>.sidebar-toggle>.icon{background:#81dff4}#main .querybox-toggle.querybox-opened{color:#29aa93}#contentNav .nav>li.active>a{color:#29aa93}#contentNav .nav>li.active>a:before{background:#29aa93}td.c-actions .btn{color:#23c8ec}td.c-actions .btn:hover{color:#29aa93;background-color:#dafaf5}td.c-actions .btn-link{color:#313c52;background:0 0}td.c-actions .btn-link:hover{color:#29aa93;background:#f0fdfb}.main-table table .btn-icon-left:hover>.icon{background:#f0fdfb}.main-table tbody>tr:hover{background:#f0fdfb}.main-table tbody>tr.checked:hover{background:#ffe6c6}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{background:#29aa93}.main-table tbody>tr>td.c-side:before{display:none}.main-table .table-grouped tbody>tr:hover{background:#f9fefd}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f9fefd}.main-table tbody>tr>td>a,.table-data tbody>tr>td>a{color:#2f8a8f}.main-table tbody>tr>td>a:not(.btn):visited,.table-data tbody>tr>td>a:not(.btn):visited{color:#0b2f28}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover,.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down,.table.has-sort-head thead>tr>th>a.sort-up,.table.has-sort-head thead>tr>th>a:hover{color:#29aa93}.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#29aa93}.table.fixed-header-copy thead>tr>th>a.sort-down,.table.fixed-header-copy thead>tr>th>a.sort-down:after,.table.fixed-header-copy thead>tr>th>a.sort-up,.table.fixed-header-copy thead>tr>th>a.sort-up:before,.table.fixed-header-copy thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover:after,.table.fixed-header-copy thead>tr>th>a:hover:before{color:#f0fdfb}.table-nest-toggle:hover{color:#29aa93}.table-footer .checkbox-primary.checked label:after{border-color:#29aa93!important}.table-footer.fixed-footer .checkbox-primary.checked label:after{background-color:#37cfb4!important;border-color:#37cfb4!important}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffe6c6}.files-list>li>a:hover{color:#29aa93}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#29aa93;border-color:#29aa93}.article-content a{color:#29aa93}.article-content a:focus,.article-content a:hover{color:#23c8ec}.list-group{overflow-y:auto}.list-group>a.selected{color:#f0fdfb;background-color:#29aa93}.list-group>a.active{color:#29aa93;background-color:#f0fdfb}.list-group>a.active:hover,.list-group>a:hover{background-color:#29aa93}.list-group.tab-menu a.active:hover,.list-group.tab-menu a:hover{color:#29aa93}#swapper #dropMenu .tree li>.selected{color:#29aa93!important;background:#f0fdfb!important}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .list-group>a.selected,#swapper #dropMenu .list-group>a.selected:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu .tree li>.clickable:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#29aa93!important}#pageNav #dropMenu .list-group>a.active{color:inherit;background-color:inherit}#pageNav #dropMenu .list-group>a.active:hover,#pageNav #dropMenu.searchbox-focus .list-group>a.active:hover{color:#29aa93!important;background:#f0fdfb!important}#pageNav #dropMenu .list-group>a.active.selected,#pageNav #dropMenu .list-group>a.active.selected:hover{color:#fff!important;background:#29aa93!important}.release-line>li>a:hover:before{background-color:#f0fdfb}.release-line>li>a:hover .title{color:#29aa93}.release-line>li.active>a:before{border-color:#29aa93}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#23c8ec}#poweredBy .icon-zentao{color:#23c8ec}#poweredBy a:hover{color:#29aa93}#poweredBy a:hover .icon-zentao{color:#29aa93}#poweredBy a.text-primary{color:#29aa93}#poweredBy a.text-primary:hover{color:#23c8ec}.block-guide .nav-secondary>li.active>a:before,.block-statistic .nav-secondary>li.active>a:before{background:#29aa93!important}.dynamic.active .dynamic-date,.dynamic.active .timeline{border-color:#23c8ec!important}.dynamic.active .dynamic-date:before{background-color:#23c8ec!important}.tablesorter-header-inner:hover,table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after,table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{color:#29aa93!important}.table td.has-child>.task-toggle:hover{color:#29aa93!important}#openTaskPage.open:hover,#task .task-nav{color:#29aa93!important;background:#f0fdfb!important}#tasksProgress>.progress-bar{background:#29aa93!important}#tasksProgress .progress-text{color:#29aa93!important}#tasks>li.active.finish>a,#tasks>li.active>a{color:#29aa93!important;background:#f0fdfb!important;border-left-color:#29aa93!important;-webkit-box-shadow:inset 4px 0 0 #29aa93!important;box-shadow:inset 4px 0 0 #29aa93!important}#copyProjectModal a:hover{border-color:#23c8ec!important}#zeroTaskStory.checked{background:#f0fdfb!important;border-color:#23c8ec!important}.cols-list .col:hover{background:#f0fdfb!important}.files-grid .actions,.files-grid .col:hover .file{background:#f0fdfb!important}.dashboard .panel,.panel-default{-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}#menu .nav>li.active>a{background:#23c8ec!important}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:#23c8ec!important}#bars>li.active>a,#bars>li.active>a:active,#bars>li.active>a:focus{background:#29aa93!important}#bars>li.active:after{background:#f0fdfb!important}#userNav>li>a>.icon{filter:none;opacity:1;-webkit-filter:none}#menu{background:#415a72}#mainMenu>.btn-toobar .btn-active-text,#mainMenu>.btn-toolBar .btn-active-text,#mainMenu>.btn-toolbar .btn-active-text{color:#27988a;background:#e7eded}#mainMenu>.btn-toobar .btn-active-text .text,#mainMenu>.btn-toolBar .btn-active-text .text,#mainMenu>.btn-toolbar .btn-active-text .text{top:0}#mainMenu>.btn-toobar .btn-active-text .text:after,#mainMenu>.btn-toolBar .btn-active-text .text:after,#mainMenu>.btn-toolbar .btn-active-text .text:after{border:none}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text:after{border-color:#29aa93}td.c-actions .btn{color:#29aa93}.main-table tbody>tr:hover{background:rgba(240,253,251,.8)}.main-table tbody>tr>td.c-name a{color:#2f8a8f}.main-table tbody>tr>td.c-name a:hover{color:#27988a}.table.table-data tbody>tr:hover,.table.table-form tbody>tr:hover{background:0 0}#programTableList>tr:hover{background:#e6f0ff;opacity:.8}#programTableList>tr>.c-name:hover>a{color:#29aa93!important}.assigned-none{color:#27988a!important}.assigned-current{color:#faae1a!important}a.assigned-current:hover,a.assigned-none:hover,a.assigned-other:hover{color:#27988a!important}a.assigned-current:hover .icon,a.assigned-none:hover .icon,a.assigned-other:hover .icon{color:#27988a!important}#dashboard .block-welcome .progress{background:#edeef2}#dashboard .block-welcome .progress>.progress-bar{background:#33c6ab}#assigntomeBlock .nav>li.active>a{color:#27988a}.consumedTotally{color:#29aa93;background:#f0fdfb}#toggleFoldIcon .icon-border{border:1px solid #d4eee9}#createEffort .table tbody .date-group .input-group-addon .icon,#recordForm .table tbody .date-group .input-group-addon .icon,#toggleFoldIcon{color:#29aa93}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.nav-steps>ul>li.active>a{background-color:#23c8ec}.nav-steps>ul>li.active>a:focus{background-color:#29aa93}.nav-steps>ul>li.active+li:after{border-left-color:#23c8ec}.nav-steps>ul>li.active:hover+li:after{border-left-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{background-color:#29aa93}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{color:#fff}.shadow-primary-hover:hover{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.border-primary-hover:hover{border:1px solid #29aa93}.menu-hover-primary>li>a:hover{color:#27988a!important;background-color:#d4eee9!important}.menu-active-primary>li.active>a{color:#29aa93!important;background-color:unset}.menu-active-primary>li.disabled>a:hover{color:#c4c4c4!important;background-color:unset!important}.bg-primary-100{background-color:#d4eee9!important}.form-active-primary .active .label,.form-active-primary .hover .label{color:#29aa93!important}.form-active-primary .active .form-control,.form-active-primary .hover .form-control{-webkit-box-shadow:0 0 1px 1px #29aa93;box-shadow:0 0 1px 1px #29aa93}.preference .picker-drop-menu .picker-option-list .picker-option.picker-option-active,.preference .picker-drop-menu .picker-option-list .picker-single .picker-option.picker-option-selected.picker-option-active{color:#29aa93;background:#d4eee9}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#faae1a;border-color:#faae1a}#mainHeader{color:#313c52;background:#fff;border-bottom:1px solid #eee}#heading .header-btn .btn,#navbar .nav>li>a,#userNav>li>a{color:#313c52}#navbar .nav>li.active>a{position:relative;font-weight:500;color:#27988a;background:0 0}#navbar .nav>li.active>a:before{position:absolute;right:10px;bottom:0;left:10px;display:block;height:2px;content:' ';background-color:#27988a}#navbar .nav>li>a.active:hover,#navbar .nav>li>a:hover{background-color:rgba(0,0,0,.1)}#navbar .nav>li.divider{background-color:#f1f1f1}#visionSwitcher .dropdown-toggle>div,#visionSwitcher>div{background-color:rgba(0,0,0,.1)}#menu{position:relative;background:#248f83!important}#menu::after{position:absolute;bottom:0;left:0;z-index:-1;width:100%;height:108px;content:'';background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABsCAYAAACVWrdDAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAA7dSURBVHgB7V1Nc9vGGV4QBL8pSjLp2LUddWK3jWvVOdjptMk4Mzl0euk1/gnN78ifyEzPuSk9J9PpIZlm6saTpJ00VJQ2jhJaiiOLFKkvghS/0H2ABQ1RILEgdkEi1ePBQCJpgXiffT/33YVCBMMwjAQ9pemR0Ikex2sZkhnQ0wkORVFa5BxDKEQQqOCz9JSjQo9N+hwlo0dPx+dEWAhMABvxeSr4hJ//R4kAAQeUCIP8HyMQAVT4C1TwWTIlKAnQhCP2txTzJUKS9NCgScx0denR+rFqzFQEUGGp9FSgQkqSgKBCPqAnmK3sJPPFTFedEtEnPyL4JoCZnILtYMMEyKIE6ExblujRpL+fkAjDlxDhaKngF8js0GPCX2Y+J0l/P6IkHJOIgosAdtP5IPZeEJJkxOHTn/P0+5GokuBpgpi9X/Qb5YQNap4iqQkTCSiXy4nSTzNLMSXGnGOWZBCnmMHK/CGKJIwlgI58CJ2aqHXy9GlfSyRy8XrnOBlXNWgEyZpMgJD5IoOSUI+SY54mClIbjc3cvJJhEGOQJdlaVMLVqRMxEFGtrqd1JZZ3vg4yMpkSmSWQZVMC9kkEIKIUoW4frhf6ndippGzWRNCrVykJPTLnEFaM290t50a1AZgVEVFxyMIIALa2ttL91NGi23thExEVMxQjAnHt2rWW2s673nRT10m1ViEhIhJVVqEaYGOSJgBhaAO9wm4UIiGhGmADmpAxBkfj3oc26HqVyAIVvh6VMFQKAcDFi6vHamIwNiGSbJJOzR3QSC1w2VwWpBEAXF24dWAYg4m2WDQJAzLo09Hfwc8ondMDldNlep7L+olUAmAGaPnUMxQECTrVCBHIkVyLCltjgr9gTxrRc4HNZcwVpBIAvP32n3UvLQCa1CcIIgHTmcUxs3UFVlqfG4TyZb7e+3hBGyxwzSWUiitEJpzz0PMA6RoAnPyQa/N+VnauQDUjN0+mKBQCbt265SskDCFhy5E5QSgEvPXWW76zUpkkwD9QLUiTOUBoDmnroLw8WjH1gsyMGW0u1BfIywY5EYoGADw5wSisjFlMeDoKtNXMgxaERgBygr3H7b1ev+vLHzR1qYN05gQINUEsxo6xv4szWgv7zv5PTOA8qj/Mxvu5jKLEuK8vKzylpmjPzpxlYW1tTX3jjZKyvZ3U6tpRTI0lzPvuDzp8SQkTLOZ/NXZ2HjZiZLxGDXs86dGBNuBvbm9vp+icSaaX9A4Ls9QXyJhzFp0XWPf1j1QzNYgbJ1qipxnxk1ZnrKVRxv0RYvWeaOwQ3YbY2zneIc4qxUm763kNGVqA2lFeye+SAIC81tc/zJJCMtHu97gDDa2n9hWXP4ZRvUzEC/0MarUaaRJ+Gy8rKpp27gCm5YU7SzmiJqdSzefU+L6bkAskBOEDxWIR4Qi3o0VUJKnzBffLTQBG/MNH7+fjWm7qVs1+vNO5dvW11hnb9OjRw55O5IR+bihmiqZ954WkBI07GiyX1xL/2vmoGET4wE+MjO564Rs3HjepPTNqenjzt35JkJUbeOHzz/+SbecuXaDTTIEsBGz/tWuvmJNGZwhQlPv9WHt779tv141KbYOEBZDA23MqITfwND8PttbS3UJaSGt+bjk5nCl0Vb27d9/svnyrWT14stXfqHxEoA1hjLrS7LTAk4Br5CoRhReWNofh3/j4lGrC7dsHe4Pj+Eml8hUBERXJVUrE+bymSJQWdEm3zRMBvff0CyFddksLaBi4P7zeROeDD66uvlInagdJFKlVvyKyHbRlivgQVAuQAxRI4dDtPcP4II4w0/79TWoVBkY/cK9Ra2nzVMMAn/c/+uFgMLAuXql8Jp2EMLQAGTCdP66Ojn5EOeWtB8ufVdTSC7++dPHTb/5asInIxJOBShYIPVeV+6f+BnctBhFAVzNMJwRTsbJyBzdBZIE3ACgVQRb/92Dt6w23+s/HX7+34BZe0iJ6r01z91g7pwUJP1MrO3ujBHDHvy+99Hta3kiaNROovmxN4NUCXW8SP1CIgnsuOEvRSKww6scJF2Fnon9psZC+oJEp4Tb6AV/l6NXV14/DIoHXFzSn8AOYC6DHIhX8IswLEiueGk6zdzL1XHL2St214Od7PgAkaF3lED5hSIKkELWU4Su+Td/m+KRz496l5aCJlRcQ+biNfiDACpk19YsvMgudeDyF34ul581qpWi/wFuw818p1cl/djZ6soUP3FnZ2XWGnk4EnpDBSsqmupNXjV7CqtdTCrJF0zmKIgMaVjVH+XhN8+uMK5UNEkbNK5XpH61efH1sd6DA7WrW1M3NpVzjpG8tZJUQKdX02tjQ00+pGgW9WrNGZAM1n5duvDpxrkHYnDBU7Pr13x2cdtJia0lwzOP8Aq8zDkv4wO3r3+95feYUAQjH6GF2C7Ajy4406zT2tJdw0ktJ1ZSGTkcsDpGAZo0jwTsYoEanGU4l9bKGjUXue5Y44mz6EfFvgmf7mabRhFmBR0dtBOfOaDb5zjt/P/rD/d+YtqdSrZCbK/zlBR6YNSNScjFHyAnGm7xKpRKa3b9y8S7XhRQq0MskICghKK8OJ9zxWrn8YLkdOzQJvXnznpSs2SoOnr7PcdEQQtVK9TERAdSEYh3S02MtJaPl4vg9mU4MkqrR6hUXT1aVVe6ShZAQjGmOKWyqUSCi9fDh+734AuuEg4wkVC1Qvq6emThyv1gqk8LAUIkAxBRViS0Q5d6lNC1pvBaoSiq8MYuSkcaKlOu/+uUwra9Kml1zK1+PK03kyHP7KTUubA8J5A8o2JXLHwRq9A2lM64mSPXdMFqyOB0NWZFY/fBbbJfZ6WtHwjfxaOfUPCqm0y78kEZAJnO6riU6GnLCvXCnD53u00Y9+c8f/lZSa1e6RAI0I0NN7btTydLVB1jhXNNqjnWJGuBQrcQnS8Yb94xpIuzQUEY05Pw+TsODa5pLnhzfHSajnatfIBKgXi/sK8qrUy2LZQTopu2sYpQ2iWeohvdr7I4z2YwpALdSAN6zCYAGYG65mBHf3Qai4w2lgxZHdGD3BwcDmmwJcbheMEsNPqKeUSjfVb+8jORERHwMgSNJsns4zdCPzicP35c7kYPtL+EQjz578mGWdNWpa/e84Ck1eCGGtFxUcgIiK9UNNpulm7UZZ0OtLndxtinwRmMzEYbwEfvzlBq8IMUJg4gNGn1A2CVapnYCEZEkhwxz2tvv6ikSAi7Hk1ylBi/EctnYsZZqHT63Et/HAZuG1zCFFrQLANpVrdbOtJVDSySUBEybX281pIfWkI/d2RYUnrFr2Sgn0o12+rh+kuzG+9M5NpciGSZwVoo3iUB0G41Gd/Ow7MvBZEjR9F2AzmOOT/rdu794XZgKe1c3LQ9vevmtrQfp+omR900ENGCEBCs5o05ZXM+/0SCbXB80o7bSypkkzqwsNR8PSbGCk2eyhtO9/fOdBhEIX7UgpnatqYhwJeErGjVht0Uh+UGn1ex4Ot9i9vmxpNutkcP32ddCULF7/NTo7m/Q2s+bQrfBmcpeggiEX/AXJCA2xE3qd7w6GzCyJ2mcGSa7vI9MuxevHty588cemx/JsXPgXCOQw8JcJyacoZpc/2HM6gr0nQYkgV7/3YlVySC5R2qQ6v/26htoSblEDzSn5dn5IsggASBsTri8+0Gurat5rg+PEXax9OK0PuFofX29M1pqKGatdQe2rUdofHNFqOMfXn/aHRqFhWzQBu2gdcj14TGaAJ8wxZoELIM9rmY/Gd4L7PydlXtmlOV0tKWStH3q8tNuCCV8q4JPP/2Tpi2uLnE56DGa4KNkgTzFbLBFYNBPLS46SyFnL6fL3l7Z95pjKXtFoEXl399cucAdJY01SUVWW3KNkiB83LBZYt7f318qFAqhZMETgPXQvvatlrZZxzQkQNBuZQqMWsTlWfq+WV+yNAM7Ix5Y1zK7tmf9cAkbmPyp835Y6m4pfkmwnaZZyzfbR0Y1AwmURYK9wJo9v2yWj1Vxg/msG54PSt+uBiR88l2phIlsns8XzbZGvkgIC6yJlS6FtukIJ2CKdnmekSb9i5urLvf+y122tbrWvAcPNIBY9f95Ez5gPpaL94PSgVWX3CEqsRqovGAQAwTMo/BtZHkm6kO7Aayw4c2YUQLzmrjJ42FKhPhbHhMuIFvPBR2hPoxNbRf2u5wT4zBF41rOmfnB8lI6yAy0moSxNTHsOQi3WzIHozbesV+SHXR4dmGEvonpuIVwbkC4ueJSOsDDGYg1eAx2lrkNJcjel7WpUyidA05cvfCz7s9ffj5JBjHPa3fpv2xCI5p2mi8Nm+NaBTF7AylZQH1nX+ZO7DPZxtdvfmAV0DKm6YmRmMo0gK/w5/OrESuEBFph7LA7kyjC3Abh+vd7vE65WrPa0HMkt0eFj/8jy+bDru+yI5TtjWcWxtkk8DTMYjaKPUkVwh+QZ6NUNEKXx1zsJI5K5hNFz6i9xClnqqXUfqK33H/xyouGXV+hkQZ29IKgRBfeQG7DLu6Fhbnayt3c/I6sm/O6X5Iv+/eplrCNtvHs4F0WdiL7ReQDAkR9fwh/bxaPPQn9ocyTwOLqzshrHRZfa+w9CCnFfhbhCzDiG7N65sw8p/JOQNi2eQJJiJ5E9PrbZmdmD/yJIgF2DSiorbYndGb6tKWoEID03+75sSMgCM6vFoA0u9TamodHXc2VD5gAaECM9eHY9Rf4BWSq8ANtdvZyygabRTsgc4JIaAAVmrkJOD0S7GcbpjOmr8GO77DXkECBEJA2948zjIoGADAfdukCgoVJgl8wTQp7AjjQcvbosAgK96mQOQu7gSgR4FznOyDPdnO3O+IUx3tDsNA21OTKD6LihAEI0emIMXgGjjKxSQ7PPOw8IUoEYKQ7NSBNno1+4ng9UogSARBubKQj2Zk1414iNfqByBDgiNlh6+2fnQTg9XMNkAwIXhv53YYzR4gMokYAbP4wlKRaMeoDIvEQZyeiqAF218GosM81ICRA0Cg7uBFwrgGSYc8FAG5Lks6dsGTAxIz7znafUKQQNQImjXDcy7kJkoxJI/w8DwgBrgJ2ZMfnJihEjCZhZB5muPzifzvaxdIXFrNVAAAAAElFTkSuQmCC) no-repeat}#userNav>li>a>.icon{color:#23c8ec}#menu .nav>li.active>a,#menu .nav>li>a:focus,#menu .nav>li>a:hover{background:-webkit-gradient(linear,left top,right top,from(rgba(229,244,169,.4)),to(rgba(237,254,171,.036)))!important;background:-webkit-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:-o-linear-gradient(left,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;background:linear-gradient(90deg,rgba(229,244,169,.4) 0,rgba(237,254,171,.036) 100%)!important;border-radius:4px;opacity:1}#featurebar .nav li.active a{color:#27988a!important}#featurebar .nav li.active a:after{border-bottom:2px solid #27988a!important}.btn.btn-action,.c-actions .btn,td.c-name a{color:#29aa93}#logForm .table .versions a,#mainMenu .page-title strong a,#readOnlyOfKanban i{color:#29aa93!important}.picker-drop-menu .picker-option-list .picker-option.picker-option-active,.picker-drop-menu .picker-option-list .picker-single .picker-option.picker-option-selected.picker-option-active{color:#fff;background:#29aa93}.table-actions .btn{background:#29aa93!important;border-color:#29aa93!important}.table-actions .btn:hover{color:#fff;background:#27988a;border-color:#27988a}.table-actions>.btn-group:first-child>.btn:first-child{border-right:1px solid rgba(255,255,255,.2)!important}a.programName:focus,a.programName:hover{background:#29aa93!important}#guideDialog .project-type-img:hover,#guideDialog .project-type.active img,.kanbans .panel:hover{border-color:#29aa93!important}.btn.btn-action:hover,.c-actions .btn:hover{color:#29aa93;background:#f0fdfb}.btn.btn-action.disabled,.c-actions .btn.disabled,.c-actions .btn[disabled=disabled]{border-color:transparent}.main-table table tr{border-color:#f2f6f8!important}#mainHeader #headerActions .btn-group>.btn{color:#313c52!important}.c-manager .avatar.avatar-top{border-color:#faae1a}#programTableList>tr:hover{background:#f0fdfbcc}#programTableList>tr:hover>.c-name>a{color:#27988a!important}#programTableList>tr[data-type=project]>.c-name>a{color:#2f8a8f!important}.m-product-all #mainMenu>div.btn-toolbar.pull-right>a.btn.btn-link.iframe{color:#00c4d0!important}#featuresNav.nav-simple>li.active>a,.nav-simple>li.active>a,.nav-simple>li.active>a:focus,.nav-simple>li.active>a:hover{color:#29aa93}#featuresCarousel .carousel-indicators .active{background-color:#29aa93!important;border-color:#29aa93!important}#dashboard .block-welcome .progress{background:#eee}
\ No newline at end of file
diff --git a/www/theme/zui/css/min.css b/www/theme/zui/css/min.css
index 80612ccbfd..5a81c69424 100644
--- a/www/theme/zui/css/min.css
+++ b/www/theme/zui/css/min.css
@@ -1,5 +1,5 @@
 /*!
- * ZUI: ZUI for Zentao - v1.10.0 - 2023-02-24
+ * ZUI: ZUI for Zentao - v1.10.0 - 2023-03-07
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2023 cnezsoft.com; Licensed MIT
@@ -13,4 +13,4 @@
  *
  * Copyright (c) 2011-2016 Harvest http://getharvest.com
  * MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-*/.chosen-container{position:relative;display:block;font-size:13px;vertical-align:middle;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;z-index:1010;display:none;width:100%;background:#fff;border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.15);border-top:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container .chosen-drop.chosen-drop-size-limited{border-top:1px solid rgba(0,0,0,.15)}.chosen-container .chosen-drop.chosen-auto-max-width{min-width:100%;border-top:1px solid rgba(0,0,0,.15);opacity:0}.chosen-container .chosen-drop.chosen-auto-max-width>.chosen-results>li{display:inline-block;white-space:nowrap}.chosen-container .chosen-drop.chosen-auto-max-width.in{opacity:1}.chosen-container .chosen-drop.chosen-auto-max-width.in>.chosen-results>li{display:block;white-space:normal}.chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap!important}.chosen-container.chosen-with-drop .chosen-drop{display:block}.chosen-container a{cursor:pointer}.chosen-container.chosen-up .chosen-drop{top:inherit;bottom:100%;margin-top:auto;margin-bottom:-1px;border-radius:2px 2px 0 0;-webkit-box-shadow:0 -3px 5px rgba(0,0,0,.175);box-shadow:0 -3px 5px rgba(0,0,0,.175)}.chosen-container.chosen-highlight-selected .result-selected{color:#2e7fff;background:#e6f0ff}.chosen-container-single .chosen-single{display:block;width:100%;height:32px;padding:5px 8px;overflow:hidden;line-height:1.42857143;color:#0b0f18;text-decoration:none;white-space:nowrap;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #dcdcdc;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s,-webkit-box-shadow ease-in-out .15s}.chosen-container-single .chosen-default{color:#838a9d}.chosen-container-single .chosen-single>span{display:block;margin-right:26px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:5px;right:24px;display:block;width:20px;height:20px;font-family:sans-serif;font-size:18px;font-weight:700;line-height:18px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-single .chosen-single abbr:before{display:block;content:'×'}.chosen-container-single .chosen-single abbr:focus,.chosen-container-single .chosen-single abbr:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;height:100%;padding:5px 8px}.chosen-container-single .chosen-single div b{display:inline-block;width:0;height:0;margin-bottom:2px;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent;opacity:.5}.chosen-container-single .chosen-search{position:relative;z-index:1010;padding:3px 4px;margin:0;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{width:100%;height:27px;padding:2px 26px 2px 8px;margin:1px 0;font-size:12px;line-height:1.5;background-color:#fff;border:1px solid #dcdcdc;border-radius:2px;outline:0}.chosen-container-single .chosen-search input[type=text]:focus{border-color:#2e7fff}.chosen-container-single .chosen-search:before{position:absolute;top:10px;right:10px;display:block;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#838a9d;text-transform:none;content:"\e928";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-single .chosen-drop{margin-top:-1px;-webkit-background-clip:padding-box;background-clip:padding-box;border-radius:0 0 4px 4px}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;max-height:240px;padding:0;margin:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;padding:5px 10px;margin:0;line-height:15px;list-style:none;-webkit-transition:background-color .2s cubic-bezier(.175,.885,.32,1);-o-transition:background-color .2s cubic-bezier(.175,.885,.32,1);transition:background-color .2s cubic-bezier(.175,.885,.32,1);-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{color:#fff;background-color:#2e7fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;width:100%;min-height:32px;min-height:30px\9;padding:0;margin:0;overflow:hidden;cursor:text;background-color:#fff;border:1px solid #dcdcdc;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s,-webkit-box-shadow ease-in-out .15s}.chosen-container-multi .chosen-choices:after,.chosen-container-multi .chosen-choices:before{display:table;content:" "}.chosen-container-multi .chosen-choices:after{clear:both}.chosen-container-multi .chosen-choices li{display:block;float:left;padding:0 6px;margin:5px 4px;list-style:none}.chosen-container-multi .chosen-choices li.search-field{padding:0;line-height:12px;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:20px;font-size:100%;color:#838a9d;background:0 0!important;border:0!important;border-radius:0;outline:0;-webkit-box-shadow:none;box-shadow:none}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-field:before{position:absolute;right:8px;bottom:8px;display:block;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#838a9d;text-transform:none;content:"\e928";opacity:0;-webkit-transition:opacity .2s cubic-bezier(.175,.885,.32,1);-o-transition:opacity .2s cubic-bezier(.175,.885,.32,1);transition:opacity .2s cubic-bezier(.175,.885,.32,1);speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-multi .chosen-choices li.search-choice{position:relative;padding:3px 20px 3px 5px;line-height:12px;cursor:default;background-color:#f1f1f1;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #c4c4c4;border-radius:3px;-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);-webkit-transition:all .4s cubic-bezier(.175,.885,.32,1);-o-transition:all .4s cubic-bezier(.175,.885,.32,1);transition:all .4s cubic-bezier(.175,.885,.32,1)}.chosen-container-multi .chosen-choices li.search-choice:hover{background-color:#fff;border-color:#ababab;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 0 rgba(0,0,0,.1)}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:1px;right:0;display:block;width:20px;height:18px;line-height:18px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-shadow:0 1px 0 #fff;text-transform:none;content:'\d7';speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:focus,.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;color:#666;background-color:#e4e4e4;border:1px solid #ccc}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{padding:5px 0;margin:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border-color:#2e7fff;-webkit-box-shadow:none,0 0 8px rgba(46,127,255,.6);box-shadow:none,0 0 8px rgba(46,127,255,.6)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.15);border-bottom-right-radius:0!important;border-bottom-left-radius:0!important;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container-active.chosen-with-drop .chosen-single div{background:0 0;border-left:none}.chosen-container-active.chosen-with-drop .chosen-single div b{content:"";border-top:0 dotted;border-bottom:4px solid}.chosen-container-active.chosen-with-drop.chosen-up .chosen-single{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:2px;border-bottom-left-radius:2px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container-active .chosen-choices{border-color:#2e7fff;-webkit-box-shadow:none,0 0 8px rgba(46,127,255,.6);box-shadow:none,0 0 8px rgba(46,127,255,.6)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-container-active .chosen-choices li.search-field:before{opacity:1}.chosen-disabled{cursor:default;opacity:.5!important}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-compact.chosen-container-single .chosen-single>.chosen-search{left:0;display:none;padding:3px 4px;opacity:0}.chosen-compact.chosen-container-single .chosen-single>.chosen-search>input{height:25px;padding:2px 26px 2px 4px;font-size:inherit}.chosen-compact.chosen-container-single .chosen-single>.chosen-search:before{top:9px}.chosen-compact.chosen-with-search.chosen-with-drop .chosen-single>.chosen-search{display:block;opacity:1}select.chosen[multiple]{height:32px;overflow:hidden}select.chosen[multiple] option{visibility:hidden}.picker{min-height:32px;background-color:#eee}.picker:not(.picker-ready)>*{display:none}.picker-selections{position:relative;min-height:32px;color:#0b0f18;background-color:#fff;border:1px solid #dcdcdc;border-radius:2px;-webkit-box-shadow:none;box-shadow:none}.picker-focus .picker-selections{border-color:#2e7fff;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(46,127,255,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(46,127,255,.6)}.disabled .picker-selections{cursor:not-allowed;background-color:#f5f5f5}.picker-multi .picker-selections{padding:3px}.picker-multi.picker-focus .picker-selections:before{position:absolute;right:0;bottom:8px;display:block;width:24px;height:14px;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;content:"\e928";opacity:.4;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.picker-multi.picker-focus.picker-loading .picker-selections::before{display:inline-block;content:"\e982";-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}.picker-multi .picker-selection{position:relative;display:inline-block;padding:0 20px 0 5px;margin:2px;line-height:18px;background-color:#f1f1f1;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #c4c4c4;border-radius:3px;-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05)}.picker-selection-single{max-width:100%;padding:5px 20px 5px 8px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.picker-focus .picker-selection-single .picker-selection-text{display:none}.picker-selection-single:after{position:absolute;top:7px;right:0;display:block;width:24px;height:14px;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;content:"\f0d7";opacity:.4;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.picker-focus .picker-selection-single::after{content:"\e928"}.picker-focus.picker-loading .picker-selection-single::after{display:inline-block;content:"\e982";-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}.picker-selection-remove{position:absolute;top:0;right:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:18px;height:18px;text-align:center;cursor:pointer;opacity:.2;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.picker-selection-remove:before{font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-shadow:0 1px 0 #fff;text-transform:none;content:'\d7';speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.picker-selection-remove:hover{opacity:.5}.picker-single .picker-selection-remove{top:5px;right:20px;z-index:1}.picker-no-value .picker-selection-remove,.picker-single.picker-focus .picker-selection-remove{display:none}.picker-multi.picker-sortable .picker-selection-text{cursor:move}.picker-search{color:transparent;background:0 0;border:none}.picker-search:focus{color:inherit;outline:0}.disabled .picker-search{cursor:not-allowed}.picker-single .picker-search{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;width:100%;padding:5px 8px}.picker-multi .picker-search{display:inline-block;width:10px;min-width:10px;max-width:100%;padding:0 2px;margin:2px 0}.picker-placeholder{position:absolute;top:5px;right:20px;left:8px;z-index:0;display:none;overflow:hidden;color:#838a9d;text-overflow:ellipsis;white-space:nowrap}.picker-no-value.picker-focus .picker-placeholder{display:none}.picker-input-empty.picker-focus.picker-no-value .picker-placeholder,.picker-no-value .picker-placeholder{display:block}.picker-drop-menu{position:fixed;z-index:1200;display:none;min-width:100px;background-color:#fff;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.12),0 1px 3px rgba(0,0,0,.1);box-shadow:0 6px 12px rgba(0,0,0,.12),0 1px 3px rgba(0,0,0,.1);opacity:0}.picker-drop-menu.picker-drop-show{display:block}.picker-option-list{padding:5px 0;margin:0;overflow-y:auto}.picker-no-options .picker-option-list{display:none}.picker-option{display:block;min-height:30px;padding:5px 10px;overflow:hidden;clear:both;font-weight:400;line-height:1.42857143;color:#313c52;text-overflow:ellipsis;white-space:nowrap;-webkit-transition:none;-o-transition:none;transition:none}.picker-single .picker-option.picker-option-selected{color:#2e7fff;background:#e6f0ff}.picker-option:focus,.picker-option:hover{text-decoration:none}.picker-option.picker-option-active,.picker-single .picker-option.picker-option-selected.picker-option-active{color:#fff;background-color:#2e7fff}.picker-multi .picker-option.picker-option-selected,.picker-multi .picker-option.picker-option-selected.picker-option-active{color:#ccc;cursor:not-allowed;background-color:#fff}.picker-option.disabled{cursor:not-allowed!important}.picker-option-text-matched{position:relative;color:#2e7fff}.picker-option-text-matched:before{position:absolute;right:0;bottom:-4px;left:0;display:block;height:2px;content:' ';background-color:#2e7fff;border-radius:2px;opacity:.5}.picker-option-active .picker-option-text-matched,.picker-option:hover .picker-option-text-matched{color:#fff}.picker-option-active .picker-option-text-matched:before,.picker-option:hover .picker-option-text-matched:before{background-color:#fff}.picker-message{display:none;height:22px;padding:2px 5px;overflow:hidden;font-size:12px;color:#838a9d;text-overflow:ellipsis;white-space:nowrap;background-color:#f1f1f1}.picker-has-message .picker-message{display:block}.picker-message[data-type=danger]{color:#fc5959}.picker-actions{padding:5px;border-top:1px solid #eee}.picker-no-actions .picker-actions{display:none}.picker-actions .btn{padding:2px 4px}.picker-actions .btn[disabled]{background-color:transparent;filter:grayscale(1);-webkit-filter:grayscale(1)}.picker-actions .btn+.btn{margin-left:4px}.picker-checkable .picker-option{position:relative;padding-left:32px;color:inherit!important;cursor:pointer!important}.picker-checkable .picker-option>.checkbox-primary{position:absolute;top:4px;left:10px}.picker-checkable .picker-option.picker-option-active{background-color:rgba(0,0,0,.05)!important}.picker-checkable .picker-option:hover{background-color:rgba(0,0,0,.075)!important}.picker-checkable .picker-option.picker-option-selected{background-color:#e6f0ff!important}.picker-checkable .picker-option-active .picker-option-text-matched,.picker-checkable .picker-option:hover .picker-option-text-matched{color:#2e7fff!important}.picker-checkable .picker-option-active .picker-option-text-matched:before,.picker-checkable .picker-option:hover .picker-option-text-matched:before{background:#2e7fff!important}:root{--color-primary:#2e7fff;--color-secondary:#18a6fd;--color-pale:#e6f0ff;--color-fore:#313c52;--color-back:#fff;--color-red:#fc5959;--color-yellow:#ff9f46;--color-green:#22c98d;--color-blue:#37b2fe;--color-purple:#8166ee;--color-brown:#ff6f42;--color-danger:#fc5959;--color-warning:#ff9f46;--color-success:#22c98d;--color-info:#37b2fe;--color-special:#8166ee;--color-important:#ff6f42;--color-green-pale:#ecfff8;--color-yellow-pale:#fff4ea;--color-red-pale:#ffebeb;--color-blue-pale:#e7f6ff;--color-brown-pale:#fff2ed;--color-purple-pale:#efecfa;--link-color:#313c52;--link-hover-color:#2e7fff;--color-gray-darker:#0b0f18;--color-gray-dark:#313c52;--color-gray:#838a9d;--color-gray-light:#c4c4c4;--color-gray-lighter:#eee;--color-gray-pale:#f1f1f1;--border-radius:4px;--border-radius-lg:6px;--border-radius-sm:3px;--bg-gradient:#3785ff}.container,.container-fixed,.container-fluid{position:relative}.container{max-width:1800px!important}body{color:#313c52;background-color:#f4f5f7}body.article-content,body.body-modal{background:0 0}body.body-modal{padding:0}@media screen and (min-width:1920px){body{font-size:14px}}a:active,a:focus,button:active,button:focus{outline:0!important}.strong{font-weight:700}.font-normal{font-weight:400!important}.text-middle{vertical-align:middle!important}.text-bottom{vertical-align:bottom!important}.text-top{vertical-align:top!important}.inline-block{display:inline-block!important}.layer{border-radius:4px;-webkit-box-shadow:0 0 20px 0 #bdc9d8;box-shadow:0 0 20px 0 #bdc9d8}.space{margin-bottom:20px}.space-lg{margin-bottom:30px}.space-sm{margin-bottom:10px}.muted{opacity:.5}.text-muted em{color:#313c52}.no-animate{-webkit-transition:none!important;-o-transition:none!important;transition:none!important}.template{display:none!important}.text-left{text-align:left!important}.text-yellow.icon-folder{color:#ff9f46}.table-row{display:table;width:100%;table-layout:fixed}.table-col,.table-row>.col,.table-row>[class*=col-],.table-row>[class*="-col"]{display:table-cell;float:none;vertical-align:top}.side-col{width:200px;padding-right:20px}.side-col.col-4{width:33.3333333%}.col-lg{width:260px}.col-xl{width:320px}.col-sm{width:150px}.col-xs{width:100px}.main-col+.side-col{padding-right:0;padding-left:20px}.row-grid>[class*=col-],.row-grid>[class*="-col"]{padding-top:6px;padding-bottom:6px}hr.space{margin:10px 0;border:none}hr.space-sm{margin:5px 0;border:none}.text-secondary{color:#18a6fd}a.text-primary{color:#2e7fff}.text-primary-400{color:#3785ff}.text-primary-600{color:#1e6aeb}.text-primary-700{color:#2463c7}.text-primary-900{color:#063072}.text-green-400{color:#48d1a0}.text-yellow-400{color:#ffaf65}.text-blue-400{color:#60c2ff}.text-red-400{color:#ff7c7c}.text-important-400{color:#ff9777}.text-purple-400{color:#8a6ff5}.text-green-600{color:#0dbb7d}.text-yellow-600{color:#f38f19}.text-blue-600{color:#00c0e9}.text-red-600{color:#fb2b2b}.text-important-600{color:#ff6f42}.text-purple-600{color:#7055df}.text-green-700{color:#0ca76f}.text-yellow-700{color:#ed8307}.text-blue-700{color:#1099ed}.text-red-700{color:#d91b1b}.text-important-700{color:#ff4912}.text-purple-700{color:#513baa}.text-green-900{color:#186c4e}.text-yellow-900{color:#af5f01}.text-blue-900{color:#046bab}.text-red-900{color:#a20606}.text-important-900{color:#611700}.text-purple-900{color:#30216f}.text-gray-14,.text-title{color:#0b0f18}.icon-important,.text-color,.text-gray-13{color:#313c52}.text-gray-12{color:#5e626d}.icon-common,.text-gray-11{color:#838a9d}.icon-secondary,.text-gray-10{color:#9ea3b0}.text-disabled{color:#c4c4c4}.nav-primary>li>a{min-width:100px;padding:5px 8px;color:#838a9d;border-color:#e7f1fc}.nav-primary>li.active>a{color:#2e7fff;background-color:#e7f1fc;border-color:#e7f1fc}.nav-primary>li.active>a:hover{color:#2e7fff;background-color:#c3dcf7;border-color:#c3dcf7}.end-marker{margin-bottom:20px;color:#c4c4c4;text-align:center}@-webkit-keyframes highlight{0%{background:#fff;outline:1px solid transparent}100%{background:#fff0d5;outline:2px solid #ffdcbc}}@-o-keyframes highlight{0%{background:#fff;outline:1px solid transparent}100%{background:#fff0d5;outline:2px solid #ffdcbc}}@keyframes highlight{0%{background:#fff;outline:1px solid transparent}100%{background:#fff0d5;outline:2px solid #ffdcbc}}.highlight{-webkit-animation:highlight .5s linear 0s 2 alternate;-o-animation:highlight .5s linear 0s 2 alternate;animation:highlight .5s linear 0s 2 alternate}.progress.inline-block{width:100px;margin:0}.w-p5{width:5%!important}.w-p10{width:10%!important}.w-p15{width:15%!important}.w-p20{width:20%!important}.w-p25{width:25%!important}.w-p30{width:30%!important}.w-p35{width:35%!important}.w-p40{width:40%!important}.w-p45{width:45%!important}.w-p50{width:50%!important}.w-p55{width:55%!important}.w-p60{width:60%!important}.w-p65{width:65%!important}.w-p70{width:70%!important}.w-p75{width:75%!important}.w-p80{width:80%!important}.w-p85{width:85%!important}.w-p90{width:90%!important}.w-p94{width:94%!important}.w-p95{width:95%!important}.w-p98{width:98%!important}.w-p99{width:99%!important}.w-p100{width:100%!important}.w-auto{width:auto!important}.w-10px{width:10px!important}.w-20px{width:20px!important}.w-30px{width:30px!important}.w-35px{width:35px!important}.w-40px{width:40px!important}.w-45px{width:45px!important}.w-50px{width:50px!important}.w-60px{width:60px!important}.w-70px{width:70px!important}.w-80px{width:80px!important}.w-90px{width:90px!important}.w-100px{width:100px!important}.w-110px{width:110px!important}.w-120px{width:120px!important}.w-130px{width:130px!important}.w-140px{width:140px!important}.w-150px{width:150px!important}.w-160px{width:160px!important}.w-180px{width:180px!important}.w-200px{width:200px!important}.w-230px{width:230px!important}.w-250px{width:250px!important}.w-300px{width:300px!important}.w-400px{width:400px!important}.w-500px{width:500px!important}.w-600px{width:600px!important}.w-700px{width:700px!important}.w-800px{width:800px!important}.w-900px{width:900px!important}.mw-200px{max-width:200px!important}.mw-300px{max-width:300px!important}.mw-400px{max-width:400px!important}.mw-500px{max-width:500px!important}.mw-600px{max-width:600px!important}.mw-700px{max-width:700px!important}.mw-800px{max-width:800px!important}.mw-900px{max-width:900px!important}.mw-1400px{max-width:1400px!important}.w-id{width:70px!important}.w-pri{width:40px!important}.w-severity{width:50px!important}.w-hour{width:57px!important}.w-date{width:90px!important}.w-status{width:60px!important}.w-resolution,.w-type,.w-user{width:80px!important}.w-p15-f{width:15%!important;min-width:120px!important}.w-p25-f{width:25%!important;min-width:200px!important}.w-p35-f{width:35%!important;min-width:300px!important}.w-p45-f{width:45%!important;min-width:400px!important}.h-5px{height:5px!important}.h-10px{height:10px!important}.h-20px{height:20px!important}.h-30px{height:30px!important}.h-35px{height:35px!important}.h-40px{height:40px!important}.h-45px{height:45px!important}.h-50px{height:50px!important}.h-60px{height:60px!important}.h-70px{height:70px!important}.h-80px{height:80px!important}.h-100px{height:100px!important}.h-120px{height:120px!important}.h-130px{height:130px!important}.h-140px{height:140px!important}.h-150px{height:150px!important}.h-200px{height:200px!important}.pd-0{padding:0!important}.mg-0{margin:0!important}.mgb-20{margin-bottom:20px!important}.mgb-10{margin-bottom:10px!important}.pdb-20{padding-bottom:20px!important}.pdt-20{padding-top:20px!important}.br-0{border-radius:0!important}.bd-0,.bd-none,.borderless{border:none!important}.bg-none{background:0 0!important}.red{color:#fc5959!important}.icon-pro-version{font-size:14px!important}.icon-pro-version:before{position:relative;top:-1px;font-size:14px;color:#fc5959;content:"\e92b"}.bg-primary{color:#fff;background:#3785ff;border-top-color:#2e7fff}.bg-primary-pure{color:#fff;background-color:#2e7fff}.bg-primary-pale{color:#2e7fff;background-color:#e6f0ff}.bg-secondary{color:#fff;background:#18a6fd}.line-gray-8{background:#d8dbde}.line-gray-5{background:#e3e4e9}.line-gray-7{background:#eee}.bg-gray-1{background:#e3e4e9}.bg-gray-2{background:#edeef2}.bg-gray-3{background:#f8f8f8}.bg-green-400{background:#48d1a0}.bg-yellow-400{background:#ffaf65}.bg-blue-400{background:#60c2ff}.bg-red-400{background:#ff7c7c}.bg-important-400{background:#ff9777}.bg-purple-400{background:#8a6ff5}.bg-green-600{background:#0dbb7d}.bg-yellow-600{background:#f38f19}.bg-blue-600{background:#00c0e9}.bg-red-600{background:#fb2b2b}.bg-important-600{background:#ff6f42}.bg-purple-600{background:#7055df}.bg-green-700{background:#0ca76f}.bg-yellow-700{background:#ed8307}.bg-blue-700{background:#1099ed}.bg-red-700{background:#d91b1b}.bg-important-700{background:#ff4912}.bg-purple-700{background:#513baa}.bg-green-900{background:#186c4e}.bg-yellow-900{background:#af5f01}.bg-blue-900{background:#046bab}.bg-red-900{background:#a20606}.bg-important-900{background:#611700}.bg-purple-900{background:#30216f}.bg-hover{background:#f6f6f6}.bg-active{background:#e6eaf1}.hl-tutorial{position:relative!important;z-index:1010!important;-webkit-box-shadow:0 0 0 0 #000!important;box-shadow:0 0 0 0 #000!important;-webkit-transition:-webkit-box-shadow 1s!important;-o-transition:box-shadow 1s!important;transition:-webkit-box-shadow 1s!important;transition:box-shadow 1s!important;transition:box-shadow 1s,-webkit-box-shadow 1s!important}.hl-tutorial.hl-in{-webkit-box-shadow:0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 3000px rgba(0,0,0,.2)!important;box-shadow:0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 3000px rgba(0,0,0,.2)!important}.btn.tooltip-tutorial,.hl-tutorial.hl-in:hover{position:relative!important;z-index:1010!important;-webkit-box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 3000px rgba(0,0,0,.3)!important;box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 3000px rgba(0,0,0,.3)!important}.tooltip-max .tooltip-inner{max-width:1000px;padding:8px 10px}.transition-all *{-webkit-transition:all .2s!important;-o-transition:all .2s!important;transition:all .2s!important}.scroll-x{overflow-x:auto!important}.scroll-y{overflow-y:auto!important}.divider+.divider{display:none}.ie *{-webkit-transition:none!important;-o-transition:none!important;transition:none!important}@font-face{font-family:Oswald;font-weight:400;src:url(../fonts/Oswald-Regular.ttf)}@font-face{font-family:Oswald;font-weight:500;src:url(../fonts/Oswald-Medium.ttf)}@font-face{font-family:Oswald;font-weight:300;src:url(../fonts/Oswald-Light.ttf)}.num{font-family:Oswald;font-weight:400}@font-face{font-family:ZentaoIcon;font-style:normal;font-weight:400;src:url(../fonts/ZentaoIcon.eot?v=1.44);src:url(../fonts/ZentaoIcon.eot?#iefix&v=1.44) format('embedded-opentype'),url(../fonts/ZentaoIcon.woff?v=1.44) format('woff'),url(../fonts/ZentaoIcon.ttf?v=1.44) format('truetype'),url(../fonts/ZentaoIcon.svg#regular?v=1.44) format('svg')}.icon,[class*=" icon-"],[class^=icon-]{font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{display:inline-block;min-width:14px;text-align:center}a .icon,a [class*=" icon-"],a [class^=icon-]{display:inline}.icon-lg:before{font-size:1.33333333em;vertical-align:-10%}.icon-2x{font-size:28px}.icon-3x{font-size:42px}.icon-4x{font-size:56px}.icon-5x{font-size:70px}.icon-spin{display:inline-block;-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}a .icon-spin{display:inline-block;text-decoration:none}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.icon-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.icon-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.icon-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.icon-flip-horizontal{-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.icon-flip-vertical{-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.icon.icon-flip-horizontal,.icon.icon-flip-vertical,.icon.icon-rotate-180,.icon.icon-rotate-270,.icon.icon-rotate-90{display:inline-block}.icon-zentao:before{content:"\e901"}.icon-zentao-alt:before{content:"\e900"}.icon-help:before{content:"\e968"}.icon-import:before{content:"\e904"}.icon-download:before{content:"\e904"}.icon-export:before{content:"\e905"}.icon-lightbulb:before{content:"\e91c"}.icon-close:before{content:"\e936"}.icon-check:before{content:"\e5ca"}.icon-plus:before{content:"\e925"}.icon-minus:before{content:"\e926"}.icon-expand-alt:before{content:"\e6f1"}.icon-collapse-alt:before{content:"\e6f2"}.icon-fullscreen:before{content:"\e96b"}.icon-star-empty:before{content:"\e94a"}.icon-star:before{content:"\e94b"}.icon-exclamation-sign:before{content:"\e930"}.icon-info-sign:before{content:"\e9d5"}.icon-flag:before{content:"\e937"}.icon-check-circle:before{content:"\e92f"}.icon-check-sign:before{content:"\e938"}.icon-chart-pie:before{content:"\e95b"}.icon-history:before{content:"\e95f"}.icon-pencil:before{content:"\e254"}.icon-search:before{content:"\e928"}.icon-restart:before{content:"\e95e"}.icon-cog:before{content:"\e93b"}.icon-chart-line:before{content:"\e95c"}.icon-chart-bar:before{content:"\e95d"}.icon-bar-chart:before{content:"\e95d"}.icon-exchange:before{content:"\e927"}.icon-severity:before{content:"\e973"}.icon-book:before{content:"\f02d"}.icon-treemap-alt:before{content:"\e971"}.icon-severity-solid:before{content:"\e902"}.icon-chat-line:before{content:"\e998"}.icon-stack:before{content:"\e943"}.icon-cube:before{content:"\e967"}.icon-minus-sign:before{content:"\e939"}.icon-bars-sign:before{content:"\e93a"}.icon-chat:before{content:"\e940"}.icon-message:before{content:"\e940"}.icon-more:before{content:"\e744"}.icon-certificate:before{content:"\f0a3"}.icon-bell:before{content:"\e7f5"}.icon-columns:before{content:"\f0db"}.icon-envelope-o:before{content:"\e92a"}.icon-unfold-all:before{content:"\e931"}.icon-fold-all:before{content:"\e932"}.icon-bars:before{content:"\e948"}.icon-cards-view:before{content:"\e949"}.icon-ellipsis-v:before{content:"\e5d4"}.icon-spinner-indicator:before{content:"\e982"}.icon-up-circle:before{content:"\e92b"}.icon-right-circle:before{content:"\e92c"}.icon-down-circle:before{content:"\e92d"}.icon-left-circle:before{content:"\e92e"}.icon-angle-double-right:before{content:"\f101"}.icon-angle-down:before{content:"\e313"}.icon-angle-left:before{content:"\e314"}.icon-angle-right:before{content:"\e315"}.icon-angle-top:before{content:"\e316"}.icon-first-page:before{content:"\e5dc"}.icon-last-page:before{content:"\e5dd"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-arrow-up:before{content:"\e923"}.icon-arrow-down:before{content:"\e924"}.icon-arrow-left:before{content:"\e952"}.icon-arrow-right:before{content:"\e93e"}.icon-chevron-left:before{content:"\e934"}.icon-chevron-right:before{content:"\e935"}.icon-chevron-double-up:before{content:"\e959"}.icon-chevron-double-down:before{content:"\e95a"}.icon-folder-account:before{content:"\e942"}.icon-folder-move:before{content:"\e960"}.icon-folder-plus:before{content:"\e961"}.icon-folder-upload:before{content:"\e962"}.icon-folder-star:before{content:"\e963"}.icon-folder-edit:before{content:"\e964"}.icon-folder-download:before{content:"\e965"}.icon-folder-outline:before{content:"\e966"}.icon-folder:before{content:"\e944"}.icon-folder-o:before{content:"\e945"}.icon-folder-open-o:before{content:"\e946"}.icon-folder-open:before{content:"\e947"}.icon-color:before{content:"\e93c"}.icon-paper-clip:before{content:"\e93d"}.icon-text:before{content:"\e929"}.icon-share:before{content:"\f064"}.icon-format-list-bulleted:before{content:"\e9a8"}.icon-format-bold:before{content:"\e953"}.icon-format-header-pound:before{content:"\e954"}.icon-format-italic:before{content:"\e955"}.icon-format-list-numbers:before{content:"\e969"}.icon-format-quote-close:before{content:"\e96a"}.icon-image:before{content:"\e96c"}.icon-table-large:before{content:"\e96d"}.icon-aiux:before{content:"\e99e"}.icon-qc:before{content:"\e986"}.icon-qc-q:before{content:"\e985"}.icon-qc-c:before{content:"\e987"}.icon-sonarqube:before{content:"\e9ba"}.icon-college:before{content:"\e9c8"}.icon-ztool:before{content:"\e9c1"}.icon-contacts:before{content:"\e9c3"}.icon-chats:before{content:"\e9c4"}.icon-menu-my:before{content:"\e97a"}.icon-home:before{content:"\e97a"}.icon-program:before{content:"\e9aa"}.icon-lightbulb-alt:before{content:"\e98f"}.icon-product:before{content:"\e98f"}.icon-rocket:before{content:"\e99c"}.icon-project:before{content:"\e99c"}.icon-run:before{content:"\e9a9"}.icon-test:before{content:"\e956"}.icon-infinite:before{content:"\e9a3"}.icon-devops:before{content:"\e9a3"}.icon-ops:before{content:"\e903"}.icon-doc:before{content:"\e99b"}.icon-menu-doc:before{content:"\e99b"}.icon-statistic:before{content:"\e999"}.icon-menu-backend:before{content:"\e993"}.icon-assets:before{content:"\e9ae"}.icon-diamond:before{content:"\e9ae"}.icon-feedback:before{content:"\e991"}.icon-flow:before{content:"\e994"}.icon-oa:before{content:"\e9a1"}.icon-more-circle:before{content:"\e988"}.icon-controls:before{content:"\e995"}.icon-account:before{content:"\e992"}.icon-about:before{content:"\e996"}.icon-info:before{content:"\e996"}.icon-cog-outline:before{content:"\e997"}.icon-backend:before{content:"\e997"}.icon-exit:before{content:"\e99a"}.icon-theme:before{content:"\e9a0"}.icon-globe:before{content:"\f0ac"}.icon-lang:before{content:"\f0ac"}.icon-table-sort:before{content:"\e9e1"}.icon-design:before{content:"\e9ec"}.icon-download-alt:before{content:"\e9ea"}.icon-blame:before{content:"\e9e0"}.icon-draft-edit:before{content:"\e9dd"}.icon-sub-review:before{content:"\e9df"}.icon-sub-review-user:before{content:"\e9db"}.icon-ztf:before{content:"\e9dc"}.icon-save:before{content:"\e9d8"}.icon-list-box:before{content:"\e9b4"}.icon-usecase:before{content:"\e99d"}.icon-code:before{content:"\e990"}.icon-summary:before{content:"\e9ad"}.icon-more-alt:before{content:"\e9a7"}.icon-customer:before{content:"\e9d9"}.icon-waterfallplus:before{content:"\e9ed"}.icon-agileplus:before{content:"\e9ee"}.icon-horn:before{content:"\e9eb"}.icon-resume:before{content:"\e9e9"}.icon-mirror:before{content:"\e9e6"}.icon-remote:before{content:"\e9e7"}.icon-moon:before{content:"\e9e8"}.icon-ticket:before{content:"\e9e1"}.icon-gantt-alt:before{content:"\e9e2"}.icon-appose:before{content:"\e9e2"}.icon-inline:before{content:"\e9e3"}.icon-tree:before{content:"\e9c9"}.icon-list:before{content:"\e9cb"}.icon-gantt:before{content:"\e9cc"}.icon-group-view:before{content:"\e9cd"}.icon-inherit-space:before{content:"\e9c2"}.icon-card-archive:before{content:"\e9b8"}.icon-col-archive:before{content:"\e9b9"}.icon-col-add-right:before{content:"\e9bb"}.icon-col-add-left:before{content:"\e9bc"}.icon-col-split:before{content:"\e9bd"}.icon-waterfall:before{content:"\e9a4"}.icon-manual:before{content:"\e98d"}.icon-kanban:before{content:"\e983"}.icon-lane:before{content:"\e9b1"}.icon-snap-house:before{content:"\e9e3"}.icon-wrench:before{content:"\e9e4"}.icon-desktop:before{content:"\e9e5"}.icon-back:before{content:"\e9d3"}.icon-back-circle:before{content:"\e9da"}.icon-shield:before{content:"\e9ca"}.icon-meh:before{content:"\e9ce"}.icon-frown:before{content:"\e9cf"}.icon-smile:before{content:"\e9d0"}.icon-unlock-solid:before{content:"\e9d1"}.icon-lock-solid:before{content:"\e9d2"}.icon-ver:before{content:"\e9c6"}.icon-publish:before{content:"\e9c7"}.icon-send:before{content:"\e9c7"}.icon-tag:before{content:"\e9be"}.icon-tag-lock:before{content:"\e9bf"}.icon-code-fork:before{content:"\f126"}.icon-branch-lock:before{content:"\e9c0"}.icon-groups:before{content:"\e9af"}.icon-thumbs-up:before{content:"\f087"}.icon-thumbs-down:before{content:"\f088"}.icon-thumbs-up-solid:before{content:"\e9d6"}.icon-thumbs-down-solid:before{content:"\e9d7"}.icon-hash:before{content:"\e9ab"}.icon-version:before{content:"\e9ab"}.icon-p-square:before{content:"\e97b"}.icon-video-play:before{content:"\e97f"}.icon-plus-solid-circle:before{content:"\e974"}.icon-minuse-solid-circle:before{content:"\e9b6"}.icon-s:before{content:"\e975"}.icon-c:before{content:"\e976"}.icon-t:before{content:"\e977"}.icon-guide:before{content:"\e978"}.icon-todo:before{content:"\e979"}.icon-side-left:before{content:"\e9b3"}.icon-side-right:before{content:"\e9b2"}.icon-fullscreen-exit:before{content:"\e972"}.icon-alert:before{content:"\e99f"}.icon-undo:before{content:"\e93f"}.icon-redo:before{content:"\e9d4"}.icon-swap:before{content:"\e9b0"}.icon-chat-solid:before{content:"\e9b5"}.icon-clock:before{content:"\e97c"}.icon-cost:before{content:"\e97d"}.icon-pencil-alt:before{content:"\e984"}.icon-size-height:before{content:"\e9c5"}.icon-file-log:before{content:"\e9de"}.icon-rich-text:before{content:"\e913"}.icon-markdown:before{content:"\e916"}.icon-excel:before{content:"\e933"}.icon-text-link:before{content:"\e94d"}.icon-ppt:before{content:"\e957"}.icon-word:before{content:"\e958"}.icon-doc-lib:before{content:"\e96f"}.icon-file:before{content:"\f016"}.icon-file-empty:before{content:"\f016"}.icon-file-text:before{content:"\f0f6"}.icon-file-alt:before{content:"\f15b"}.icon-file-text-alt:before{content:"\f15c"}.icon-file-pdf:before{content:"\f1c1"}.icon-file-word:before{content:"\f1c2"}.icon-file-excel:before{content:"\f1c3"}.icon-file-powerpoint:before{content:"\f1c4"}.icon-file-image:before{content:"\f1c5"}.icon-file-archive:before{content:"\f1c6"}.icon-file-audio:before{content:"\f1c7"}.icon-file-video:before{content:"\f1c8"}.icon-file-code:before{content:"\f1c9"}.icon-menu-collapse:before{content:"\e980"}.icon-menu-expand:before{content:"\e981"}.icon-group:before{content:"\e97e"}.icon-menu-users:before{content:"\e97e"}.icon-persons:before{content:"\e97e"}.icon-team:before{content:"\e97e"}.icon-estimate:before{content:"\e9ac"}.icon-sprint:before{content:"\e9a2"}.icon-shield-check:before{content:"\e9a5"}.icon-ok:before{content:"\e9a6"}.icon-printer:before{content:"\e906"}.icon-bullhorn:before{content:"\e910"}.icon-person:before{content:"\e941"}.icon-fields:before{content:"\e989"}.icon-trigger:before{content:"\e98a"}.icon-layout:before{content:"\e98b"}.icon-audit:before{content:"\e98c"}.icon-cancel:before{content:"\e951"}.icon-ban-circle:before{content:"\e951"}.icon-eye:before{content:"\e94e"}.icon-eye-off:before{content:"\e96e"}.icon-unlock:before{content:"\e94f"}.icon-lock:before{content:"\e950"}.icon-private:before{content:"\e950"}.icon-move:before{content:"\e94c"}.icon-hand-right:before{content:"\e907"}.icon-checked:before{content:"\e908"}.icon-off:before{content:"\e909"}.icon-start:before{content:"\e90a"}.icon-play:before{content:"\e90a"}.icon-time:before{content:"\e90b"}.icon-edit:before{content:"\e90c"}.icon-trash:before{content:"\e90d"}.icon-link:before{content:"\e90e"}.icon-unlink:before{content:"\e90f"}.icon-bug:before{content:"\e911"}.icon-list-alt:before{content:"\e912"}.icon-change:before{content:"\e970"}.icon-alter:before{content:"\e970"}.icon-glasses:before{content:"\e914"}.icon-review:before{content:"\e914"}.icon-sitemap:before{content:"\e915"}.icon-testcase:before{content:"\e915"}.icon-pluses:before{content:"\e917"}.icon-report-list:before{content:"\e918"}.icon-magic:before{content:"\e919"}.icon-active:before{content:"\e919"}.icon-treemap:before{content:"\e91a"}.icon-confirm:before{content:"\e91b"}.icon-split:before{content:"\e98e"}.icon-delay:before{content:"\e91d"}.icon-calendar:before{content:"\e91d"}.icon-pause:before{content:"\e91e"}.icon-ban:before{content:"\e91f"}.icon-plus-bold:before{content:"\e920"}.icon-copy:before{content:"\e921"}.icon-refresh:before{content:"\e922"}.icon-diff:before{content:"\e9b7"}.icon-sm:before{font-size:14px;vertical-align:10%}.icon-qc{position:relative}.icon-qc:before{width:1em;color:#7cb938;content:"\e985"}.icon-qc:after{position:absolute;top:0;left:0;width:1em;height:1em;font-family:ZentaoIcon;font-size:14px;font-size:inherit;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#36a742;text-transform:none;content:"\e987";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-message.has-dot{position:relative}.icon-message.has-dot::after{position:absolute;top:-3px;right:-5px;display:block;width:6px;height:6px;content:' ';background-color:#fc5959;border-radius:50%}.icon-project{-webkit-transform:scale(1.2);-ms-transform:scale(1.2);-o-transform:scale(1.2);transform:scale(1.2)}.icon-product{-webkit-transform:scale(1.15);-ms-transform:scale(1.15);-o-transform:scale(1.15);transform:scale(1.15)}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:13px;font-weight:400;line-height:18px;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;border-radius:4px;-webkit-transition:.4s cubic-bezier(.175,.885,.32,1);-o-transition:.4s cubic-bezier(.175,.885,.32,1);transition:.4s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:background,border,outline,opacity,-webkit-box-shadow;-o-transition-property:background,border,box-shadow,outline,opacity;transition-property:background,border,outline,opacity,-webkit-box-shadow;transition-property:background,border,box-shadow,outline,opacity;transition-property:background,border,box-shadow,outline,opacity,-webkit-box-shadow}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:focus,.btn:hover{color:#313c52;text-decoration:none}.btn:active{text-decoration:none;background-image:none;outline:0;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.1)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:grayscale(1);-webkit-box-shadow:none;box-shadow:none;opacity:.5;-webkit-filter:grayscale(1)}.btn{color:#313c52;background-color:#fff;border-color:#d8dbde}.btn.active,.btn.hover,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:rgba(255,255,255,.8);border-color:#bcc2c7}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#f2f2f2;background-image:none;border-color:#bcc2c7}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{color:rgba(49,60,82,.3);background-color:#fff;border-color:#d8dbde}.btn-gray{color:#82899f;background-color:#f1f1f1;border-color:#f1f1f1}.btn-gray.active,.btn-gray.hover,.btn-gray:active,.btn-gray:focus,.btn-gray:hover,.open .dropdown-toggle.btn-gray{color:#82899f;background-color:rgba(241,241,241,.8);border-color:#d8d8d8}.btn-gray.active,.btn-gray:active,.open .dropdown-toggle.btn-gray{background-color:#e4e4e4;background-image:none;border-color:#d8d8d8}.btn-gray.disabled,.btn-gray.disabled.active,.btn-gray.disabled:active,.btn-gray.disabled:focus,.btn-gray.disabled:hover,.btn-gray[disabled],.btn-gray[disabled].active,.btn-gray[disabled]:active,.btn-gray[disabled]:focus,.btn-gray[disabled]:hover,fieldset[disabled] .btn-gray,fieldset[disabled] .btn-gray.active,fieldset[disabled] .btn-gray:active,fieldset[disabled] .btn-gray:focus,fieldset[disabled] .btn-gray:hover{color:rgba(130,137,159,.3);background-color:#f1f1f1;border-color:#f1f1f1}.btn-primary{color:#fff;background-color:#2e7fff;border-color:transparent}.btn-primary.active,.btn-primary.hover,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:rgba(46,127,255,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#156fff;background-image:none;border-color:rgba(0,0,0,0)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{color:rgba(255,255,255,.3);background-color:#2e7fff;border-color:transparent}.btn-secondary{color:#fff;background-color:#18a6fd;border-color:transparent}.btn-secondary.active,.btn-secondary.hover,.btn-secondary:active,.btn-secondary:focus,.btn-secondary:hover,.open .dropdown-toggle.btn-secondary{color:#fff;background-color:rgba(24,166,253,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#029bf9;background-image:none;border-color:rgba(0,0,0,0)}.btn-secondary.disabled,.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary[disabled],.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:focus,.btn-secondary[disabled]:hover,fieldset[disabled] .btn-secondary,fieldset[disabled] .btn-secondary.active,fieldset[disabled] .btn-secondary:active,fieldset[disabled] .btn-secondary:focus,fieldset[disabled] .btn-secondary:hover{color:rgba(255,255,255,.3);background-color:#18a6fd;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9f46;border-color:transparent}.btn-warning.active,.btn-warning.hover,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:rgba(255,159,70,.8);border-color:rgba(0,0,0,0)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#ff922c;background-image:none;border-color:rgba(0,0,0,0)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{color:rgba(255,255,255,.3);background-color:#ff9f46;border-color:transparent}.btn-danger{color:#fff;background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger.hover,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:rgba(252,89,89,.8);border-color:rgba(0,0,0,0)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fc4040;background-image:none;border-color:rgba(0,0,0,0)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{color:rgba(255,255,255,.3);background-color:#fc5959;border-color:transparent}.btn-success{color:#fff;background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success.hover,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:rgba(34,201,141,.8);border-color:rgba(0,0,0,0)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#1eb37e;background-image:none;border-color:rgba(0,0,0,0)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{color:rgba(255,255,255,.3);background-color:#22c98d;border-color:transparent}.btn-info{color:#2e7fff;background-color:#e6f0ff;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#2e7fff;background-color:rgba(230,240,255,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#cce1ff;background-image:none;border-color:rgba(0,0,0,0)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{color:rgba(46,127,255,.3);background-color:#e6f0ff;border-color:transparent}.btn-link{padding-right:6px;padding-left:6px;font-weight:400;color:#313c52;text-shadow:none;cursor:pointer;background:0 0;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover,.btn-link[disabled],fieldset[disabled] .btn-link{border-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link:focus,.btn-link:hover{color:#0b0f18;background:#f1f1f1;background:rgba(0,0,0,.075)}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#c4c4c4;text-decoration:none}.btn-lg{padding:11px 16px;font-size:14px;line-height:18px;border-radius:4px}.btn-mini,.btn-sm{padding:3px 8px;font-size:12px;line-height:18px;border-radius:4px}.btn-mini,.btn-xs{padding:0 5px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.btn-wide{min-width:120px}.btn-limit{max-width:180px;padding-right:20px;overflow:hidden;text-overflow:unset;white-space:nowrap}.btn-limit>.caret{position:absolute;top:14px;right:8px}.btn-circle{border-radius:17px}.btn>.label-icon{top:3px;padding:3px;margin:-2px;background-color:rgba(0,0,0,.2);border-radius:12px}.btn>.label-icon>.icon{font-size:16px;line-height:18px}.btn>.icon+.text{margin-left:5px}.btn.btn-sm.btn-circle{border-radius:12px}.btn.btn-sm>.label-icon{top:2px;width:20px;height:20px;padding:1px;line-height:20px}.btn.btn-sm>.label-icon>.icon{position:relative;top:-1px;display:inline-block;font-size:14px;line-height:18px}.btn-icon-left{position:relative;padding-left:35px;overflow:hidden;text-align:right}.btn-icon-left>.label-icon{position:absolute;left:5px;margin:0}.btn-icon-left>.icon{position:absolute;top:0;bottom:0;left:0;display:block;width:30px;line-height:30px;color:#18a6fd;text-align:center;background:#e6f0ff}.btn-icon-left.btn-sm{padding-left:28px}.btn-icon-left.btn-sm>.label-icon{left:2px}.btn-icon-left.btn-sm>.icon{width:24px;line-height:24px}.btn-icon-right{position:relative;padding-right:35px;text-align:left}.btn-icon-right>.label-icon{position:absolute;right:5px;margin:0}.btn-icon-right.btn-sm{padding-right:28px}.btn-icon-right.btn-sm>.label-icon{right:2px}.btn-icon{min-width:32px;padding-right:0;padding-left:0}.btn-icon.btn-sm{width:24px;min-width:24px;height:24px}.btn-group{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group>.btn-group{float:left}.btn-group>.btn{border-radius:0}.btn-group>.btn:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.btn-group>.btn:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.dropdown{float:left;margin-right:10px}.btn-toolbar>.btn-group:last-child,.btn-toolbar>.btn:last-child,.btn-toolbar>.dropdown:last-child{margin-right:0}.btn-toolbar>.divider{float:left;height:20px;margin:7px 5px 4px 10px;border-left:1px solid rgba(0,0,0,.1)}.btn-toolbar .space{float:left;min-height:1px;margin:0 10px 0 10px}.btn-toolbar .input-control{float:left;width:120px}.btn-toolbar .page-title{float:left;line-height:34px}.btn-toolbar .page-title .text{font-size:14px;font-weight:700}.btn-toolbar .page-title .label{top:-2px;margin-right:10px}.btn-toolbar .divider+.page-title{margin-left:15px}.btn-active-line{position:relative;font-weight:700;color:#2e7fff}.btn-active-line:after{position:absolute;right:5px;bottom:1px;left:5px;display:block;content:' ';border-bottom:2px solid #2e7fff}.btn-active-line:hover{color:#2e7fff}.btn-active-text .text{position:relative;top:-1px;display:inline-block;font-weight:700;color:#1e6aeb}.btn-active-text .text:after{position:absolute;bottom:-5px;display:block;width:100%;content:' ';border-bottom:2px solid #2e7fff}.angle-btn{position:relative;padding:1px;background:#fff;border:1px solid #c4c4c4;border-right:none}.angle-btn:first-child{border-radius:2px 0 0 2px}.btn-toolbar>.angle-btn{margin-right:8px}.angle-btn:after,.angle-btn:before{position:absolute;top:-1px;right:-8px;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #c4c4c4;border-style:solid;border-width:17px 0 17px 8px}.angle-btn:after{right:-7px;border-color:transparent transparent transparent #fff;border-radius:2px}.angle-btn .btn{padding:6px;font-weight:700;background:#fff;border:none;border-radius:4px!important}.angle-btn .btn.btn-limit{padding-right:16px}.angle-btn .btn.btn-limit>.caret{right:4px}.angle-btn+.angle-btn{border-left:none}.angle-btn+.angle-btn>.btn-group:first-child{padding-left:8px}.angle-btn+.angle-btn>.btn-group:first-child:after,.angle-btn+.angle-btn>.btn-group:first-child:before{position:absolute;top:-2px;left:0;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #c4c4c4;border-style:solid;border-width:17px 0 17px 8px}.angle-btn+.angle-btn>.btn-group:first-child:after{left:-1px;border-color:transparent transparent transparent #fff;border-width:17px 0 17px 8px}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#2e7fff}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#2e7fff}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn.active:before,.btn-toolbar>.angle-btn:last-child:after,.btn-toolbar>.angle-btn:last-child:before{border-color:transparent transparent transparent #2e7fff}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn:last-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before{border-color:transparent transparent transparent #2e7fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn,.btn-toolbar>.angle-btn.normal{border-color:#c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#313c52}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.active+.angle-btn:before,.btn-toolbar>.angle-btn.normal:after,.btn-toolbar>.angle-btn.normal:before{border-color:transparent transparent transparent #c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.normal:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before,.btn-toolbar>.angle-btn.normal>.btn-group:first-child:before{border-color:transparent transparent transparent #c4c4c4!important}.nav>li>.btn.btn-primary{color:#fff}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(46,127,255,.8)}.btn.btn-action,.c-actions .btn{display:inline-block;width:26px;padding:2px;overflow:hidden;line-height:20px;color:#18a6fd;background:0 0;border-color:transparent}.btn.btn-action>i,.c-actions .btn>i{position:relative;top:1px;font-size:18px}.btn.btn-action:hover,.c-actions .btn:hover{color:#2e7fff;background-color:#cce1ff}.c-actions .btn+.btn{margin-left:-4px}.label{position:relative;display:inline-block;padding:3px 5px;font-size:12px;font-weight:400;vertical-align:middle;border-radius:2px}.label+.label{margin-left:4px}.label-pale{background:#b3d1ff!important}.label-badge{border-radius:9px}.label-light{color:#3c4353;background-color:#ddd}.label-primary{background:#2e7fff!important}.label-gray{color:#878da0;background:#e8ebef}.label-outline.label-danger{color:#fc5959;background:#ffebeb;border-color:rgba(252,89,89,.25)}.label-outline.label-light{color:#838a9d;background:#f2f5fb;border-color:#e1e5ee}.label-primary.label-outline{background:#e6f0ff!important;border-color:rgba(46,127,255,.25)}.label-outline.label-success{background:#ecfff8;border-color:rgba(34,201,141,.25)}.label-outline.label-info{background:#e7f6ff;border-color:rgba(55,178,254,.25)}.label-outline.label-warning{background:#fff4ea;border-color:rgba(255,159,70,.25)}.label-dot{position:relative;top:-1px;padding:0;border-radius:50%}.label-dot+.status-text{display:inline-block;margin-left:5px}.label-icon{min-width:18px;padding:0;line-height:18px;border-radius:10px}.label-id{display:inline-block;min-width:30px;padding:0 5px;font-size:12px;line-height:16px;color:#838a9d;text-align:center;vertical-align:middle;background-color:transparent;border:1px solid #838a9d;border-radius:2px}.pri-1,.todo-pri-1{color:#fc5959}[class*=" status-"],[class^=status-]{color:#313c52}.status-changed,.status-delayed,.status-doing,.status-fail,.status-investigate{color:#fc5959}.status-changed>.label-dot,.status-delayed>.label-dot,.status-doing>.label-dot,.status-fail>.label-dot,.status-investigate>.label-dot{background-color:#fc5959}.status-wait{color:#838a9d}.status-wait>.label-dot{background-color:#7ec5ff}.status-unclosed{color:#838a9d}.status-unclosed>.label-dot{background-color:#2e7fff}.status-done,.status-normal,.status-pass,.status-resolved{color:#43a047}.status-done>.label-dot,.status-normal>.label-dot,.status-pass>.label-dot,.status-resolved>.label-dot{background-color:#22c98d}.status-postpone{color:#838a9d}.status-postpone>.label-dot{background-color:#fc5959}.status-blocked{position:relative;left:-5px;display:inline-block;padding:0 5px;line-height:20px;color:#313c52;background:0 0;border-radius:10px}.status-blocked>.label-dot{background-color:#ff9f46}.status-pause,.status-suspended{color:#ff9f46}.status-pause>.label-dot,.status-suspended>.label-dot{background-color:#ff9f46}.status-active.status-bug,.status-draft{color:#8166ee}.status-active.status-bug>.label-dot,.status-draft>.label-dot{background-color:#8166ee}.status-closed,.status-terminate{color:#838a9d}.status-closed>.label-dot,.status-terminate>.label-dot{background-color:#838a9d}.status-cancel{color:#838a9d}.status-cancel>.label-dot{background-color:#c4c4c4}.label-pri{display:inline-block;min-width:18px;max-width:100%;height:18px;padding:0 4px;overflow:hidden;font-size:12px;line-height:16px;color:#838a9d;text-align:center;text-overflow:clip;white-space:normal;vertical-align:middle;border:1px solid #838a9d;border-radius:10px}.label-pri-1,.label-selector>.label-pri[data-value="1"]{overflow:visible;color:#ff6f42;border-color:#ff6f42}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#f38f19;border-color:#f38f19}.label-pri-3,.label-selector>.label-pri[data-value="3"]{color:#37b2fe;border-color:#37b2fe}.label-pri-4,.label-selector>.label-pri[data-value="4"]{color:#22c98d;border-color:#22c98d}.label-pri-5,.label-selector>.label-pri[data-value="5"]{color:#838a9d;border-color:#838a9d}.label-pri-0,.label-selector>.label-pri.active[data-value="0"]{color:#d5d9df;border-color:#d5d9df}.label-severity{position:relative;display:inline-block;width:24px;height:20px;font-weight:bolder;text-align:center;vertical-align:middle}.label-severity:before{position:absolute;top:-3px;left:0;z-index:0;display:block;font-family:ZentaoIcon;font-size:14px;font-size:24px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:inherit;text-transform:none;content:"\e973";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.label-severity:after{position:absolute;top:7px;left:0;z-index:1;display:block;width:24px;font-size:12px;line-height:12px;text-align:center;content:attr(data-severity)}.label-severity[data-severity],.label-severity[data-value]{color:#ccc}.label-severity[data-severity="0"],.label-severity[data-value="0"]{color:#ccc}.label-severity[data-severity="1"],.label-severity[data-value="1"]{color:#fb2b2b}.label-severity[data-severity="2"],.label-severity[data-value="2"]{color:#c92d79}.label-severity[data-severity="3"],.label-severity[data-value="3"]{color:#f48116}.label-severity[data-severity="4"],.label-severity[data-value="4"]{color:#ffba34}.label-severity[data-severity="5"],.label-severity[data-value="5"]{color:#9ea3b0}.label-severity-custom[data-severity]{color:#d5d9df}.label-severity-custom[data-severity="1"]{color:#c62828}.label-severity-custom[data-severity="2"]{color:#ff8f00}.label-severity-custom[data-severity="3"]{color:#fdd835}.label-severity-custom[data-severity="4"]{color:#cddc39}.label-severity-custom[data-severity="5"]{color:#8bc34a}.label-selector{padding:0 10px}.label-selector>.label{display:inline-block;min-width:24px;height:24px;padding:0 5px;font-size:14px;line-height:20px;text-align:center;cursor:pointer;background:0 0;border:2px solid #d5d9df;border-radius:15px}.label-selector>.label+.label{margin-left:10px}.label-selector>.label.empty{border-color:transparent}.label-selector>.label.label-severity{font-size:12px;line-height:28px;border-color:transparent}.label-selector>.label.label-severity:before{top:-2px;left:-2px}.label-selector>.label.label-severity:after{display:none}.label-selector>.label.label-severity.active{background:0 0;filter:none;-webkit-filter:none}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{margin-top:2px}.ie .checkbox input[type=checkbox],.ie .checkbox-inline input[type=checkbox],.ie .radio input[type=radio],.ie .radio-inline input[type=radio]{margin-top:4px}.is-firefox .checkbox input[type=checkbox],.is-firefox .checkbox-inline input[type=checkbox],.is-firefox .radio input[type=radio],.is-firefox .radio-inline input[type=radio]{margin-top:3px}.checkbox-primary,.radio-primary{position:relative;display:block;vertical-align:middle}.checkbox-primary.inline-block,.radio-primary.inline-block{display:inline-block}.checkbox-primary.inline-block+.inline-block,.radio-primary.inline-block+.inline-block{margin-left:15px}.checkbox-primary>input,.radio-primary>input{position:absolute;top:0;left:0;z-index:3;width:100%;height:100%;margin:0;opacity:0}.checkbox-primary>label,.radio-primary>label{display:block;height:20px;padding-left:20px;margin:0;font-weight:400;line-height:20px;cursor:pointer}.checkbox-primary>label:after,.checkbox-primary>label:before,.radio-primary>label:after,.radio-primary>label:before{position:absolute;top:3px;right:0;left:0;display:block;width:14px;height:14px;line-height:14px;text-align:center;content:' ';border-radius:3px}.checkbox-primary>label:after,.radio-primary>label:after{z-index:1;border:1px solid #d9dbe1;border-color:rgba(0,0,0,.15);-webkit-transition:.4s cubic-bezier(.175,.885,.32,1);-o-transition:.4s cubic-bezier(.175,.885,.32,1);transition:.4s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:border,background-color;-o-transition-property:border,background-color;transition-property:border,background-color}.checkbox-primary>label:before,.radio-primary>label:before{top:3px;z-index:2;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-weight:900;font-variant:normal;line-height:1;text-transform:none;content:"\e5ca";opacity:0;-webkit-transition:.2s cubic-bezier(.175,.885,.32,1);-o-transition:.2s cubic-bezier(.175,.885,.32,1);transition:.2s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:opacity,-webkit-transform;-o-transition-property:opacity,-o-transform;transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform,-o-transform;-webkit-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0);speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#22c98d;border-color:#22c98d;border-width:4px}.checkbox-primary.checked>label:before,.checkbox-primary>input:checked+label:before,.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{color:#fff;opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}.checkbox-primary input:indeterminate+label:before,.checkbox-primary.indeterminate>label:before,.radio-primary input:indeterminate+label:before,.radio-primary.indeterminate>label:before{top:9px;left:3px;width:8px;height:2px;content:' ';background-color:#a3a2bc;opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#22c98d;-webkit-box-shadow:0 0 0 3px rgba(34,201,141,.2);box-shadow:0 0 0 3px rgba(34,201,141,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#22c98d}.checkbox-primary.checkbox-right>label,.radio-primary.checkbox-right>label{padding:0 30px 0 0}.checkbox-primary.checkbox-right>label:after,.checkbox-primary.checkbox-right>label:before,.radio-primary.checkbox-right>label:after,.radio-primary.checkbox-right>label:before{right:0;left:auto}.checkbox-primary input:disabled+label:after,.checkbox-primary.disabled>label:after,.radio-primary input:disabled+label:after,.radio-primary.disabled>label:after{background-color:#e5e5e5!important;border-color:#bbb!important}.checkbox-primary input:disabled:checked+label:after,.checkbox-primary.checked.disabled>label:after,.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#bbb!important}.radio-primary>label:after{border-radius:50%}.radio-primary>label:before{top:7px;left:6px;width:6px;height:6px;content:' ';border:none;border-radius:50%}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:transparent;border-color:#22c98d;border-width:2px}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#22c98d}.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:transparent;border-color:#bbb}.radio-primary input:disabled:checked+label:before,.radio-primary.checked.disabled>label:before{background-color:#bbb}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li>a{position:relative;border:none!important;border-radius:2px!important}.nav-tabs>li.active>a{font-weight:700;color:#313c52!important}.nav-tabs>li.active>a:before{position:absolute;right:0;bottom:-1px;left:0;display:block;height:2px;content:' ';background:#2e7fff}.nav-tabs-primary>li.active>a{color:#1e6aeb!important}.nav-steps{height:29px;text-align:center}.nav-steps>ul{display:inline-block;margin:0}.nav-steps>ul>li{position:relative;background-color:#fff}.nav-steps>ul>li.active>a{color:#fff;background-color:#18a6fd}.nav-steps>ul>li>a{min-width:119px;padding:5px 20px;text-align:center;border:1px solid transparent;-webkit-transition:none;-o-transition:none;transition:none}.nav-steps>ul>li>a:hover{background-color:transparent}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{background-color:#2e7fff}.nav-steps>ul>li+li>a{padding-left:34px}.nav-steps>ul>li+li:after,.nav-steps>ul>li+li:before{position:absolute;top:0;left:0;width:-1;height:0;content:' ';border-color:transparent transparent transparent #a6aab8;border-style:solid;border-width:15px 0 15px 15px}.nav-steps>ul>li+li:after{left:-2px;border-left-color:#fff}.nav-steps>ul>li.active+li:after{border-left-color:#18a6fd}.nav-steps>ul>li:hover{background-color:#eceef3}.nav-steps>ul>li:hover+li:after{border-left-color:#eceef3}.nav-steps>ul>li.active:hover+li:after{border-left-color:#2e7fff}.nav-steps.editor-steps-advance>ul>li:last-child:after,.nav-steps.editor-steps-advance>ul>li:last-child:before{display:none}.nav-steps.editor-steps-advance>ul>li:last-child>a{padding-left:19px}.panel{position:relative;margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.panel-body{padding:20px}.panel-body.has-table{padding:10px}.panel-body.has-table .table{margin-bottom:0;table-layout:fixed}.panel-heading{padding:12px 48px 12px 20px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading+.panel-body{padding-top:0}.panel-title{font-size:14px;font-weight:700;line-height:20px}.panel-title .label{top:-1px}.panel-actions{position:absolute;top:0;right:0;padding:7px 8px}.panel:hover .panel-actions{z-index:10}.panel-actions>li>a{display:inline-block;min-width:30px;padding:0 5px;line-height:30px;color:#a6aab8;text-align:center;border-radius:4px}.panel-actions>li>a:hover{color:#313c52;text-decoration:initial;background-color:#f1f1f1}.panel-actions .btn-icon{color:#a6aab8}.panel-actions .btn.text-primary{color:#2e7fff}.panel .empty-tip{padding:30px 10px 50px;font-size:14px;color:#838a9d;text-align:center}.progress-text-left{position:relative;margin:7px 0;margin-left:35px;overflow:visible}.progress-text-left .progress-text{position:absolute;top:-7px;left:-35px;display:block;width:35px;height:20px;padding-right:5px;line-height:20px;color:#838a9d;text-align:right}.chart-color{width:20px}.chart-color-dot{display:inline-block;width:10px;height:10px;border-radius:50%}.chart-row{margin-top:10px}.chart-row+.chart-row{padding-top:10px;border-top:1px solid #eee}.chart-wrapper{padding:10px 5px;background:#eee}.chart-wrapper>h4{margin:5px 0 10px}.table-wrapper{max-height:250px;overflow:auto}.table-wrapper .table{margin:0}.progress-pie{position:relative}.progress-pie canvas{display:block}.progress-pie .progress-info{position:absolute;top:0;left:0;width:100%;height:100%;padding-top:25px;text-align:center}.progress-pie .progress-info>small{display:block;line-height:14px;color:#a6aab8}.progress-pie .progress-info>strong{display:block;font-size:36px;line-height:40px}.progress-pie .progress-info>strong>small{font-size:20px}.progress-pie-120 .progress-info{padding-top:30px}.progress-pie-120 .progress-info>small{line-height:18px}.progress-pie-50 .progress-info{padding-top:4px}.progress-pie-50 .progress-info>strong{font-size:20px;font-weight:400}.progress-pie-50 .progress-info>strong>small{font-size:14px}.progress-pie[data-value="100"] .progress-info>strong{-webkit-transform:scale(.7);-ms-transform:scale(.7);-o-transform:scale(.7);transform:scale(.7)}.progress-pie-24 .progress-info{right:-10px;left:-10px;width:auto;padding-top:0;font-size:12px;line-height:24px;-webkit-transform:scale(.9,1);-ms-transform:scale(.9,1);-o-transform:scale(.9,1);transform:scale(.9,1)}.progress-pie-24[data-value="100"] .progress-info{-webkit-transform:scale(.8,1);-ms-transform:scale(.8,1);-o-transform:scale(.8,1);transform:scale(.8,1)}.progress-pie-26 .progress-info{right:-10px;left:-10px;width:auto;padding-top:0;font-size:12px;line-height:26px;-webkit-transform:scale(.9,1);-ms-transform:scale(.9,1);-o-transform:scale(.9,1);transform:scale(.9,1)}.progress-pie-26[data-value="100"] .progress-info{-webkit-transform:scale(.8,1);-ms-transform:scale(.8,1);-o-transform:scale(.8,1);transform:scale(.8,1)}.status-bars{display:table;width:100%;height:140px;padding:5px;padding-top:50px;margin:0;overflow:hidden}.status-bars>li{position:relative;display:table-cell;text-align:center;vertical-align:bottom}.status-bars .bar{position:absolute;bottom:20px;left:50%;display:block;width:10px;margin-left:-5px;background:#2e7fff;border-radius:5px 5px 0 0}.status-bars .bar:after{position:absolute;right:-50px;bottom:0;left:-50px;display:block;height:1px;content:' ';background:#eee}.status-bars .title{font-size:12px;font-weight:400;color:#a6a8b6}.status-bars .value{position:relative;top:-20px;left:-20px;display:inline-block;width:50px;font-size:16px;font-weight:700;text-align:center}.status-bars-h{display:block;padding-right:50px;padding-left:60px;list-style:none}.status-bars-h>li{position:relative;height:40px;border-left:1px solid #eee}.status-bars-h .bar{position:relative;top:15px;display:block;height:10px;line-height:20px;background:#2e7fff;border-radius:0 5px 5px 0}.status-bars-h .title{position:absolute;top:-5px;left:-60px;width:60px;padding-right:10px;font-size:12px;color:#a6a8b6;text-align:right}.status-bars-h .value{position:absolute;top:-5px;right:-50px;display:block;width:40px;font-size:14px;font-weight:700;text-align:left;white-space:nowrap}.ring,[class*=" ring-"],[class^=ring-]{width:24px;height:24px;font-size:12px;line-height:24px;text-align:center;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACZAAAAAwCAMAAACyyT3hAAAAP1BMVEUAAAAAAAA5rm06sG87snE4q200o2o7sG86r244q2w6r244rWw7snA7sG86rG05rm07snA5qWw7sW86sG48s3ECZypFAAAAFHRSTlMACl2b8TkPtnsqj0fVv4Zt4RrIqxUkbyYAAA1gSURBVHja7NrbbtswEIRhmyJ1IiVS0v/+z9rCbeGkdZodNEnVdHmTxP4wmF1exLB9eXCu12tqLX39cTGcm78use2z5Msx19wLfunGpOZvSv4xh/798tt+dKPSZ+jGMNn9/pWnXp1X7f9e+ynf53Xv3r37j/bLyfq4/1u+n8T8VI8jLWY/hbEbSjT76+2ssH77zeyBJHooom9dkHzssuQ5wvau+YuWz141/87zMoTewP9kP+7d2/31ZPln82e7L/fuP9LnJPk+DDDb/TQvEaDc/1//vk9Yvrl7vmHa+ztk347BXwcA1UMRPXCIfq+b5Jm3d82PneY5guSHG1fmVfu/837m5N69e/fu3T89fRZ9bRTBpyMCLFa/zfG7CU98l1/M/+EBS/59PT//bfD9lCS/pbAeR7bnb1OqC7AI+QWAkiz5Kdd1B6BVLb8Fk891Poox/7bPUNcIwGHrM3YDAHu1zyv0yWHcjfNen++nWvsvANC5d6/468nyz+bPdl/u3es+NFbFjw1A8BGAPUv5xGFMz/382HcAsNy+W9Sb9/PwwbP4ra5J8WluQDb7qQ4Ayybl05nnrQVgSFafB4AyWfvPEaBT57X2Seu3ecX9HBfN75t79+7du/+sPnVBy++A1e6nHaAEsz9ufk7W/gUgrvmBP/pf/bYDtDlp+/x8j4du1XwBFsHvQMlW348NIJjz0yH5bbz1n7R5m71/bUAL2n5iMueHAYjZvXv37t1/Tp8bJMFPDYhCfgTa2Ft9aEDJ5vzUbvnbC3562GcI5j6vf3T43/h+hlnJnwFGs99WgGDPv/lq9yPQsjCv1mcT/aUDGEVf3bt37979v+DH1kk+RIiCrwCz0AeI82bvc8vvzT5HYP1NfnjQv3uL/d+f/X/8ljUfGiD4ChDsPkcgCX0iUMX8UfDDw/6Xl+fV+q8Awb373/rLyfLP5s92X+4/rQ8QFV+BmO0+AyTND0nqT1H6xFf715/zWe35l5fXf3/e/YtnGugUnxsQhD47sNl9Klp+ipq/DmL/ovXPAJN79+7du/9on5dV80An+BEoye4nYLhofu/tPgAtafO26RWfn/chv9F93YX7N/PTDoOSHzW/LVA2Ib9Am+y+34Es5DdYlHmB2Lt37969+4/1fYQs+KlB6e0+Acsm9CnQXTQfJ61PTMI+dyiv99me7pO3u6+7cf9mvj/Ikgc6xRfNXyIcgt8KLIoX+0/A4d69e/fu/8znoPkOBsH3O8Qk5C8wiH12xR9AFvwAUfEzREOf/Wmf6Q3v967cv52fNJ+BIPgg+gmogk/xmb9a+lex/+ze/WN/PVn+2fzZ7sv93/MVVsUHIAn+AKrgV4hK/gxsYv+q7Ycg+AxMFt/d+9vy/QXZP+RHCIrvoGyCr9B6wa/QNq3/ftHyye7df2HP3pbQBKIgihqGmzKA4P7/b02lTOX2EncSEky1z8uungPosYyPj/8Nv8Mk/HaHm/Adzk/AIvy1hUb4vkKR5y0yf33Nd+K89vo+Xfy/81Oj/FahmPwBRuH7CjeTX6GRfUp8fHx8/Fc/UpRvoBpf4L4ZL/MfsLvzUoxfgM6e1/V5vNjn9jl/eLV/FrL/2DcwS1+lZxN+9X3a+Pj4+Pgvvm9B5Q8wyvxV+K11+VdgMv2r810LRZ63MX1m6IwX+ep+eMr49/HL3ChfoTF+eD65r/q+wiTy+zus8fHf+8vJ8s/mz3a94n/im075FarxE7Sby2975+8mf5T9G9gvLp/O9Jf5nfHNcz6vzzMLWfyX1wiz8Ss8ZP5g/A32+Pj4+P/XP0D5GRbjC9xkfjF+l/lV9h9gtP2PnOfN9JntfMQPsCeN/3/9dmc2/gqtym+d74BrfHx8/P/q+xaM34CryZf+CnTCT9Ca/A7YnG+N71V/P89La/r7eZ5pIYj/x35aNuUH6IzfpZ+hiY+Pj38X35dF+Ql241eoxncwGD/K/EbmL8r7/En2X+X8J99/dveb+4L/EB//zX+Wo/EFVunH+Pj4+HfxI0zG3+BmfIHF+AaKzB/VeU+Wv8BwZJ/14P56IbvEx39+bdDIBa4YP8bHx8e/kS/QGb/DZPwDVuMXGGV+Y3yR+QM+X/py5HlvB/e3C1l8/Fe/TYZfJtjNGxoY4uN/8JeT5Z/Nn+16vbVf7kX5Ga7GV+iM32Ey/gHNkfnDyfJnWA+d58H9L+aB/4Tj43/Vb4DxHdT4+Pj4f+WhVb7CZnwrfYWr8Tt0xt9lfj1ZfoVJedvn4P5ZyOL/nn+wGN9DGx8fH/+vPKB8630f/0f9drI+ymchiz+vB5Q/4Qd6fHz8efxCycIU/5G9e9lRHAaAKEr7kZi8nIT7/986UlatWaWGCbjpYn1UKizAQU7sZr0vyOzb9QkUv8Ek+qT4u77ksYv5q5g/tZQv91F9g0ta9j/Loy8RZnv7795LlvYf4b/U/JgWccLur/xBH2EXfbw4v28pP8B8cZ9HgzfR27/Tj9utpZvK7e2f8W09tWdv/8S+aBmi4OWnPis8FF+gKD7o+VHM78X8QfGD3uch+qG1bQ7s3+sDbIqPUEVf7O2/+5a2vWhqHyx7+++vUbwAGsQJfhEnjAhB8UXPLy3l97BcOgF7Y2H7v3yBeuVGqcXe/oW+qaN77O2f8jF2it9hVPwE9eKjpYqYH0S/XJk/ieM5i+P5gLG1o3Ls/7PfllE9Gkj0u3r0jb39q3xbE6q9/Qs9pE7wd+BKn4FNyU8wCn4DsuKT5vPF49Phw+k/389Mm+IT3DWf5MOh7e1f5G/n1ywPaW//MR4eil9EP0AU83sxf1d8Ub3YJ4q+iONZYRDHZ7b/aX6GovgIVfG9kr8ffYbz+fb2z/nbTZnw7O2f8V9N9clV8hMEwW8JRsF3q5i/QlX676rX+mSgqPmKnyGr42n/dh/mRfEjTIoP0Kv53Vlfj/z1tA/29s/5039hDmdv/2s9pE7wBXolv+r5aRP8CIh+UvpHSFnwQXy/GeabmG//fj9DUPyk+Q0IYp+q+ATB3v4lvqkJz96+ZR+pip8gCH5bIUr5ot/hofgIRfAZWK58vzMUxfcw2F/hQ1D8ANMm+Aq9mt8JPsB0Mj8e+UIfe/vn/Olv5KHs7e3P+QC74gdY75onC34BRsFXSEqfCFOn+XUT/KDnk+0v8AGK4LcJouC7FQYlf4VF6b9DEb4vmfP97X+HX859fvT843Vq880D2dv/o7811udyv0AV/IjmK/AQfE6wKB4YxD5B8AGoYp9R8AsQ7f+0a287bsJQFIapTxxssA3/+z9rJVS1VVOmezeDOp1s7mI+LS1bxJZChH7WeAdkpXcKX4Gs8yHqPFXyfC4/jspNlG/+VbyTPD/6/G+X9EAyb9681Dun8SMcCh8D7Enu0wirpk/T+QyMGh90fgiwKPvs5oU+45PCH4DGeyjK/KDpv0Lpyv7z237mp+/jDmRBvvnX8YLn5y/yxd/gU5g3b/4enyF0uU8FWpT7vgIKf56JSe5jgNY1XtlnV+5XQOjmhf6AfVb4AkGR3wuMXe7nBrsiPwN7evf+3xN7AAR9zJt/yst3uPO+efPmb/LbmhXeAwofCzAp8kcgyn0qyj4NcHLflfkzr+494yz3DmhZ7mdgH3T5JSp91/lxeL/+GWC++HyZb/6lfL72+Yl80d8OztvmzYv8I/9gff5/H6DKfQ6ofARwCj+i61MAp+sfstw7gPrZfO4KDzQn9w5A4TMQZrmvQFDkT0DIuv5j1Hku87eH1aiC9TH/Yn678tsT+Vdn5uM98+bNfxDvwyT3KUBwcr/o9oe+BJVPZ76T529AyBf+8jz9bH6BJYn9BLDI8x3A1nX5VZ6fGzAp+yxJ6ZX9t+ufn6m/W5+3+pt/Oe+vnx99/tWxYOM2buOfanyGluU+AHuX+jQ1IERxfi5Ac1Lfz/wmzk9uBML8P/jNO7lfgSL3sQC73DuANiWpzwA+i/Pns//UxflNN1/XgFaTuE8D1sv8/OADMLrLfPPmn/JXO/qX3w+aN2/+P/X1iHK/AZM43xWAsQt9XE5/zEKftwBQoji/nfnpH/m41S72GQg+Cn1aAcZpluYvqPLjCFCqdL59B1jFfvAAYZH2j8r5dq+b77Bd+70/8nQAtOX3+ebNP+Wvd9zz+vWjefNaP3ywPuZFfqNluQcIm9DnndNPIh+nMQDQJL5HN/kVAJY/+TinJPX5OCYXhX4F1hrnPgh8LAAUaX5tnH6rWdTfNXX+yZeaRd4DELaaZetZdwBGf/N8Jyfz+Wp9/Buv8mF97G/e/JP+egt6vAbz5s2/is9J4QthEvsVIBxR5F2A0y9d4Avwzfv8Jw8g9gXk/gDkvtdd5xfuzfdB5d2Iyg9uvHe+PrzD+izxyueLfPPmn/OaLXoYzJv/az98sD7m39XHrPAe1pqEfgUI6zJL/AYAsNc/94mA3O+g8M43lc8+aPxcR+7M73VH5aei7cOd8011fW59Vve2f1wf8+bv84+vmsybN2/+Xfzc5b4fR43i/DWU0U9uFvlpb0HsU578WOR+iJNfFb4r85Nbjjvz58kfe1N4p+wf3Xbsyvmq+9+4Ps68+dv8V5yOdlOUBd3vAAAAAElFTkSuQmCC);background-position:0 0;-webkit-background-size:1224px 24px;background-size:1224px 24px}.ring>span,[class*=" ring-"]>span,[class^=ring-]>span{display:inline-block;-webkit-transform:scale(.9,1);-ms-transform:scale(.9,1);-o-transform:scale(.9,1);transform:scale(.9,1)}.messager{border-radius:4px;-webkit-box-shadow:0 4px 16px rgba(0,0,0,.2),0 2px 8px rgba(0,0,0,.1);box-shadow:0 4px 16px rgba(0,0,0,.2),0 2px 8px rgba(0,0,0,.1)}.messager-icon{vertical-align:middle}.messager-icon>.icon{font-size:24px}.messager-content{padding:18px 20px;font-size:18px;line-height:30px}.messager-content>.icon{font-size:28px;line-height:30px}.messager-actions{vertical-align:middle}.messagger-zt{color:#313c52;background-color:#fff!important}.messagger-zt .messager-icon>.icon{color:#2e7fff}.messagger-zt .messager-actions>.action{color:#838a9d}.messagger-zt.messager-success .messager-icon>.icon{color:#22c98d}.messagger-zt.messager-danger .messager-icon>.icon{color:#fc5959}.messagger-zt.messager-warning .messager-icon>.icon{color:#ff9f46}.messagger-zt.messager-info .messager-icon>.icon{color:#37b2fe}.tree{padding-left:0;overflow:hidden}.tree ul{position:relative;display:none;padding-left:0}.tree li{position:relative;padding:2px 0 2px 15px;list-style:none}.tree li.heading{padding-left:5px;color:#313c52}.tree li>a{display:block;max-width:90%;padding:2px 6px;color:#313c52;word-break:break-all}.tree li>a:hover{color:#313c52}.tree li>a.tree-toggle:hover{background:0 0}.tree li.active>a{position:relative;font-weight:700;color:#2e7fff}.tree li>.list-toggle{position:absolute;top:1px;left:1px;z-index:10;width:20px;font-size:14px;line-height:22px;color:#cbd0db;text-align:center;cursor:pointer;-webkit-transition:all .2s;-o-transition:all .2s;transition:all .2s}.tree li>.list-toggle:before{content:"\f0da"}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#2e7fff}.tree li.has-active-item>.list-toggle{color:#313c52}.tree li.has-list.open>ul{display:block}.tree li.has-list.open>.list-toggle{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.tree li.has-list.open:before{position:absolute;top:16px;bottom:-5px;left:10px;display:block;content:' ';border-left:1px solid #d8d8d8}.tree-actions{display:inline-block;margin-left:5px;vertical-align:middle}.tree-actions a{display:inline-block;margin-left:5px;font-size:13px;opacity:.6}.tree-actions a:hover{opacity:1}.tree li>.module-name{color:#313c52;vertical-align:middle}.tree li>.module-name:hover{background-color:#f0f2f5}.tree li>.module-name:hover>a{color:#313c52}.treemap-node-fold-icon:before{position:relative;left:-4px;min-width:18px}.dropdown-menu{padding:5px 0;border-color:rgba(0,0,0,.1)}.dropdown-menu>li{padding:0 10px}.dropdown-menu>li>a{padding:2px 10px;margin:5px 0;border-radius:3px}.dropdown-menu>li>a>.icon{position:relative;left:-5px;opacity:.5}.dropdown-menu>li>a:hover>.icon{opacity:.8}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{position:relative;color:#fff;background-color:#18a6fd}.dropdown-menu>li.selected>a:after{position:absolute;top:2px;right:4px;display:block;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:20px;text-transform:none;content:"\e5ca";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.dropdown-menu>li.divider{margin:10px}.dropdown-submenu>a:after{margin-right:-5px}.dropdown-submenu>.dropdown-menu.pull-left{margin-left:-1px}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#313c52;background-color:#e6f0ff}.dropdown-submenu:hover>a:after{border-left-color:#2e7fff}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager .btn{padding:3px 10px}.pager .btn .caret{opacity:.7}.pager>li>.pager-label{padding:2px;line-height:20px}.pager>li>.pager-item{min-width:20px;padding:1px;margin:2px 0;font-size:16px;line-height:20px;text-align:center;background:0 0;border-color:transparent}.pager>li>.pager-item:hover{background-color:rgba(0,0,0,.1)}.pager>li>.pager-item>.icon{position:relative;top:-1px}.pager>li>.btn:hover,.pager>li>a:hover{background:rgba(0,0,0,.1)}.pager>li.disabled>a.pager-item{background:0 0;border-color:transparent;opacity:.5}.pager>li.active>a{background-color:#18a6fd}.pager>li .btn-group .btn{padding:1px;margin:1px 0;border-radius:4px}.pager .dropdown-menu{width:200px}.pager .dropdown-menu>li{float:left;width:33.333333%}.modal-dialog{width:900px;max-width:1360px;border:none;border-radius:0;-webkit-box-shadow:0 0 20px 0 rgba(0,0,0,.25);box-shadow:0 0 20px 0 rgba(0,0,0,.25)}.modal-dialog.modal-md{width:700px}.modal-dialog.modal-xs{width:400px}.modal-dialog.modal-sm{width:500px}.modal-dialog.modal-lg{width:1200px}.modal-dialog.modal-fullscreen{position:fixed;max-width:initial}.modal-header{padding:20px 0;margin:0 20px}.modal-header>.close{color:#838a9d;text-shadow:0 1px 0 rgba(255,255,255,.85);opacity:1}.modal-header>.close:hover{color:#0b0f18}.modal-footer{padding:20px 0;margin:0 20px}.modal-title{font-size:14px;font-weight:400;line-height:20px}.modal-actions{position:absolute;top:16px;right:16px}.modal-actions .divider{position:relative;top:5px;display:inline-block;width:0;height:20px;margin:0 10px;border-left:#eee 1px solid}.modal-actions>.dropdown{display:inline-block}.modal-body{padding:20px}.modal-iframe .modal-body>iframe{border-radius:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-3%);-ms-transform:translate(0,-3%);-o-transform:translate(0,-3%);transform:translate(0,-3%)}.modal.fade.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-simple .modal-footer{padding-top:0;border-top:none}.modal-iframe .modal-header{position:relative;z-index:10;min-height:0;padding:0;border:none}.modal-iframe .modal-title{display:none}.modal-iframe .modal-header .close{position:absolute;top:12px;right:10px;font-size:32px;font-weight:200}.modal-iframe .modal-dialog{overflow:hidden}.modal-inverse .modal-header>.close{color:rgba(255,255,255,.7);text-shadow:none}.modal-inverse .modal-header>.close:hover{color:#fff}.modal-scroll-inside>.modal-dialog{max-height:100%}.hide-modal-close .modal-iframe .modal-header .close{display:none}.tile{text-align:center}.tile-title{line-height:20px;color:#313c52}.tile-amount{font-size:32px;font-weight:700;line-height:56px}.timeline>li{position:relative;list-style:none}.timeline>li:before,.timeline>li>a:after,.timeline>li>div:after{position:absolute;left:-20px;display:block;width:15px;height:15px;content:' ';border-radius:50%}.timeline>li:before{top:12px;left:-16px;z-index:3;width:7px;height:7px;background-color:#c4c4c4;border:none;border:1px solid #c4c4c4}.timeline>li>a:after,.timeline>li>div:after{top:11px;left:-17px;z-index:3;width:9px;height:9px;background-color:#2e7fff;border-radius:50%;opacity:0}.timeline>li+li:after{position:absolute;top:-12px;bottom:20px;left:-13px;z-index:1;display:block;content:' ';border-left:1px solid #eee}.timeline>li.active>a:after,.timeline>li.active>div:after{opacity:1}.timeline>li.active:before{top:8px;left:-20px;width:15px;height:15px;background-color:rgba(46,127,255,.2);border:none}.timeline>li>a,.timeline>li>div{display:block;padding:5px;line-height:20px}.timeline>li.active>a{color:#313c52}.timeline-tag{position:absolute;top:5px;left:-115px;font-size:12px}.timeline-tag-left{padding-left:115px}.timeline-sm{font-size:12px}.timeline-sm>li:before,.timeline-sm>li>a:after,.timeline-sm>li>div:after{top:10px;left:-20px;width:11px;height:11px}.timeline-sm>li.active:before,.timeline-sm>li:before{top:10px;left:-18px;width:11px;height:11px;background:0 0;border:1px solid #eee}.timeline-sm>li>a,.timeline-sm>li>div{line-height:20px}.timeline-sm>li>a:after,.timeline-sm>li>div:after{top:13px;left:-15px;width:5px;height:5px}.form-control{-webkit-box-shadow:none;box-shadow:none}.form-horizontal .form-group>label{padding-right:0}.form-actions{margin-top:20px;margin-bottom:0}.form-actions .btn{margin-right:10px}form label{font-weight:400;color:#313c52}.form-group .btn+.btn{margin-left:5px}.table-form{margin-bottom:0;table-layout:fixed}.table-form>thead>tr>th.required:after{position:relative;top:3px;right:auto;left:4px;display:inline-block;vertical-align:middle}.table-form>tbody>tr>td,.table-form>tbody>tr>th,.table-form>tfoot>tr>td,.table-form>thead>tr>th{padding:7px;vertical-align:middle;border-bottom:none}.table-form>tfoot>tr>td{padding:20px 7px 10px}.table-form>tbody>tr>th{width:100px;font-weight:700;text-align:right}.table-form .input-group{width:100%}.chosen-container-single .chosen-single{position:relative}.chosen-container-single .chosen-single>span{height:20px;line-height:20px;word-break:break-all;white-space:normal}.chosen-container-single .chosen-single div b{position:relative;top:1px;color:#cbd0db;opacity:1}.chosen-container-single .chosen-search:before{top:8px;right:15px}.chosen-container-multi .chosen-choices li.search-choice{font-size:13px;background:#eee;border-color:#cbd0db;-webkit-box-shadow:none;box-shadow:none}.chosen-container-single .chosen-search input[type=text]{height:30px;padding:3px 25px 3px 5px}.chosen-container-single .chosen-search{padding:3px 10px 0}.chosen-container-single .chosen-single{overflow:visible}.chosen-container .chosen-results{max-height:245px;padding:10px}.chosen-container .chosen-results>li{border-radius:4px}.chosen-container .chosen-results li.highlighted em{color:#fff}.table-responsive .chosen-container .chosen-results{max-height:200px}.picker>.picker-selections>.picker-selection>.picker-selection-text{word-break:break-word}.chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li,.picker-drop-menu>.picker-option-list>.picker-option .picker-option-text{text-overflow:clip;white-space:nowrap!important}.picker-drop-menu>.picker-option-list>.picker-option .picker-option-text{display:block;overflow:hidden;word-break:break-word}.chosen-compact.chosen-container-single .chosen-single>.chosen-search{top:-2px;right:-1px;bottom:-1px;left:-1px;display:none;height:auto;padding:0;opacity:0}.chosen-compact.chosen-container-single .chosen-single>.chosen-search>input{height:31px;padding:5px 26px 5px 8px;font-size:inherit;line-height:20px}.chosen-compact.chosen-container-single .chosen-single>.chosen-search:before{right:8px}.datetimepicker{padding:10px}.datetimepicker td.day.today{background-color:#fc7272}.datetimepicker td.day.active{background-color:#18a6fd}.datetimepicker tfoot th,.datetimepicker thead th{color:#838a9d}.input-control .colorpicker{top:0;z-index:auto;opacity:1}.input-control .colorpicker .btn{padding:5px}.input-control .input-control-icon-right.btn{top:0}.colorpicker .dropdown-menu{min-width:232px;padding:5px 10px 10px 10px}.colorpicker .dropdown-menu>li{display:block;float:left;padding:5px}.colorpicker .dropdown-menu>li.heading{width:100%;margin-bottom:5px;font-size:16px;font-weight:700;text-align:left}.colorpicker .dropdown-menu>li.heading>.icon-close{position:relative;top:4px;float:right;cursor:pointer;opacity:.6}.colorpicker .dropdown-menu>li>a{position:relative;display:block;width:100%;height:100%;padding:0;margin:0;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;border:1px solid transparent;border-radius:50%;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.colorpicker .dropdown-menu>li>a:before{position:absolute;top:0;display:block;width:100%;height:20px;line-height:18px}.colorpicker .dropdown-menu>li>a:hover{-webkit-box-shadow:0 1px 4px rgba(0,0,0,.25);box-shadow:0 1px 4px rgba(0,0,0,.25)}.colorpicker .dropdown-menu>li>a.active:before{font-size:14px;content:"\e5ca"}.colorpicker .dropdown-menu>li>a.empty{color:#666;background:#fff}.colorpicker .dropdown-menu>li>a.empty:before{content:"\e90d"}.colorpicker .btn{position:relative}.colorpicker .btn .color-bar{position:absolute;right:5px;bottom:3px;left:5px;height:3px}.colorpicker .btn .color-bar[style*='background: ']+.ic{position:relative;top:-2px}.colorpicker .btn .ic{color:#cbd0db}.colorpicker .btn:hover .ic{color:#838a9d}.input-group .colorpicker{z-index:3}.input-group .chosen-container{display:table-cell}.input-group-addon{border-right-width:0;border-left-width:0}.input-group-addon:first-child{border-left-width:1px}.input-group-addon:last-child{border-right-width:1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin:0}.input-group-cell{display:table-cell;width:1%;padding:0 12px;white-space:nowrap;vertical-align:middle}.ke-container{border-color:#dcdcdc!important;border-radius:2px!important}.ke-container.focus{border-color:#2e7fff!important}.ke-toolbar{border-color:#dcdcdc!important}.required:after{top:6px;right:-10px;font-size:20px}td.required:after{top:12px;right:-5px}.input-group>.chosen-container.required:after,.input-group>.input-control.required:after{top:1px;right:1px;z-index:2}.input-group.required .required:after{display:none}.file-input{position:relative;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content}.file-input .input-group{width:auto}.file-input .input-group>.input-group-cell:first-child{padding-right:0;padding-left:7px}.file-input input[type=file]{position:absolute;width:0;height:0;opacity:0}.file-input .file-title{display:inline-block;max-width:400px;overflow:hidden;text-overflow:unset;white-space:nowrap;vertical-align:middle}.file-input .file-editbox{min-width:200px;max-width:100%}.file-input .file-size{display:inline-block;vertical-align:middle}.edit .file-input-empty,.file-input-edit,.file-input-normal,.normal .file-input-empty{display:none}.edit .file-input-edit,.normal .file-input-normal{display:block}.edit .file-input-edit.input-group,.normal .file-input-normal.input-group{display:table}.edit .file-input-normal{display:none!important}.file-input-normal>.input-group-btn{width:auto}.input-group .chosen-container-active .chosen-choices{border-color:#2e7fff!important}.input-group .chosen-container{min-width:100px}.input-group .input-group-btn .btn>.icon{line-height:17px}.os-mac select.form-control{-webkit-appearance:none;background-image:url(data:image/gif;base64,R0lGODlhCQAFAIAAAMvQ2////yH5BAEAAAEALAAAAAAJAAUAAAIKhH+BGYoNGWxgFgA7);background-image:url(data:image/gif;base64,R0lGODlhBwAEAIAAAMvQ2////yH5BAEAAAEALAAAAAAHAAQAAAIIhA+BGWoNWSgAOw==);background-repeat:no-repeat;background-position:right 5px top 12px;-moz-appearance:none}input::-webkit-contacts-auto-fill-button{position:absolute;right:0;display:none!important;pointer-events:none;visibility:hidden}.chosen-choices.has-error,.chosen-single.has-error,.form-control.has-error{border-color:#fc5959!important;-webkit-box-shadow:0 0 6px #febdbd!important;box-shadow:0 0 6px #febdbd!important}.popover-success.popover-form-result{font-weight:700;color:#fff;background:#22c98d}.popover-success.popover-form-result.popover.right .arrow:after{border-right-color:#22c98d}textarea.kindeditor{padding:0!important}.form-unsaved{outline:2px solid #ff9f46;-webkit-box-shadow:0 1px 12px #ff9f46;box-shadow:0 1px 12px #ff9f46;-webkit-transition:all .5s;-o-transition:all .5s;transition:all .5s}select[multiple].picker-select,select[multiple][data-toggle=picker]{max-height:32px;visibility:hidden}.picker-selection-remove:before{font-size:18px}.picker-user-option{position:relative;padding-left:40px}.picker-user-option>.avatar{position:absolute;top:5px;left:10px}.picker-user-option>.picker-option-text{display:inline-block;min-width:40px;font-weight:700}.picker-user-option>.dept-name,.picker-user-option>.role-name{display:inline-block;margin-left:10px;font-size:12px;opacity:.6}.picker-user-option>.dept-name{min-width:50px}#mainHeader{height:50px;color:#fff;background:#3785ff;border-top-color:#2e7fff;border-bottom-color:#e6f0ff}#mainHeader>.container{min-width:1200px;padding:0}#heading{position:absolute;top:10px;left:20px}@media (min-width:1400px){#heading{left:40px}}#heading h1{float:left;max-width:250px;margin:0;overflow:hidden;font-size:20px;font-weight:400;line-height:30px;text-overflow:unset;white-space:nowrap}#heading h1 a{color:inherit;text-decoration:inherit}#heading h1.long-name{position:relative;top:-5px;display:table-cell;font-size:16px;line-height:20px;word-break:break-all;white-space:normal}#heading>.btn{display:block;float:left;height:20px;padding:1px 5px;margin:0;margin:5px 0 0 10px;font-size:12px;font-weight:lighter;line-height:18px;background-color:rgba(255,255,255,.2);border:none}#heading>.btn:hover{background-color:rgba(0,0,0,.1)}#navbar{margin:0 auto;text-align:center}#navbar .nav{display:inline-block}#navbar .nav>li>a{padding:10px;line-height:30px;color:#fff;border-radius:0;opacity:.9}@media (max-width:1400px){#navbar .nav>li>a{padding:10px 8px}}#navbar .nav>li>a:focus,#navbar .nav>li>a:hover{background:rgba(0,0,0,.15);opacity:1}#navbar .nav>li.active>a{font-weight:700;background:rgba(0,0,0,.1);opacity:1}#navbar .nav>li.divider{display:block;width:2px;height:20px;margin:15px 8px;background:rgba(255,255,255,.4)}@media (max-width:1400px){#navbar .nav>li.divider{margin:15px 5px}}@media (max-width:1300px){#navbar .nav>li.divider{margin:15px 3px}}#navbar .nav>li.divider:last-child{display:none}#navbar .nav .dropdown-menu li>a{text-align:left}#toolbar{position:absolute;top:12px;right:20px;font-size:12px;color:#fff}@media (min-width:1400px){#toolbar{right:40px}}#extraNav{text-align:right}#extraNav>li{display:inline-block;float:none;text-align:left}#extraNav>li>a{display:block;padding:0;color:#fff;opacity:.75}#extraNav>li>a:hover{text-decoration:unset;background-color:rgba(0,0,0,.1);opacity:1}#extraNav>li.open>a{background-color:rgba(0,0,0,.1)}#extraNav>li+li{margin-left:10px}#showSearchGo{color:#fff;background:rgba(255,255,255,.1);border:1px solid rgba(255,255,255,.5)}#searchbox{position:relative;float:left;width:150px}#searchbox .input-group-btn .btn{position:relative;padding:1px 4px;font-size:12px;line-height:20px;color:#fff;background-color:rgba(255,255,255,.15);border-right:none;border-radius:2px}#searchbox .input-group-btn .btn:after{position:absolute;top:3px;right:0;bottom:3px;display:block;width:1px;content:' ';background-color:rgba(255,255,255,.15)}#searchbox .input-group-btn .btn:hover{background-color:rgba(255,255,255,.25)}#searchGo{position:absolute;top:0;right:-1px;z-index:9;min-width:24px;height:24px;padding:2px 3px;font-size:12px;line-height:20px;color:#fff;background-color:#18a6fd;border-radius:2px}#searchGo:hover{color:#fff!important;background-color:#2e7fff}#searchInput{height:24px;padding:2px 30px 2px 5px;color:#fff;text-align:left;background:rgba(255,255,255,.15);border-color:transparent;border-radius:0 12px 12px 0;-webkit-transition:background .2s,border .2s;-o-transition:background .2s,border .2s;transition:background .2s,border .2s}#searchInput:hover{background:rgba(255,255,255,.25)}#searchInput:focus{color:#333;background:#fff}#searchInput::-webkit-input-placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput::-moz-placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput:-ms-input-placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput::placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput:focus::-webkit-input-placeholder{color:#838a9d}#searchInput:focus::-moz-placeholder{color:#838a9d}#searchInput:focus:-ms-input-placeholder{color:#838a9d}#searchInput:focus::placeholder{color:#838a9d}#searchTypeMenu{min-width:220px}#searchTypeMenu>li{float:left;width:50%}#searchTypeMenu>li>a{margin:4px 0}#userNav .avatar{display:inline-block;vertical-align:middle}#userNav>li>a{padding:2px 6px;line-height:20px;color:#fff;opacity:.9}#userNav>li>a .user-name{max-width:100px;overflow:hidden;font-size:15px;text-overflow:unset;white-space:nowrap}#userNav>li>a:hover{background-color:rgba(0,0,0,.1);opacity:1}#userNav>li>a:hover>i{opacity:1}#userNav>li>a span{vertical-align:middle}#userNav>li.open>a{background-color:rgba(0,0,0,.1)}#userNav>li.has-new-items>a{position:relative}#userNav>li.has-new-items>a:before{position:absolute;top:3px;right:-1px;display:block;width:4px;height:4px;content:' ';background-color:#fc5959;border-radius:50%}#userNav .dropdown-menu{min-width:150px}#userNav .dropdown-menu>li>a>.icon{position:absolute;top:10px;right:5px;display:block;width:20px;height:20px;line-height:20px;text-align:center}#userNav .user-profile-item>a{position:relative;padding-left:45px}#userNav .user-profile-item .avatar{position:absolute;top:6px;left:5px}#userNav .user-profile-name{font-size:16px}#userNav .user-profile-role{font-size:12px;color:#a9abb8}#userNav .no-role .user-profile-role{display:none}#userNav .no-role .user-profile-name{line-height:40px}#subHeader{min-height:50px;background:#fff}#subHeader>.container{padding:0 20px}@media (min-width:1400px){#subHeader>.container{padding:0 40px}}#subHeader.admin-tab-menu{margin-bottom:-15px;background:unset}#subHeader.admin-tab-menu>.container>#subNavbar{text-align:left}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a{color:unset}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a:after{position:absolute;content:'';border-bottom:2px solid #2e7fff;inset:0 12px}#pageNav{position:absolute;top:8px;left:0;left:20px}@media (min-width:1400px){#pageNav{left:40px}}#subNavbar{margin-top:5px;font-size:13px;text-align:center}#subNavbar .nav{display:inline-block}#subNavbar .nav>li>a{padding:8px 12px;line-height:24px;color:#313c52}#subNavbar .nav>li>a:hover{color:#313c52;background-color:rgba(0,0,0,.075)}#subNavbar .nav>li.active>a{font-weight:700;color:#2e7fff}#subNavbar .nav>li.divider{display:block;width:2px;height:20px;margin:9px 5px;background-color:rgba(0,0,0,.05)}#subNavbar .dropdown-menu{text-align:left}[lang=en] #subNavbar>.nav>li>a{padding-right:8px;padding-left:8px}#pageActions{position:absolute;top:9px;right:20px}@media (min-width:1400px){#pageActions{right:40px}}.cell{padding:10px;background-color:#fff;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.cell+.cell{margin-top:10px}.cell>.panel{margin:0;-webkit-box-shadow:none;box-shadow:none}.cell>.panel>.panel-heading{padding:5px 5px 10px}.cell>.panel>.panel-heading .panel-actions{padding:0}.cell>.panel>.panel-body{padding:5px}.cell>.table{margin:0}#main{min-width:1200px;padding:20px 0}#main>.container{padding:0 20px}@media (min-width:1400px){#main>.container{padding:0 40px}}#header,#header+#main{min-width:1200px}#mainMenu{margin:-10px 0 8px}.main-content{padding:20px;background-color:#fff;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}@media (min-width:1400px){.main-content>.center-block{max-width:1350px;padding:20px;border:1px solid #eee}.main-content>.center-block .main-header{background-color:#f1f1f1}}.main-content>h2{margin:0 0 20px}.main-content .cell{-webkit-box-shadow:none;box-shadow:none}.main-header{padding:5px 20px;border-bottom:1px solid #eee}.main-header:after,.main-header:before{display:table;content:" "}.main-header:after{clear:both}.main-header>h2{display:block;float:left;margin:0 10px 0 0;font-size:14px;line-height:34px}.main-header>h2 .label-id{margin-right:5px}.main-header>h2 small{font-size:14px;font-weight:400}.main-content .main-header{margin:-20px -20px 10px}.main-header .label{top:-1px}.main-row{display:table;width:100%;table-layout:fixed}.main-row>[class*=" col-"],.main-row>[class*="-col"],.main-row>[class^=col-]{display:table-cell;vertical-align:top}@media (max-width:720px){.main-row{display:block}.main-row>*{display:block;width:100%}.main-row .side-col{width:100%;padding:0}.main-row .main-col+.side-col,.main-row .side-col+.main-col{margin-top:10px}}.main-row.hide-side .side-col{display:none}.main-form{margin:0}@media (min-width:720px){.main-content>.center-block .main-form{padding-right:20px}}#main .side-col .tabs{padding:5px}#main .side-col .nav-tabs{margin:0 5px 5px 5px}#main .side-col .nav-tabs>li{margin:0}#main .side-col .nav-tabs>li+li{margin-left:10px}#main .side-col .nav-tabs>li>a{padding:8px 5px}#main .side-col .tab-content .tab-pane table{border:none}.main-actions .btn-toolbar{display:inline-block;padding:4px 15px;color:#fff;pointer-events:auto;background:#717171;background-color:rgba(90,90,90,.85);border-radius:4px}.main-actions .btn-toolbar .divider{margin-right:15px;margin-left:15px;border-color:rgba(255,255,255,.1)}.main-actions .btn-toolbar .btn{height:30px;padding-right:10px;padding-left:10px;margin-right:0;color:#fff;background-color:transparent;border:none}.main-actions .btn-toolbar .btn+.btn{margin-left:10px}.main-actions .btn-toolbar .btn:focus,.main-actions .btn-toolbar .btn:hover{background-color:rgba(255,255,255,.2)}.main-actions .btn-toolbar .btn.btn-icon{min-width:32px;padding-right:0;padding-left:0}.main-actions .btn-toolbar .btn+.btn-group{margin-right:0;margin-left:10px}#mainContent .main-col>.main-actions{padding:30px 0 0 0;text-align:center}#mainContent .main-col>.main-actions>.btn-toolbar{visibility:visible;opacity:1;-webkit-transition:opacity .2s;-o-transition:opacity .2s;transition:opacity .2s}#mainActions{position:fixed;top:0;right:0;bottom:0;left:0;text-align:center;pointer-events:none}#mainActions .btn-toolbar{position:relative;top:-90px}#mainActions .dropdown-menu{text-align:left}#mainActions>.container{height:100%}.main-actions-holder{display:none}.main-actions-fixed .main-actions-holder{display:block}.main-actions-fixed #mainContent .main-col>.main-actions{position:fixed;bottom:10px}.main-actions-fixed.body-modal #mainContent .main-col>.main-actions{bottom:20px}#nextPage,#prevPage{position:absolute;top:50%;left:-10px;width:40px;height:60px;padding:10px 0;margin-top:-30px;line-height:40px;color:#fff;text-align:center;pointer-events:auto;background:#717171;background-color:rgba(90,90,90,.85);-webkit-box-shadow:0 2px 15px 2px rgba(0,0,0,.05);box-shadow:0 2px 15px 2px rgba(0,0,0,.05)}#nextPage:hover,#prevPage:hover{-webkit-box-shadow:0 2px 15px 2px rgba(0,0,0,.15);box-shadow:0 2px 15px 2px rgba(0,0,0,.15)}#nextPage>i,#prevPage>i{display:block;font-size:18px;line-height:36px}#nextPage{right:-10px;left:auto}@media (max-width:1800px){#prevPage{left:-3px}#nextPage{right:-3px}}#sidebarHeader{position:relative;float:left;width:180px;height:34px;padding-right:20px;margin-right:20px;background:#fff;border-left:4px solid #2e7fff;border-radius:4px 2px 2px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}#sidebarHeader:after{position:absolute;top:-1px;right:-8px;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #fff;border-style:solid;border-width:18px 0 18px 8px}#sidebarHeader .title{padding:0 5px;overflow:hidden;font-size:14px;font-weight:700;line-height:32px;color:#2e7fff;text-align:center;text-overflow:unset;white-space:nowrap}#sidebarHeader .title>a{position:absolute;top:0;right:0;width:20px;opacity:.5}#sidebarHeader .title>a:hover{opacity:1}#sidebar{position:relative;-webkit-transition:width .2s,padding .2s;-o-transition:width .2s,padding .2s;transition:width .2s,padding .2s}#sidebar>.sidebar-toggle{position:absolute;top:0;right:5px;bottom:0;width:10px;cursor:pointer;background:0 0;border-radius:5px;-webkit-transition:background-color .2s,opacity .5s;-o-transition:background-color .2s,opacity .5s;transition:background-color .2s,opacity .5s}#sidebar>.sidebar-toggle>.icon{position:absolute;top:50%;left:-1px;width:12px;height:30px;margin-top:-10px;line-height:30px;color:#fff;text-align:center;background:#7dcdfe;border-radius:6px}#sidebar>.sidebar-toggle>.icon:before{position:relative;left:-1px}#sidebar>.sidebar-toggle:before{position:absolute;top:0;right:-5px;bottom:0;left:-5px;display:block;content:' '}#sidebar>.sidebar-toggle:hover{background:rgba(0,0,0,.075)}#sidebar>.cell{position:relative;left:0;width:180px;-webkit-transition:left .2s,opacity .2s;-o-transition:left .2s,opacity .2s;transition:left .2s,opacity .2s}#sidebar.no-animate>.cell{display:none;-webkit-transition:none;-o-transition:none;transition:none}.hide-sidebar #sidebar>.cell{position:absolute;left:-200px;visibility:hidden;opacity:0}.hide-sidebar #sidebar{position:relative;width:0;padding:0}.hide-sidebar #sidebar>.sidebar-toggle>.icon:before{content:"\e315"}@media (max-width:720px){#sidebar>.cell{width:100%}}#queryBox{max-height:0;padding:0;overflow:hidden;-webkit-transition:cubic-bezier(.175,.885,.32,1) .2s;-o-transition:cubic-bezier(.175,.885,.32,1) .2s;transition:cubic-bezier(.175,.885,.32,1) .2s;-webkit-transition-property:padding,max-height,margin;-o-transition-property:padding,max-height,margin;transition-property:padding,max-height,margin}#queryBox>form{visibility:hidden;-webkit-transition:visibility .2s .2s;-o-transition:visibility .2s .2s;transition:visibility .2s .2s}#queryBox.loading{height:50px}#queryBox.show{min-height:110px;max-height:300px;margin-bottom:10px;overflow:visible}#queryBox.show>form{visibility:visible}#queryBox.divider{border-bottom:1px solid #eee}#main .querybox-toggle.querybox-opened{position:relative;color:#2e7fff;background:0 0;border:none}#main .querybox-toggle.querybox-opened:before{position:absolute;bottom:-14px;left:50%;width:0;height:0;content:' ';border-color:transparent transparent #fff transparent;border-style:solid;border-width:0 10px 10px 10px}#contentNav{padding:5px;background:#fff;border-bottom:1px solid #eee}#contentNav .nav>li>a{position:relative;padding:6px 10px;color:#838a9d}#contentNav .nav>li.active>a{font-weight:700;color:#2e7fff}#contentNav .nav>li.active>a:before{position:absolute;right:10px;bottom:3px;left:10px;display:block;height:2px;content:' ';background:#2e7fff}.body-modal{padding-bottom:0}.body-modal #main,.body-modal .container{min-width:0!important}.body-modal #main{padding:0}.body-modal .main-header{position:fixed;top:0;right:20px;left:20px;z-index:100;padding:13px 48px 13px 0;margin:0;background:#fff}.body-modal #mainContent{padding-top:70px}.body-modal .main-header>h2{max-width:100%;overflow:hidden;font-size:14px;text-overflow:unset;white-space:nowrap}.body-modal .cell,.body-modal .main-content{-webkit-box-shadow:none;box-shadow:none}.body-modal #mainMenu{position:fixed;top:0;right:0;left:0;z-index:100;padding:12px 60px 12px 10px;margin:0;background:#fff}.body-modal #mainMenu>.btn-toolbar.pull-left.divider{display:none}.body-modal #mainMenu>.btn-toolbar{width:100%;margin-left:20px}.body-modal #mainMenu>.btn-toolbar>.divider:first-child{display:none}.body-modal #mainMenu>.btn-toolbar .page-title{width:100%;margin-left:0}.body-modal #mainMenu>.btn-toolbar .page-title>.text{position:relative;top:-2px;display:inline-block;max-width:85%;max-width:-webkit-calc(100% - 100px);max-width:calc(100% - 100px);overflow:hidden;text-overflow:unset;white-space:nowrap;vertical-align:middle}.body-modal #mainMenu+#mainContent.main-row{padding:60px 10px 0}.body-modal #mainMenu+#mainContent.main-row .cell{border:1px solid #efefef;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.body-modal #mainActions{top:auto}.body-modal #mainActions .btn-toolbar{top:auto;bottom:10px}.body-modal.m-bug-view,.body-modal.m-story-view,.body-modal.m-task-view,.body-modal.m-testcase-view,.body-modal.m-testtask-view,.body-modal.m-todo-view{padding-bottom:20px;border-radius:3px}#tabsNav{position:relative}#tabsNav .tab-pane>.actions{position:absolute;top:-8px;right:0}#tabsNav .tab-pane>.cell,#tabsNav .tab-pane>.main-table{padding:0;border:1px solid #c4c4c4;border-top:none;border-radius:0 0 4px 4px}#tabsNav .tab-pane>.cell .detail-title{padding-left:5px}#helpContent{position:fixed;top:50px;right:0;bottom:40px;left:0;display:none;background-color:#fff}#helpContent .load-error{display:none;padding:20px}#helpContent .show-error .load-error{display:block}#mainMenu>.btn-toobar .btn-link .label-light,#mainMenu>.btn-toolBar .btn-link .label-light,#mainMenu>.btn-toolbar .btn-link .label-light{color:#313c52;background:#fff}#mainMenu>.btn-toobar .btn-active-text,#mainMenu>.btn-toolBar .btn-active-text,#mainMenu>.btn-toolbar .btn-active-text{color:#1e6aeb;background:#e6eaf1}#mainMenu>.btn-toobar .btn-active-text .text,#mainMenu>.btn-toolBar .btn-active-text .text,#mainMenu>.btn-toolbar .btn-active-text .text{top:0}#mainMenu>.btn-toobar .btn-active-text .text:after,#mainMenu>.btn-toolBar .btn-active-text .text:after,#mainMenu>.btn-toolbar .btn-active-text .text:after{border:none}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text{position:relative;font-size:14px;color:unset;background:unset}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text>span{color:unset}#mainMenu.menu-secondary>.btn-toolbar>a.btn{margin-right:10px}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text:after{position:absolute;content:'';border-bottom:2px solid #2e7fff;inset:0 6px}#menu{background:#415a72}#userNav>li>a>.icon{color:#fff;filter:none;opacity:.25;-webkit-filter:none}.picker-option.picker-option-active,.picker-single .picker-option.picker-option-selected.picker-option-active{background:#2e7fff}select.form-control option.selected,select.form-control option:hover{background:#2e7fff}#guideDialog .project-type-img:hover,#guideDialog .project-type.active img,.kanbans .panel:hover{border-color:#2e7fff}#dashboard .block-welcome .progress{background:#edeef2}#dashboard .block-welcome .progress>.progress-bar{background:#3785ff}#assigntomeBlock .nav>li.active>a{color:#1e6aeb}.consumedTotally{color:#2e7fff;background:#e6f0ff}#toggleFoldIcon .icon-border{border:1px solid #d5e5ff}#createEffort .table tbody .date-group .input-group-addon .icon,#recordForm .table tbody .date-group .input-group-addon .icon,#toggleFoldIcon{color:#2e7fff}.shadow-primary-hover:hover{-webkit-box-shadow:0 0 1px 1px #2e7fff;box-shadow:0 0 1px 1px #2e7fff}.border-primary-hover:hover{border:1px solid #2e7fff}.menu-hover-primary>li>a:hover{color:#1e6aeb!important;background-color:#d5e5ff!important}.menu-active-primary>li.active>a{color:#2e7fff!important;background-color:unset}.menu-active-primary>li.disabled>a:hover{color:#c4c4c4!important;background-color:unset!important}.bg-primary-100{background-color:#d5e5ff!important}.form-active-primary .active .label,.form-active-primary .hover .label{color:#2e7fff!important}.form-active-primary .active .form-control,.form-active-primary .hover .form-control{-webkit-box-shadow:0 0 1px 1px #2e7fff;box-shadow:0 0 1px 1px #2e7fff}.text-middle td,.text-middle th{vertical-align:middle}.text-center td,.text-center th{text-align:center}.c-sm{width:40px}.c-id{width:90px}.c-id-sm{width:70px}.c-id-xs{width:55px}.c-date{width:100px}.c-num,.c-pri,.c-type{width:80px;overflow:hidden}.c-begin,.c-end,.c-time{width:65px}.c-hours{width:60px}.c-actions-1{width:50px}.c-actions-2{width:75px}.c-actions-3{width:102px}.c-actions,.c-actions-4{width:128px}.c-actions-5{width:155px}.c-actions-6{width:180px}.c-product,.c-project{width:180px}.c-plan{width:130px}.c-datetime{width:120px}.c-stage,.c-status,.c-user{width:80px}.c-side{width:200px;border-right:10px solid #efefef}.c-assign,.c-assignedTo,.c-openedBy{width:130px}.c-progress{width:155px}.c-assign,.c-assignedTo,.c-openedBy,.c-product,.c-project,.c-status,.c-url,.c-user{overflow:hidden;text-overflow:unset;white-space:nowrap}.assigned-none{color:#1e6aeb!important;background:inherit}.assigned-current{color:#f38f19!important;background:inherit}.assigned-other{color:#313c52!important;background:inherit}a.assigned-current:hover,a.assigned-none:hover,a.assigned-other:hover{color:#1e6aeb!important;background:#fff;border-color:#fff!important}a.assigned-current:hover .icon,a.assigned-none:hover .icon,a.assigned-other:hover .icon{color:#1e6aeb!important}td.c-name,td.c-title{overflow:hidden;text-align:left!important;text-overflow:unset;white-space:nowrap}td.c-actions{position:relative;padding-top:0;padding-bottom:0;overflow:hidden;text-overflow:unset;white-space:nowrap;vertical-align:middle}td.c-actions .btn-link{color:#313c52;background:0 0}td.c-actions .btn-link:hover{color:#2e7fff;background:#e6f0ff}td.c-actions .btn.disabled,td.c-actions .btn[disabled]{pointer-events:auto}td.c-actions .more{position:absolute;top:50%;right:100%;display:none;padding-right:4px;padding-left:20px;margin-top:-15px;margin-right:-6px;white-space:nowrap;background-color:#fafafa;-webkit-transition:opacity .3s,margin .3s;-o-transition:opacity .3s,margin .3s;transition:opacity .3s,margin .3s}tr:hover td.c-actions .more{display:block}td:hover+td.c-actions>.more{margin-right:-15px;pointer-events:none;opacity:.15}tr[data-url]{cursor:pointer}.table tbody>tr>td,.table thead>tr>th{vertical-align:middle}.table tbody>tr>td.has-btn,.table thead>tr>th.has-btn{padding-top:1px;padding-bottom:1px;overflow:visible}.table tbody>tr>td .progress,.table thead>tr>th .progress{height:6px}.table .em,.table em{color:#313c52}.table .divider{border-bottom:10px solid #efefef}.table .divider-top{border-top:10px solid #efefef}.table .btn-icon-left{max-width:100%;padding-left:20px;overflow:hidden;line-height:18px;text-align:left;text-overflow:unset;background:0 0;border-color:#eaf3fc}.table .btn-icon-left>.icon{width:20px;font-size:14px;background:0 0!important;opacity:0}.table .btn-icon-left.btn-sm{height:26px;font-size:13px}.table .btn-icon-left:active,.table .btn-icon-left:focus,.table .btn-icon-left:hover{border-color:rgba(0,0,0,.2)}.table .btn-icon-left:active>.icon,.table .btn-icon-left:focus>.icon,.table .btn-icon-left:hover>.icon{opacity:1}.table .btn-icon-left>.text{padding-left:25px}.table thead>tr>th.c-assign,.table thead>tr>th.c-assignedTo{padding-left:29px}.table a{vertical-align:middle}.table caption{margin-bottom:5px;background:#f1f1f1;border:none}.is-firefox .table .btn-icon-left>.icon{line-height:22px}.table tbody>tr>td.c-name a{color:#2463c7}.table tbody>tr>td.c-name a:hover{color:#1e6aeb}.table.table-data tbody>tr:hover,.table.table-form tbody>tr:hover{background:0 0}.main-table{border-radius:4px}.main-table>.table,.main-table>.table-footer,.main-table>.table-header,.main-table>.table-responsive{-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.main-table .table{font-size:13px;table-layout:fixed;background-color:#fff;border-radius:4px 4px 0 0}.main-table .table.table-lg{font-size:14px}.main-table .table .btn-icon-left{border-color:transparent}.main-table .table .btn-icon-left>.icon{background:0 0;border-radius:4px}.main-table .table .btn-icon-left.btn-sm{height:26px}.main-table .table .btn-icon-left:hover{border-color:rgba(0,0,0,.2)}.main-table .table .btn-icon-left:hover>.icon{background:#e6f0ff;border-radius:4px 0 0 4px}.main-table tbody>tr>td,.main-table thead>tr>th{min-height:36px;padding:2px 8px;line-height:30px}.main-table tbody>tr>td:first-child,.main-table thead>tr>th:first-child{padding-right:4px;padding-left:15px}.main-table thead>tr>th{overflow:hidden;text-overflow:unset;white-space:nowrap}.main-table td,.main-table th{border-bottom:none!important}.main-table thead>tr{background:#fcfdfe;border-bottom:1px solid #f4f5f7}.main-table tbody>tr:last-child>td{border-bottom:1px solid #ddd}.main-table tbody>tr>td{position:relative}.main-table tbody>tr>td .label{max-width:200px;overflow:hidden;text-overflow:unset;white-space:nowrap}.main-table tbody>tr>td>a{line-height:28px;color:#2463c7}.main-table tbody>tr>td>a:not(.btn):visited{color:#003994;opacity:.9}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover{color:#2e7fff}.main-table tbody>tr>td.c-actions{padding-right:10px}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{position:absolute;top:0;bottom:0;left:0;display:block;width:0;content:'';background:#2e7fff;opacity:0;-webkit-transition:.2s linear;-o-transition:.2s linear;transition:.2s linear;-webkit-transition-property:width,opacity,border-radius;-o-transition-property:width,opacity,border-radius;transition-property:width,opacity,border-radius}@-moz-document url-prefix(){.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{bottom:-1px}}.main-table tbody>tr>td.c-side:before{display:none}.main-table tbody>tr>td.c-name a{color:#2463c7}.main-table tbody>tr>td.c-name a:hover{color:#1e6aeb}.main-table tbody>tr{border-bottom:1px solid #f4f5f7;-webkit-transition:.2s cubic-bezier(.175,.885,.32,1);-o-transition:.2s cubic-bezier(.175,.885,.32,1);transition:.2s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:background-color,-webkit-box-shadow;-o-transition-property:box-shadow,background-color;transition-property:background-color,-webkit-box-shadow;transition-property:box-shadow,background-color;transition-property:box-shadow,background-color,-webkit-box-shadow}.main-table tbody>tr:hover{background:rgba(230,240,255,.8)}.main-table .table-grouped tbody>tr:hover{background:#f0f6ff;-webkit-box-shadow:none;box-shadow:none}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f0f6ff}.main-table tbody>tr.checked{background:#fff4ea}.main-table tbody>tr.checked:hover{background:#ffe6c6}.main-table tbody>tr.checked>td.c-side+td:before,.main-table tbody>tr.checked>td:first-child:before{width:4px;opacity:1}.main-table tbody>tr.checked.row-check-begin{border-top-left-radius:4px;border-top-right-radius:2px}.main-table tbody>tr.checked.row-check-begin>td:first-child:before{border-top-left-radius:4px}.main-table tbody>tr.checked.row-check-end{border-bottom-right-radius:2px;border-bottom-left-radius:4px}.main-table tbody>tr.checked.row-check-end>td:first-child:before{border-bottom-left-radius:4px}.main-table .checkbox-primary{display:inline-block;line-height:20px}.main-table .checkbox-primary label{margin:0}.main-table .table{margin:0}.table-header{padding:4px 0 12px}.table-header .table-statistic{color:#838a9d}.table-header .table-statistic strong{font-size:15px;color:#313c52}.table-header .btn-toolbar{margin-top:-28px}.table-header.fixed-right{position:relative;z-index:5;padding:0}.table-header.fixed-right>.btn-toolbar{position:absolute;top:0;right:1px;z-index:1;padding:1px;margin:0;background:#fff;border-radius:4px}.table-header.fixed-right>.btn-toolbar .btn{opacity:.65}.table-header.fixed-right>.btn-toolbar .btn:hover{opacity:1}.table-header-fixed .table-header{position:fixed;top:0}.table-header-fixed .table-header>.btn-toolbar{background-color:transparent}.table-header-fixed .table-header>.btn-toolbar .btn{color:#fff}.table-footer{position:relative;min-height:40px;padding:6px 15px;background:#fff;border-radius:0 0 4px 4px}.body-modal .table-footer{margin-bottom:20px}.talbe-lg+.table-footer{padding:11px 15px}.table-footer .btn-toolbar,.table-footer .checkbox-primary{float:left}.table-footer .btn-toolbar+.btn-toolbar{margin-left:8px}.table-footer .checkbox-primary{margin:5px 20px 0 0}.table-footer .checkbox-primary.checked label:after{border-color:#22c98d!important}.table-footer .btn{padding:3px 10px;line-height:20px}.table-footer .pager{position:absolute;top:0;right:0;z-index:5;height:40px;padding:6px 5px 6px 10px;margin:0;background:#fff;opacity:1;-webkit-transition:opacity .4s;-o-transition:opacity .4s;transition:opacity .4s}.table-footer .pager:before{position:absolute;top:0;bottom:0;left:-50px;display:block;width:50px;content:' ';background:-webkit-gradient(linear,left top,right top,from(rgba(255,255,255,0)),to(#fff));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,#fff 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,#fff 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,#fff 100%)}.table-footer .pager .btn,.table-footer .pager>li>.pager-item,.table-footer .pager>li>.pager-label{color:#838a9d;background:0 0;border-color:transparent}.table-footer .pager .btn,.table-footer .pager>li>a{border-radius:3px}.table-footer .pager .btn:hover,.table-footer .pager>li>a:hover{background:rgba(0,0,0,.1)}.table-footer .pager>li.disabled>a.pager-item{opacity:1}.table-footer .form-control{height:28px;padding:3px 8px}.table-footer .table-statistic{position:relative;z-index:2;float:left;padding-right:30px;line-height:28px;color:#838a9d;background:#fff}.table-footer .table-statistic:hover{z-index:4}.table-footer .table-statistic:hover+.pager{z-index:2;opacity:.3}.table-footer .btn-toolbar+.table-statistic,.table-footer .btn-toolbar+.text{margin-left:10px}.table-footer .text{float:left;line-height:28px}.table-footer.fixed-footer{position:fixed;z-index:10;margin:0;background:rgba(75,75,75,.85);border-top-color:transparent}.table-footer.fixed-footer .checkbox-primary label{color:#fff}.table-footer.fixed-footer .checkbox-primary label:after{border-color:rgba(255,255,255,.8)}.table-footer.fixed-footer .table-statistic{color:#fff;background:0 0}.table-footer.fixed-footer .pager{background:#666}.table-footer.fixed-footer .pager:before{background:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,0)),to(#666));background:-webkit-linear-gradient(left,rgba(0,0,0,0) 0,#666 100%);background:-o-linear-gradient(left,rgba(0,0,0,0) 0,#666 100%);background:linear-gradient(to right,rgba(0,0,0,0) 0,#666 100%)}.table-footer.fixed-footer .pager .btn,.table-footer.fixed-footer .pager>li>.pager-item,.table-footer.fixed-footer .pager>li>.pager-label{color:#fff}.table-footer.fixed-footer .pager .btn:hover,.table-footer.fixed-footer .pager>li>a:hover{background:rgba(255,255,255,.3)}.table-footer.fixed-footer .pager>li.disabled>a.pager-item{opacity:.5}.table-actions{display:none;height:28px}.table-actions.show-always{display:block;pointer-events:none;cursor:not-allowed}.has-row-checked .table-actions{display:block;pointer-events:auto!important;cursor:default}.table-lg tbody>tr>td{padding:9px 10px}.table-lg tbody>tr>td .btn+.btn{margin-left:5px}.table.has-sort-head thead>tr>th{padding-right:0}.table.has-sort-head thead>tr>th>a{position:relative;display:inline-block;padding-right:16px;color:#313c52}.table.has-sort-head thead>tr>th>a:after,.table.has-sort-head thead>tr>th>a:before{position:absolute;top:0;right:0;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:30px;color:#313c52;text-transform:none;content:"\f0de";opacity:.5;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.table.has-sort-head thead>tr>th>a:after{content:"\f0dd"}.table.has-sort-head thead>tr>th>a.sort-down,.table.has-sort-head thead>tr>th>a.sort-up{color:#000;text-decoration:none}.table.has-sort-head thead>tr>th>a:hover,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#2e7fff;opacity:1}.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before{color:#000;opacity:1}.head-fixed .datatable-head-span .table,.table.fixed-header-copy{z-index:10;color:#fff;background:rgba(75,75,75,.85)}.head-fixed .datatable-head-span .table thead>tr,.table.fixed-header-copy thead>tr{background:0 0}.head-fixed .datatable-head-span .table thead>tr>th,.table.fixed-header-copy thead>tr>th{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>a,.table.fixed-header-copy thead>tr>th>a{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover{color:#fff}.head-fixed .datatable-head-span .table thead>tr>th>a:after,.head-fixed .datatable-head-span .table thead>tr>th>a:before,.table.fixed-header-copy thead>tr>th>a:after,.table.fixed-header-copy thead>tr>th>a:before{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>a.sort-down,.head-fixed .datatable-head-span .table thead>tr>th>a.sort-down:after,.head-fixed .datatable-head-span .table thead>tr>th>a.sort-up,.head-fixed .datatable-head-span .table thead>tr>th>a.sort-up:before,.head-fixed .datatable-head-span .table thead>tr>th>a:hover,.head-fixed .datatable-head-span .table thead>tr>th>a:hover:after,.head-fixed .datatable-head-span .table thead>tr>th>a:hover:before,.table.fixed-header-copy thead>tr>th>a.sort-down,.table.fixed-header-copy thead>tr>th>a.sort-down:after,.table.fixed-header-copy thead>tr>th>a.sort-up,.table.fixed-header-copy thead>tr>th>a.sort-up:before,.table.fixed-header-copy thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover:after,.table.fixed-header-copy thead>tr>th>a:hover:before{color:#fff}.head-fixed .datatable-head-span .table thead>tr>th>.dropdown>a,.table.fixed-header-copy thead>tr>th>.dropdown>a{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>.dropdown>a:hover,.table.fixed-header-copy thead>tr>th>.dropdown>a:hover{color:#fff}.head-fixed .datatable-head-span .table .checkbox-primary,.table.fixed-header-copy .checkbox-primary{z-index:1}.head-fixed .datatable-head-span .table .checkbox-primary label,.table.fixed-header-copy .checkbox-primary label{color:#fff}.head-fixed .datatable-head-span .table .checkbox-primary label:after,.table.fixed-header-copy .checkbox-primary label:after{border-color:rgba(255,255,255,.8)}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#22c98d!important}.table-data{margin:0;table-layout:fixed}.table-data tbody>tr>td,.table-data tbody>tr>th{padding:6px 8px;word-break:break-all;border:none}.table-data tbody>tr>th{width:70px;padding-left:0;font-weight:400;color:#838a9d;text-align:right;vertical-align:middle}.table-data tbody>tr>td{padding-right:0}.table-data tbody>tr>td>a{color:#2463c7}.table-data tbody>tr>td>a:not(.btn):visited{color:#003994}.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#2e7fff}.table-data ol,.table-data ul{margin:0}.fixed-head-table{background:rgba(0,0,0,.7);border-bottom:1px solid #ddd}.fixed-head-table thead>tr>th{color:#fff}.table-empty-tip{padding:80px 10px;text-align:center;background:#fff}.not-firefox .table-grouped>tbody>tr>td.c-side{background:#fff!important}.table-grouped .group-toggle{cursor:pointer}.table-grouped .group-toggle.group-summary{border-top:10px solid #efefef}.table-grouped tbody>tr>td:first-child,.table-grouped thead>tr>th:first-child{padding-left:8px}.group-expand-all,.table-group-collapsed .group-collapse-all{display:none}.table-group-collapsed .group-expand-all{display:inline-block}.table-auto{table-layout:auto}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffe6c6}body.has-fixed-footer{padding-bottom:60px}.table.with-footer-fixed{margin-bottom:20px}.table-nest-hide{display:none!important}th.table-nest-title{position:relative;padding-left:30px!important}.table-nest-icon{position:relative;display:inline-block;width:22px;height:22px;font-size:16px;color:#a6aab8;text-align:center;border-radius:4px}.table-nest-toggle:before{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:12px;color:#888fa1;content:"\e926";-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.table-nest-toggle:after{position:absolute;top:4px;right:4px;bottom:4px;left:4px;display:inline-block;content:"";border:1px solid;border-radius:50%}.table-nest-toggle:hover{color:#2e7fff;background-color:rgba(0,0,0,.1)}.table-nest-child-hide .table-nest-toggle:before{font-size:12px;content:"\e925"}th.table-nest-title .table-nest-toggle{position:absolute!important;top:7px;left:8px}.table-nest-toggle.table-nest-toggle-global{width:22px;height:22px;padding:0!important;line-height:22px;text-align:center;border-radius:4px}.table-nest-toggle.table-nest-toggle-global:before{position:absolute!important;font-size:12px!important;line-height:22px!important;content:"\e959"!important;opacity:1!important}.table-nest-toggle.table-nest-toggle-global:after{display:none!important}.table-nest-collapsed .table-nest-toggle.table-nest-toggle-global:before{font-size:12px!important;content:"\e95a"!important}.disable-empty-nest-row .is-nest-child .table-nest-icon:before,.disable-empty-nest-row .no-nest .table-nest-icon:before{position:relative;top:-1px;width:6px;min-width:6px;height:6px;content:' ';background-color:#c4c4c4;border-radius:1px}.table-nest-child-hover>td:first-child,.table-nest-hover>td:first-child{-webkit-box-shadow:inset 3px 0 0 #c4c4c4;box-shadow:inset 3px 0 0 #c4c4c4}.c-manager .avatar{position:relative;z-index:2;line-height:17px;border:1.5px solid transparent}.c-manager .avatar.avatar-top{border-color:#ffaf65}.c-manager a{position:absolute;top:8px;left:16px;height:20px;padding:0 8px 0 13px;line-height:20px!important;color:#313c52!important;background:#f4f5f7;border-radius:10px}.article-content{overflow:auto}.article-content img{margin-top:0}.article-content table{margin:10px 0}.article-content table td,.article-content table th{border:1px solid #cbd0db!important}.article-content table th{background:#eee}.article-content a{color:#2e7fff}.article-content a:focus,.article-content a:hover{color:#18a6fd}.article-content,.article>.content{word-wrap:break-word}.detail{padding:10px 0;margin:0 10px}.detail+.detail{padding-top:25px;border-top:1px solid #eee}.detail-title{font-size:14px;font-weight:700;line-height:20px}.detail-title>.pull-right{position:relative;top:-8px}h2.detail-title{margin:0;font-size:15px;font-weight:700}h2.detail-title .label,h2.detail-title .label-id{position:relative;top:-1px}.detail-content{padding:0;margin-top:10px}.detail-content em{color:#313c52}.detail-content .list-unstyled>li+li{margin-top:5px}.side-col .detail-content{padding-left:0}details.detail{padding:10px 0}details.detail summary{position:relative;cursor:pointer;outline:0}details.detail summary::-webkit-details-marker{display:none}details.detail summary:after{position:absolute;top:0;right:0;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;content:"\e316";opacity:.4;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}details.detail[open] summary:after{content:"\e313"}.files-list{padding-left:0;list-style:none}.files-list>li>a{display:block;line-height:24px}.files-list>li>a>.icon{display:inline-block;margin-right:5px;opacity:.7}.files-list>li>a:hover{color:#2e7fff}.files-list>li>.right-icon{opacity:0;-webkit-transition:opacity .2s;-o-transition:opacity .2s;transition:opacity .2s}.files-list>li:hover>.right-icon{opacity:1}.histories-list{padding-left:15px;margin-bottom:0}.histories-list>li{position:relative}.histories-list>li+li{margin-top:5px}.histories-list>li strong{color:#313c52}.histories-list .comment,.histories-list .show-form .comment-edit-form{padding:5px 5px 5px 10px;margin:5px 0 0;background-color:rgba(0,0,0,.025);border:1px solid #eee}.histories-list .btn-edit-comment{position:absolute;top:28px;right:2px}.histories-list .comment-edit-form,.histories-list .show-form .btn-edit-comment,.histories-list .show-form .comment{display:none}.histories-list .show-form .comment-edit-form{display:block;padding:10px;border:1px solid #eee}.histories .btn-mini{width:16px;min-width:16px;height:16px;overflow:hidden;line-height:16px;color:#cbd0db;vertical-align:-8%;border-radius:1px}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#2e7fff;border-color:#2e7fff}.histories .show-changes .btn-expand>.icon:before{content:"\e926"}.histories .btn-strip{display:none}.histories .show-changes .btn-strip{display:inline-block}.history-changes{display:none;padding:5px;margin-bottom:-5px;margin-left:5px;font-size:12px;line-height:20px}.history-changes blockquote{padding:5px 5px 5px 10px;margin:5px 0 0;font-size:12px;background-color:rgba(0,0,0,.05);border-left:3px solid #eee}.history-changes blockquote.original{display:none}.show-changes .history-changes,.show-original .history-changes blockquote.original{display:block}.show-original .history-changes blockquote.textdiff{display:none}.syntaxhighlighter{overflow:auto}.list-group{overflow-y:auto}.list-group>a{display:block;padding:2px 10px 2px 5px;overflow:hidden;line-height:20px;text-overflow:unset;white-space:nowrap;border-radius:4px}.list-group>a+a{margin-top:5px}.list-group>a>.icon{display:inline-block;margin-right:3px;opacity:.5}.list-group>a.selected{color:#e6f0ff;background-color:#2e7fff}.list-group>a.active{color:#2e7fff;background-color:#e6f0ff}.list-group>a.active:hover,.list-group>a:hover{color:#fff;background-color:#2e7fff}.list-group>.heading{padding:2px 5px;line-height:20px;color:#838a9d}.list-group>a+.heading{margin-top:4px}.list-group.tab-menu>a{padding:6px 24px}.list-group.tab-menu>a.active{background:unset}.list-group.tab-menu>a.active:hover,.list-group.tab-menu>a:hover{color:#2e7fff;background-color:unset}.dropup .search-box-sink{padding-top:5px;padding-bottom:45px}.dropup .search-box-sink .search-box{position:absolute;right:10px;bottom:10px;left:10px;margin:0}.dropup .search-box-sink .search-box+.list-group{height:auto;max-height:171px}.search-list{min-width:200px;max-width:300px;padding:0}.search-list .search-box{float:none;width:auto;margin:10px}.search-list .search-box .icon-search{opacity:.5}.search-list .list-group{max-height:248px;padding:5px 10px;margin:5px 0}.dropup .search-list .search-box+.list-group{height:171px;padding-top:0}.search-list .search-input{height:30px}.search-list .input-control-icon-right{height:28px;line-height:28px}.search-list .list-group>a.active{color:inherit;background-color:inherit}.search-list.searchbox-focus .list-group>a.active{color:#2e7fff;background-color:#e6f0ff}.search-list .list-group>a.active:hover,.search-list.searchbox-focus .list-group>a.active:hover{color:#fff;background-color:#2e7fff}#dropMenu{width:initial;max-width:initial}#dropMenu>.search-box{width:100%;padding:10px 10px 0;margin:0}#dropMenu>.search-box .icon-search{color:#333}#dropMenu>.search-box.has-icon-right>.form-control{padding-left:26px}#dropMenu .input-control-icon-left{top:10px;left:10px}#dropMenu .input-control-icon-right{top:11px;right:11px}#dropMenu .input-control-icon-right .icon{position:relative;top:2px}#dropMenu .list-group{max-height:initial;margin:0}#dropMenu .table-row{margin:0 -10px;table-layout:auto}#dropMenu .table-col{position:relative;width:100%;min-width:250px;max-width:450px}#dropMenu .table-col .list-group{max-height:300px;padding:0 10px 5px}#dropMenu .col-left{padding-bottom:30px}#dropMenu .col-right{display:none}#dropMenu .col-footer{position:absolute;right:0;bottom:-5px;left:0;padding:8px 10px;border-top:1px solid #eee}#dropMenu .col-footer>a{opacity:.8}#dropMenu .col-footer>a:hover{opacity:1}#dropMenu.show-right-col .table-col{width:50%}#dropMenu.show-right-col .col-right{display:table-cell;border-left:1px solid #eee}#dropMenu.show-right-col .col-right>.list-group{max-height:335px;margin:0}#dropMenu.show-right-col .col-right>.list-group>a{opacity:.7}#dropMenu.show-right-col .col-right>.list-group>a:hover{opacity:1}#dropMenu.show-right-col .toggle-right-col>.icon-angle-right:before{content:"\e314"}#dropMenu.has-search-text .list-group{overflow-x:hidden}#dropMenu.has-search-text>.search-box{width:100%!important}#dropMenu.has-search-text>.list-group>.table-row{display:block}#dropMenu.has-search-text>.list-group>.table-row>.table-col{display:block;width:100%}#dropMenu.has-search-text .col-left{padding-bottom:0}#dropMenu.has-search-text .pull-right.toggle-right-col{display:none}#dropMenu.has-search-text .col-left .list-group{margin-bottom:0}#dropMenu.has-search-text .col-right .list-group{margin-bottom:0}#dropMenu.has-search-text .col-right .list-group>a{opacity:.7}#dropMenu.has-search-text .col-footer,#dropMenu.has-search-text .hide-in-search{display:none}#swapper{position:relative}#swapper #dropMenu .tree li>.selected{color:#2e7fff!important;background:#e6f0ff!important}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu .tree li>.clickable:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#2e7fff!important}#swapper #dropMenu .tree{margin:0}#pageNav #dropMenu .list-group>a.active{color:inherit;background-color:inherit}#pageNav #dropMenu .list-group>a.active:hover,#pageNav #dropMenu.searchbox-focus .list-group>a.active:hover{color:#2e7fff!important;background:#e6f0ff!important}#pageNav #dropMenu .list-group>a.active.selected,#pageNav #dropMenu .list-group>a.active.selected:hover{color:#fff!important;background:#2e7fff!important}.release-path{overflow:hidden}.release-line{display:table;width:100%;padding:0;table-layout:fixed}.release-line>li{display:table-cell;list-style:none}.release-line>li>a{position:relative;display:block}.release-line>li>a:before{position:absolute;left:0;display:block;width:13px;height:13px;content:' ';background:#fff;border:2px solid #838a9d;border-radius:50%}.release-line>li>a:after{position:absolute;left:5px;display:block;width:2px;height:30px;content:' ';background:#c2dbff}.release-line>li>a>.icon{position:absolute;left:4px;font-size:24px}.release-line>li>a .title{display:block;font-size:14px;white-space:nowrap}.release-line>li>a .date,.release-line>li>a .info{display:block;max-height:18px;overflow:hidden;font-size:12px;color:#838a9d;text-overflow:unset;white-space:nowrap}.release-line>li>a:hover:before{background-color:#e6f0ff}.release-line>li>a:hover:after{background-color:#838a9d}.release-line>li>a:hover .title{color:#2e7fff}.release-line>li>a:hover .date,.release-line>li>a:hover .info{color:#838a9d}.release-line>li:nth-child(odd){padding-top:80px;vertical-align:top}.release-line>li:nth-child(odd)>a{height:85px;padding-top:36px;border-top:5px solid #c2dbff}.release-line>li:nth-child(odd)>a:before{top:-9px}.release-line>li:nth-child(odd)>a:after{top:6px}.release-line>li:nth-child(odd)>a>.icon{top:-26px}.release-line>li:nth-child(even){padding-bottom:80px;vertical-align:bottom}.release-line>li:nth-child(even)>a{height:85px;padding-bottom:36px;border-bottom:5px solid #c2dbff}.release-line>li:nth-child(even)>a:before{bottom:-9px}.release-line>li:nth-child(even)>a:after{bottom:6px}.release-line>li:nth-child(even)>a>.icon{bottom:-2px}.release-line>li:last-child>a{border-color:transparent}.release-line>li.active>a:before{border-color:#2e7fff}.release-line>li+li>a>.date,.release-line>li+li>a>.info,.release-line>li+li>a>.title{position:relative;left:-36%}#footer{position:fixed;right:0;bottom:0;left:0;z-index:1010;height:40px;background:#fff;border-top:1px solid #eff1f7}#footer .breadcrumb{padding:10px 0;margin:0}#footer .breadcrumb>li{max-width:200px;overflow:hidden;text-overflow:unset;white-space:nowrap}#footer .breadcrumb>.active,#footer .breadcrumb>li>a{color:#838a9e}#footer .breadcrumb>.active>.icon,#footer .breadcrumb>li>a>.icon{display:none}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#18a6fd}#footer .breadcrumb>li+li:before{content:'>'}#footer>.container{padding:0 20px}@media (min-width:1400px){#footer>.container{padding:0 40px}}#poweredBy{position:absolute;top:4px;right:0;padding:5px 10px}#poweredBy .icon-zentao{color:#0097fd}#poweredBy a{color:#313c52}#poweredBy a:hover{color:#2e7fff}#poweredBy a:hover .icon-zentao{color:#2e7fff}#poweredBy a.text-important{color:#ff6f42}#poweredBy a.text-important:hover{color:#fc5959}#poweredBy a.text-primary{color:#2e7fff}#poweredBy a.text-primary:hover{color:#18a6fd}#poweredBy #aiux{color:#cbd0dc}#noticeBox .alert{-webkit-box-shadow:rgba(0,0,0,.15) 0 3px 10px,rgba(0,0,0,.25) 0 3px 10px;box-shadow:rgba(0,0,0,.15) 0 3px 10px,rgba(0,0,0,.25) 0 3px 10px}#heading{top:0}.header-btn{position:relative;padding:8px 0}.header-btn .btn{position:relative;height:34px;padding:1px 6px;margin:0;overflow:visible;font-size:13px;font-weight:400;line-height:28px;color:#fff;background-color:transparent;border-color:transparent!important;border-right:none;-webkit-transition:none;-o-transition:none;transition:none}.header-btn .btn>.caret{margin-left:0;border-width:4px}.header-btn .btn>.text{display:inline-block;max-width:150px;overflow:hidden;text-overflow:unset;vertical-align:middle}.header-btn .btn:hover{-webkit-box-shadow:none;box-shadow:none}.header-btn .btn:hover,.header-btn.active .btn{color:#fff;background:rgba(0,0,0,.15)}.header-btn .btn:hover>.caret,.header-btn.active .btn>.caret{opacity:1}.header-btn+.header-btn{margin-left:10px}.header-btn+.header-btn:before{position:absolute;top:16px;left:-13px;display:block;font-family:ZentaoIcon;font-size:14px;font-size:16px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;content:"\e315";opacity:.6;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.header-btn .dropdown-menu{margin-top:-10px}#toolbar{top:0;height:50px}#userNav>li{margin-right:0}#userNav>li>a{padding:10px 5px}#userNav>li>a>.icon{font-size:30px;filter:brightness(1.2) hue-rotate(30deg);opacity:.9;-webkit-filter:brightness(1.2) hue-rotate(30deg)}#userNav>li:hover>a{background-color:rgba(0,0,0,.1)}#userNav .dropdown-menu>li>a{position:relative;padding-left:24px}#userNav .dropdown-menu>li>a>.icon{top:1px;left:0}#userNav .dropdown-menu>li.user-profile-item>a{padding-left:45px}
\ No newline at end of file
+*/.chosen-container{position:relative;display:block;font-size:13px;vertical-align:middle;zoom:1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;z-index:1010;display:none;width:100%;background:#fff;border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.15);border-top:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container .chosen-drop.chosen-drop-size-limited{border-top:1px solid rgba(0,0,0,.15)}.chosen-container .chosen-drop.chosen-auto-max-width{min-width:100%;border-top:1px solid rgba(0,0,0,.15);opacity:0}.chosen-container .chosen-drop.chosen-auto-max-width>.chosen-results>li{display:inline-block;white-space:nowrap}.chosen-container .chosen-drop.chosen-auto-max-width.in{opacity:1}.chosen-container .chosen-drop.chosen-auto-max-width.in>.chosen-results>li{display:block;white-space:normal}.chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap!important}.chosen-container.chosen-with-drop .chosen-drop{display:block}.chosen-container a{cursor:pointer}.chosen-container.chosen-up .chosen-drop{top:inherit;bottom:100%;margin-top:auto;margin-bottom:-1px;border-radius:2px 2px 0 0;-webkit-box-shadow:0 -3px 5px rgba(0,0,0,.175);box-shadow:0 -3px 5px rgba(0,0,0,.175)}.chosen-container.chosen-highlight-selected .result-selected{color:#2e7fff;background:#e6f0ff}.chosen-container-single .chosen-single{display:block;width:100%;height:32px;padding:5px 8px;overflow:hidden;line-height:1.42857143;color:#0b0f18;text-decoration:none;white-space:nowrap;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #dcdcdc;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s,-webkit-box-shadow ease-in-out .15s}.chosen-container-single .chosen-default{color:#838a9d}.chosen-container-single .chosen-single>span{display:block;margin-right:26px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:5px;right:24px;display:block;width:20px;height:20px;font-family:sans-serif;font-size:18px;font-weight:700;line-height:18px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-single .chosen-single abbr:before{display:block;content:'×'}.chosen-container-single .chosen-single abbr:focus,.chosen-container-single .chosen-single abbr:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;height:100%;padding:5px 8px}.chosen-container-single .chosen-single div b{display:inline-block;width:0;height:0;margin-bottom:2px;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent;opacity:.5}.chosen-container-single .chosen-search{position:relative;z-index:1010;padding:3px 4px;margin:0;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{width:100%;height:27px;padding:2px 26px 2px 8px;margin:1px 0;font-size:12px;line-height:1.5;background-color:#fff;border:1px solid #dcdcdc;border-radius:2px;outline:0}.chosen-container-single .chosen-search input[type=text]:focus{border-color:#2e7fff}.chosen-container-single .chosen-search:before{position:absolute;top:10px;right:10px;display:block;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#838a9d;text-transform:none;content:"\e928";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-single .chosen-drop{margin-top:-1px;-webkit-background-clip:padding-box;background-clip:padding-box;border-radius:0 0 4px 4px}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;max-height:240px;padding:0;margin:0;overflow-x:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;padding:5px 10px;margin:0;line-height:15px;list-style:none;-webkit-transition:background-color .2s cubic-bezier(.175,.885,.32,1);-o-transition:background-color .2s cubic-bezier(.175,.885,.32,1);transition:background-color .2s cubic-bezier(.175,.885,.32,1);-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{color:#fff;background-color:#2e7fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;width:100%;min-height:32px;min-height:30px\9;padding:0;margin:0;overflow:hidden;cursor:text;background-color:#fff;border:1px solid #dcdcdc;border-radius:2px;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s,-webkit-box-shadow ease-in-out .15s}.chosen-container-multi .chosen-choices:after,.chosen-container-multi .chosen-choices:before{display:table;content:" "}.chosen-container-multi .chosen-choices:after{clear:both}.chosen-container-multi .chosen-choices li{display:block;float:left;padding:0 6px;margin:5px 4px;list-style:none}.chosen-container-multi .chosen-choices li.search-field{padding:0;line-height:12px;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{height:20px;font-size:100%;color:#838a9d;background:0 0!important;border:0!important;border-radius:0;outline:0;-webkit-box-shadow:none;box-shadow:none}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-field:before{position:absolute;right:8px;bottom:8px;display:block;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#838a9d;text-transform:none;content:"\e928";opacity:0;-webkit-transition:opacity .2s cubic-bezier(.175,.885,.32,1);-o-transition:opacity .2s cubic-bezier(.175,.885,.32,1);transition:opacity .2s cubic-bezier(.175,.885,.32,1);speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-multi .chosen-choices li.search-choice{position:relative;padding:3px 20px 3px 5px;line-height:12px;cursor:default;background-color:#f1f1f1;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #c4c4c4;border-radius:3px;-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);-webkit-transition:all .4s cubic-bezier(.175,.885,.32,1);-o-transition:all .4s cubic-bezier(.175,.885,.32,1);transition:all .4s cubic-bezier(.175,.885,.32,1)}.chosen-container-multi .chosen-choices li.search-choice:hover{background-color:#fff;border-color:#ababab;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.1);box-shadow:0 1px 0 rgba(0,0,0,.1)}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:1px;right:0;display:block;width:20px;height:18px;line-height:18px;color:#000;text-align:center;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:before{font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-shadow:0 1px 0 #fff;text-transform:none;content:'\d7';speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:focus,.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;color:#666;background-color:#e4e4e4;border:1px solid #ccc}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{padding:5px 0;margin:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border-color:#2e7fff;-webkit-box-shadow:none,0 0 8px rgba(46,127,255,.6);box-shadow:none,0 0 8px rgba(46,127,255,.6)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #b2b2b2;border:1px solid rgba(0,0,0,.15);border-bottom-right-radius:0!important;border-bottom-left-radius:0!important;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container-active.chosen-with-drop .chosen-single div{background:0 0;border-left:none}.chosen-container-active.chosen-with-drop .chosen-single div b{content:"";border-top:0 dotted;border-bottom:4px solid}.chosen-container-active.chosen-with-drop.chosen-up .chosen-single{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:2px;border-bottom-left-radius:2px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.chosen-container-active .chosen-choices{border-color:#2e7fff;-webkit-box-shadow:none,0 0 8px rgba(46,127,255,.6);box-shadow:none,0 0 8px rgba(46,127,255,.6)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-container-active .chosen-choices li.search-field:before{opacity:1}.chosen-disabled{cursor:default;opacity:.5!important}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-compact.chosen-container-single .chosen-single>.chosen-search{left:0;display:none;padding:3px 4px;opacity:0}.chosen-compact.chosen-container-single .chosen-single>.chosen-search>input{height:25px;padding:2px 26px 2px 4px;font-size:inherit}.chosen-compact.chosen-container-single .chosen-single>.chosen-search:before{top:9px}.chosen-compact.chosen-with-search.chosen-with-drop .chosen-single>.chosen-search{display:block;opacity:1}select.chosen[multiple]{height:32px;overflow:hidden}select.chosen[multiple] option{visibility:hidden}.picker{min-height:32px;background-color:#eee}.picker:not(.picker-ready)>*{display:none}.picker-selections{position:relative;min-height:32px;color:#0b0f18;background-color:#fff;border:1px solid #dcdcdc;border-radius:2px;-webkit-box-shadow:none;box-shadow:none}.picker-focus .picker-selections{border-color:#2e7fff;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(46,127,255,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(46,127,255,.6)}.disabled .picker-selections{cursor:not-allowed;background-color:#f5f5f5}.picker-multi .picker-selections{padding:3px}.picker-multi.picker-focus .picker-selections:before{position:absolute;right:0;bottom:8px;display:block;width:24px;height:14px;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;content:"\e928";opacity:.4;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.picker-multi.picker-focus.picker-loading .picker-selections::before{display:inline-block;content:"\e982";-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}.picker-multi .picker-selection{position:relative;display:inline-block;padding:0 20px 0 5px;margin:2px;line-height:18px;background-color:#f1f1f1;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #c4c4c4;border-radius:3px;-webkit-box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05)}.picker-selection-single{max-width:100%;padding:5px 20px 5px 8px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.picker-focus .picker-selection-single .picker-selection-text{display:none}.picker-selection-single:after{position:absolute;top:7px;right:0;display:block;width:24px;height:14px;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;content:"\f0d7";opacity:.4;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.picker-focus .picker-selection-single::after{content:"\e928"}.picker-focus.picker-loading .picker-selection-single::after{display:inline-block;content:"\e982";-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}.picker-selection-remove{position:absolute;top:0;right:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:18px;height:18px;text-align:center;cursor:pointer;opacity:.2;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.picker-selection-remove:before{font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-shadow:0 1px 0 #fff;text-transform:none;content:'\d7';speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.picker-selection-remove:hover{opacity:.5}.picker-single .picker-selection-remove{top:5px;right:20px;z-index:1}.picker-no-value .picker-selection-remove,.picker-single.picker-focus .picker-selection-remove{display:none}.picker-multi.picker-sortable .picker-selection-text{cursor:move}.picker-search{color:transparent;background:0 0;border:none}.picker-search:focus{color:inherit;outline:0}.disabled .picker-search{cursor:not-allowed}.picker-single .picker-search{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;width:100%;padding:5px 8px}.picker-multi .picker-search{display:inline-block;width:10px;min-width:10px;max-width:100%;padding:0 2px;margin:2px 0}.picker-placeholder{position:absolute;top:5px;right:20px;left:8px;z-index:0;display:none;overflow:hidden;color:#838a9d;text-overflow:ellipsis;white-space:nowrap}.picker-no-value.picker-focus .picker-placeholder{display:none}.picker-input-empty.picker-focus.picker-no-value .picker-placeholder,.picker-no-value .picker-placeholder{display:block}.picker-drop-menu{position:fixed;z-index:1200;display:none;min-width:100px;background-color:#fff;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.12),0 1px 3px rgba(0,0,0,.1);box-shadow:0 6px 12px rgba(0,0,0,.12),0 1px 3px rgba(0,0,0,.1);opacity:0}.picker-drop-menu.picker-drop-show{display:block}.picker-option-list{padding:5px 0;margin:0;overflow-y:auto}.picker-no-options .picker-option-list{display:none}.picker-option{display:block;min-height:30px;padding:5px 10px;overflow:hidden;clear:both;font-weight:400;line-height:1.42857143;color:#313c52;text-overflow:ellipsis;white-space:nowrap;-webkit-transition:none;-o-transition:none;transition:none}.picker-single .picker-option.picker-option-selected{color:#2e7fff;background:#e6f0ff}.picker-option:focus,.picker-option:hover{text-decoration:none}.picker-option.picker-option-active,.picker-single .picker-option.picker-option-selected.picker-option-active{color:#fff;background-color:#2e7fff}.picker-multi .picker-option.picker-option-selected,.picker-multi .picker-option.picker-option-selected.picker-option-active{color:#ccc;cursor:not-allowed;background-color:#fff}.picker-option.disabled{cursor:not-allowed!important}.picker-option-text-matched{position:relative;color:#2e7fff}.picker-option-text-matched:before{position:absolute;right:0;bottom:-4px;left:0;display:block;height:2px;content:' ';background-color:#2e7fff;border-radius:2px;opacity:.5}.picker-option-active .picker-option-text-matched,.picker-option:hover .picker-option-text-matched{color:#fff}.picker-option-active .picker-option-text-matched:before,.picker-option:hover .picker-option-text-matched:before{background-color:#fff}.picker-message{display:none;height:22px;padding:2px 5px;overflow:hidden;font-size:12px;color:#838a9d;text-overflow:ellipsis;white-space:nowrap;background-color:#f1f1f1}.picker-has-message .picker-message{display:block}.picker-message[data-type=danger]{color:#fc5959}.picker-actions{padding:5px;border-top:1px solid #eee}.picker-no-actions .picker-actions{display:none}.picker-actions .btn{padding:2px 4px}.picker-actions .btn[disabled]{background-color:transparent;filter:grayscale(1);-webkit-filter:grayscale(1)}.picker-actions .btn+.btn{margin-left:4px}.picker-checkable .picker-option{position:relative;padding-left:32px;color:inherit!important;cursor:pointer!important}.picker-checkable .picker-option>.checkbox-primary{position:absolute;top:4px;left:10px}.picker-checkable .picker-option.picker-option-active{background-color:rgba(0,0,0,.05)!important}.picker-checkable .picker-option:hover{background-color:rgba(0,0,0,.075)!important}.picker-checkable .picker-option.picker-option-selected{background-color:#e6f0ff!important}.picker-checkable .picker-option-active .picker-option-text-matched,.picker-checkable .picker-option:hover .picker-option-text-matched{color:#2e7fff!important}.picker-checkable .picker-option-active .picker-option-text-matched:before,.picker-checkable .picker-option:hover .picker-option-text-matched:before{background:#2e7fff!important}:root{--color-primary:#2e7fff;--color-secondary:#18a6fd;--color-pale:#e6f0ff;--color-fore:#313c52;--color-back:#fff;--color-red:#fc5959;--color-yellow:#ff9f46;--color-green:#22c98d;--color-blue:#37b2fe;--color-purple:#8166ee;--color-brown:#ff6f42;--color-danger:#fc5959;--color-warning:#ff9f46;--color-success:#22c98d;--color-info:#37b2fe;--color-special:#8166ee;--color-important:#ff6f42;--color-green-pale:#ecfff8;--color-yellow-pale:#fff4ea;--color-red-pale:#ffebeb;--color-blue-pale:#e7f6ff;--color-brown-pale:#fff2ed;--color-purple-pale:#efecfa;--link-color:#313c52;--link-hover-color:#2e7fff;--color-gray-darker:#0b0f18;--color-gray-dark:#313c52;--color-gray:#838a9d;--color-gray-light:#c4c4c4;--color-gray-lighter:#eee;--color-gray-pale:#f1f1f1;--border-radius:4px;--border-radius-lg:6px;--border-radius-sm:3px;--bg-gradient:#3785ff}.container,.container-fixed,.container-fluid{position:relative}.container{max-width:1800px!important}body{color:#313c52;background-color:#f4f5f7}body.article-content,body.body-modal{background:0 0}body.body-modal{padding:0}@media screen and (min-width:1920px){body{font-size:14px}}a:active,a:focus,button:active,button:focus{outline:0!important}.strong{font-weight:700}.font-normal{font-weight:400!important}.text-middle{vertical-align:middle!important}.text-bottom{vertical-align:bottom!important}.text-top{vertical-align:top!important}.inline-block{display:inline-block!important}.layer{border-radius:4px;-webkit-box-shadow:0 0 20px 0 #bdc9d8;box-shadow:0 0 20px 0 #bdc9d8}.space{margin-bottom:20px}.space-lg{margin-bottom:30px}.space-sm{margin-bottom:10px}.muted{opacity:.5}.text-muted em{color:#313c52}.no-animate{-webkit-transition:none!important;-o-transition:none!important;transition:none!important}.template{display:none!important}.text-left{text-align:left!important}.text-yellow.icon-folder{color:#ff9f46}.table-row{display:table;width:100%;table-layout:fixed}.table-col,.table-row>.col,.table-row>[class*=col-],.table-row>[class*="-col"]{display:table-cell;float:none;vertical-align:top}.side-col{width:200px;padding-right:20px}.side-col.col-4{width:33.3333333%}.col-lg{width:260px}.col-xl{width:320px}.col-sm{width:150px}.col-xs{width:100px}.main-col+.side-col{padding-right:0;padding-left:20px}.row-grid>[class*=col-],.row-grid>[class*="-col"]{padding-top:6px;padding-bottom:6px}hr.space{margin:10px 0;border:none}hr.space-sm{margin:5px 0;border:none}.text-secondary{color:#18a6fd}a.text-primary{color:#2e7fff}.text-primary-400{color:#3785ff}.text-primary-600{color:#1e6aeb}.text-primary-700{color:#2463c7}.text-primary-900{color:#063072}.text-green-400{color:#48d1a0}.text-yellow-400{color:#ffaf65}.text-blue-400{color:#60c2ff}.text-red-400{color:#ff7c7c}.text-important-400{color:#ff9777}.text-purple-400{color:#8a6ff5}.text-green-600{color:#0dbb7d}.text-yellow-600{color:#f38f19}.text-blue-600{color:#00c0e9}.text-red-600{color:#fb2b2b}.text-important-600{color:#ff6f42}.text-purple-600{color:#7055df}.text-green-700{color:#0ca76f}.text-yellow-700{color:#ed8307}.text-blue-700{color:#1099ed}.text-red-700{color:#d91b1b}.text-important-700{color:#ff4912}.text-purple-700{color:#513baa}.text-green-900{color:#186c4e}.text-yellow-900{color:#af5f01}.text-blue-900{color:#046bab}.text-red-900{color:#a20606}.text-important-900{color:#611700}.text-purple-900{color:#30216f}.text-gray-14,.text-title{color:#0b0f18}.icon-important,.text-color,.text-gray-13{color:#313c52}.text-gray-12{color:#5e626d}.icon-common,.text-gray-11{color:#838a9d}.icon-secondary,.text-gray-10{color:#9ea3b0}.text-disabled{color:#c4c4c4}.nav-primary>li>a{min-width:100px;padding:5px 8px;color:#838a9d;border-color:#e7f1fc}.nav-primary>li.active>a{color:#2e7fff;background-color:#e7f1fc;border-color:#e7f1fc}.nav-primary>li.active>a:hover{color:#2e7fff;background-color:#c3dcf7;border-color:#c3dcf7}.end-marker{margin-bottom:20px;color:#c4c4c4;text-align:center}@-webkit-keyframes highlight{0%{background:#fff;outline:1px solid transparent}100%{background:#fff0d5;outline:2px solid #ffdcbc}}@-o-keyframes highlight{0%{background:#fff;outline:1px solid transparent}100%{background:#fff0d5;outline:2px solid #ffdcbc}}@keyframes highlight{0%{background:#fff;outline:1px solid transparent}100%{background:#fff0d5;outline:2px solid #ffdcbc}}.highlight{-webkit-animation:highlight .5s linear 0s 2 alternate;-o-animation:highlight .5s linear 0s 2 alternate;animation:highlight .5s linear 0s 2 alternate}.progress.inline-block{width:100px;margin:0}.w-p5{width:5%!important}.w-p10{width:10%!important}.w-p15{width:15%!important}.w-p20{width:20%!important}.w-p25{width:25%!important}.w-p30{width:30%!important}.w-p35{width:35%!important}.w-p40{width:40%!important}.w-p45{width:45%!important}.w-p50{width:50%!important}.w-p55{width:55%!important}.w-p60{width:60%!important}.w-p65{width:65%!important}.w-p70{width:70%!important}.w-p75{width:75%!important}.w-p80{width:80%!important}.w-p85{width:85%!important}.w-p90{width:90%!important}.w-p94{width:94%!important}.w-p95{width:95%!important}.w-p98{width:98%!important}.w-p99{width:99%!important}.w-p100{width:100%!important}.w-auto{width:auto!important}.w-10px{width:10px!important}.w-20px{width:20px!important}.w-30px{width:30px!important}.w-35px{width:35px!important}.w-40px{width:40px!important}.w-45px{width:45px!important}.w-50px{width:50px!important}.w-60px{width:60px!important}.w-70px{width:70px!important}.w-80px{width:80px!important}.w-90px{width:90px!important}.w-100px{width:100px!important}.w-110px{width:110px!important}.w-120px{width:120px!important}.w-130px{width:130px!important}.w-140px{width:140px!important}.w-150px{width:150px!important}.w-160px{width:160px!important}.w-180px{width:180px!important}.w-200px{width:200px!important}.w-230px{width:230px!important}.w-250px{width:250px!important}.w-300px{width:300px!important}.w-400px{width:400px!important}.w-500px{width:500px!important}.w-600px{width:600px!important}.w-700px{width:700px!important}.w-800px{width:800px!important}.w-900px{width:900px!important}.mw-200px{max-width:200px!important}.mw-300px{max-width:300px!important}.mw-400px{max-width:400px!important}.mw-500px{max-width:500px!important}.mw-600px{max-width:600px!important}.mw-700px{max-width:700px!important}.mw-800px{max-width:800px!important}.mw-900px{max-width:900px!important}.mw-1400px{max-width:1400px!important}.w-id{width:70px!important}.w-pri{width:40px!important}.w-severity{width:50px!important}.w-hour{width:57px!important}.w-date{width:90px!important}.w-status{width:60px!important}.w-resolution,.w-type,.w-user{width:80px!important}.w-p15-f{width:15%!important;min-width:120px!important}.w-p25-f{width:25%!important;min-width:200px!important}.w-p35-f{width:35%!important;min-width:300px!important}.w-p45-f{width:45%!important;min-width:400px!important}.h-5px{height:5px!important}.h-10px{height:10px!important}.h-20px{height:20px!important}.h-30px{height:30px!important}.h-35px{height:35px!important}.h-40px{height:40px!important}.h-45px{height:45px!important}.h-50px{height:50px!important}.h-60px{height:60px!important}.h-70px{height:70px!important}.h-80px{height:80px!important}.h-100px{height:100px!important}.h-120px{height:120px!important}.h-130px{height:130px!important}.h-140px{height:140px!important}.h-150px{height:150px!important}.h-200px{height:200px!important}.pd-0{padding:0!important}.mg-0{margin:0!important}.mgb-20{margin-bottom:20px!important}.mgb-10{margin-bottom:10px!important}.pdb-20{padding-bottom:20px!important}.pdt-20{padding-top:20px!important}.br-0{border-radius:0!important}.bd-0,.bd-none,.borderless{border:none!important}.bg-none{background:0 0!important}.red{color:#fc5959!important}.icon-pro-version{font-size:14px!important}.icon-pro-version:before{position:relative;top:-1px;font-size:14px;color:#fc5959;content:"\e92b"}.bg-primary{color:#fff;background:#3785ff;border-top-color:#2e7fff}.bg-primary-pure{color:#fff;background-color:#2e7fff}.bg-primary-pale{color:#2e7fff;background-color:#e6f0ff}.bg-secondary{color:#fff;background:#18a6fd}.line-gray-8{background:#d8dbde}.line-gray-5{background:#e3e4e9}.line-gray-7{background:#eee}.bg-gray-1{background:#e3e4e9}.bg-gray-2{background:#edeef2}.bg-gray-3{background:#f8f8f8}.bg-green-400{background:#48d1a0}.bg-yellow-400{background:#ffaf65}.bg-blue-400{background:#60c2ff}.bg-red-400{background:#ff7c7c}.bg-important-400{background:#ff9777}.bg-purple-400{background:#8a6ff5}.bg-green-600{background:#0dbb7d}.bg-yellow-600{background:#f38f19}.bg-blue-600{background:#00c0e9}.bg-red-600{background:#fb2b2b}.bg-important-600{background:#ff6f42}.bg-purple-600{background:#7055df}.bg-green-700{background:#0ca76f}.bg-yellow-700{background:#ed8307}.bg-blue-700{background:#1099ed}.bg-red-700{background:#d91b1b}.bg-important-700{background:#ff4912}.bg-purple-700{background:#513baa}.bg-green-900{background:#186c4e}.bg-yellow-900{background:#af5f01}.bg-blue-900{background:#046bab}.bg-red-900{background:#a20606}.bg-important-900{background:#611700}.bg-purple-900{background:#30216f}.bg-hover{background:#f6f6f6}.bg-active{background:#e6eaf1}.hl-tutorial{position:relative!important;z-index:1010!important;-webkit-box-shadow:0 0 0 0 #000!important;box-shadow:0 0 0 0 #000!important;-webkit-transition:-webkit-box-shadow 1s!important;-o-transition:box-shadow 1s!important;transition:-webkit-box-shadow 1s!important;transition:box-shadow 1s!important;transition:box-shadow 1s,-webkit-box-shadow 1s!important}.hl-tutorial.hl-in{-webkit-box-shadow:0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 3000px rgba(0,0,0,.2)!important;box-shadow:0 0 20px 0 #ffff8d,0 0 0 2px #ffd180,0 0 0 3000px rgba(0,0,0,.2)!important}.btn.tooltip-tutorial,.hl-tutorial.hl-in:hover{position:relative!important;z-index:1010!important;-webkit-box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 3000px rgba(0,0,0,.3)!important;box-shadow:0 0 30px 0 #ffff8d,0 0 0 5px #ffd180,0 0 0 3000px rgba(0,0,0,.3)!important}.tooltip-max .tooltip-inner{max-width:1000px;padding:8px 10px}.transition-all *{-webkit-transition:all .2s!important;-o-transition:all .2s!important;transition:all .2s!important}.scroll-x{overflow-x:auto!important}.scroll-y{overflow-y:auto!important}.divider+.divider{display:none}.ie *{-webkit-transition:none!important;-o-transition:none!important;transition:none!important}@font-face{font-family:Oswald;font-weight:400;src:url(../fonts/Oswald-Regular.ttf)}@font-face{font-family:Oswald;font-weight:500;src:url(../fonts/Oswald-Medium.ttf)}@font-face{font-family:Oswald;font-weight:300;src:url(../fonts/Oswald-Light.ttf)}.num{font-family:Oswald;font-weight:400}@font-face{font-family:ZentaoIcon;font-style:normal;font-weight:400;src:url(../fonts/ZentaoIcon.eot?v=1.44);src:url(../fonts/ZentaoIcon.eot?#iefix&v=1.44) format('embedded-opentype'),url(../fonts/ZentaoIcon.woff?v=1.44) format('woff'),url(../fonts/ZentaoIcon.ttf?v=1.44) format('truetype'),url(../fonts/ZentaoIcon.svg#regular?v=1.44) format('svg')}.icon,[class*=" icon-"],[class^=icon-]{font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{display:inline-block;min-width:14px;text-align:center}a .icon,a [class*=" icon-"],a [class^=icon-]{display:inline}.icon-lg:before{font-size:1.33333333em;vertical-align:-10%}.icon-2x{font-size:28px}.icon-3x{font-size:42px}.icon-4x{font-size:56px}.icon-5x{font-size:70px}.icon-spin{display:inline-block;-webkit-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}a .icon-spin{display:inline-block;text-decoration:none}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.icon-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.icon-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.icon-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.icon-flip-horizontal{-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.icon-flip-vertical{-webkit-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.icon.icon-flip-horizontal,.icon.icon-flip-vertical,.icon.icon-rotate-180,.icon.icon-rotate-270,.icon.icon-rotate-90{display:inline-block}.icon-zentao:before{content:"\e901"}.icon-zentao-alt:before{content:"\e900"}.icon-help:before{content:"\e968"}.icon-import:before{content:"\e904"}.icon-download:before{content:"\e904"}.icon-export:before{content:"\e905"}.icon-lightbulb:before{content:"\e91c"}.icon-close:before{content:"\e936"}.icon-check:before{content:"\e5ca"}.icon-plus:before{content:"\e925"}.icon-minus:before{content:"\e926"}.icon-expand-alt:before{content:"\e6f1"}.icon-collapse-alt:before{content:"\e6f2"}.icon-fullscreen:before{content:"\e96b"}.icon-star-empty:before{content:"\e94a"}.icon-star:before{content:"\e94b"}.icon-exclamation-sign:before{content:"\e930"}.icon-info-sign:before{content:"\e9d5"}.icon-flag:before{content:"\e937"}.icon-check-circle:before{content:"\e92f"}.icon-check-sign:before{content:"\e938"}.icon-chart-pie:before{content:"\e95b"}.icon-history:before{content:"\e95f"}.icon-pencil:before{content:"\e254"}.icon-search:before{content:"\e928"}.icon-restart:before{content:"\e95e"}.icon-cog:before{content:"\e93b"}.icon-chart-line:before{content:"\e95c"}.icon-chart-bar:before{content:"\e95d"}.icon-bar-chart:before{content:"\e95d"}.icon-exchange:before{content:"\e927"}.icon-severity:before{content:"\e973"}.icon-book:before{content:"\f02d"}.icon-treemap-alt:before{content:"\e971"}.icon-severity-solid:before{content:"\e902"}.icon-chat-line:before{content:"\e998"}.icon-stack:before{content:"\e943"}.icon-cube:before{content:"\e967"}.icon-minus-sign:before{content:"\e939"}.icon-bars-sign:before{content:"\e93a"}.icon-chat:before{content:"\e940"}.icon-message:before{content:"\e940"}.icon-more:before{content:"\e744"}.icon-certificate:before{content:"\f0a3"}.icon-bell:before{content:"\e7f5"}.icon-columns:before{content:"\f0db"}.icon-envelope-o:before{content:"\e92a"}.icon-unfold-all:before{content:"\e931"}.icon-fold-all:before{content:"\e932"}.icon-bars:before{content:"\e948"}.icon-cards-view:before{content:"\e949"}.icon-ellipsis-v:before{content:"\e5d4"}.icon-spinner-indicator:before{content:"\e982"}.icon-up-circle:before{content:"\e92b"}.icon-right-circle:before{content:"\e92c"}.icon-down-circle:before{content:"\e92d"}.icon-left-circle:before{content:"\e92e"}.icon-angle-double-right:before{content:"\f101"}.icon-angle-down:before{content:"\e313"}.icon-angle-left:before{content:"\e314"}.icon-angle-right:before{content:"\e315"}.icon-angle-top:before{content:"\e316"}.icon-first-page:before{content:"\e5dc"}.icon-last-page:before{content:"\e5dd"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-arrow-up:before{content:"\e923"}.icon-arrow-down:before{content:"\e924"}.icon-arrow-left:before{content:"\e952"}.icon-arrow-right:before{content:"\e93e"}.icon-chevron-left:before{content:"\e934"}.icon-chevron-right:before{content:"\e935"}.icon-chevron-double-up:before{content:"\e959"}.icon-chevron-double-down:before{content:"\e95a"}.icon-folder-account:before{content:"\e942"}.icon-folder-move:before{content:"\e960"}.icon-folder-plus:before{content:"\e961"}.icon-folder-upload:before{content:"\e962"}.icon-folder-star:before{content:"\e963"}.icon-folder-edit:before{content:"\e964"}.icon-folder-download:before{content:"\e965"}.icon-folder-outline:before{content:"\e966"}.icon-folder:before{content:"\e944"}.icon-folder-o:before{content:"\e945"}.icon-folder-open-o:before{content:"\e946"}.icon-folder-open:before{content:"\e947"}.icon-color:before{content:"\e93c"}.icon-paper-clip:before{content:"\e93d"}.icon-text:before{content:"\e929"}.icon-share:before{content:"\f064"}.icon-format-list-bulleted:before{content:"\e9a8"}.icon-format-bold:before{content:"\e953"}.icon-format-header-pound:before{content:"\e954"}.icon-format-italic:before{content:"\e955"}.icon-format-list-numbers:before{content:"\e969"}.icon-format-quote-close:before{content:"\e96a"}.icon-image:before{content:"\e96c"}.icon-table-large:before{content:"\e96d"}.icon-aiux:before{content:"\e99e"}.icon-qc:before{content:"\e986"}.icon-qc-q:before{content:"\e985"}.icon-qc-c:before{content:"\e987"}.icon-sonarqube:before{content:"\e9ba"}.icon-college:before{content:"\e9c8"}.icon-ztool:before{content:"\e9c1"}.icon-contacts:before{content:"\e9c3"}.icon-chats:before{content:"\e9c4"}.icon-menu-my:before{content:"\e97a"}.icon-home:before{content:"\e97a"}.icon-program:before{content:"\e9aa"}.icon-lightbulb-alt:before{content:"\e98f"}.icon-product:before{content:"\e98f"}.icon-rocket:before{content:"\e99c"}.icon-project:before{content:"\e99c"}.icon-run:before{content:"\e9a9"}.icon-test:before{content:"\e956"}.icon-infinite:before{content:"\e9a3"}.icon-devops:before{content:"\e9a3"}.icon-ops:before{content:"\e903"}.icon-doc:before{content:"\e99b"}.icon-menu-doc:before{content:"\e99b"}.icon-statistic:before{content:"\e999"}.icon-menu-backend:before{content:"\e993"}.icon-assets:before{content:"\e9ae"}.icon-diamond:before{content:"\e9ae"}.icon-feedback:before{content:"\e991"}.icon-flow:before{content:"\e994"}.icon-oa:before{content:"\e9a1"}.icon-more-circle:before{content:"\e988"}.icon-controls:before{content:"\e995"}.icon-account:before{content:"\e992"}.icon-about:before{content:"\e996"}.icon-info:before{content:"\e996"}.icon-cog-outline:before{content:"\e997"}.icon-backend:before{content:"\e997"}.icon-exit:before{content:"\e99a"}.icon-theme:before{content:"\e9a0"}.icon-globe:before{content:"\f0ac"}.icon-lang:before{content:"\f0ac"}.icon-table-sort:before{content:"\e9e1"}.icon-design:before{content:"\e9ec"}.icon-download-alt:before{content:"\e9ea"}.icon-blame:before{content:"\e9e0"}.icon-draft-edit:before{content:"\e9dd"}.icon-sub-review:before{content:"\e9df"}.icon-sub-review-user:before{content:"\e9db"}.icon-ztf:before{content:"\e9dc"}.icon-save:before{content:"\e9d8"}.icon-list-box:before{content:"\e9b4"}.icon-usecase:before{content:"\e99d"}.icon-code:before{content:"\e990"}.icon-summary:before{content:"\e9ad"}.icon-more-alt:before{content:"\e9a7"}.icon-customer:before{content:"\e9d9"}.icon-waterfallplus:before{content:"\e9ed"}.icon-agileplus:before{content:"\e9ee"}.icon-horn:before{content:"\e9eb"}.icon-resume:before{content:"\e9e9"}.icon-mirror:before{content:"\e9e6"}.icon-remote:before{content:"\e9e7"}.icon-moon:before{content:"\e9e8"}.icon-ticket:before{content:"\e9e1"}.icon-gantt-alt:before{content:"\e9e2"}.icon-appose:before{content:"\e9e2"}.icon-inline:before{content:"\e9e3"}.icon-tree:before{content:"\e9c9"}.icon-list:before{content:"\e9cb"}.icon-gantt:before{content:"\e9cc"}.icon-group-view:before{content:"\e9cd"}.icon-inherit-space:before{content:"\e9c2"}.icon-card-archive:before{content:"\e9b8"}.icon-col-archive:before{content:"\e9b9"}.icon-col-add-right:before{content:"\e9bb"}.icon-col-add-left:before{content:"\e9bc"}.icon-col-split:before{content:"\e9bd"}.icon-waterfall:before{content:"\e9a4"}.icon-manual:before{content:"\e98d"}.icon-kanban:before{content:"\e983"}.icon-lane:before{content:"\e9b1"}.icon-snap-house:before{content:"\e9e3"}.icon-wrench:before{content:"\e9e4"}.icon-desktop:before{content:"\e9e5"}.icon-back:before{content:"\e9d3"}.icon-back-circle:before{content:"\e9da"}.icon-shield:before{content:"\e9ca"}.icon-meh:before{content:"\e9ce"}.icon-frown:before{content:"\e9cf"}.icon-smile:before{content:"\e9d0"}.icon-unlock-solid:before{content:"\e9d1"}.icon-lock-solid:before{content:"\e9d2"}.icon-ver:before{content:"\e9c6"}.icon-publish:before{content:"\e9c7"}.icon-send:before{content:"\e9c7"}.icon-tag:before{content:"\e9be"}.icon-tag-lock:before{content:"\e9bf"}.icon-code-fork:before{content:"\f126"}.icon-branch-lock:before{content:"\e9c0"}.icon-groups:before{content:"\e9af"}.icon-thumbs-up:before{content:"\f087"}.icon-thumbs-down:before{content:"\f088"}.icon-thumbs-up-solid:before{content:"\e9d6"}.icon-thumbs-down-solid:before{content:"\e9d7"}.icon-hash:before{content:"\e9ab"}.icon-version:before{content:"\e9ab"}.icon-p-square:before{content:"\e97b"}.icon-video-play:before{content:"\e97f"}.icon-plus-solid-circle:before{content:"\e974"}.icon-minuse-solid-circle:before{content:"\e9b6"}.icon-s:before{content:"\e975"}.icon-c:before{content:"\e976"}.icon-t:before{content:"\e977"}.icon-guide:before{content:"\e978"}.icon-todo:before{content:"\e979"}.icon-side-left:before{content:"\e9b3"}.icon-side-right:before{content:"\e9b2"}.icon-fullscreen-exit:before{content:"\e972"}.icon-alert:before{content:"\e99f"}.icon-undo:before{content:"\e93f"}.icon-redo:before{content:"\e9d4"}.icon-swap:before{content:"\e9b0"}.icon-chat-solid:before{content:"\e9b5"}.icon-clock:before{content:"\e97c"}.icon-cost:before{content:"\e97d"}.icon-pencil-alt:before{content:"\e984"}.icon-size-height:before{content:"\e9c5"}.icon-file-log:before{content:"\e9de"}.icon-rich-text:before{content:"\e913"}.icon-markdown:before{content:"\e916"}.icon-excel:before{content:"\e933"}.icon-text-link:before{content:"\e94d"}.icon-ppt:before{content:"\e957"}.icon-word:before{content:"\e958"}.icon-doc-lib:before{content:"\e96f"}.icon-file:before{content:"\f016"}.icon-file-empty:before{content:"\f016"}.icon-file-text:before{content:"\f0f6"}.icon-file-alt:before{content:"\f15b"}.icon-file-text-alt:before{content:"\f15c"}.icon-file-pdf:before{content:"\f1c1"}.icon-file-word:before{content:"\f1c2"}.icon-file-excel:before{content:"\f1c3"}.icon-file-powerpoint:before{content:"\f1c4"}.icon-file-image:before{content:"\f1c5"}.icon-file-archive:before{content:"\f1c6"}.icon-file-audio:before{content:"\f1c7"}.icon-file-video:before{content:"\f1c8"}.icon-file-code:before{content:"\f1c9"}.icon-menu-collapse:before{content:"\e980"}.icon-menu-expand:before{content:"\e981"}.icon-group:before{content:"\e97e"}.icon-menu-users:before{content:"\e97e"}.icon-persons:before{content:"\e97e"}.icon-team:before{content:"\e97e"}.icon-estimate:before{content:"\e9ac"}.icon-sprint:before{content:"\e9a2"}.icon-shield-check:before{content:"\e9a5"}.icon-ok:before{content:"\e9a6"}.icon-printer:before{content:"\e906"}.icon-bullhorn:before{content:"\e910"}.icon-person:before{content:"\e941"}.icon-fields:before{content:"\e989"}.icon-trigger:before{content:"\e98a"}.icon-layout:before{content:"\e98b"}.icon-audit:before{content:"\e98c"}.icon-cancel:before{content:"\e951"}.icon-ban-circle:before{content:"\e951"}.icon-eye:before{content:"\e94e"}.icon-eye-off:before{content:"\e96e"}.icon-unlock:before{content:"\e94f"}.icon-lock:before{content:"\e950"}.icon-private:before{content:"\e950"}.icon-move:before{content:"\e94c"}.icon-hand-right:before{content:"\e907"}.icon-checked:before{content:"\e908"}.icon-off:before{content:"\e909"}.icon-start:before{content:"\e90a"}.icon-play:before{content:"\e90a"}.icon-time:before{content:"\e90b"}.icon-edit:before{content:"\e90c"}.icon-trash:before{content:"\e90d"}.icon-link:before{content:"\e90e"}.icon-unlink:before{content:"\e90f"}.icon-bug:before{content:"\e911"}.icon-list-alt:before{content:"\e912"}.icon-change:before{content:"\e970"}.icon-alter:before{content:"\e970"}.icon-glasses:before{content:"\e914"}.icon-review:before{content:"\e914"}.icon-sitemap:before{content:"\e915"}.icon-testcase:before{content:"\e915"}.icon-pluses:before{content:"\e917"}.icon-report-list:before{content:"\e918"}.icon-magic:before{content:"\e919"}.icon-active:before{content:"\e919"}.icon-treemap:before{content:"\e91a"}.icon-confirm:before{content:"\e91b"}.icon-split:before{content:"\e98e"}.icon-delay:before{content:"\e91d"}.icon-calendar:before{content:"\e91d"}.icon-pause:before{content:"\e91e"}.icon-ban:before{content:"\e91f"}.icon-plus-bold:before{content:"\e920"}.icon-copy:before{content:"\e921"}.icon-refresh:before{content:"\e922"}.icon-diff:before{content:"\e9b7"}.icon-sm:before{font-size:14px;vertical-align:10%}.icon-qc{position:relative}.icon-qc:before{width:1em;color:#7cb938;content:"\e985"}.icon-qc:after{position:absolute;top:0;left:0;width:1em;height:1em;font-family:ZentaoIcon;font-size:14px;font-size:inherit;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:#36a742;text-transform:none;content:"\e987";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-message.has-dot{position:relative}.icon-message.has-dot::after{position:absolute;top:-3px;right:-5px;display:block;width:6px;height:6px;content:' ';background-color:#fc5959;border-radius:50%}.icon-project{-webkit-transform:scale(1.2);-ms-transform:scale(1.2);-o-transform:scale(1.2);transform:scale(1.2)}.icon-product{-webkit-transform:scale(1.15);-ms-transform:scale(1.15);-o-transform:scale(1.15);transform:scale(1.15)}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:13px;font-weight:400;line-height:18px;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;border-radius:4px;-webkit-transition:.4s cubic-bezier(.175,.885,.32,1);-o-transition:.4s cubic-bezier(.175,.885,.32,1);transition:.4s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:background,border,outline,opacity,-webkit-box-shadow;-o-transition-property:background,border,box-shadow,outline,opacity;transition-property:background,border,outline,opacity,-webkit-box-shadow;transition-property:background,border,box-shadow,outline,opacity;transition-property:background,border,box-shadow,outline,opacity,-webkit-box-shadow}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:focus,.btn:hover{color:#313c52;text-decoration:none}.btn:active{text-decoration:none;background-image:none;outline:0;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.1)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:grayscale(1);-webkit-box-shadow:none;box-shadow:none;opacity:.5;-webkit-filter:grayscale(1)}.btn{color:#313c52;background-color:#fff;border-color:#d8dbde}.btn.active,.btn.hover,.btn:active,.btn:focus,.btn:hover,.open .dropdown-toggle.btn{color:#313c52;background-color:rgba(255,255,255,.8);border-color:#bcc2c7}.btn.active,.btn:active,.open .dropdown-toggle.btn{background-color:#f2f2f2;background-image:none;border-color:#bcc2c7}.btn.disabled,.btn.disabled.active,.btn.disabled:active,.btn.disabled:focus,.btn.disabled:hover,.btn[disabled],.btn[disabled].active,.btn[disabled]:active,.btn[disabled]:focus,.btn[disabled]:hover,fieldset[disabled] .btn,fieldset[disabled] .btn.active,fieldset[disabled] .btn:active,fieldset[disabled] .btn:focus,fieldset[disabled] .btn:hover{color:rgba(49,60,82,.3);background-color:#fff;border-color:#d8dbde}.btn-gray{color:#82899f;background-color:#f1f1f1;border-color:#f1f1f1}.btn-gray.active,.btn-gray.hover,.btn-gray:active,.btn-gray:focus,.btn-gray:hover,.open .dropdown-toggle.btn-gray{color:#82899f;background-color:rgba(241,241,241,.8);border-color:#d8d8d8}.btn-gray.active,.btn-gray:active,.open .dropdown-toggle.btn-gray{background-color:#e4e4e4;background-image:none;border-color:#d8d8d8}.btn-gray.disabled,.btn-gray.disabled.active,.btn-gray.disabled:active,.btn-gray.disabled:focus,.btn-gray.disabled:hover,.btn-gray[disabled],.btn-gray[disabled].active,.btn-gray[disabled]:active,.btn-gray[disabled]:focus,.btn-gray[disabled]:hover,fieldset[disabled] .btn-gray,fieldset[disabled] .btn-gray.active,fieldset[disabled] .btn-gray:active,fieldset[disabled] .btn-gray:focus,fieldset[disabled] .btn-gray:hover{color:rgba(130,137,159,.3);background-color:#f1f1f1;border-color:#f1f1f1}.btn-primary{color:#fff;background-color:#2e7fff;border-color:transparent}.btn-primary.active,.btn-primary.hover,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open .dropdown-toggle.btn-primary{color:#fff;background-color:rgba(46,127,255,.8);border-color:rgba(0,0,0,0)}.btn-primary.active,.btn-primary:active,.open .dropdown-toggle.btn-primary{background-color:#156fff;background-image:none;border-color:rgba(0,0,0,0)}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{color:rgba(255,255,255,.3);background-color:#2e7fff;border-color:transparent}.btn-secondary{color:#fff;background-color:#18a6fd;border-color:transparent}.btn-secondary.active,.btn-secondary.hover,.btn-secondary:active,.btn-secondary:focus,.btn-secondary:hover,.open .dropdown-toggle.btn-secondary{color:#fff;background-color:rgba(24,166,253,.8);border-color:rgba(0,0,0,0)}.btn-secondary.active,.btn-secondary:active,.open .dropdown-toggle.btn-secondary{background-color:#029bf9;background-image:none;border-color:rgba(0,0,0,0)}.btn-secondary.disabled,.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary[disabled],.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:focus,.btn-secondary[disabled]:hover,fieldset[disabled] .btn-secondary,fieldset[disabled] .btn-secondary.active,fieldset[disabled] .btn-secondary:active,fieldset[disabled] .btn-secondary:focus,fieldset[disabled] .btn-secondary:hover{color:rgba(255,255,255,.3);background-color:#18a6fd;border-color:transparent}.btn-warning{color:#fff;background-color:#ff9f46;border-color:transparent}.btn-warning.active,.btn-warning.hover,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open .dropdown-toggle.btn-warning{color:#fff;background-color:rgba(255,159,70,.8);border-color:rgba(0,0,0,0)}.btn-warning.active,.btn-warning:active,.open .dropdown-toggle.btn-warning{background-color:#ff922c;background-image:none;border-color:rgba(0,0,0,0)}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{color:rgba(255,255,255,.3);background-color:#ff9f46;border-color:transparent}.btn-danger{color:#fff;background-color:#fc5959;border-color:transparent}.btn-danger.active,.btn-danger.hover,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open .dropdown-toggle.btn-danger{color:#fff;background-color:rgba(252,89,89,.8);border-color:rgba(0,0,0,0)}.btn-danger.active,.btn-danger:active,.open .dropdown-toggle.btn-danger{background-color:#fc4040;background-image:none;border-color:rgba(0,0,0,0)}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{color:rgba(255,255,255,.3);background-color:#fc5959;border-color:transparent}.btn-success{color:#fff;background-color:#22c98d;border-color:transparent}.btn-success.active,.btn-success.hover,.btn-success:active,.btn-success:focus,.btn-success:hover,.open .dropdown-toggle.btn-success{color:#fff;background-color:rgba(34,201,141,.8);border-color:rgba(0,0,0,0)}.btn-success.active,.btn-success:active,.open .dropdown-toggle.btn-success{background-color:#1eb37e;background-image:none;border-color:rgba(0,0,0,0)}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{color:rgba(255,255,255,.3);background-color:#22c98d;border-color:transparent}.btn-info{color:#2e7fff;background-color:#e6f0ff;border-color:transparent}.btn-info.active,.btn-info.hover,.btn-info:active,.btn-info:focus,.btn-info:hover,.open .dropdown-toggle.btn-info{color:#2e7fff;background-color:rgba(230,240,255,.8);border-color:rgba(0,0,0,0)}.btn-info.active,.btn-info:active,.open .dropdown-toggle.btn-info{background-color:#cce1ff;background-image:none;border-color:rgba(0,0,0,0)}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{color:rgba(46,127,255,.3);background-color:#e6f0ff;border-color:transparent}.btn-link{padding-right:6px;padding-left:6px;font-weight:400;color:#313c52;text-shadow:none;cursor:pointer;background:0 0;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover,.btn-link[disabled],fieldset[disabled] .btn-link{border-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link:focus,.btn-link:hover{color:#0b0f18;background:#f1f1f1;background:rgba(0,0,0,.075)}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#c4c4c4;text-decoration:none}.btn-lg{padding:11px 16px;font-size:14px;line-height:18px;border-radius:4px}.btn-mini,.btn-sm{padding:3px 8px;font-size:12px;line-height:18px;border-radius:4px}.btn-mini,.btn-xs{padding:0 5px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.btn-wide{min-width:120px}.btn-limit{max-width:180px;padding-right:20px;overflow:hidden;text-overflow:unset;white-space:nowrap}.btn-limit>.caret{position:absolute;top:14px;right:8px}.btn-circle{border-radius:17px}.btn>.label-icon{top:3px;padding:3px;margin:-2px;background-color:rgba(0,0,0,.2);border-radius:12px}.btn>.label-icon>.icon{font-size:16px;line-height:18px}.btn>.icon+.text{margin-left:5px}.btn.btn-sm.btn-circle{border-radius:12px}.btn.btn-sm>.label-icon{top:2px;width:20px;height:20px;padding:1px;line-height:20px}.btn.btn-sm>.label-icon>.icon{position:relative;top:-1px;display:inline-block;font-size:14px;line-height:18px}.btn-icon-left{position:relative;padding-left:35px;overflow:hidden;text-align:right}.btn-icon-left>.label-icon{position:absolute;left:5px;margin:0}.btn-icon-left>.icon{position:absolute;top:0;bottom:0;left:0;display:block;width:30px;line-height:30px;color:#18a6fd;text-align:center;background:#e6f0ff}.btn-icon-left.btn-sm{padding-left:28px}.btn-icon-left.btn-sm>.label-icon{left:2px}.btn-icon-left.btn-sm>.icon{width:24px;line-height:24px}.btn-icon-right{position:relative;padding-right:35px;text-align:left}.btn-icon-right>.label-icon{position:absolute;right:5px;margin:0}.btn-icon-right.btn-sm{padding-right:28px}.btn-icon-right.btn-sm>.label-icon{right:2px}.btn-icon{min-width:32px;padding-right:0;padding-left:0}.btn-icon.btn-sm{width:24px;min-width:24px;height:24px}.btn-group{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group>.btn-group{float:left}.btn-group>.btn{border-radius:0}.btn-group>.btn:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.btn-group>.btn:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.dropdown{float:left;margin-right:10px}.btn-toolbar>.btn-group:last-child,.btn-toolbar>.btn:last-child,.btn-toolbar>.dropdown:last-child{margin-right:0}.btn-toolbar>.divider{float:left;height:20px;margin:7px 5px 4px 10px;border-left:1px solid rgba(0,0,0,.1)}.btn-toolbar .space{float:left;min-height:1px;margin:0 10px 0 10px}.btn-toolbar .input-control{float:left;width:120px}.btn-toolbar .page-title{float:left;line-height:34px}.btn-toolbar .page-title .text{font-size:14px;font-weight:700}.btn-toolbar .page-title .label{top:-2px;margin-right:10px}.btn-toolbar .divider+.page-title{margin-left:15px}.btn-active-line{position:relative;font-weight:700;color:#2e7fff}.btn-active-line:after{position:absolute;right:5px;bottom:1px;left:5px;display:block;content:' ';border-bottom:2px solid #2e7fff}.btn-active-line:hover{color:#2e7fff}.btn-active-text .text{position:relative;top:-1px;display:inline-block;font-weight:700;color:#1e6aeb}.btn-active-text .text:after{position:absolute;bottom:-5px;display:block;width:100%;content:' ';border-bottom:2px solid #2e7fff}.angle-btn{position:relative;padding:1px;background:#fff;border:1px solid #c4c4c4;border-right:none}.angle-btn:first-child{border-radius:2px 0 0 2px}.btn-toolbar>.angle-btn{margin-right:8px}.angle-btn:after,.angle-btn:before{position:absolute;top:-1px;right:-8px;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #c4c4c4;border-style:solid;border-width:17px 0 17px 8px}.angle-btn:after{right:-7px;border-color:transparent transparent transparent #fff;border-radius:2px}.angle-btn .btn{padding:6px;font-weight:700;background:#fff;border:none;border-radius:4px!important}.angle-btn .btn.btn-limit{padding-right:16px}.angle-btn .btn.btn-limit>.caret{right:4px}.angle-btn+.angle-btn{border-left:none}.angle-btn+.angle-btn>.btn-group:first-child{padding-left:8px}.angle-btn+.angle-btn>.btn-group:first-child:after,.angle-btn+.angle-btn>.btn-group:first-child:before{position:absolute;top:-2px;left:0;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #c4c4c4;border-style:solid;border-width:17px 0 17px 8px}.angle-btn+.angle-btn>.btn-group:first-child:after{left:-1px;border-color:transparent transparent transparent #fff;border-width:17px 0 17px 8px}.btn-toolbar>.angle-btn.active,.btn-toolbar>.angle-btn:last-child{border-color:#2e7fff}.btn-toolbar>.angle-btn.active .btn,.btn-toolbar>.angle-btn:last-child .btn{color:#2e7fff}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn.active:before,.btn-toolbar>.angle-btn:last-child:after,.btn-toolbar>.angle-btn:last-child:before{border-color:transparent transparent transparent #2e7fff}.btn-toolbar>.angle-btn.active:after,.btn-toolbar>.angle-btn:last-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before{border-color:transparent transparent transparent #2e7fff}.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after,.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn,.btn-toolbar>.angle-btn.normal{border-color:#c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn .btn,.btn-toolbar>.angle-btn.normal .btn{color:#313c52}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.active+.angle-btn:before,.btn-toolbar>.angle-btn.normal:after,.btn-toolbar>.angle-btn.normal:before{border-color:transparent transparent transparent #c4c4c4}.btn-toolbar>.angle-btn.active+.angle-btn:after,.btn-toolbar>.angle-btn.normal:after{border-color:transparent transparent transparent #fff}.btn-toolbar>.angle-btn.active+.angle-btn>.btn-group:first-child:before,.btn-toolbar>.angle-btn.normal>.btn-group:first-child:before{border-color:transparent transparent transparent #c4c4c4!important}.nav>li>.btn.btn-primary{color:#fff}.nav>li>.btn.btn-primary:focus,.nav>li>.btn.btn-primary:hover{background:rgba(46,127,255,.8)}.btn.btn-action,.c-actions .btn{display:inline-block;width:26px;padding:2px;overflow:hidden;line-height:20px;color:#18a6fd;background:0 0;border-color:transparent}.btn.btn-action>i,.c-actions .btn>i{position:relative;top:1px;font-size:18px}.btn.btn-action:hover,.c-actions .btn:hover{color:#2e7fff;background-color:#cce1ff}.c-actions .btn+.btn{margin-left:-4px}.label{position:relative;display:inline-block;padding:3px 5px;font-size:12px;font-weight:400;vertical-align:middle;border-radius:2px}.label+.label{margin-left:4px}.label-pale{background:#b3d1ff!important}.label-badge{border-radius:9px}.label-light{color:#3c4353;background-color:#ddd}.label-primary{background:#2e7fff!important}.label-gray{color:#878da0;background:#e8ebef}.label-outline.label-danger{color:#fc5959;background:#ffebeb;border-color:rgba(252,89,89,.25)}.label-outline.label-light{color:#838a9d;background:#f2f5fb;border-color:#e1e5ee}.label-primary.label-outline{background:#e6f0ff!important;border-color:rgba(46,127,255,.25)}.label-outline.label-success{background:#ecfff8;border-color:rgba(34,201,141,.25)}.label-outline.label-info{background:#e7f6ff;border-color:rgba(55,178,254,.25)}.label-outline.label-warning{background:#fff4ea;border-color:rgba(255,159,70,.25)}.label-dot{position:relative;top:-1px;padding:0;border-radius:50%}.label-dot+.status-text{display:inline-block;margin-left:5px}.label-icon{min-width:18px;padding:0;line-height:18px;border-radius:10px}.label-id{display:inline-block;min-width:30px;padding:0 5px;font-size:12px;line-height:16px;color:#838a9d;text-align:center;vertical-align:middle;background-color:transparent;border:1px solid #838a9d;border-radius:2px}.pri-1,.todo-pri-1{color:#fc5959}[class*=" status-"],[class^=status-]{color:#313c52}.status-changed,.status-delayed,.status-doing,.status-fail,.status-investigate{color:#fc5959}.status-changed>.label-dot,.status-delayed>.label-dot,.status-doing>.label-dot,.status-fail>.label-dot,.status-investigate>.label-dot{background-color:#fc5959}.status-wait{color:#838a9d}.status-wait>.label-dot{background-color:#7ec5ff}.status-unclosed{color:#838a9d}.status-unclosed>.label-dot{background-color:#2e7fff}.status-done,.status-normal,.status-pass,.status-resolved{color:#43a047}.status-done>.label-dot,.status-normal>.label-dot,.status-pass>.label-dot,.status-resolved>.label-dot{background-color:#22c98d}.status-postpone{color:#838a9d}.status-postpone>.label-dot{background-color:#fc5959}.status-blocked{position:relative;left:-5px;display:inline-block;padding:0 5px;line-height:20px;color:#313c52;background:0 0;border-radius:10px}.status-blocked>.label-dot{background-color:#ff9f46}.status-pause,.status-suspended{color:#ff9f46}.status-pause>.label-dot,.status-suspended>.label-dot{background-color:#ff9f46}.status-active.status-bug,.status-draft{color:#8166ee}.status-active.status-bug>.label-dot,.status-draft>.label-dot{background-color:#8166ee}.status-closed,.status-terminate{color:#838a9d}.status-closed>.label-dot,.status-terminate>.label-dot{background-color:#838a9d}.status-cancel{color:#838a9d}.status-cancel>.label-dot{background-color:#c4c4c4}.label-pri{display:inline-block;min-width:18px;max-width:100%;height:18px;padding:0 4px;overflow:hidden;font-size:12px;line-height:16px;color:#838a9d;text-align:center;text-overflow:clip;white-space:normal;vertical-align:middle;border:1px solid #838a9d;border-radius:10px}.label-pri-1,.label-selector>.label-pri[data-value="1"]{overflow:visible;color:#ff6f42;border-color:#ff6f42}.label-pri-2,.label-selector>.label-pri[data-value="2"]{color:#f38f19;border-color:#f38f19}.label-pri-3,.label-selector>.label-pri[data-value="3"]{color:#37b2fe;border-color:#37b2fe}.label-pri-4,.label-selector>.label-pri[data-value="4"]{color:#22c98d;border-color:#22c98d}.label-pri-5,.label-selector>.label-pri[data-value="5"]{color:#838a9d;border-color:#838a9d}.label-pri-0,.label-selector>.label-pri.active[data-value="0"]{color:#d5d9df;border-color:#d5d9df}.label-severity{position:relative;display:inline-block;width:24px;height:20px;font-weight:bolder;text-align:center;vertical-align:middle}.label-severity:before{position:absolute;top:-3px;left:0;z-index:0;display:block;font-family:ZentaoIcon;font-size:14px;font-size:24px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;color:inherit;text-transform:none;content:"\e973";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.label-severity:after{position:absolute;top:7px;left:0;z-index:1;display:block;width:24px;font-size:12px;line-height:12px;text-align:center;content:attr(data-severity)}.label-severity[data-severity],.label-severity[data-value]{color:#ccc}.label-severity[data-severity="0"],.label-severity[data-value="0"]{color:#ccc}.label-severity[data-severity="1"],.label-severity[data-value="1"]{color:#fb2b2b}.label-severity[data-severity="2"],.label-severity[data-value="2"]{color:#c92d79}.label-severity[data-severity="3"],.label-severity[data-value="3"]{color:#f48116}.label-severity[data-severity="4"],.label-severity[data-value="4"]{color:#ffba34}.label-severity[data-severity="5"],.label-severity[data-value="5"]{color:#9ea3b0}.label-severity-custom[data-severity]{color:#d5d9df}.label-severity-custom[data-severity="1"]{color:#c62828}.label-severity-custom[data-severity="2"]{color:#ff8f00}.label-severity-custom[data-severity="3"]{color:#fdd835}.label-severity-custom[data-severity="4"]{color:#cddc39}.label-severity-custom[data-severity="5"]{color:#8bc34a}.label-selector{padding:0 10px}.label-selector>.label{display:inline-block;min-width:24px;height:24px;padding:0 5px;font-size:14px;line-height:20px;text-align:center;cursor:pointer;background:0 0;border:2px solid #d5d9df;border-radius:15px}.label-selector>.label+.label{margin-left:10px}.label-selector>.label.empty{border-color:transparent}.label-selector>.label.label-severity{font-size:12px;line-height:28px;border-color:transparent}.label-selector>.label.label-severity:before{top:-2px;left:-2px}.label-selector>.label.label-severity:after{display:none}.label-selector>.label.label-severity.active{background:0 0;filter:none;-webkit-filter:none}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{margin-top:2px}.ie .checkbox input[type=checkbox],.ie .checkbox-inline input[type=checkbox],.ie .radio input[type=radio],.ie .radio-inline input[type=radio]{margin-top:4px}.is-firefox .checkbox input[type=checkbox],.is-firefox .checkbox-inline input[type=checkbox],.is-firefox .radio input[type=radio],.is-firefox .radio-inline input[type=radio]{margin-top:3px}.checkbox-primary,.radio-primary{position:relative;display:block;vertical-align:middle}.checkbox-primary.inline-block,.radio-primary.inline-block{display:inline-block}.checkbox-primary.inline-block+.inline-block,.radio-primary.inline-block+.inline-block{margin-left:15px}.checkbox-primary>input,.radio-primary>input{position:absolute;top:0;left:0;z-index:3;width:100%;height:100%;margin:0;opacity:0}.checkbox-primary>label,.radio-primary>label{display:block;height:20px;padding-left:20px;margin:0;font-weight:400;line-height:20px;cursor:pointer}.checkbox-primary>label:after,.checkbox-primary>label:before,.radio-primary>label:after,.radio-primary>label:before{position:absolute;top:3px;right:0;left:0;display:block;width:14px;height:14px;line-height:14px;text-align:center;content:' ';border-radius:3px}.checkbox-primary>label:after,.radio-primary>label:after{z-index:1;border:1px solid #d9dbe1;border-color:rgba(0,0,0,.15);-webkit-transition:.4s cubic-bezier(.175,.885,.32,1);-o-transition:.4s cubic-bezier(.175,.885,.32,1);transition:.4s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:border,background-color;-o-transition-property:border,background-color;transition-property:border,background-color}.checkbox-primary>label:before,.radio-primary>label:before{top:3px;z-index:2;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-weight:900;font-variant:normal;line-height:1;text-transform:none;content:"\e5ca";opacity:0;-webkit-transition:.2s cubic-bezier(.175,.885,.32,1);-o-transition:.2s cubic-bezier(.175,.885,.32,1);transition:.2s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:opacity,-webkit-transform;-o-transition-property:opacity,-o-transform;transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform,-o-transform;-webkit-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0);speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.checkbox-primary.checked>label:after,.checkbox-primary>input:checked+label:after,.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:#22c98d;border-color:#22c98d;border-width:4px}.checkbox-primary.checked>label:before,.checkbox-primary>input:checked+label:before,.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{color:#fff;opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}.checkbox-primary input:indeterminate+label:before,.checkbox-primary.indeterminate>label:before,.radio-primary input:indeterminate+label:before,.radio-primary.indeterminate>label:before{top:9px;left:3px;width:8px;height:2px;content:' ';background-color:#a3a2bc;opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1)}.checkbox-primary.focus>label:after,.checkbox-primary>input:focus+label:after,.radio-primary.focus>label:after,.radio-primary>input:focus+label:after{border-color:#22c98d;-webkit-box-shadow:0 0 0 3px rgba(34,201,141,.2);box-shadow:0 0 0 3px rgba(34,201,141,.2)}.checkbox-primary:hover>label:after,.radio-primary:hover>label:after{border-color:#22c98d}.checkbox-primary.checkbox-right>label,.radio-primary.checkbox-right>label{padding:0 30px 0 0}.checkbox-primary.checkbox-right>label:after,.checkbox-primary.checkbox-right>label:before,.radio-primary.checkbox-right>label:after,.radio-primary.checkbox-right>label:before{right:0;left:auto}.checkbox-primary input:disabled+label:after,.checkbox-primary.disabled>label:after,.radio-primary input:disabled+label:after,.radio-primary.disabled>label:after{background-color:#e5e5e5!important;border-color:#bbb!important}.checkbox-primary input:disabled:checked+label:after,.checkbox-primary.checked.disabled>label:after,.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:#bbb!important}.radio-primary>label:after{border-radius:50%}.radio-primary>label:before{top:7px;left:6px;width:6px;height:6px;content:' ';border:none;border-radius:50%}.radio-primary.checked>label:after,.radio-primary>input:checked+label:after{background-color:transparent;border-color:#22c98d;border-width:2px}.radio-primary.checked>label:before,.radio-primary>input:checked+label:before{background-color:#22c98d}.radio-primary input:disabled:checked+label:after,.radio-primary.checked.disabled>label:after{background-color:transparent;border-color:#bbb}.radio-primary input:disabled:checked+label:before,.radio-primary.checked.disabled>label:before{background-color:#bbb}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li>a{position:relative;border:none!important;border-radius:2px!important}.nav-tabs>li.active>a{font-weight:700;color:#313c52!important}.nav-tabs>li.active>a:before{position:absolute;right:0;bottom:-1px;left:0;display:block;height:2px;content:' ';background:#2e7fff}.nav-tabs-primary>li.active>a{color:#1e6aeb!important}.nav-steps{height:29px;text-align:center}.nav-steps>ul{display:inline-block;margin:0}.nav-steps>ul>li{position:relative;background-color:#fff}.nav-steps>ul>li.active>a{color:#fff;background-color:#18a6fd}.nav-steps>ul>li>a{min-width:119px;padding:5px 20px;text-align:center;border:1px solid transparent;-webkit-transition:none;-o-transition:none;transition:none}.nav-steps>ul>li>a:hover{background-color:transparent}.nav-steps>ul>li.active>a:focus,.nav-steps>ul>li.active>a:hover{background-color:#2e7fff}.nav-steps>ul>li+li>a{padding-left:34px}.nav-steps>ul>li+li:after,.nav-steps>ul>li+li:before{position:absolute;top:0;left:0;width:-1;height:0;content:' ';border-color:transparent transparent transparent #a6aab8;border-style:solid;border-width:15px 0 15px 15px}.nav-steps>ul>li+li:after{left:-2px;border-left-color:#fff}.nav-steps>ul>li.active+li:after{border-left-color:#18a6fd}.nav-steps>ul>li:hover{background-color:#eceef3}.nav-steps>ul>li:hover+li:after{border-left-color:#eceef3}.nav-steps>ul>li.active:hover+li:after{border-left-color:#2e7fff}.nav-steps.editor-steps-advance>ul>li:last-child:after,.nav-steps.editor-steps-advance>ul>li:last-child:before{display:none}.nav-steps.editor-steps-advance>ul>li:last-child>a{padding-left:19px}.panel{position:relative;margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.panel-body{padding:20px}.panel-body.has-table{padding:10px}.panel-body.has-table .table{margin-bottom:0;table-layout:fixed}.panel-heading{padding:12px 48px 12px 20px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading+.panel-body{padding-top:0}.panel-title{font-size:14px;font-weight:700;line-height:20px}.panel-title .label{top:-1px}.panel-actions{position:absolute;top:0;right:0;padding:7px 8px}.panel:hover .panel-actions{z-index:10}.panel-actions>li>a{display:inline-block;min-width:30px;padding:0 5px;line-height:30px;color:#a6aab8;text-align:center;border-radius:4px}.panel-actions>li>a:hover{color:#313c52;text-decoration:initial;background-color:#f1f1f1}.panel-actions .btn-icon{color:#a6aab8}.panel-actions .btn.text-primary{color:#2e7fff}.panel .empty-tip{padding:30px 10px 50px;font-size:14px;color:#838a9d;text-align:center}.progress-text-left{position:relative;margin:7px 0;margin-left:35px;overflow:visible}.progress-text-left .progress-text{position:absolute;top:-7px;left:-35px;display:block;width:35px;height:20px;padding-right:5px;line-height:20px;color:#838a9d;text-align:right}.chart-color{width:20px}.chart-color-dot{display:inline-block;width:10px;height:10px;border-radius:50%}.chart-row{margin-top:10px}.chart-row+.chart-row{padding-top:10px;border-top:1px solid #eee}.chart-wrapper{padding:10px 5px;background:#eee}.chart-wrapper>h4{margin:5px 0 10px}.table-wrapper{max-height:250px;overflow:auto}.table-wrapper .table{margin:0}.progress-pie{position:relative}.progress-pie canvas{display:block}.progress-pie .progress-info{position:absolute;top:0;left:0;width:100%;height:100%;padding-top:25px;text-align:center}.progress-pie .progress-info>small{display:block;line-height:14px;color:#a6aab8}.progress-pie .progress-info>strong{display:block;font-size:36px;line-height:40px}.progress-pie .progress-info>strong>small{font-size:20px}.progress-pie-120 .progress-info{padding-top:30px}.progress-pie-120 .progress-info>small{line-height:18px}.progress-pie-50 .progress-info{padding-top:4px}.progress-pie-50 .progress-info>strong{font-size:20px;font-weight:400}.progress-pie-50 .progress-info>strong>small{font-size:14px}.progress-pie[data-value="100"] .progress-info>strong{-webkit-transform:scale(.7);-ms-transform:scale(.7);-o-transform:scale(.7);transform:scale(.7)}.progress-pie-24 .progress-info{right:-10px;left:-10px;width:auto;padding-top:0;font-size:12px;line-height:24px;-webkit-transform:scale(.9,1);-ms-transform:scale(.9,1);-o-transform:scale(.9,1);transform:scale(.9,1)}.progress-pie-24[data-value="100"] .progress-info{-webkit-transform:scale(.8,1);-ms-transform:scale(.8,1);-o-transform:scale(.8,1);transform:scale(.8,1)}.progress-pie-26 .progress-info{right:-10px;left:-10px;width:auto;padding-top:0;font-size:12px;line-height:26px;-webkit-transform:scale(.9,1);-ms-transform:scale(.9,1);-o-transform:scale(.9,1);transform:scale(.9,1)}.progress-pie-26[data-value="100"] .progress-info{-webkit-transform:scale(.8,1);-ms-transform:scale(.8,1);-o-transform:scale(.8,1);transform:scale(.8,1)}.status-bars{display:table;width:100%;height:140px;padding:5px;padding-top:50px;margin:0;overflow:hidden}.status-bars>li{position:relative;display:table-cell;text-align:center;vertical-align:bottom}.status-bars .bar{position:absolute;bottom:20px;left:50%;display:block;width:10px;margin-left:-5px;background:#2e7fff;border-radius:5px 5px 0 0}.status-bars .bar:after{position:absolute;right:-50px;bottom:0;left:-50px;display:block;height:1px;content:' ';background:#eee}.status-bars .title{font-size:12px;font-weight:400;color:#a6a8b6}.status-bars .value{position:relative;top:-20px;left:-20px;display:inline-block;width:50px;font-size:16px;font-weight:700;text-align:center}.status-bars-h{display:block;padding-right:50px;padding-left:60px;list-style:none}.status-bars-h>li{position:relative;height:40px;border-left:1px solid #eee}.status-bars-h .bar{position:relative;top:15px;display:block;height:10px;line-height:20px;background:#2e7fff;border-radius:0 5px 5px 0}.status-bars-h .title{position:absolute;top:-5px;left:-60px;width:60px;padding-right:10px;font-size:12px;color:#a6a8b6;text-align:right}.status-bars-h .value{position:absolute;top:-5px;right:-50px;display:block;width:40px;font-size:14px;font-weight:700;text-align:left;white-space:nowrap}.ring,[class*=" ring-"],[class^=ring-]{width:24px;height:24px;font-size:12px;line-height:24px;text-align:center;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACZAAAAAwCAMAAACyyT3hAAAAP1BMVEUAAAAAAAA5rm06sG87snE4q200o2o7sG86r244q2w6r244rWw7snA7sG86rG05rm07snA5qWw7sW86sG48s3ECZypFAAAAFHRSTlMACl2b8TkPtnsqj0fVv4Zt4RrIqxUkbyYAAA1gSURBVHja7NrbbtswEIRhmyJ1IiVS0v/+z9rCbeGkdZodNEnVdHmTxP4wmF1exLB9eXCu12tqLX39cTGcm78use2z5Msx19wLfunGpOZvSv4xh/798tt+dKPSZ+jGMNn9/pWnXp1X7f9e+ynf53Xv3r37j/bLyfq4/1u+n8T8VI8jLWY/hbEbSjT76+2ssH77zeyBJHooom9dkHzssuQ5wvau+YuWz141/87zMoTewP9kP+7d2/31ZPln82e7L/fuP9LnJPk+DDDb/TQvEaDc/1//vk9Yvrl7vmHa+ztk347BXwcA1UMRPXCIfq+b5Jm3d82PneY5guSHG1fmVfu/837m5N69e/fu3T89fRZ9bRTBpyMCLFa/zfG7CU98l1/M/+EBS/59PT//bfD9lCS/pbAeR7bnb1OqC7AI+QWAkiz5Kdd1B6BVLb8Fk891Poox/7bPUNcIwGHrM3YDAHu1zyv0yWHcjfNen++nWvsvANC5d6/468nyz+bPdl/u3es+NFbFjw1A8BGAPUv5xGFMz/382HcAsNy+W9Sb9/PwwbP4ra5J8WluQDb7qQ4Ayybl05nnrQVgSFafB4AyWfvPEaBT57X2Seu3ecX9HBfN75t79+7du/+sPnVBy++A1e6nHaAEsz9ufk7W/gUgrvmBP/pf/bYDtDlp+/x8j4du1XwBFsHvQMlW348NIJjz0yH5bbz1n7R5m71/bUAL2n5iMueHAYjZvXv37t1/Tp8bJMFPDYhCfgTa2Ft9aEDJ5vzUbvnbC3562GcI5j6vf3T43/h+hlnJnwFGs99WgGDPv/lq9yPQsjCv1mcT/aUDGEVf3bt37979v+DH1kk+RIiCrwCz0AeI82bvc8vvzT5HYP1NfnjQv3uL/d+f/X/8ljUfGiD4ChDsPkcgCX0iUMX8UfDDw/6Xl+fV+q8Awb373/rLyfLP5s92X+4/rQ8QFV+BmO0+AyTND0nqT1H6xFf715/zWe35l5fXf3/e/YtnGugUnxsQhD47sNl9Klp+ipq/DmL/ovXPAJN79+7du/9on5dV80An+BEoye4nYLhofu/tPgAtafO26RWfn/chv9F93YX7N/PTDoOSHzW/LVA2Ib9Am+y+34Es5DdYlHmB2Lt37969+4/1fYQs+KlB6e0+Acsm9CnQXTQfJ61PTMI+dyiv99me7pO3u6+7cf9mvj/Ikgc6xRfNXyIcgt8KLIoX+0/A4d69e/fu/8znoPkOBsH3O8Qk5C8wiH12xR9AFvwAUfEzREOf/Wmf6Q3v967cv52fNJ+BIPgg+gmogk/xmb9a+lex/+ze/WN/PVn+2fzZ7sv93/MVVsUHIAn+AKrgV4hK/gxsYv+q7Ycg+AxMFt/d+9vy/QXZP+RHCIrvoGyCr9B6wa/QNq3/ftHyye7df2HP3pbQBKIgihqGmzKA4P7/b02lTOX2EncSEky1z8uungPosYyPj/8Nv8Mk/HaHm/Adzk/AIvy1hUb4vkKR5y0yf33Nd+K89vo+Xfy/81Oj/FahmPwBRuH7CjeTX6GRfUp8fHx8/Fc/UpRvoBpf4L4ZL/MfsLvzUoxfgM6e1/V5vNjn9jl/eLV/FrL/2DcwS1+lZxN+9X3a+Pj4+Pgvvm9B5Q8wyvxV+K11+VdgMv2r810LRZ63MX1m6IwX+ep+eMr49/HL3ChfoTF+eD65r/q+wiTy+zus8fHf+8vJ8s/mz3a94n/im075FarxE7Sby2975+8mf5T9G9gvLp/O9Jf5nfHNcz6vzzMLWfyX1wiz8Ss8ZP5g/A32+Pj4+P/XP0D5GRbjC9xkfjF+l/lV9h9gtP2PnOfN9JntfMQPsCeN/3/9dmc2/gqtym+d74BrfHx8/P/q+xaM34CryZf+CnTCT9Ca/A7YnG+N71V/P89La/r7eZ5pIYj/x35aNuUH6IzfpZ+hiY+Pj38X35dF+Ql241eoxncwGD/K/EbmL8r7/En2X+X8J99/dveb+4L/EB//zX+Wo/EFVunH+Pj4+HfxI0zG3+BmfIHF+AaKzB/VeU+Wv8BwZJ/14P56IbvEx39+bdDIBa4YP8bHx8e/kS/QGb/DZPwDVuMXGGV+Y3yR+QM+X/py5HlvB/e3C1l8/Fe/TYZfJtjNGxoY4uN/8JeT5Z/Nn+16vbVf7kX5Ga7GV+iM32Ey/gHNkfnDyfJnWA+d58H9L+aB/4Tj43/Vb4DxHdT4+Pj4f+WhVb7CZnwrfYWr8Tt0xt9lfj1ZfoVJedvn4P5ZyOL/nn+wGN9DGx8fH/+vPKB8630f/0f9drI+ymchiz+vB5Q/4Qd6fHz8efxCycIU/5G9e9lRHAaAKEr7kZi8nIT7/986UlatWaWGCbjpYn1UKizAQU7sZr0vyOzb9QkUv8Ek+qT4u77ksYv5q5g/tZQv91F9g0ta9j/Loy8RZnv7795LlvYf4b/U/JgWccLur/xBH2EXfbw4v28pP8B8cZ9HgzfR27/Tj9utpZvK7e2f8W09tWdv/8S+aBmi4OWnPis8FF+gKD7o+VHM78X8QfGD3uch+qG1bQ7s3+sDbIqPUEVf7O2/+5a2vWhqHyx7+++vUbwAGsQJfhEnjAhB8UXPLy3l97BcOgF7Y2H7v3yBeuVGqcXe/oW+qaN77O2f8jF2it9hVPwE9eKjpYqYH0S/XJk/ieM5i+P5gLG1o3Ls/7PfllE9Gkj0u3r0jb39q3xbE6q9/Qs9pE7wd+BKn4FNyU8wCn4DsuKT5vPF49Phw+k/389Mm+IT3DWf5MOh7e1f5G/n1ywPaW//MR4eil9EP0AU83sxf1d8Ub3YJ4q+iONZYRDHZ7b/aX6GovgIVfG9kr8ffYbz+fb2z/nbTZnw7O2f8V9N9clV8hMEwW8JRsF3q5i/QlX676rX+mSgqPmKnyGr42n/dh/mRfEjTIoP0Kv53Vlfj/z1tA/29s/5039hDmdv/2s9pE7wBXolv+r5aRP8CIh+UvpHSFnwQXy/GeabmG//fj9DUPyk+Q0IYp+q+ATB3v4lvqkJz96+ZR+pip8gCH5bIUr5ot/hofgIRfAZWK58vzMUxfcw2F/hQ1D8ANMm+Aq9mt8JPsB0Mj8e+UIfe/vn/Olv5KHs7e3P+QC74gdY75onC34BRsFXSEqfCFOn+XUT/KDnk+0v8AGK4LcJouC7FQYlf4VF6b9DEb4vmfP97X+HX859fvT843Vq880D2dv/o7811udyv0AV/IjmK/AQfE6wKB4YxD5B8AGoYp9R8AsQ7f+0a287bsJQFIapTxxssA3/+z9rJVS1VVOmezeDOp1s7mI+LS1bxJZChH7WeAdkpXcKX4Gs8yHqPFXyfC4/jspNlG/+VbyTPD/6/G+X9EAyb9681Dun8SMcCh8D7Enu0wirpk/T+QyMGh90fgiwKPvs5oU+45PCH4DGeyjK/KDpv0Lpyv7z237mp+/jDmRBvvnX8YLn5y/yxd/gU5g3b/4enyF0uU8FWpT7vgIKf56JSe5jgNY1XtlnV+5XQOjmhf6AfVb4AkGR3wuMXe7nBrsiPwN7evf+3xN7AAR9zJt/yst3uPO+efPmb/LbmhXeAwofCzAp8kcgyn0qyj4NcHLflfkzr+494yz3DmhZ7mdgH3T5JSp91/lxeL/+GWC++HyZb/6lfL72+Yl80d8OztvmzYv8I/9gff5/H6DKfQ6ofARwCj+i61MAp+sfstw7gPrZfO4KDzQn9w5A4TMQZrmvQFDkT0DIuv5j1Hku87eH1aiC9TH/Yn678tsT+Vdn5uM98+bNfxDvwyT3KUBwcr/o9oe+BJVPZ76T529AyBf+8jz9bH6BJYn9BLDI8x3A1nX5VZ6fGzAp+yxJ6ZX9t+ufn6m/W5+3+pt/Oe+vnx99/tWxYOM2buOfanyGluU+AHuX+jQ1IERxfi5Ac1Lfz/wmzk9uBML8P/jNO7lfgSL3sQC73DuANiWpzwA+i/Pns//UxflNN1/XgFaTuE8D1sv8/OADMLrLfPPmn/JXO/qX3w+aN2/+P/X1iHK/AZM43xWAsQt9XE5/zEKftwBQoji/nfnpH/m41S72GQg+Cn1aAcZpluYvqPLjCFCqdL59B1jFfvAAYZH2j8r5dq+b77Bd+70/8nQAtOX3+ebNP+Wvd9zz+vWjefNaP3ywPuZFfqNluQcIm9DnndNPIh+nMQDQJL5HN/kVAJY/+TinJPX5OCYXhX4F1hrnPgh8LAAUaX5tnH6rWdTfNXX+yZeaRd4DELaaZetZdwBGf/N8Jyfz+Wp9/Buv8mF97G/e/JP+egt6vAbz5s2/is9J4QthEvsVIBxR5F2A0y9d4Avwzfv8Jw8g9gXk/gDkvtdd5xfuzfdB5d2Iyg9uvHe+PrzD+izxyueLfPPmn/OaLXoYzJv/az98sD7m39XHrPAe1pqEfgUI6zJL/AYAsNc/94mA3O+g8M43lc8+aPxcR+7M73VH5aei7cOd8011fW59Vve2f1wf8+bv84+vmsybN2/+Xfzc5b4fR43i/DWU0U9uFvlpb0HsU578WOR+iJNfFb4r85Nbjjvz58kfe1N4p+wf3Xbsyvmq+9+4Ps68+dv8V5yOdlOUBd3vAAAAAElFTkSuQmCC);background-position:0 0;-webkit-background-size:1224px 24px;background-size:1224px 24px}.ring>span,[class*=" ring-"]>span,[class^=ring-]>span{display:inline-block;-webkit-transform:scale(.9,1);-ms-transform:scale(.9,1);-o-transform:scale(.9,1);transform:scale(.9,1)}.messager{border-radius:4px;-webkit-box-shadow:0 4px 16px rgba(0,0,0,.2),0 2px 8px rgba(0,0,0,.1);box-shadow:0 4px 16px rgba(0,0,0,.2),0 2px 8px rgba(0,0,0,.1)}.messager-icon{vertical-align:middle}.messager-icon>.icon{font-size:24px}.messager-content{padding:18px 20px;font-size:18px;line-height:30px}.messager-content>.icon{font-size:28px;line-height:30px}.messager-actions{vertical-align:middle}.messagger-zt{color:#313c52;background-color:#fff!important}.messagger-zt .messager-icon>.icon{color:#2e7fff}.messagger-zt .messager-actions>.action{color:#838a9d}.messagger-zt.messager-success .messager-icon>.icon{color:#22c98d}.messagger-zt.messager-danger .messager-icon>.icon{color:#fc5959}.messagger-zt.messager-warning .messager-icon>.icon{color:#ff9f46}.messagger-zt.messager-info .messager-icon>.icon{color:#37b2fe}.tree{padding-left:0;overflow:hidden}.tree ul{position:relative;display:none;padding-left:0}.tree li{position:relative;padding:2px 0 2px 15px;list-style:none}.tree li.heading{padding-left:5px;color:#313c52}.tree li>a{display:block;max-width:90%;padding:2px 6px;color:#313c52;word-break:break-all}.tree li>a:hover{color:#313c52}.tree li>a.tree-toggle:hover{background:0 0}.tree li.active>a{position:relative;font-weight:700;color:#2e7fff}.tree li>.list-toggle{position:absolute;top:1px;left:1px;z-index:10;width:20px;font-size:14px;line-height:22px;color:#cbd0db;text-align:center;cursor:pointer;-webkit-transition:all .2s;-o-transition:all .2s;transition:all .2s}.tree li>.list-toggle:before{content:"\f0da"}.tree li>.list-toggle:active,.tree li>.list-toggle:hover{color:#2e7fff}.tree li.has-active-item>.list-toggle{color:#313c52}.tree li.has-list.open>ul{display:block}.tree li.has-list.open>.list-toggle{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.tree li.has-list.open:before{position:absolute;top:16px;bottom:-5px;left:10px;display:block;content:' ';border-left:1px solid #d8d8d8}.tree-actions{display:inline-block;margin-left:5px;vertical-align:middle}.tree-actions a{display:inline-block;margin-left:5px;font-size:13px;opacity:.6}.tree-actions a:hover{opacity:1}.tree li>.module-name{color:#313c52;vertical-align:middle}.tree li>.module-name:hover{background-color:#f0f2f5}.tree li>.module-name:hover>a{color:#313c52}.treemap-node-fold-icon:before{position:relative;left:-4px;min-width:18px}.dropdown-menu{padding:5px 0;border-color:rgba(0,0,0,.1)}.dropdown-menu>li{padding:0 10px}.dropdown-menu>li>a{padding:2px 10px;margin:5px 0;border-radius:3px}.dropdown-menu>li>a>.icon{position:relative;left:-5px;opacity:.5}.dropdown-menu>li>a:hover>.icon{opacity:.8}.dropdown-menu>li.active>a,.dropdown-menu>li.selected>a{position:relative;color:#fff;background-color:#18a6fd}.dropdown-menu>li.selected>a:after{position:absolute;top:2px;right:4px;display:block;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:20px;text-transform:none;content:"\e5ca";speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.dropdown-menu>li.divider{margin:10px}.dropdown-submenu>a:after{margin-right:-5px}.dropdown-submenu>.dropdown-menu.pull-left{margin-left:-1px}.dropdown-submenu:focus>a,.dropdown-submenu:hover>a{color:#313c52;background-color:#e6f0ff}.dropdown-submenu:hover>a:after{border-left-color:#2e7fff}.dropdown-submenu>a:hover:after{border-left-color:#fff}.pager .btn{padding:3px 10px}.pager .btn .caret{opacity:.7}.pager>li>.pager-label{padding:2px;line-height:20px}.pager>li>.pager-item{min-width:20px;padding:1px;margin:2px 0;font-size:16px;line-height:20px;text-align:center;background:0 0;border-color:transparent}.pager>li>.pager-item:hover{background-color:rgba(0,0,0,.1)}.pager>li>.pager-item>.icon{position:relative;top:-1px}.pager>li>.btn:hover,.pager>li>a:hover{background:rgba(0,0,0,.1)}.pager>li.disabled>a.pager-item{background:0 0;border-color:transparent;opacity:.5}.pager>li.active>a{background-color:#18a6fd}.pager>li .btn-group .btn{padding:1px;margin:1px 0;border-radius:4px}.pager .dropdown-menu{width:200px}.pager .dropdown-menu>li{float:left;width:33.333333%}.modal-dialog{width:900px;max-width:1360px;border:none;border-radius:0;-webkit-box-shadow:0 0 20px 0 rgba(0,0,0,.25);box-shadow:0 0 20px 0 rgba(0,0,0,.25)}.modal-dialog.modal-md{width:700px}.modal-dialog.modal-xs{width:400px}.modal-dialog.modal-sm{width:500px}.modal-dialog.modal-lg{width:1200px}.modal-dialog.modal-fullscreen{position:fixed;max-width:initial}.modal-header{padding:20px 0;margin:0 20px}.modal-header>.close{color:#838a9d;text-shadow:0 1px 0 rgba(255,255,255,.85);opacity:1}.modal-header>.close:hover{color:#0b0f18}.modal-footer{padding:20px 0;margin:0 20px}.modal-title{font-size:14px;font-weight:400;line-height:20px}.modal-actions{position:absolute;top:16px;right:16px}.modal-actions .divider{position:relative;top:5px;display:inline-block;width:0;height:20px;margin:0 10px;border-left:#eee 1px solid}.modal-actions>.dropdown{display:inline-block}.modal-body{padding:20px}.modal-iframe .modal-body>iframe{border-radius:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-3%);-ms-transform:translate(0,-3%);-o-transform:translate(0,-3%);transform:translate(0,-3%)}.modal.fade.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-simple .modal-footer{padding-top:0;border-top:none}.modal-iframe .modal-header{position:relative;z-index:10;min-height:0;padding:0;border:none}.modal-iframe .modal-title{display:none}.modal-iframe .modal-header .close{position:absolute;top:12px;right:10px;font-size:32px;font-weight:200}.modal-iframe .modal-dialog{overflow:hidden}.modal-inverse .modal-header>.close{color:rgba(255,255,255,.7);text-shadow:none}.modal-inverse .modal-header>.close:hover{color:#fff}.modal-scroll-inside>.modal-dialog{max-height:100%}.hide-modal-close .modal-iframe .modal-header .close{display:none}.tile{text-align:center}.tile-title{line-height:20px;color:#313c52}.tile-amount{font-size:32px;font-weight:700;line-height:56px}.timeline>li{position:relative;list-style:none}.timeline>li:before,.timeline>li>a:after,.timeline>li>div:after{position:absolute;left:-20px;display:block;width:15px;height:15px;content:' ';border-radius:50%}.timeline>li:before{top:12px;left:-16px;z-index:3;width:7px;height:7px;background-color:#c4c4c4;border:none;border:1px solid #c4c4c4}.timeline>li>a:after,.timeline>li>div:after{top:11px;left:-17px;z-index:3;width:9px;height:9px;background-color:#2e7fff;border-radius:50%;opacity:0}.timeline>li+li:after{position:absolute;top:-12px;bottom:20px;left:-13px;z-index:1;display:block;content:' ';border-left:1px solid #eee}.timeline>li.active>a:after,.timeline>li.active>div:after{opacity:1}.timeline>li.active:before{top:8px;left:-20px;width:15px;height:15px;background-color:rgba(46,127,255,.2);border:none}.timeline>li>a,.timeline>li>div{display:block;padding:5px;line-height:20px}.timeline>li.active>a{color:#313c52}.timeline-tag{position:absolute;top:5px;left:-115px;font-size:12px}.timeline-tag-left{padding-left:115px}.timeline-sm{font-size:12px}.timeline-sm>li:before,.timeline-sm>li>a:after,.timeline-sm>li>div:after{top:10px;left:-20px;width:11px;height:11px}.timeline-sm>li.active:before,.timeline-sm>li:before{top:10px;left:-18px;width:11px;height:11px;background:0 0;border:1px solid #eee}.timeline-sm>li>a,.timeline-sm>li>div{line-height:20px}.timeline-sm>li>a:after,.timeline-sm>li>div:after{top:13px;left:-15px;width:5px;height:5px}.form-control{-webkit-box-shadow:none;box-shadow:none}.form-horizontal .form-group>label{padding-right:0}.form-actions{margin-top:20px;margin-bottom:0}.form-actions .btn{margin-right:10px}form label{font-weight:400;color:#313c52}.form-group .btn+.btn{margin-left:5px}.table-form{margin-bottom:0;table-layout:fixed}.table-form>thead>tr>th.required:after{position:relative;top:3px;right:auto;left:4px;display:inline-block;vertical-align:middle}.table-form>tbody>tr>td,.table-form>tbody>tr>th,.table-form>tfoot>tr>td,.table-form>thead>tr>th{padding:7px;vertical-align:middle;border-bottom:none}.table-form>tfoot>tr>td{padding:20px 7px 10px}.table-form>tbody>tr>th{width:100px;font-weight:700;text-align:right}.table-form .input-group{width:100%}.chosen-container-single .chosen-single{position:relative}.chosen-container-single .chosen-single>span{height:20px;line-height:20px;word-break:break-all;white-space:normal}.chosen-container-single .chosen-single div b{position:relative;top:1px;color:#cbd0db;opacity:1}.chosen-container-single .chosen-search:before{top:8px;right:15px}.chosen-container-multi .chosen-choices li.search-choice{font-size:13px;background:#eee;border-color:#cbd0db;-webkit-box-shadow:none;box-shadow:none}.chosen-container-single .chosen-search input[type=text]{height:30px;padding:3px 25px 3px 5px}.chosen-container-single .chosen-search{padding:3px 10px 0}.chosen-container-single .chosen-single{overflow:visible}.chosen-container .chosen-results{max-height:245px;padding:10px}.chosen-container .chosen-results>li{border-radius:4px}.chosen-container .chosen-results li.highlighted em{color:#fff}.table-responsive .chosen-container .chosen-results{max-height:200px}.picker>.picker-selections>.picker-selection>.picker-selection-text{word-break:break-word}.chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li,.picker-drop-menu>.picker-option-list>.picker-option .picker-option-text{text-overflow:clip;white-space:nowrap!important}.picker-drop-menu>.picker-option-list>.picker-option .picker-option-text{display:block;overflow:hidden;word-break:break-word}.chosen-compact.chosen-container-single .chosen-single>.chosen-search{top:-2px;right:-1px;bottom:-1px;left:-1px;display:none;height:auto;padding:0;opacity:0}.chosen-compact.chosen-container-single .chosen-single>.chosen-search>input{height:31px;padding:5px 26px 5px 8px;font-size:inherit;line-height:20px}.chosen-compact.chosen-container-single .chosen-single>.chosen-search:before{right:8px}.datetimepicker{padding:10px}.datetimepicker td.day.today{background-color:#fc7272}.datetimepicker td.day.active{background-color:#18a6fd}.datetimepicker tfoot th,.datetimepicker thead th{color:#838a9d}.input-control .colorpicker{top:0;z-index:auto;opacity:1}.input-control .colorpicker .btn{padding:5px}.input-control .input-control-icon-right.btn{top:0}.colorpicker .dropdown-menu{min-width:232px;padding:5px 10px 10px 10px}.colorpicker .dropdown-menu>li{display:block;float:left;padding:5px}.colorpicker .dropdown-menu>li.heading{width:100%;margin-bottom:5px;font-size:16px;font-weight:700;text-align:left}.colorpicker .dropdown-menu>li.heading>.icon-close{position:relative;top:4px;float:right;cursor:pointer;opacity:.6}.colorpicker .dropdown-menu>li>a{position:relative;display:block;width:100%;height:100%;padding:0;margin:0;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-align:center;text-transform:none;border:1px solid transparent;border-radius:50%;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.colorpicker .dropdown-menu>li>a:before{position:absolute;top:0;display:block;width:100%;height:20px;line-height:18px}.colorpicker .dropdown-menu>li>a:hover{-webkit-box-shadow:0 1px 4px rgba(0,0,0,.25);box-shadow:0 1px 4px rgba(0,0,0,.25)}.colorpicker .dropdown-menu>li>a.active:before{font-size:14px;content:"\e5ca"}.colorpicker .dropdown-menu>li>a.empty{color:#666;background:#fff}.colorpicker .dropdown-menu>li>a.empty:before{content:"\e90d"}.colorpicker .btn{position:relative}.colorpicker .btn .color-bar{position:absolute;right:5px;bottom:3px;left:5px;height:3px}.colorpicker .btn .color-bar[style*='background: ']+.ic{position:relative;top:-2px}.colorpicker .btn .ic{color:#cbd0db}.colorpicker .btn:hover .ic{color:#838a9d}.input-group .colorpicker{z-index:3}.input-group .chosen-container{display:table-cell}.input-group-addon{border-right-width:0;border-left-width:0}.input-group-addon:first-child{border-left-width:1px}.input-group-addon:last-child{border-right-width:1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin:0}.input-group-cell{display:table-cell;width:1%;padding:0 12px;white-space:nowrap;vertical-align:middle}.ke-container{border-color:#dcdcdc!important;border-radius:2px!important}.ke-container.focus{border-color:#2e7fff!important}.ke-toolbar{border-color:#dcdcdc!important}.required:after{top:6px;right:-10px;font-size:20px}td.required:after{top:12px;right:-5px}.input-group>.chosen-container.required:after,.input-group>.input-control.required:after{top:1px;right:1px;z-index:2}.input-group.required .required:after{display:none}.file-input{position:relative;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content}.file-input .input-group{width:auto}.file-input .input-group>.input-group-cell:first-child{padding-right:0;padding-left:7px}.file-input input[type=file]{position:absolute;width:0;height:0;opacity:0}.file-input .file-title{display:inline-block;max-width:400px;overflow:hidden;text-overflow:unset;white-space:nowrap;vertical-align:middle}.file-input .file-editbox{min-width:200px;max-width:100%}.file-input .file-size{display:inline-block;vertical-align:middle}.edit .file-input-empty,.file-input-edit,.file-input-normal,.normal .file-input-empty{display:none}.edit .file-input-edit,.normal .file-input-normal{display:block}.edit .file-input-edit.input-group,.normal .file-input-normal.input-group{display:table}.edit .file-input-normal{display:none!important}.file-input-normal>.input-group-btn{width:auto}.input-group .chosen-container-active .chosen-choices{border-color:#2e7fff!important}.input-group .chosen-container{min-width:100px}.input-group .input-group-btn .btn>.icon{line-height:17px}.os-mac select.form-control{-webkit-appearance:none;background-image:url(data:image/gif;base64,R0lGODlhCQAFAIAAAMvQ2////yH5BAEAAAEALAAAAAAJAAUAAAIKhH+BGYoNGWxgFgA7);background-image:url(data:image/gif;base64,R0lGODlhBwAEAIAAAMvQ2////yH5BAEAAAEALAAAAAAHAAQAAAIIhA+BGWoNWSgAOw==);background-repeat:no-repeat;background-position:right 5px top 12px;-moz-appearance:none}input::-webkit-contacts-auto-fill-button{position:absolute;right:0;display:none!important;pointer-events:none;visibility:hidden}.chosen-choices.has-error,.chosen-single.has-error,.form-control.has-error{border-color:#fc5959!important;-webkit-box-shadow:0 0 6px #febdbd!important;box-shadow:0 0 6px #febdbd!important}.form-control.has-error+.picker .picker-selections{border-color:#fc5959!important;-webkit-box-shadow:0 0 6px #febdbd!important;box-shadow:0 0 6px #febdbd!important}.popover-success.popover-form-result{font-weight:700;color:#fff;background:#22c98d}.popover-success.popover-form-result.popover.right .arrow:after{border-right-color:#22c98d}textarea.kindeditor{padding:0!important}.form-unsaved{outline:2px solid #ff9f46;-webkit-box-shadow:0 1px 12px #ff9f46;box-shadow:0 1px 12px #ff9f46;-webkit-transition:all .5s;-o-transition:all .5s;transition:all .5s}select[multiple].picker-select,select[multiple][data-toggle=picker]{max-height:32px;visibility:hidden}.picker-selection-remove:before{font-size:18px}.picker-user-option{position:relative;padding-left:40px}.picker-user-option>.avatar{position:absolute;top:5px;left:10px}.picker-user-option>.picker-option-text{display:inline-block;min-width:40px;font-weight:700}.picker-user-option>.dept-name,.picker-user-option>.role-name{display:inline-block;margin-left:10px;font-size:12px;opacity:.6}.picker-user-option>.dept-name{min-width:50px}#mainHeader{height:50px;color:#fff;background:#3785ff;border-top-color:#2e7fff;border-bottom-color:#e6f0ff}#mainHeader>.container{min-width:1200px;padding:0}#heading{position:absolute;top:10px;left:20px}@media (min-width:1400px){#heading{left:40px}}#heading h1{float:left;max-width:250px;margin:0;overflow:hidden;font-size:20px;font-weight:400;line-height:30px;text-overflow:unset;white-space:nowrap}#heading h1 a{color:inherit;text-decoration:inherit}#heading h1.long-name{position:relative;top:-5px;display:table-cell;font-size:16px;line-height:20px;word-break:break-all;white-space:normal}#heading>.btn{display:block;float:left;height:20px;padding:1px 5px;margin:0;margin:5px 0 0 10px;font-size:12px;font-weight:lighter;line-height:18px;background-color:rgba(255,255,255,.2);border:none}#heading>.btn:hover{background-color:rgba(0,0,0,.1)}#navbar{margin:0 auto;text-align:center}#navbar .nav{display:inline-block}#navbar .nav>li>a{padding:10px;line-height:30px;color:#fff;border-radius:0;opacity:.9}@media (max-width:1400px){#navbar .nav>li>a{padding:10px 8px}}#navbar .nav>li>a:focus,#navbar .nav>li>a:hover{background:rgba(0,0,0,.15);opacity:1}#navbar .nav>li.active>a{font-weight:700;background:rgba(0,0,0,.1);opacity:1}#navbar .nav>li.divider{display:block;width:2px;height:20px;margin:15px 8px;background:rgba(255,255,255,.4)}@media (max-width:1400px){#navbar .nav>li.divider{margin:15px 5px}}@media (max-width:1300px){#navbar .nav>li.divider{margin:15px 3px}}#navbar .nav>li.divider:last-child{display:none}#navbar .nav .dropdown-menu li>a{text-align:left}#toolbar{position:absolute;top:12px;right:20px;font-size:12px;color:#fff}@media (min-width:1400px){#toolbar{right:40px}}#extraNav{text-align:right}#extraNav>li{display:inline-block;float:none;text-align:left}#extraNav>li>a{display:block;padding:0;color:#fff;opacity:.75}#extraNav>li>a:hover{text-decoration:unset;background-color:rgba(0,0,0,.1);opacity:1}#extraNav>li.open>a{background-color:rgba(0,0,0,.1)}#extraNav>li+li{margin-left:10px}#showSearchGo{color:#fff;background:rgba(255,255,255,.1);border:1px solid rgba(255,255,255,.5)}#searchbox{position:relative;float:left;width:150px}#searchbox .input-group-btn .btn{position:relative;padding:1px 4px;font-size:12px;line-height:20px;color:#fff;background-color:rgba(255,255,255,.15);border-right:none;border-radius:2px}#searchbox .input-group-btn .btn:after{position:absolute;top:3px;right:0;bottom:3px;display:block;width:1px;content:' ';background-color:rgba(255,255,255,.15)}#searchbox .input-group-btn .btn:hover{background-color:rgba(255,255,255,.25)}#searchGo{position:absolute;top:0;right:-1px;z-index:9;min-width:24px;height:24px;padding:2px 3px;font-size:12px;line-height:20px;color:#fff;background-color:#18a6fd;border-radius:2px}#searchGo:hover{color:#fff!important;background-color:#2e7fff}#searchInput{height:24px;padding:2px 30px 2px 5px;color:#fff;text-align:left;background:rgba(255,255,255,.15);border-color:transparent;border-radius:0 12px 12px 0;-webkit-transition:background .2s,border .2s;-o-transition:background .2s,border .2s;transition:background .2s,border .2s}#searchInput:hover{background:rgba(255,255,255,.25)}#searchInput:focus{color:#333;background:#fff}#searchInput::-webkit-input-placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput::-moz-placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput:-ms-input-placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput::placeholder{font-size:12px;color:#fff;color:rgba(255,255,255,.5)}#searchInput:focus::-webkit-input-placeholder{color:#838a9d}#searchInput:focus::-moz-placeholder{color:#838a9d}#searchInput:focus:-ms-input-placeholder{color:#838a9d}#searchInput:focus::placeholder{color:#838a9d}#searchTypeMenu{min-width:220px}#searchTypeMenu>li{float:left;width:50%}#searchTypeMenu>li>a{margin:4px 0}#userNav .avatar{display:inline-block;vertical-align:middle}#userNav>li>a{padding:2px 6px;line-height:20px;color:#fff;opacity:.9}#userNav>li>a .user-name{max-width:100px;overflow:hidden;font-size:15px;text-overflow:unset;white-space:nowrap}#userNav>li>a:hover{background-color:rgba(0,0,0,.1);opacity:1}#userNav>li>a:hover>i{opacity:1}#userNav>li>a span{vertical-align:middle}#userNav>li.open>a{background-color:rgba(0,0,0,.1)}#userNav>li.has-new-items>a{position:relative}#userNav>li.has-new-items>a:before{position:absolute;top:3px;right:-1px;display:block;width:4px;height:4px;content:' ';background-color:#fc5959;border-radius:50%}#userNav .dropdown-menu{min-width:150px}#userNav .dropdown-menu>li>a>.icon{position:absolute;top:10px;right:5px;display:block;width:20px;height:20px;line-height:20px;text-align:center}#userNav .user-profile-item>a{position:relative;padding-left:45px}#userNav .user-profile-item .avatar{position:absolute;top:6px;left:5px}#userNav .user-profile-name{font-size:16px}#userNav .user-profile-role{font-size:12px;color:#a9abb8}#userNav .no-role .user-profile-role{display:none}#userNav .no-role .user-profile-name{line-height:40px}#subHeader{min-height:50px;background:#fff}#subHeader>.container{padding:0 20px}@media (min-width:1400px){#subHeader>.container{padding:0 40px}}#subHeader.admin-tab-menu{margin-bottom:-15px;background:unset}#subHeader.admin-tab-menu>.container>#subNavbar{text-align:left}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a{color:unset}#subHeader.admin-tab-menu>.container>#subNavbar>ul>li.active>a:after{position:absolute;content:'';border-bottom:2px solid #2e7fff;inset:0 12px}#pageNav{position:absolute;top:8px;left:0;left:20px}@media (min-width:1400px){#pageNav{left:40px}}#subNavbar{margin-top:5px;font-size:13px;text-align:center}#subNavbar .nav{display:inline-block}#subNavbar .nav>li>a{padding:8px 12px;line-height:24px;color:#313c52}#subNavbar .nav>li>a:hover{color:#313c52;background-color:rgba(0,0,0,.075)}#subNavbar .nav>li.active>a{font-weight:700;color:#2e7fff}#subNavbar .nav>li.divider{display:block;width:2px;height:20px;margin:9px 5px;background-color:rgba(0,0,0,.05)}#subNavbar .dropdown-menu{text-align:left}[lang=en] #subNavbar>.nav>li>a{padding-right:8px;padding-left:8px}#pageActions{position:absolute;top:9px;right:20px}@media (min-width:1400px){#pageActions{right:40px}}.cell{padding:10px;background-color:#fff;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.cell+.cell{margin-top:10px}.cell>.panel{margin:0;-webkit-box-shadow:none;box-shadow:none}.cell>.panel>.panel-heading{padding:5px 5px 10px}.cell>.panel>.panel-heading .panel-actions{padding:0}.cell>.panel>.panel-body{padding:5px}.cell>.table{margin:0}#main{min-width:1200px;padding:20px 0}#main>.container{padding:0 20px}@media (min-width:1400px){#main>.container{padding:0 40px}}#header,#header+#main{min-width:1200px}#mainMenu{margin:-10px 0 8px}.main-content{padding:20px;background-color:#fff;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}@media (min-width:1400px){.main-content>.center-block{max-width:1350px;padding:20px;border:1px solid #eee}.main-content>.center-block .main-header{background-color:#f1f1f1}}.main-content>h2{margin:0 0 20px}.main-content .cell{-webkit-box-shadow:none;box-shadow:none}.main-header{padding:5px 20px;border-bottom:1px solid #eee}.main-header:after,.main-header:before{display:table;content:" "}.main-header:after{clear:both}.main-header>h2{display:block;float:left;margin:0 10px 0 0;font-size:14px;line-height:34px}.main-header>h2 .label-id{margin-right:5px}.main-header>h2 small{font-size:14px;font-weight:400}.main-content .main-header{margin:-20px -20px 10px}.main-header .label{top:-1px}.main-row{display:table;width:100%;table-layout:fixed}.main-row>[class*=" col-"],.main-row>[class*="-col"],.main-row>[class^=col-]{display:table-cell;vertical-align:top}@media (max-width:720px){.main-row{display:block}.main-row>*{display:block;width:100%}.main-row .side-col{width:100%;padding:0}.main-row .main-col+.side-col,.main-row .side-col+.main-col{margin-top:10px}}.main-row.hide-side .side-col{display:none}.main-form{margin:0}@media (min-width:720px){.main-content>.center-block .main-form{padding-right:20px}}#main .side-col .tabs{padding:5px}#main .side-col .nav-tabs{margin:0 5px 5px 5px}#main .side-col .nav-tabs>li{margin:0}#main .side-col .nav-tabs>li+li{margin-left:10px}#main .side-col .nav-tabs>li>a{padding:8px 5px}#main .side-col .tab-content .tab-pane table{border:none}.main-actions .btn-toolbar{display:inline-block;padding:4px 15px;color:#fff;pointer-events:auto;background:#717171;background-color:rgba(90,90,90,.85);border-radius:4px}.main-actions .btn-toolbar .divider{margin-right:15px;margin-left:15px;border-color:rgba(255,255,255,.1)}.main-actions .btn-toolbar .btn{height:30px;padding-right:10px;padding-left:10px;margin-right:0;color:#fff;background-color:transparent;border:none}.main-actions .btn-toolbar .btn+.btn{margin-left:10px}.main-actions .btn-toolbar .btn:focus,.main-actions .btn-toolbar .btn:hover{background-color:rgba(255,255,255,.2)}.main-actions .btn-toolbar .btn.btn-icon{min-width:32px;padding-right:0;padding-left:0}.main-actions .btn-toolbar .btn+.btn-group{margin-right:0;margin-left:10px}#mainContent .main-col>.main-actions{padding:30px 0 0 0;text-align:center}#mainContent .main-col>.main-actions>.btn-toolbar{visibility:visible;opacity:1;-webkit-transition:opacity .2s;-o-transition:opacity .2s;transition:opacity .2s}#mainActions{position:fixed;top:0;right:0;bottom:0;left:0;text-align:center;pointer-events:none}#mainActions .btn-toolbar{position:relative;top:-90px}#mainActions .dropdown-menu{text-align:left}#mainActions>.container{height:100%}.main-actions-holder{display:none}.main-actions-fixed .main-actions-holder{display:block}.main-actions-fixed #mainContent .main-col>.main-actions{position:fixed;bottom:10px}.main-actions-fixed.body-modal #mainContent .main-col>.main-actions{bottom:20px}#nextPage,#prevPage{position:absolute;top:50%;left:-10px;width:40px;height:60px;padding:10px 0;margin-top:-30px;line-height:40px;color:#fff;text-align:center;pointer-events:auto;background:#717171;background-color:rgba(90,90,90,.85);-webkit-box-shadow:0 2px 15px 2px rgba(0,0,0,.05);box-shadow:0 2px 15px 2px rgba(0,0,0,.05)}#nextPage:hover,#prevPage:hover{-webkit-box-shadow:0 2px 15px 2px rgba(0,0,0,.15);box-shadow:0 2px 15px 2px rgba(0,0,0,.15)}#nextPage>i,#prevPage>i{display:block;font-size:18px;line-height:36px}#nextPage{right:-10px;left:auto}@media (max-width:1800px){#prevPage{left:-3px}#nextPage{right:-3px}}#sidebarHeader{position:relative;float:left;width:180px;height:34px;padding-right:20px;margin-right:20px;background:#fff;border-left:4px solid #2e7fff;border-radius:4px 2px 2px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}#sidebarHeader:after{position:absolute;top:-1px;right:-8px;display:block;width:0;height:0;content:' ';border-color:transparent transparent transparent #fff;border-style:solid;border-width:18px 0 18px 8px}#sidebarHeader .title{padding:0 5px;overflow:hidden;font-size:14px;font-weight:700;line-height:32px;color:#2e7fff;text-align:center;text-overflow:unset;white-space:nowrap}#sidebarHeader .title>a{position:absolute;top:0;right:0;width:20px;opacity:.5}#sidebarHeader .title>a:hover{opacity:1}#sidebar{position:relative;-webkit-transition:width .2s,padding .2s;-o-transition:width .2s,padding .2s;transition:width .2s,padding .2s}#sidebar>.sidebar-toggle{position:absolute;top:0;right:5px;bottom:0;width:10px;cursor:pointer;background:0 0;border-radius:5px;-webkit-transition:background-color .2s,opacity .5s;-o-transition:background-color .2s,opacity .5s;transition:background-color .2s,opacity .5s}#sidebar>.sidebar-toggle>.icon{position:absolute;top:50%;left:-1px;width:12px;height:30px;margin-top:-10px;line-height:30px;color:#fff;text-align:center;background:#7dcdfe;border-radius:6px}#sidebar>.sidebar-toggle>.icon:before{position:relative;left:-1px}#sidebar>.sidebar-toggle:before{position:absolute;top:0;right:-5px;bottom:0;left:-5px;display:block;content:' '}#sidebar>.sidebar-toggle:hover{background:rgba(0,0,0,.075)}#sidebar>.cell{position:relative;left:0;width:180px;-webkit-transition:left .2s,opacity .2s;-o-transition:left .2s,opacity .2s;transition:left .2s,opacity .2s}#sidebar.no-animate>.cell{display:none;-webkit-transition:none;-o-transition:none;transition:none}.hide-sidebar #sidebar>.cell{position:absolute;left:-200px;visibility:hidden;opacity:0}.hide-sidebar #sidebar{position:relative;width:0;padding:0}.hide-sidebar #sidebar>.sidebar-toggle>.icon:before{content:"\e315"}@media (max-width:720px){#sidebar>.cell{width:100%}}#queryBox{max-height:0;padding:0;overflow:hidden;-webkit-transition:cubic-bezier(.175,.885,.32,1) .2s;-o-transition:cubic-bezier(.175,.885,.32,1) .2s;transition:cubic-bezier(.175,.885,.32,1) .2s;-webkit-transition-property:padding,max-height,margin;-o-transition-property:padding,max-height,margin;transition-property:padding,max-height,margin}#queryBox>form{visibility:hidden;-webkit-transition:visibility .2s .2s;-o-transition:visibility .2s .2s;transition:visibility .2s .2s}#queryBox.loading{height:50px}#queryBox.show{min-height:110px;max-height:300px;margin-bottom:10px;overflow:visible}#queryBox.show>form{visibility:visible}#queryBox.divider{border-bottom:1px solid #eee}#main .querybox-toggle.querybox-opened{position:relative;color:#2e7fff;background:0 0;border:none}#main .querybox-toggle.querybox-opened:before{position:absolute;bottom:-14px;left:50%;width:0;height:0;content:' ';border-color:transparent transparent #fff transparent;border-style:solid;border-width:0 10px 10px 10px}#contentNav{padding:5px;background:#fff;border-bottom:1px solid #eee}#contentNav .nav>li>a{position:relative;padding:6px 10px;color:#838a9d}#contentNav .nav>li.active>a{font-weight:700;color:#2e7fff}#contentNav .nav>li.active>a:before{position:absolute;right:10px;bottom:3px;left:10px;display:block;height:2px;content:' ';background:#2e7fff}.body-modal{padding-bottom:0}.body-modal #main,.body-modal .container{min-width:0!important}.body-modal #main{padding:0}.body-modal .main-header{position:fixed;top:0;right:20px;left:20px;z-index:100;padding:13px 48px 13px 0;margin:0;background:#fff}.body-modal #mainContent{padding-top:70px}.body-modal .main-header>h2{max-width:100%;overflow:hidden;font-size:14px;text-overflow:unset;white-space:nowrap}.body-modal .cell,.body-modal .main-content{-webkit-box-shadow:none;box-shadow:none}.body-modal #mainMenu{position:fixed;top:0;right:0;left:0;z-index:100;padding:12px 60px 12px 10px;margin:0;background:#fff}.body-modal #mainMenu>.btn-toolbar.pull-left.divider{display:none}.body-modal #mainMenu>.btn-toolbar{width:100%;margin-left:20px}.body-modal #mainMenu>.btn-toolbar>.divider:first-child{display:none}.body-modal #mainMenu>.btn-toolbar .page-title{width:100%;margin-left:0}.body-modal #mainMenu>.btn-toolbar .page-title>.text{position:relative;top:-2px;display:inline-block;max-width:85%;max-width:-webkit-calc(100% - 100px);max-width:calc(100% - 100px);overflow:hidden;text-overflow:unset;white-space:nowrap;vertical-align:middle}.body-modal #mainMenu+#mainContent.main-row{padding:60px 10px 0}.body-modal #mainMenu+#mainContent.main-row .cell{border:1px solid #efefef;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.body-modal #mainActions{top:auto}.body-modal #mainActions .btn-toolbar{top:auto;bottom:10px}.body-modal.m-bug-view,.body-modal.m-story-view,.body-modal.m-task-view,.body-modal.m-testcase-view,.body-modal.m-testtask-view,.body-modal.m-todo-view{padding-bottom:20px;border-radius:3px}#tabsNav{position:relative}#tabsNav .tab-pane>.actions{position:absolute;top:-8px;right:0}#tabsNav .tab-pane>.cell,#tabsNav .tab-pane>.main-table{padding:0;border:1px solid #c4c4c4;border-top:none;border-radius:0 0 4px 4px}#tabsNav .tab-pane>.cell .detail-title{padding-left:5px}#helpContent{position:fixed;top:50px;right:0;bottom:40px;left:0;display:none;background-color:#fff}#helpContent .load-error{display:none;padding:20px}#helpContent .show-error .load-error{display:block}#mainMenu>.btn-toobar .btn-link .label-light,#mainMenu>.btn-toolBar .btn-link .label-light,#mainMenu>.btn-toolbar .btn-link .label-light{color:#313c52;background:#fff}#mainMenu>.btn-toobar .btn-active-text,#mainMenu>.btn-toolBar .btn-active-text,#mainMenu>.btn-toolbar .btn-active-text{color:#1e6aeb;background:#e6eaf1}#mainMenu>.btn-toobar .btn-active-text .text,#mainMenu>.btn-toolBar .btn-active-text .text,#mainMenu>.btn-toolbar .btn-active-text .text{top:0}#mainMenu>.btn-toobar .btn-active-text .text:after,#mainMenu>.btn-toolBar .btn-active-text .text:after,#mainMenu>.btn-toolbar .btn-active-text .text:after{border:none}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text{position:relative;font-size:14px;color:unset;background:unset}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text>span{color:unset}#mainMenu.menu-secondary>.btn-toolbar>a.btn{margin-right:10px}#mainMenu.menu-secondary>.btn-toolbar .btn-active-text:after{position:absolute;content:'';border-bottom:2px solid #2e7fff;inset:0 6px}#menu{background:#415a72}#userNav>li>a>.icon{color:#fff;filter:none;opacity:.25;-webkit-filter:none}.picker-option.picker-option-active,.picker-single .picker-option.picker-option-selected.picker-option-active{background:#2e7fff}select.form-control option.selected,select.form-control option:hover{background:#2e7fff}#guideDialog .project-type-img:hover,#guideDialog .project-type.active img,.kanbans .panel:hover{border-color:#2e7fff}#dashboard .block-welcome .progress{background:#edeef2}#dashboard .block-welcome .progress>.progress-bar{background:#3785ff}#assigntomeBlock .nav>li.active>a{color:#1e6aeb}.consumedTotally{color:#2e7fff;background:#e6f0ff}#toggleFoldIcon .icon-border{border:1px solid #d5e5ff}#createEffort .table tbody .date-group .input-group-addon .icon,#recordForm .table tbody .date-group .input-group-addon .icon,#toggleFoldIcon{color:#2e7fff}.shadow-primary-hover:hover{-webkit-box-shadow:0 0 1px 1px #2e7fff;box-shadow:0 0 1px 1px #2e7fff}.border-primary-hover:hover{border:1px solid #2e7fff}.menu-hover-primary>li>a:hover{color:#1e6aeb!important;background-color:#d5e5ff!important}.menu-active-primary>li.active>a{color:#2e7fff!important;background-color:unset}.menu-active-primary>li.disabled>a:hover{color:#c4c4c4!important;background-color:unset!important}.bg-primary-100{background-color:#d5e5ff!important}.form-active-primary .active .label,.form-active-primary .hover .label{color:#2e7fff!important}.form-active-primary .active .form-control,.form-active-primary .hover .form-control{-webkit-box-shadow:0 0 1px 1px #2e7fff;box-shadow:0 0 1px 1px #2e7fff}.preference .picker-drop-menu .picker-option-list .picker-option.picker-option-active,.preference .picker-drop-menu .picker-option-list .picker-single .picker-option.picker-option-selected.picker-option-active{color:#2e7fff;background:#d5e5ff}.text-middle td,.text-middle th{vertical-align:middle}.text-center td,.text-center th{text-align:center}.c-sm{width:40px}.c-id{width:90px}.c-id-sm{width:70px}.c-id-xs{width:55px}.c-date{width:100px}.c-num,.c-pri,.c-type{width:80px;overflow:hidden}.c-begin,.c-end,.c-time{width:65px}.c-hours{width:60px}.c-actions-1{width:50px}.c-actions-2{width:75px}.c-actions-3{width:102px}.c-actions,.c-actions-4{width:128px}.c-actions-5{width:155px}.c-actions-6{width:180px}.c-product,.c-project{width:180px}.c-plan{width:130px}.c-datetime{width:120px}.c-stage,.c-status,.c-user{width:80px}.c-side{width:200px;border-right:10px solid #efefef}.c-assign,.c-assignedTo,.c-openedBy{width:130px}.c-progress{width:155px}.c-assign,.c-assignedTo,.c-openedBy,.c-product,.c-project,.c-status,.c-url,.c-user{overflow:hidden;text-overflow:unset;white-space:nowrap}.assigned-none{color:#1e6aeb!important;background:inherit}.assigned-current{color:#f38f19!important;background:inherit}.assigned-other{color:#313c52!important;background:inherit}a.assigned-current:hover,a.assigned-none:hover,a.assigned-other:hover{color:#1e6aeb!important;background:#fff;border-color:#fff!important}a.assigned-current:hover .icon,a.assigned-none:hover .icon,a.assigned-other:hover .icon{color:#1e6aeb!important}td.c-name,td.c-title{overflow:hidden;text-align:left!important;text-overflow:unset;white-space:nowrap}td.c-actions{position:relative;padding-top:0;padding-bottom:0;overflow:hidden;text-overflow:unset;white-space:nowrap;vertical-align:middle}td.c-actions .btn-link{color:#313c52;background:0 0}td.c-actions .btn-link:hover{color:#2e7fff;background:#e6f0ff}td.c-actions .btn.disabled,td.c-actions .btn[disabled]{pointer-events:auto}td.c-actions .more{position:absolute;top:50%;right:100%;display:none;padding-right:4px;padding-left:20px;margin-top:-15px;margin-right:-6px;white-space:nowrap;background-color:#fafafa;-webkit-transition:opacity .3s,margin .3s;-o-transition:opacity .3s,margin .3s;transition:opacity .3s,margin .3s}tr:hover td.c-actions .more{display:block}td:hover+td.c-actions>.more{margin-right:-15px;pointer-events:none;opacity:.15}tr[data-url]{cursor:pointer}.table tbody>tr>td,.table thead>tr>th{vertical-align:middle}.table tbody>tr>td.has-btn,.table thead>tr>th.has-btn{padding-top:1px;padding-bottom:1px;overflow:visible}.table tbody>tr>td .progress,.table thead>tr>th .progress{height:6px}.table .em,.table em{color:#313c52}.table .divider{border-bottom:10px solid #efefef}.table .divider-top{border-top:10px solid #efefef}.table .btn-icon-left{max-width:100%;padding-left:20px;overflow:hidden;line-height:18px;text-align:left;text-overflow:unset;background:0 0;border-color:#eaf3fc}.table .btn-icon-left>.icon{width:20px;font-size:14px;background:0 0!important;opacity:0}.table .btn-icon-left.btn-sm{height:26px;font-size:13px}.table .btn-icon-left:active,.table .btn-icon-left:focus,.table .btn-icon-left:hover{border-color:rgba(0,0,0,.2)}.table .btn-icon-left:active>.icon,.table .btn-icon-left:focus>.icon,.table .btn-icon-left:hover>.icon{opacity:1}.table .btn-icon-left>.text{padding-left:25px}.table thead>tr>th.c-assign,.table thead>tr>th.c-assignedTo{padding-left:29px}.table a{vertical-align:middle}.table caption{margin-bottom:5px;background:#f1f1f1;border:none}.is-firefox .table .btn-icon-left>.icon{line-height:22px}.table tbody>tr>td.c-name a{color:#2463c7}.table tbody>tr>td.c-name a:hover{color:#1e6aeb}.table.table-data tbody>tr:hover,.table.table-form tbody>tr:hover{background:0 0}.main-table{border-radius:4px}.main-table>.table,.main-table>.table-footer,.main-table>.table-header,.main-table>.table-responsive{-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045);box-shadow:0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)}.main-table .table{font-size:13px;table-layout:fixed;background-color:#fff;border-radius:4px 4px 0 0}.main-table .table.table-lg{font-size:14px}.main-table .table .btn-icon-left{border-color:transparent}.main-table .table .btn-icon-left>.icon{background:0 0;border-radius:4px}.main-table .table .btn-icon-left.btn-sm{height:26px}.main-table .table .btn-icon-left:hover{border-color:rgba(0,0,0,.2)}.main-table .table .btn-icon-left:hover>.icon{background:#e6f0ff;border-radius:4px 0 0 4px}.main-table tbody>tr>td,.main-table thead>tr>th{min-height:36px;padding:2px 8px;line-height:30px}.main-table tbody>tr>td:first-child,.main-table thead>tr>th:first-child{padding-right:4px;padding-left:15px}.main-table thead>tr>th{overflow:hidden;text-overflow:unset;white-space:nowrap}.main-table td,.main-table th{border-bottom:none!important}.main-table thead>tr{background:#fcfdfe;border-bottom:1px solid #f4f5f7}.main-table tbody>tr:last-child>td{border-bottom:1px solid #ddd}.main-table tbody>tr>td{position:relative}.main-table tbody>tr>td .label{max-width:200px;overflow:hidden;text-overflow:unset;white-space:nowrap}.main-table tbody>tr>td>a{line-height:28px;color:#2463c7}.main-table tbody>tr>td>a:not(.btn):visited{color:#003994;opacity:.9}.main-table tbody>tr>td>a:hover,.main-table tbody>tr>td>a:visited:hover{color:#2e7fff}.main-table tbody>tr>td.c-actions{padding-right:10px}.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{position:absolute;top:0;bottom:0;left:0;display:block;width:0;content:'';background:#2e7fff;opacity:0;-webkit-transition:.2s linear;-o-transition:.2s linear;transition:.2s linear;-webkit-transition-property:width,opacity,border-radius;-o-transition-property:width,opacity,border-radius;transition-property:width,opacity,border-radius}@-moz-document url-prefix(){.main-table tbody>tr>td.c-side+td:before,.main-table tbody>tr>td:first-child:before{bottom:-1px}}.main-table tbody>tr>td.c-side:before{display:none}.main-table tbody>tr>td.c-name a{color:#2463c7}.main-table tbody>tr>td.c-name a:hover{color:#1e6aeb}.main-table tbody>tr{border-bottom:1px solid #f4f5f7;-webkit-transition:.2s cubic-bezier(.175,.885,.32,1);-o-transition:.2s cubic-bezier(.175,.885,.32,1);transition:.2s cubic-bezier(.175,.885,.32,1);-webkit-transition-property:background-color,-webkit-box-shadow;-o-transition-property:box-shadow,background-color;transition-property:background-color,-webkit-box-shadow;transition-property:box-shadow,background-color;transition-property:box-shadow,background-color,-webkit-box-shadow}.main-table tbody>tr:hover{background:rgba(230,240,255,.8)}.main-table .table-grouped tbody>tr:hover{background:#f0f6ff;-webkit-box-shadow:none;box-shadow:none}.main-table .table-grouped tbody>tr:hover td.c-actions .more{background:#f0f6ff}.main-table tbody>tr.checked{background:#fff4ea}.main-table tbody>tr.checked:hover{background:#ffe6c6}.main-table tbody>tr.checked>td.c-side+td:before,.main-table tbody>tr.checked>td:first-child:before{width:4px;opacity:1}.main-table tbody>tr.checked.row-check-begin{border-top-left-radius:4px;border-top-right-radius:2px}.main-table tbody>tr.checked.row-check-begin>td:first-child:before{border-top-left-radius:4px}.main-table tbody>tr.checked.row-check-end{border-bottom-right-radius:2px;border-bottom-left-radius:4px}.main-table tbody>tr.checked.row-check-end>td:first-child:before{border-bottom-left-radius:4px}.main-table .checkbox-primary{display:inline-block;line-height:20px}.main-table .checkbox-primary label{margin:0}.main-table .table{margin:0}.table-header{padding:4px 0 12px}.table-header .table-statistic{color:#838a9d}.table-header .table-statistic strong{font-size:15px;color:#313c52}.table-header .btn-toolbar{margin-top:-28px}.table-header.fixed-right{position:relative;z-index:5;padding:0}.table-header.fixed-right>.btn-toolbar{position:absolute;top:0;right:1px;z-index:1;padding:1px;margin:0;background:#fff;border-radius:4px}.table-header.fixed-right>.btn-toolbar .btn{opacity:.65}.table-header.fixed-right>.btn-toolbar .btn:hover{opacity:1}.table-header-fixed .table-header{position:fixed;top:0}.table-header-fixed .table-header>.btn-toolbar{background-color:transparent}.table-header-fixed .table-header>.btn-toolbar .btn{color:#fff}.table-footer{position:relative;min-height:40px;padding:6px 15px;background:#fff;border-radius:0 0 4px 4px}.body-modal .table-footer{margin-bottom:20px}.talbe-lg+.table-footer{padding:11px 15px}.table-footer .btn-toolbar,.table-footer .checkbox-primary{float:left}.table-footer .btn-toolbar+.btn-toolbar{margin-left:8px}.table-footer .checkbox-primary{margin:5px 20px 0 0}.table-footer .checkbox-primary.checked label:after{border-color:#22c98d!important}.table-footer .btn{padding:3px 10px;line-height:20px}.table-footer .pager{position:absolute;top:0;right:0;z-index:5;height:40px;padding:6px 5px 6px 10px;margin:0;background:#fff;opacity:1;-webkit-transition:opacity .4s;-o-transition:opacity .4s;transition:opacity .4s}.table-footer .pager:before{position:absolute;top:0;bottom:0;left:-50px;display:block;width:50px;content:' ';background:-webkit-gradient(linear,left top,right top,from(rgba(255,255,255,0)),to(#fff));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,#fff 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,#fff 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,#fff 100%)}.table-footer .pager .btn,.table-footer .pager>li>.pager-item,.table-footer .pager>li>.pager-label{color:#838a9d;background:0 0;border-color:transparent}.table-footer .pager .btn,.table-footer .pager>li>a{border-radius:3px}.table-footer .pager .btn:hover,.table-footer .pager>li>a:hover{background:rgba(0,0,0,.1)}.table-footer .pager>li.disabled>a.pager-item{opacity:1}.table-footer .form-control{height:28px;padding:3px 8px}.table-footer .table-statistic{position:relative;z-index:2;float:left;padding-right:30px;line-height:28px;color:#838a9d;background:#fff}.table-footer .table-statistic:hover{z-index:4}.table-footer .table-statistic:hover+.pager{z-index:2;opacity:.3}.table-footer .btn-toolbar+.table-statistic,.table-footer .btn-toolbar+.text{margin-left:10px}.table-footer .text{float:left;line-height:28px}.table-footer.fixed-footer{position:fixed;z-index:10;margin:0;background:rgba(75,75,75,.85);border-top-color:transparent}.table-footer.fixed-footer .checkbox-primary label{color:#fff}.table-footer.fixed-footer .checkbox-primary label:after{border-color:rgba(255,255,255,.8)}.table-footer.fixed-footer .table-statistic{color:#fff;background:0 0}.table-footer.fixed-footer .pager{background:#666}.table-footer.fixed-footer .pager:before{background:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,0)),to(#666));background:-webkit-linear-gradient(left,rgba(0,0,0,0) 0,#666 100%);background:-o-linear-gradient(left,rgba(0,0,0,0) 0,#666 100%);background:linear-gradient(to right,rgba(0,0,0,0) 0,#666 100%)}.table-footer.fixed-footer .pager .btn,.table-footer.fixed-footer .pager>li>.pager-item,.table-footer.fixed-footer .pager>li>.pager-label{color:#fff}.table-footer.fixed-footer .pager .btn:hover,.table-footer.fixed-footer .pager>li>a:hover{background:rgba(255,255,255,.3)}.table-footer.fixed-footer .pager>li.disabled>a.pager-item{opacity:.5}.table-actions{display:none;height:28px}.table-actions.show-always{display:block;pointer-events:none;cursor:not-allowed}.has-row-checked .table-actions{display:block;pointer-events:auto!important;cursor:default}.table-lg tbody>tr>td{padding:9px 10px}.table-lg tbody>tr>td .btn+.btn{margin-left:5px}.table.has-sort-head thead>tr>th{padding-right:0}.table.has-sort-head thead>tr>th>a{position:relative;display:inline-block;padding-right:16px;color:#313c52}.table.has-sort-head thead>tr>th>a:after,.table.has-sort-head thead>tr>th>a:before{position:absolute;top:0;right:0;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;line-height:30px;color:#313c52;text-transform:none;content:"\f0de";opacity:.5;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.table.has-sort-head thead>tr>th>a:after{content:"\f0dd"}.table.has-sort-head thead>tr>th>a.sort-down,.table.has-sort-head thead>tr>th>a.sort-up{color:#000;text-decoration:none}.table.has-sort-head thead>tr>th>a:hover,.table.has-sort-head thead>tr>th>a:hover:after,.table.has-sort-head thead>tr>th>a:hover:before{color:#2e7fff;opacity:1}.table.has-sort-head thead>tr>th>a.sort-down:after,.table.has-sort-head thead>tr>th>a.sort-up:before{color:#000;opacity:1}.head-fixed .datatable-head-span .table,.table.fixed-header-copy{z-index:10;color:#fff;background:rgba(75,75,75,.85)}.head-fixed .datatable-head-span .table thead>tr,.table.fixed-header-copy thead>tr{background:0 0}.head-fixed .datatable-head-span .table thead>tr>th,.table.fixed-header-copy thead>tr>th{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>a,.table.fixed-header-copy thead>tr>th>a{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover{color:#fff}.head-fixed .datatable-head-span .table thead>tr>th>a:after,.head-fixed .datatable-head-span .table thead>tr>th>a:before,.table.fixed-header-copy thead>tr>th>a:after,.table.fixed-header-copy thead>tr>th>a:before{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>a.sort-down,.head-fixed .datatable-head-span .table thead>tr>th>a.sort-down:after,.head-fixed .datatable-head-span .table thead>tr>th>a.sort-up,.head-fixed .datatable-head-span .table thead>tr>th>a.sort-up:before,.head-fixed .datatable-head-span .table thead>tr>th>a:hover,.head-fixed .datatable-head-span .table thead>tr>th>a:hover:after,.head-fixed .datatable-head-span .table thead>tr>th>a:hover:before,.table.fixed-header-copy thead>tr>th>a.sort-down,.table.fixed-header-copy thead>tr>th>a.sort-down:after,.table.fixed-header-copy thead>tr>th>a.sort-up,.table.fixed-header-copy thead>tr>th>a.sort-up:before,.table.fixed-header-copy thead>tr>th>a:hover,.table.fixed-header-copy thead>tr>th>a:hover:after,.table.fixed-header-copy thead>tr>th>a:hover:before{color:#fff}.head-fixed .datatable-head-span .table thead>tr>th>.dropdown>a,.table.fixed-header-copy thead>tr>th>.dropdown>a{color:#eee}.head-fixed .datatable-head-span .table thead>tr>th>.dropdown>a:hover,.table.fixed-header-copy thead>tr>th>.dropdown>a:hover{color:#fff}.head-fixed .datatable-head-span .table .checkbox-primary,.table.fixed-header-copy .checkbox-primary{z-index:1}.head-fixed .datatable-head-span .table .checkbox-primary label,.table.fixed-header-copy .checkbox-primary label{color:#fff}.head-fixed .datatable-head-span .table .checkbox-primary label:after,.table.fixed-header-copy .checkbox-primary label:after{border-color:rgba(255,255,255,.8)}.head-fixed .datatable-head-span .table .checkbox-primary.checked label:after,.table.fixed-header-copy .checkbox-primary.checked label:after{border-color:#22c98d!important}.table-data{margin:0;table-layout:fixed}.table-data tbody>tr>td,.table-data tbody>tr>th{padding:6px 8px;word-break:break-all;border:none}.table-data tbody>tr>th{width:70px;padding-left:0;font-weight:400;color:#838a9d;text-align:right;vertical-align:middle}.table-data tbody>tr>td{padding-right:0}.table-data tbody>tr>td>a{color:#2463c7}.table-data tbody>tr>td>a:not(.btn):visited{color:#003994}.table-data tbody>tr>td>a:hover,.table-data tbody>tr>td>a:visited:hover{color:#2e7fff}.table-data ol,.table-data ul{margin:0}.fixed-head-table{background:rgba(0,0,0,.7);border-bottom:1px solid #ddd}.fixed-head-table thead>tr>th{color:#fff}.table-empty-tip{padding:80px 10px;text-align:center;background:#fff}.not-firefox .table-grouped>tbody>tr>td.c-side{background:#fff!important}.table-grouped .group-toggle{cursor:pointer}.table-grouped .group-toggle.group-summary{border-top:10px solid #efefef}.table-grouped tbody>tr>td:first-child,.table-grouped thead>tr>th:first-child{padding-left:8px}.group-expand-all,.table-group-collapsed .group-collapse-all{display:none}.table-group-collapsed .group-expand-all{display:inline-block}.table-auto{table-layout:auto}.datatable .table>tbody>tr.checked.hover>td,.datatable .table>tbody>tr.checked>td.col-hover{background:#ffe6c6}body.has-fixed-footer{padding-bottom:60px}.table.with-footer-fixed{margin-bottom:20px}.table-nest-hide{display:none!important}th.table-nest-title{position:relative;padding-left:30px!important}.table-nest-icon{position:relative;display:inline-block;width:22px;height:22px;font-size:16px;color:#a6aab8;text-align:center;border-radius:4px}.table-nest-toggle:before{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;font-size:12px;color:#888fa1;content:"\e926";-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.table-nest-toggle:after{position:absolute;top:4px;right:4px;bottom:4px;left:4px;display:inline-block;content:"";border:1px solid;border-radius:50%}.table-nest-toggle:hover{color:#2e7fff;background-color:rgba(0,0,0,.1)}.table-nest-child-hide .table-nest-toggle:before{font-size:12px;content:"\e925"}th.table-nest-title .table-nest-toggle{position:absolute!important;top:7px;left:8px}.table-nest-toggle.table-nest-toggle-global{width:22px;height:22px;padding:0!important;line-height:22px;text-align:center;border-radius:4px}.table-nest-toggle.table-nest-toggle-global:before{position:absolute!important;font-size:12px!important;line-height:22px!important;content:"\e959"!important;opacity:1!important}.table-nest-toggle.table-nest-toggle-global:after{display:none!important}.table-nest-collapsed .table-nest-toggle.table-nest-toggle-global:before{font-size:12px!important;content:"\e95a"!important}.disable-empty-nest-row .is-nest-child .table-nest-icon:before,.disable-empty-nest-row .no-nest .table-nest-icon:before{position:relative;top:-1px;width:6px;min-width:6px;height:6px;content:' ';background-color:#c4c4c4;border-radius:1px}.table-nest-child-hover>td:first-child,.table-nest-hover>td:first-child{-webkit-box-shadow:inset 3px 0 0 #c4c4c4;box-shadow:inset 3px 0 0 #c4c4c4}.c-manager .avatar{position:relative;z-index:2;line-height:17px;border:1.5px solid transparent}.c-manager .avatar.avatar-top{border-color:#ffaf65}.c-manager a{position:absolute;top:8px;left:16px;height:20px;padding:0 8px 0 13px;line-height:20px!important;color:#313c52!important;background:#f4f5f7;border-radius:10px}.article-content{overflow:auto}.article-content img{margin-top:0}.article-content table{margin:10px 0}.article-content table td,.article-content table th{border:1px solid #cbd0db!important}.article-content table th{background:#eee}.article-content a{color:#2e7fff}.article-content a:focus,.article-content a:hover{color:#18a6fd}.article-content,.article>.content{word-wrap:break-word}.detail{padding:10px 0;margin:0 10px}.detail+.detail{padding-top:25px;border-top:1px solid #eee}.detail-title{font-size:14px;font-weight:700;line-height:20px}.detail-title>.pull-right{position:relative;top:-8px}h2.detail-title{margin:0;font-size:15px;font-weight:700}h2.detail-title .label,h2.detail-title .label-id{position:relative;top:-1px}.detail-content{padding:0;margin-top:10px}.detail-content em{color:#313c52}.detail-content .list-unstyled>li+li{margin-top:5px}.side-col .detail-content{padding-left:0}details.detail{padding:10px 0}details.detail summary{position:relative;cursor:pointer;outline:0}details.detail summary::-webkit-details-marker{display:none}details.detail summary:after{position:absolute;top:0;right:0;font-family:ZentaoIcon;font-size:14px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;content:"\e316";opacity:.4;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}details.detail[open] summary:after{content:"\e313"}.files-list{padding-left:0;list-style:none}.files-list>li>a{display:block;line-height:24px}.files-list>li>a>.icon{display:inline-block;margin-right:5px;opacity:.7}.files-list>li>a:hover{color:#2e7fff}.files-list>li>.right-icon{opacity:0;-webkit-transition:opacity .2s;-o-transition:opacity .2s;transition:opacity .2s}.files-list>li:hover>.right-icon{opacity:1}.histories-list{padding-left:15px;margin-bottom:0}.histories-list>li{position:relative}.histories-list>li+li{margin-top:5px}.histories-list>li strong{color:#313c52}.histories-list .comment,.histories-list .show-form .comment-edit-form{padding:5px 5px 5px 10px;margin:5px 0 0;background-color:rgba(0,0,0,.025);border:1px solid #eee}.histories-list .btn-edit-comment{position:absolute;top:28px;right:2px}.histories-list .comment-edit-form,.histories-list .show-form .btn-edit-comment,.histories-list .show-form .comment{display:none}.histories-list .show-form .comment-edit-form{display:block;padding:10px;border:1px solid #eee}.histories .btn-mini{width:16px;min-width:16px;height:16px;overflow:hidden;line-height:16px;color:#cbd0db;vertical-align:-8%;border-radius:1px}.histories .btn-mini:focus,.histories .btn-mini:hover{color:#2e7fff;border-color:#2e7fff}.histories .show-changes .btn-expand>.icon:before{content:"\e926"}.histories .btn-strip{display:none}.histories .show-changes .btn-strip{display:inline-block}.history-changes{display:none;padding:5px;margin-bottom:-5px;margin-left:5px;font-size:12px;line-height:20px}.history-changes blockquote{padding:5px 5px 5px 10px;margin:5px 0 0;font-size:12px;background-color:rgba(0,0,0,.05);border-left:3px solid #eee}.history-changes blockquote.original{display:none}.show-changes .history-changes,.show-original .history-changes blockquote.original{display:block}.show-original .history-changes blockquote.textdiff{display:none}.syntaxhighlighter{overflow:auto}.list-group{overflow-y:auto}.list-group>a{display:block;padding:2px 10px 2px 5px;overflow:hidden;line-height:20px;text-overflow:unset;white-space:nowrap;border-radius:4px}.list-group>a+a{margin-top:5px}.list-group>a>.icon{display:inline-block;margin-right:3px;opacity:.5}.list-group>a.selected{color:#e6f0ff;background-color:#2e7fff}.list-group>a.active{color:#2e7fff;background-color:#e6f0ff}.list-group>a.active:hover,.list-group>a:hover{color:#fff;background-color:#2e7fff}.list-group>.heading{padding:2px 5px;line-height:20px;color:#838a9d}.list-group>a+.heading{margin-top:4px}.list-group.tab-menu>a{padding:6px 24px}.list-group.tab-menu>a.active{background:unset}.list-group.tab-menu>a.active:hover,.list-group.tab-menu>a:hover{color:#2e7fff;background-color:unset}.dropup .search-box-sink{padding-top:5px;padding-bottom:45px}.dropup .search-box-sink .search-box{position:absolute;right:10px;bottom:10px;left:10px;margin:0}.dropup .search-box-sink .search-box+.list-group{height:auto;max-height:171px}.search-list{min-width:200px;max-width:300px;padding:0}.search-list .search-box{float:none;width:auto;margin:10px}.search-list .search-box .icon-search{opacity:.5}.search-list .list-group{max-height:248px;padding:5px 10px;margin:5px 0}.dropup .search-list .search-box+.list-group{height:171px;padding-top:0}.search-list .search-input{height:30px}.search-list .input-control-icon-right{height:28px;line-height:28px}.search-list .list-group>a.active{color:inherit;background-color:inherit}.search-list.searchbox-focus .list-group>a.active{color:#2e7fff;background-color:#e6f0ff}.search-list .list-group>a.active:hover,.search-list.searchbox-focus .list-group>a.active:hover{color:#fff;background-color:#2e7fff}#dropMenu{width:initial;max-width:initial}#dropMenu>.search-box{width:100%;padding:10px 10px 0;margin:0}#dropMenu>.search-box .icon-search{color:#333}#dropMenu>.search-box.has-icon-right>.form-control{padding-left:26px}#dropMenu .input-control-icon-left{top:10px;left:10px}#dropMenu .input-control-icon-right{top:11px;right:11px}#dropMenu .input-control-icon-right .icon{position:relative;top:2px}#dropMenu .list-group{max-height:initial;margin:0}#dropMenu .table-row{margin:0 -10px;table-layout:auto}#dropMenu .table-col{position:relative;width:100%;min-width:250px;max-width:450px}#dropMenu .table-col .list-group{max-height:300px;padding:0 10px 5px}#dropMenu .col-left{padding-bottom:30px}#dropMenu .col-right{display:none}#dropMenu .col-footer{position:absolute;right:0;bottom:-5px;left:0;padding:8px 10px;border-top:1px solid #eee}#dropMenu .col-footer>a{opacity:.8}#dropMenu .col-footer>a:hover{opacity:1}#dropMenu.show-right-col .table-col{width:50%}#dropMenu.show-right-col .col-right{display:table-cell;border-left:1px solid #eee}#dropMenu.show-right-col .col-right>.list-group{max-height:335px;margin:0}#dropMenu.show-right-col .col-right>.list-group>a{opacity:.7}#dropMenu.show-right-col .col-right>.list-group>a:hover{opacity:1}#dropMenu.show-right-col .toggle-right-col>.icon-angle-right:before{content:"\e314"}#dropMenu.has-search-text .list-group{overflow-x:hidden}#dropMenu.has-search-text>.search-box{width:100%!important}#dropMenu.has-search-text>.list-group>.table-row{display:block}#dropMenu.has-search-text>.list-group>.table-row>.table-col{display:block;width:100%}#dropMenu.has-search-text .col-left{padding-bottom:0}#dropMenu.has-search-text .pull-right.toggle-right-col{display:none}#dropMenu.has-search-text .col-left .list-group{margin-bottom:0}#dropMenu.has-search-text .col-right .list-group{margin-bottom:0}#dropMenu.has-search-text .col-right .list-group>a{opacity:.7}#dropMenu.has-search-text .col-footer,#dropMenu.has-search-text .hide-in-search{display:none}#swapper{position:relative}#swapper #dropMenu .tree li>.selected{color:#2e7fff!important;background:#e6f0ff!important}#swapper #dropMenu .list-group>a.active:hover,#swapper #dropMenu .search-box .list-group>a.active,#swapper #dropMenu .tree li>.clickable:hover,#swapper #dropMenu.searchbox-focus .list-group>a.active:hover{color:#fff!important;background:#2e7fff!important}#swapper #dropMenu .tree{margin:0}#pageNav #dropMenu .list-group>a.active{color:inherit;background-color:inherit}#pageNav #dropMenu .list-group>a.active:hover,#pageNav #dropMenu.searchbox-focus .list-group>a.active:hover{color:#2e7fff!important;background:#e6f0ff!important}#pageNav #dropMenu .list-group>a.active.selected,#pageNav #dropMenu .list-group>a.active.selected:hover{color:#fff!important;background:#2e7fff!important}.release-path{overflow:hidden}.release-line{display:table;width:100%;padding:0;table-layout:fixed}.release-line>li{display:table-cell;list-style:none}.release-line>li>a{position:relative;display:block}.release-line>li>a:before{position:absolute;left:0;display:block;width:13px;height:13px;content:' ';background:#fff;border:2px solid #838a9d;border-radius:50%}.release-line>li>a:after{position:absolute;left:5px;display:block;width:2px;height:30px;content:' ';background:#c2dbff}.release-line>li>a>.icon{position:absolute;left:4px;font-size:24px}.release-line>li>a .title{display:block;font-size:14px;white-space:nowrap}.release-line>li>a .date,.release-line>li>a .info{display:block;max-height:18px;overflow:hidden;font-size:12px;color:#838a9d;text-overflow:unset;white-space:nowrap}.release-line>li>a:hover:before{background-color:#e6f0ff}.release-line>li>a:hover:after{background-color:#838a9d}.release-line>li>a:hover .title{color:#2e7fff}.release-line>li>a:hover .date,.release-line>li>a:hover .info{color:#838a9d}.release-line>li:nth-child(odd){padding-top:80px;vertical-align:top}.release-line>li:nth-child(odd)>a{height:85px;padding-top:36px;border-top:5px solid #c2dbff}.release-line>li:nth-child(odd)>a:before{top:-9px}.release-line>li:nth-child(odd)>a:after{top:6px}.release-line>li:nth-child(odd)>a>.icon{top:-26px}.release-line>li:nth-child(even){padding-bottom:80px;vertical-align:bottom}.release-line>li:nth-child(even)>a{height:85px;padding-bottom:36px;border-bottom:5px solid #c2dbff}.release-line>li:nth-child(even)>a:before{bottom:-9px}.release-line>li:nth-child(even)>a:after{bottom:6px}.release-line>li:nth-child(even)>a>.icon{bottom:-2px}.release-line>li:last-child>a{border-color:transparent}.release-line>li.active>a:before{border-color:#2e7fff}.release-line>li+li>a>.date,.release-line>li+li>a>.info,.release-line>li+li>a>.title{position:relative;left:-36%}#footer{position:fixed;right:0;bottom:0;left:0;z-index:1010;height:40px;background:#fff;border-top:1px solid #eff1f7}#footer .breadcrumb{padding:10px 0;margin:0}#footer .breadcrumb>li{max-width:200px;overflow:hidden;text-overflow:unset;white-space:nowrap}#footer .breadcrumb>.active,#footer .breadcrumb>li>a{color:#838a9e}#footer .breadcrumb>.active>.icon,#footer .breadcrumb>li>a>.icon{display:none}#footer .breadcrumb>.active:hover,#footer .breadcrumb>li>a:hover{color:#18a6fd}#footer .breadcrumb>li+li:before{content:'>'}#footer>.container{padding:0 20px}@media (min-width:1400px){#footer>.container{padding:0 40px}}#poweredBy{position:absolute;top:4px;right:0;padding:5px 10px}#poweredBy .icon-zentao{color:#0097fd}#poweredBy a{color:#313c52}#poweredBy a:hover{color:#2e7fff}#poweredBy a:hover .icon-zentao{color:#2e7fff}#poweredBy a.text-important{color:#ff6f42}#poweredBy a.text-important:hover{color:#fc5959}#poweredBy a.text-primary{color:#2e7fff}#poweredBy a.text-primary:hover{color:#18a6fd}#poweredBy #aiux{color:#cbd0dc}#noticeBox .alert{-webkit-box-shadow:rgba(0,0,0,.15) 0 3px 10px,rgba(0,0,0,.25) 0 3px 10px;box-shadow:rgba(0,0,0,.15) 0 3px 10px,rgba(0,0,0,.25) 0 3px 10px}#heading{top:0}.header-btn{position:relative;padding:8px 0}.header-btn .btn{position:relative;height:34px;padding:1px 6px;margin:0;overflow:visible;font-size:13px;font-weight:400;line-height:28px;color:#fff;background-color:transparent;border-color:transparent!important;border-right:none;-webkit-transition:none;-o-transition:none;transition:none}.header-btn .btn>.caret{margin-left:0;border-width:4px}.header-btn .btn>.text{display:inline-block;max-width:150px;overflow:hidden;text-overflow:unset;vertical-align:middle}.header-btn .btn:hover{-webkit-box-shadow:none;box-shadow:none}.header-btn .btn:hover,.header-btn.active .btn{color:#fff;background:rgba(0,0,0,.15)}.header-btn .btn:hover>.caret,.header-btn.active .btn>.caret{opacity:1}.header-btn+.header-btn{margin-left:10px}.header-btn+.header-btn:before{position:absolute;top:16px;left:-13px;display:block;font-family:ZentaoIcon;font-size:14px;font-size:16px;font-style:normal;font-weight:400;font-variant:normal;line-height:1;text-transform:none;content:"\e315";opacity:.6;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.header-btn .dropdown-menu{margin-top:-10px}#toolbar{top:0;height:50px}#userNav>li{margin-right:0}#userNav>li>a{padding:10px 5px}#userNav>li>a>.icon{font-size:30px;filter:brightness(1.2) hue-rotate(30deg);opacity:.9;-webkit-filter:brightness(1.2) hue-rotate(30deg)}#userNav>li:hover>a{background-color:rgba(0,0,0,.1)}#userNav .dropdown-menu>li>a{position:relative;padding-left:24px}#userNav .dropdown-menu>li>a>.icon{top:1px;left:0}#userNav .dropdown-menu>li.user-profile-item>a{padding-left:45px}
\ No newline at end of file

From 1328ae82bcd7670504df8624400da12f906ef2c2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 15:38:49 +0800
Subject: [PATCH 271/319] * Update project common language.

---
 module/personnel/lang/de.php      |  4 ++--
 module/personnel/lang/en.php      |  4 ++--
 module/personnel/lang/fr.php      |  4 ++--
 module/personnel/lang/zh-cn.php   |  4 ++--
 module/projectplan/lang/de.php    | 10 +++++-----
 module/projectplan/lang/en.php    | 10 +++++-----
 module/projectplan/lang/fr.php    | 10 +++++-----
 module/projectplan/lang/zh-cn.php | 10 +++++-----
 module/stakeholder/lang/de.php    |  2 +-
 module/stakeholder/lang/en.php    |  2 +-
 module/stakeholder/lang/fr.php    |  2 +-
 module/stakeholder/lang/zh-cn.php |  2 +-
 module/task/lang/de.php           |  6 +++---
 module/task/lang/en.php           |  6 +++---
 module/task/lang/fr.php           |  6 +++---
 module/task/lang/zh-cn.php        |  6 +++---
 module/testtask/lang/de.php       |  2 +-
 module/testtask/lang/en.php       |  2 +-
 module/testtask/lang/fr.php       |  2 +-
 module/testtask/lang/zh-cn.php    |  2 +-
 20 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/module/personnel/lang/de.php b/module/personnel/lang/de.php
index 50a01ae536..f94877f59c 100644
--- a/module/personnel/lang/de.php
+++ b/module/personnel/lang/de.php
@@ -7,13 +7,13 @@ $lang->personnel->realName   = 'Name';
 $lang->personnel->userName   = 'Account';
 $lang->personnel->job        = 'Position';
 $lang->personnel->genders    = 'Gender';
-$lang->personnel->project    = 'Project';
+$lang->personnel->project    = $lang->projectCommon;
 $lang->personnel->search     = 'Search';
 $lang->personnel->delete     = 'Remove';
 $lang->personnel->role       = 'Role';
 
 $lang->personnel->name          = 'User';
-$lang->personnel->projects      = 'Projects';
+$lang->personnel->projects      = $lang->projectCommon . 's';
 $lang->personnel->executions    = 'Executions';
 $lang->personnel->workingHours  = 'Hours';
 $lang->personnel->task          = 'Task';
diff --git a/module/personnel/lang/en.php b/module/personnel/lang/en.php
index fc2b640f72..b6984c4cff 100644
--- a/module/personnel/lang/en.php
+++ b/module/personnel/lang/en.php
@@ -7,13 +7,13 @@ $lang->personnel->realName   = 'Name';
 $lang->personnel->userName   = 'Account';
 $lang->personnel->job        = 'Position';
 $lang->personnel->genders    = 'Gender';
-$lang->personnel->project    = 'Project';
+$lang->personnel->project    = $lang->projectCommon;
 $lang->personnel->search     = 'Search';
 $lang->personnel->delete     = 'Remove';
 $lang->personnel->role       = 'Role';
 
 $lang->personnel->name          = 'User';
-$lang->personnel->projects      = 'Projects';
+$lang->personnel->projects      = $lang->projectCommon . 's';
 $lang->personnel->executions    = 'Executions';
 $lang->personnel->workingHours  = 'Hours';
 $lang->personnel->task          = 'Task';
diff --git a/module/personnel/lang/fr.php b/module/personnel/lang/fr.php
index 50a01ae536..f94877f59c 100644
--- a/module/personnel/lang/fr.php
+++ b/module/personnel/lang/fr.php
@@ -7,13 +7,13 @@ $lang->personnel->realName   = 'Name';
 $lang->personnel->userName   = 'Account';
 $lang->personnel->job        = 'Position';
 $lang->personnel->genders    = 'Gender';
-$lang->personnel->project    = 'Project';
+$lang->personnel->project    = $lang->projectCommon;
 $lang->personnel->search     = 'Search';
 $lang->personnel->delete     = 'Remove';
 $lang->personnel->role       = 'Role';
 
 $lang->personnel->name          = 'User';
-$lang->personnel->projects      = 'Projects';
+$lang->personnel->projects      = $lang->projectCommon . 's';
 $lang->personnel->executions    = 'Executions';
 $lang->personnel->workingHours  = 'Hours';
 $lang->personnel->task          = 'Task';
diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php
index db04addf1b..d6f1b0021d 100644
--- a/module/personnel/lang/zh-cn.php
+++ b/module/personnel/lang/zh-cn.php
@@ -7,13 +7,13 @@ $lang->personnel->realName   = '真实姓名';
 $lang->personnel->userName   = '用户名';
 $lang->personnel->job        = '岗位';
 $lang->personnel->genders    = '性别';
-$lang->personnel->project    = '项目';
+$lang->personnel->project    = $lang->projectCommon;
 $lang->personnel->search     = '搜索';
 $lang->personnel->delete     = '移除';
 $lang->personnel->role       = '角色';
 
 $lang->personnel->name          = '人员名称';
-$lang->personnel->projects      = '项目数';
+$lang->personnel->projects      = $lang->projectCommon . '数';
 $lang->personnel->executions    = '执行数';
 $lang->personnel->workingHours  = '工时';
 $lang->personnel->task          = '任务';
diff --git a/module/projectplan/lang/de.php b/module/projectplan/lang/de.php
index 6817988868..97d9e622dc 100644
--- a/module/projectplan/lang/de.php
+++ b/module/projectplan/lang/de.php
@@ -1,7 +1,7 @@
 <?php
 $lang->projectplan = new stdclass();
-$lang->projectplan->common  = 'Project Plan';
-$lang->projectplan->browse  = 'Project Plan List';
-$lang->projectplan->create  = 'Create Project Plan';
-$lang->projectplan->edit    = 'Edit Project Plan';
-$lang->projectplan->view    = 'View Project Plan';
+$lang->projectplan->common  = "{$lang->projectCommon} Plan";
+$lang->projectplan->browse  = "{$lang->projectCommon} Plan List";
+$lang->projectplan->create  = "Create {$lang->projectCommon} Plan";
+$lang->projectplan->edit    = "Edit {$lang->projectCommon} Plan";
+$lang->projectplan->view    = "View {$lang->projectCommon} Plan";
diff --git a/module/projectplan/lang/en.php b/module/projectplan/lang/en.php
index 6817988868..97d9e622dc 100644
--- a/module/projectplan/lang/en.php
+++ b/module/projectplan/lang/en.php
@@ -1,7 +1,7 @@
 <?php
 $lang->projectplan = new stdclass();
-$lang->projectplan->common  = 'Project Plan';
-$lang->projectplan->browse  = 'Project Plan List';
-$lang->projectplan->create  = 'Create Project Plan';
-$lang->projectplan->edit    = 'Edit Project Plan';
-$lang->projectplan->view    = 'View Project Plan';
+$lang->projectplan->common  = "{$lang->projectCommon} Plan";
+$lang->projectplan->browse  = "{$lang->projectCommon} Plan List";
+$lang->projectplan->create  = "Create {$lang->projectCommon} Plan";
+$lang->projectplan->edit    = "Edit {$lang->projectCommon} Plan";
+$lang->projectplan->view    = "View {$lang->projectCommon} Plan";
diff --git a/module/projectplan/lang/fr.php b/module/projectplan/lang/fr.php
index 6817988868..97d9e622dc 100644
--- a/module/projectplan/lang/fr.php
+++ b/module/projectplan/lang/fr.php
@@ -1,7 +1,7 @@
 <?php
 $lang->projectplan = new stdclass();
-$lang->projectplan->common  = 'Project Plan';
-$lang->projectplan->browse  = 'Project Plan List';
-$lang->projectplan->create  = 'Create Project Plan';
-$lang->projectplan->edit    = 'Edit Project Plan';
-$lang->projectplan->view    = 'View Project Plan';
+$lang->projectplan->common  = "{$lang->projectCommon} Plan";
+$lang->projectplan->browse  = "{$lang->projectCommon} Plan List";
+$lang->projectplan->create  = "Create {$lang->projectCommon} Plan";
+$lang->projectplan->edit    = "Edit {$lang->projectCommon} Plan";
+$lang->projectplan->view    = "View {$lang->projectCommon} Plan";
diff --git a/module/projectplan/lang/zh-cn.php b/module/projectplan/lang/zh-cn.php
index 7eed14d715..cd37f7fe7d 100644
--- a/module/projectplan/lang/zh-cn.php
+++ b/module/projectplan/lang/zh-cn.php
@@ -1,7 +1,7 @@
 <?php
 $lang->projectplan = new stdclass();
-$lang->projectplan->common  = '项目计划';
-$lang->projectplan->browse  = '项目计划列表';
-$lang->projectplan->create  = '新增项目计划';
-$lang->projectplan->edit    = '编辑项目计划';
-$lang->projectplan->view    = '项目计划详情';
+$lang->projectplan->common  = "{$lang->projectCommon}计划";
+$lang->projectplan->browse  = "{$lang->projectCommon}计划列表";
+$lang->projectplan->create  = "新增{$lang->projectCommon}计划";
+$lang->projectplan->edit    = "编辑{$lang->projectCommon}计划";
+$lang->projectplan->view    = "{$lang->projectCommon}计划详情";
diff --git a/module/stakeholder/lang/de.php b/module/stakeholder/lang/de.php
index d6a3d4798a..25bbd57899 100644
--- a/module/stakeholder/lang/de.php
+++ b/module/stakeholder/lang/de.php
@@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = 'Yes';
 $lang->stakeholder->typeList['inside']  = 'Internal';
 $lang->stakeholder->typeList['outside'] = 'External';
 
-$lang->stakeholder->fromList['team']    = 'Project Team';
+$lang->stakeholder->fromList['team']    = $lang->projectCommon . ' Team';
 $lang->stakeholder->fromList['company'] = 'Internal';
 $lang->stakeholder->fromList['outside'] = 'External';
 
diff --git a/module/stakeholder/lang/en.php b/module/stakeholder/lang/en.php
index 6909e0f42c..767758ac5f 100644
--- a/module/stakeholder/lang/en.php
+++ b/module/stakeholder/lang/en.php
@@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = 'Yes';
 $lang->stakeholder->typeList['inside']  = 'Internal';
 $lang->stakeholder->typeList['outside'] = 'External';
 
-$lang->stakeholder->fromList['team']    = 'Project Team';
+$lang->stakeholder->fromList['team']    = $lang->projectCommon . ' Team';
 $lang->stakeholder->fromList['company'] = 'Internal';
 $lang->stakeholder->fromList['outside'] = 'External';
 
diff --git a/module/stakeholder/lang/fr.php b/module/stakeholder/lang/fr.php
index d6a3d4798a..25bbd57899 100644
--- a/module/stakeholder/lang/fr.php
+++ b/module/stakeholder/lang/fr.php
@@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = 'Yes';
 $lang->stakeholder->typeList['inside']  = 'Internal';
 $lang->stakeholder->typeList['outside'] = 'External';
 
-$lang->stakeholder->fromList['team']    = 'Project Team';
+$lang->stakeholder->fromList['team']    = $lang->projectCommon . ' Team';
 $lang->stakeholder->fromList['company'] = 'Internal';
 $lang->stakeholder->fromList['outside'] = 'External';
 
diff --git a/module/stakeholder/lang/zh-cn.php b/module/stakeholder/lang/zh-cn.php
index 8e5b132015..ca20f378ac 100644
--- a/module/stakeholder/lang/zh-cn.php
+++ b/module/stakeholder/lang/zh-cn.php
@@ -59,7 +59,7 @@ $lang->stakeholder->keyList[1] = '是';
 $lang->stakeholder->typeList['inside']  = '内部';
 $lang->stakeholder->typeList['outside'] = '外部';
 
-$lang->stakeholder->fromList['team']    = '项目团队成员';
+$lang->stakeholder->fromList['team']    = $lang->projectCommon . '团队成员';
 $lang->stakeholder->fromList['company'] = '公司同事';
 $lang->stakeholder->fromList['outside'] = '外部人员';
 
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index a9dfb4350e..cf366874e1 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -67,7 +67,7 @@ $lang->task->foldEffort          = 'Fold Effort';
 
 $lang->task->common            = 'Aufgabe';
 $lang->task->id                = 'ID';
-$lang->task->project           = 'Project';
+$lang->task->project           = $lang->projectCommon;
 $lang->task->execution         = $lang->executionCommon;
 $lang->task->module            = 'Modul';
 $lang->task->moduleAB          = 'Modul';
@@ -250,7 +250,7 @@ $lang->task->confirmFinish             = '"Reststunden " sind 0. Möchten Sue de
 $lang->task->confirmRecord             = '"Reststunden " sind 0. Möchten Sie den Task auf Erledigt setzen?';
 $lang->task->confirmTransfer           = '"Left Hour" is 0，Do you want to assign to <strong>%s</strong> task?';
 $lang->task->noticeTaskStart           = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
-$lang->task->noticeLinkStory           = "Es wurde keine Story verknüpft. Sie können %s für dieses Projekt, anschließend %s.";
+$lang->task->noticeLinkStory           = "Es wurde keine Story verknüpft. Sie können %s für dieses {$lang->projectCommon}, anschließend %s.";
 $lang->task->noticeLinkStoryNoProduct  = "No story has been linked.";
 $lang->task->noticeSaveRecord          = 'Ihre Stunden wurden nicht gespeichrt. Bitte erst speichern.';
 $lang->task->noticeManageTeam          = 'Task status is %s, can not manage team.';
@@ -259,7 +259,7 @@ $lang->task->deniedNotice              = 'Nur %s kann die Aufgabe %s.';
 $lang->task->deniedStatusNotice        = 'The task status is %s, the effort cannot be maintained.';
 $lang->task->transferNotice            = 'Linear task cannot be transferred.';
 $lang->task->noTask                    = 'Keine Aufagben. ';
-$lang->task->createDenied              = 'Aufgben erstellen it in diesem Projekt gesperrt';
+$lang->task->createDenied              = "Aufgben erstellen it in diesem {$lang->projectCommon} gesperrt";
 $lang->task->cannotDeleteParent        = 'Cannot delete parent task';
 $lang->task->addChildTask              = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
 
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 13cd21ca77..d16288a64d 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -67,7 +67,7 @@ $lang->task->foldEffort          = 'Fold Effort';
 
 $lang->task->common            = 'Task';
 $lang->task->id                = 'ID';
-$lang->task->project           = 'Project';
+$lang->task->project           = $lang->projectCommon;
 $lang->task->execution         = $lang->executionCommon;
 $lang->task->module            = 'Module';
 $lang->task->moduleAB          = 'Module';
@@ -250,7 +250,7 @@ $lang->task->confirmFinish             = '"Left Hour" is 0. Do you want to chang
 $lang->task->confirmRecord             = '"Left Hour" is 0. Do you want to set the task as "Finished"?';
 $lang->task->confirmTransfer           = '"Left Hour" is 0，Do you want to assign to <strong>%s</strong> task?';
 $lang->task->noticeTaskStart           = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
-$lang->task->noticeLinkStory           = "No story has been linked. You can %s for this project, then %s.";
+$lang->task->noticeLinkStory           = "No story has been linked. You can %s for this {$lang->projectCommon}, then %s.";
 $lang->task->noticeLinkStoryNoProduct  = "No story has been linked.";
 $lang->task->noticeSaveRecord          = 'Your Hour is not saved. Please save it first.';
 $lang->task->noticeManageTeam          = 'Task status is %s, can not manage team.';
@@ -259,7 +259,7 @@ $lang->task->deniedNotice              = 'Only the %s can %s the task.';
 $lang->task->deniedStatusNotice        = 'The task status is %s, the effort cannot be maintained.';
 $lang->task->transferNotice            = 'Linear task cannot be transferred.';
 $lang->task->noTask                    = 'No tasks yet. ';
-$lang->task->createDenied              = 'Create Task is denied in this project';
+$lang->task->createDenied              = 'Create Task is denied in this ' . $lang->projectCommon;
 $lang->task->cannotDeleteParent        = 'Cannot delete parent task';
 $lang->task->addChildTask              = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
 
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 2fc2956dbb..c58f8d7265 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -67,7 +67,7 @@ $lang->task->foldEffort          = 'Fold Effort';
 
 $lang->task->common            = 'Tâche';
 $lang->task->id                = 'ID';
-$lang->task->project           = 'Project';
+$lang->task->project           = $lang->projectCommon;
 $lang->task->execution         = $lang->executionCommon;
 $lang->task->module            = 'Module';
 $lang->task->moduleAB          = 'Module';
@@ -250,7 +250,7 @@ $lang->task->confirmFinish             = '"Heures Restantes" à 0. Voulez-vous p
 $lang->task->confirmRecord             = '"Heures Restantes" à 0. Voulez-vous passer le statut de la tâche à "Finie" ?';
 $lang->task->confirmTransfer           = '"Left Hour" is 0，Do you want to assign to <strong>%s</strong> task?';
 $lang->task->noticeTaskStart           = '"Cost Hour" and "Left Hour" cannot be 0 at the same time.';
-$lang->task->noticeLinkStory           = "Aucune Story n'est associée. Vous pouvez %s pour ce projet, alors %s.";
+$lang->task->noticeLinkStory           = "Aucune Story n'est associée. Vous pouvez %s pour ce {$lang->projectCommon}, alors %s.";
 $lang->task->noticeLinkStoryNoProduct  = "No story has been linked.";
 $lang->task->noticeSaveRecord          = "Votre temps n'a pas été sauvé. Enregistrez-le d'abord.";
 $lang->task->noticeManageTeam          = 'Task status is %s, can not manage team.';
@@ -259,7 +259,7 @@ $lang->task->deniedNotice              = 'Seulement le %s peut %s la tâche.';
 $lang->task->deniedStatusNotice        = 'The task status is %s, the effort cannot be maintained.';
 $lang->task->transferNotice            = 'Linear task cannot be transferred.';
 $lang->task->noTask                    = "Pas de tâche pour l'instant. ";
-$lang->task->createDenied              = 'La création de tâches est interdite dans ce projet';
+$lang->task->createDenied              = 'La création de tâches est interdite dans ce ' . $lang->projectCommon;
 $lang->task->cannotDeleteParent        = 'Impossible de supprimer la tâche parente';
 $lang->task->addChildTask              = 'Because the task has already consumed consumption, to ensure data consistency, we will help you create a subtask with the same name to record the consumption.';
 
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 6f2f86dc88..6e7aabde02 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -67,7 +67,7 @@ $lang->task->foldEffort          = '收起日志';
 
 $lang->task->common            = '任务';
 $lang->task->id                = '编号';
-$lang->task->project           = '所属项目';
+$lang->task->project           = '所属' . $lang->projectCommon;
 $lang->task->execution         = '所属' . $lang->execution->common;
 $lang->task->module            = '所属模块';
 $lang->task->moduleAB          = '模块';
@@ -250,7 +250,7 @@ $lang->task->confirmFinish             = '"预计剩余"为0，确认将任务
 $lang->task->confirmRecord             = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
 $lang->task->confirmTransfer           = '剩余工时为0，当前成员已完成任务，任务指派给：<strong>%s</strong>。';
 $lang->task->noticeTaskStart           = '"总计消耗"和"预计剩余"不能同时为0';
-$lang->task->noticeLinkStory           = "没有可关联的相关{$lang->SRCommon}，您可以为当前项目%s，然后%s";
+$lang->task->noticeLinkStory           = "没有可关联的相关{$lang->SRCommon}，您可以为当前{$lang->projectCommon}%s，然后%s";
 $lang->task->noticeLinkStoryNoProduct  = "没有可关联的相关{$lang->SRCommon}";
 $lang->task->noticeSaveRecord          = '您有尚未保存的工时记录，请先将其保存。';
 $lang->task->noticeManageTeam          = '任务状态是%s，不能维护团队';
@@ -259,7 +259,7 @@ $lang->task->deniedNotice              = '当前任务只有%s才可以%s。';
 $lang->task->deniedStatusNotice        = '当前任务状态是%s，不能维护日志。';
 $lang->task->transferNotice            = '串行多人任务不能转交。';
 $lang->task->noTask                    = '暂时没有任务。';
-$lang->task->createDenied              = '你不能在该项目添加任务';
+$lang->task->createDenied              = "你不能在该{$lang->projectCommon}添加任务";
 $lang->task->cannotDeleteParent        = '不能删除父任务。';
 $lang->task->addChildTask              = '因该任务已经产生消耗，为保证数据一致性，我们会帮您创建一条同名子任务记录该消耗。';
 
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 7e0dd2b034..137b5b8a34 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = 'Case Report';
 $lang->testtask->id                = 'ID';
 $lang->testtask->common            = 'Testaufgabe';
 $lang->testtask->product           = $lang->productCommon;
-$lang->testtask->project           = 'Project';
+$lang->testtask->project           = $lang->projectCommon;;
 $lang->testtask->execution         = $lang->execution->common;
 $lang->testtask->type              = 'Typ';
 $lang->testtask->build             = 'Build';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index e40067f21b..3826416d20 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = 'Report';
 $lang->testtask->id                = 'ID';
 $lang->testtask->common            = 'Request';
 $lang->testtask->product           = $lang->productCommon;
-$lang->testtask->project           = 'Project';
+$lang->testtask->project           = $lang->projectCommon;;
 $lang->testtask->execution         = $lang->execution->common;
 $lang->testtask->type              = 'Type';
 $lang->testtask->build             = 'Build';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 9aca9a6aa9..798ebd9ac2 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = 'Rapport CasTests';
 $lang->testtask->id                = 'ID';
 $lang->testtask->common            = 'Recette';
 $lang->testtask->product           = $lang->productCommon;
-$lang->testtask->project           = 'Project';
+$lang->testtask->project           = $lang->projectCommon;;
 $lang->testtask->execution         = $lang->execution->common;
 $lang->testtask->type              = 'Type';
 $lang->testtask->build             = 'Build';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 7f92d053d7..100d3a8dd6 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -71,7 +71,7 @@ $lang->testtask->reportAction   = '用例报表统计';
 $lang->testtask->id                = '编号';
 $lang->testtask->common            = '测试单';
 $lang->testtask->product           = '所属' . $lang->productCommon;
-$lang->testtask->project           = '所属项目';
+$lang->testtask->project           = '所属' . $lang->projectCommon;
 $lang->testtask->execution         = '所属' . $lang->execution->common;
 $lang->testtask->type              = '测试类型';
 $lang->testtask->build             = '版本';

From 76016e1b7834f1c64f13bd107eeeefd614878209 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Tue, 7 Mar 2023 07:43:26 +0000
Subject: [PATCH 272/319] * Fixed #bug86288.

---
 module/action/model.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 6a346ac118..b148865057 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -482,9 +482,18 @@ class actionModel extends model
                 if($name) $action->extra = common::hasPriv('testtask', 'view') ? html::a(helper::createLink('testtask', 'view', "taskID=$action->extra"), $name) : $name;
             }
             elseif(strpos('feedback,ticket', $action->objectType) === false and $actionName == 'tostory')
-            {
-                $title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
-                if($title) $action->extra = common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$action->extra"), "#$action->extra " . $title) : "#$action->extra " . $title;
+	    {
+		$projectID = 0;
+		$productShadow = $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in($action->product)->fetch('shadow');
+		$title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
+		$defaultExtra = "#$action->extra ".$title;
+		if($productShadow === "1")
+		{
+		    $projectID = $this->dao->select('project')->from(TABLE_PROJECTPRODUCT)->where('product')->in($action->product)->fetch('project');
+		    if($title) $action->extra = common::hasPriv('projectstory','story') && $projectID ? html::a(helper::createLink('projectstory','story',"projectID=$projectID"),"#$action->extra ".$title) : $defaultExtra;
+		}else{
+		    if($title) $action->extra = common::hasPriv('story', 'view') ?  html::a(helper::createLink('story', 'view', "storyID=$action->extra"), "#$action->extra " . $title) : $defaultExtra;
+		}
             }
             elseif($actionName == 'importedcard')
             {

From 234347cede7b21cd62552424cfcfab1bdf4bf7ef Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 15:58:38 +0800
Subject: [PATCH 273/319] * Update project common language.

---
 module/company/config.php            |  2 +-
 module/company/lang/de.php           |  2 +-
 module/company/lang/en.php           |  2 +-
 module/company/lang/fr.php           |  4 ++--
 module/company/lang/zh-cn.php        |  2 +-
 module/editor/lang/de.php            |  1 +
 module/editor/lang/en.php            |  1 +
 module/editor/lang/fr.php            | 17 +++++++++--------
 module/editor/lang/zh-cn.php         |  2 +-
 module/group/lang/de.php             | 12 ++++++------
 module/group/lang/en.php             | 10 +++++-----
 module/group/lang/fr.php             | 10 +++++-----
 module/group/lang/zh-cn.php          | 10 +++++-----
 module/programplan/lang/de.php       |  4 ++--
 module/programplan/lang/en.php       |  4 ++--
 module/programplan/lang/fr.php       |  4 ++--
 module/programplan/lang/zh-cn.php    |  6 +++---
 module/projectrelease/lang/zh-cn.php |  2 +-
 module/release/lang/de.php           |  6 +++---
 module/release/lang/en.php           |  6 +++---
 module/release/lang/fr.php           |  6 +++---
 module/release/lang/zh-cn.php        |  6 +++---
 module/transfer/lang/zh-cn.php       |  2 +-
 23 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/module/company/config.php b/module/company/config.php
index 475e57d824..383037d0ba 100644
--- a/module/company/config.php
+++ b/module/company/config.php
@@ -11,7 +11,7 @@ $config->company->dynamic->search['module']               = 'action';
 
 if($config->vision == 'rnd') $config->company->dynamic->search['fields']['product']    = $lang->action->product;
 
-$config->company->dynamic->search['fields']['project']    = '项目';
+$config->company->dynamic->search['fields']['project']    = $lang->projectCommon;
 $config->company->dynamic->search['fields']['execution']  = $lang->action->execution;
 $config->company->dynamic->search['fields']['actor']      = $lang->action->actor;
 $config->company->dynamic->search['fields']['objectID']   = $lang->action->objectID;
diff --git a/module/company/lang/de.php b/module/company/lang/de.php
index a32b2de3af..4ed8116d50 100644
--- a/module/company/lang/de.php
+++ b/module/company/lang/de.php
@@ -31,7 +31,7 @@ $lang->company->admins   = 'Administratoren';
 $lang->company->deleted  = 'Deleted';
 
 $lang->company->product   = $lang->productCommon;
-$lang->company->project   = 'Project';
+$lang->company->project   = $lang->projectCommon;
 $lang->company->execution = 'Execution';
 $lang->company->user      = 'Benutzer';
 $lang->company->empty     = 'No Dynamic';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index dc931405c0..71522687c2 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -31,7 +31,7 @@ $lang->company->admins   = 'Administrator';
 $lang->company->deleted  = 'Deleted';
 
 $lang->company->product   = $lang->productCommon;
-$lang->company->project   = 'Project';
+$lang->company->project   = $lang->projectCommon;
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = 'User';
 $lang->company->empty     = 'No Dynamic';
diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php
index 772fc4490a..e1180e37f8 100644
--- a/module/company/lang/fr.php
+++ b/module/company/lang/fr.php
@@ -31,8 +31,8 @@ $lang->company->admins   = 'Administrateur';
 $lang->company->deleted  = 'Deleted';
 
 $lang->company->product   = $lang->productCommon;
-$lang->company->project   = 'Project';
-$lang->company->execution = 'Execution';
+$lang->company->project   = $lang->projectCommon;
+$lang->company->execution = $lang->executionCommon;
 $lang->company->user      = 'Utilisateurs';
 $lang->company->empty     = 'No Dynamic';
 
diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php
index 5ae22d14df..c2e21d87e0 100644
--- a/module/company/lang/zh-cn.php
+++ b/module/company/lang/zh-cn.php
@@ -31,7 +31,7 @@ $lang->company->admins   = '管理员';
 $lang->company->deleted  = '已删除';
 
 $lang->company->product   = $lang->productCommon;
-$lang->company->project   = '项目';
+$lang->company->project   = $lang->projectCommon;
 $lang->company->execution = $lang->executionCommon;
 $lang->company->user      = '用户';
 $lang->company->empty     = '暂时没有动态';
diff --git a/module/editor/lang/de.php b/module/editor/lang/de.php
index 624035bbe1..2476d4f355 100644
--- a/module/editor/lang/de.php
+++ b/module/editor/lang/de.php
@@ -32,6 +32,7 @@ $lang->editor->repeatFile    = 'Datei existiert bereits';
 $lang->editor->repeatPage    = 'Seite existiert bereits. Möchten Sie die Seite überschreiben?';
 $lang->editor->noticeOkFile  = 'Aus Sicherheitsgründen muss Ihr Adminkonto bestätigt werden. \n Bitte melden Sie sich an und erstellen Sie die Datei %s File.\n Hinweis:\n 1. Die Datei ist leer.\n 2. Wenn die Datei bereits existiert, löschen Sie sie und erstellen Sie eine neue Datei.';
 $lang->editor->editFileError = 'Sie können nur ZenTao Dateien verändern!';
+$lang->editor->turnOff       = "If you don't use the editor function, you can turn it off here.";
 
 $lang->editor->notWritable    = "Nicht beschreibbar. Berechtigung erforderlich. Bitte versuchen Sie chmod 777 -R ";
 $lang->editor->notDelete      = 'Kann nicht gelöscht werden. Bitte prüfen Sie Ihre Berechtigungen!';
diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php
index 5dfb681829..2d3a1bfd2d 100644
--- a/module/editor/lang/en.php
+++ b/module/editor/lang/en.php
@@ -32,6 +32,7 @@ $lang->editor->repeatFile    = 'File Name Duplicated';
 $lang->editor->repeatPage    = 'This page exists. Do you want to overwrite it?';
 $lang->editor->noticeOkFile  = 'For security reasons, your Admin account has to be confirmed. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
 $lang->editor->editFileError = 'You can only modify ZenTao files!';
+$lang->editor->turnOff       = "If you don't use the editor function, you can turn it off here.";
 
 $lang->editor->notWritable    = "Not wirtable. Permission is required. Please try chmod 777 -R ";
 $lang->editor->notDelete      = 'Cannot be deleted. Please check your permissions!';
diff --git a/module/editor/lang/fr.php b/module/editor/lang/fr.php
index d483fce164..3a4887fffb 100644
--- a/module/editor/lang/fr.php
+++ b/module/editor/lang/fr.php
@@ -2,7 +2,7 @@
 $lang->editor->common    = 'Editeur';
 $lang->editor->api       = 'API';
 $lang->editor->index     = 'Accueil';
-$lang->editor->newMethod = 'New M�thode';
+$lang->editor->newMethod = 'New M?thode';
 $lang->editor->extend    = 'Extension';
 $lang->editor->api       = 'API';
 $lang->editor->newLang   = 'New Language';
@@ -29,18 +29,19 @@ $lang->editor->pageName     = "Nom Page :";
 $lang->editor->deleteConfirm = 'Voulez-vous le supprimer ?';
 $lang->editor->extendConfirm = 'Voulez-vous utiliser le code original ?';
 $lang->editor->repeatFile    = 'Doublon';
-$lang->editor->repeatPage    = "Cette page existe. Voulez-vous l'�craser ?";
-$lang->editor->noticeOkFile  = 'Pour des raisons de s�curit�, votre compte administrateur doit �tre confirm�. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
+$lang->editor->repeatPage    = "Cette page existe. Voulez-vous l'?craser ?";
+$lang->editor->noticeOkFile  = 'Pour des raisons de s?curit?, votre compte administrateur doit ?tre confirm?. \n Please login ZenTao server and create %s File.\n Note:\n 1. File is blank.\n 2. If the file existed, delete it and then create a new one.';
 $lang->editor->editFileError = 'Vous pouvez seulement modifier les fichiers ZenTao !';
+$lang->editor->turnOff       = "If you don't use the editor function, you can turn it off here.";
 
 $lang->editor->notWritable    = "Non inscriptible. Permission requise. Essayez chmod 777 -R ";
-$lang->editor->notDelete      = 'Ne peut pas �tre supprim�. V�rifiez les permissions !';
+$lang->editor->notDelete      = 'Ne peut pas ?tre supprim?. V?rifiez les permissions !';
 $lang->editor->emptyFileName  = 'Entrez un nom de fichier !';
-$lang->editor->onlyLocalVisit = "Cette fonctionnalit� ne fonctionne que pour une IP 127.0.0.1. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Aide</a>";
+$lang->editor->onlyLocalVisit = "Cette fonctionnalit? ne fonctionne que pour une IP 127.0.0.1. <a href='https://api.zentao.pm/goto.php?item=howtodevelop&from=en' target='_blank'>Aide</a>";
 
 $lang->editor->translate['config.php']  = 'config';
-$lang->editor->translate['control.php'] = 'contr�le';
-$lang->editor->translate['model.php']   = 'mod�le';
+$lang->editor->translate['control.php'] = 'contr?le';
+$lang->editor->translate['model.php']   = 'mod?le';
 
 $lang->editor->modules['action']      = 'System Log';
 $lang->editor->modules['admin']       = 'Admin';
@@ -67,7 +68,7 @@ $lang->editor->modules['release']     = 'Release';
 $lang->editor->modules['report']      = 'Rapport';
 $lang->editor->modules['search']      = 'Recherche';
 $lang->editor->modules['story']       = 'Story';
-$lang->editor->modules['task']        = 'T�che';
+$lang->editor->modules['task']        = 'T?che';
 $lang->editor->modules['testcase']    = 'CasTest';
 $lang->editor->modules['testtask']    = 'Recette';
 $lang->editor->modules['todo']        = 'Agenda';
diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php
index 82898da78e..6936539032 100644
--- a/module/editor/lang/zh-cn.php
+++ b/module/editor/lang/zh-cn.php
@@ -62,7 +62,7 @@ $lang->editor->modules['misc']        = '杂项';
 $lang->editor->modules['my']          = '我的地盘';
 $lang->editor->modules['product']     = $lang->productCommon . '视图';
 $lang->editor->modules['productplan'] = '计划';
-$lang->editor->modules['project']     = '项目视图';
+$lang->editor->modules['project']     = $lang->projectCommon . '视图';
 $lang->editor->modules['execution']   = $lang->executionCommon . '视图';
 $lang->editor->modules['qa']          = '测试视图';
 $lang->editor->modules['release']     = '发布';
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index c32d2444c1..ba0fa1071e 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = 'Modul Rechte';
 $lang->group->byModuleTips       = '<span class="tips">(SHIFT/STRG für Multi-Select)</span>';
 $lang->group->allTips            = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
 $lang->group->manageMember       = 'Mitglieder';
-$lang->group->manageProjectAdmin = 'Manage Program Admins';
+$lang->group->manageProjectAdmin = "Manage {$lang->projectCommon} Admins";
 $lang->group->confirmDelete      = "Do you want to delete '%s'?";
 $lang->group->successSaved       = 'Gespeichert!';
 $lang->group->errorNotSaved      = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.';
 $lang->group->viewList           = 'Anzeige ist zulässig.';
 $lang->group->object             = 'Manage Object';
 $lang->group->manageProgram      = 'Manage Program';
-$lang->group->manageProject      = 'Manage Project';
+$lang->group->manageProject      = 'Manage ' . $lang->projectCommon;
 $lang->group->manageExecution    = 'Manage ' . $lang->execution->common;
 $lang->group->manageProduct      = 'Manage ' . $lang->productCommon;
 $lang->group->programList        = 'Access Program';
-$lang->group->productList        = 'Produkte sind zugänglich.';
-$lang->group->projectList        = 'Projekte sind zugänglich.';
+$lang->group->productList        = $lang->productCommon . ' sind zugänglich.';
+$lang->group->projectList        = $lang->projectCommon . ' sind zugänglich.';
 $lang->group->executionList      = "Access {$lang->execution->common}";
 $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Leer bedeutet Zugriff verweigert.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
 $lang->group->noneExecution      = "No {$lang->execution->common}";
-$lang->group->project            = 'Project';
+$lang->group->project            = $lang->projectCommon;
 $lang->group->group              = 'Group';
 $lang->group->more               = 'More';
 $lang->group->allCheck           = 'All';
 $lang->group->noGroup            = 'No group';
 $lang->group->repeat             = "『%s』『%s』exists.Please adjust it and try again.";
-$lang->group->noneProject        = 'No Project';
+$lang->group->noneProject        = 'No ' . $lang->projectCommon;
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Name';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index aece3f3e5a..8d161b6e0a 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = 'Manage Privileges by Module';
 $lang->group->byModuleTips       = '<span class="tips">(Press Shift/Ctrl to Multi-select)</span>';
 $lang->group->allTips            = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
 $lang->group->manageMember       = 'Manage Members';
-$lang->group->manageProjectAdmin = 'Manage Program Admins';
+$lang->group->manageProjectAdmin = "Manage {$lang->projectCommon} Admins";
 $lang->group->confirmDelete      = "Do you want to delete '%s'?";
 $lang->group->successSaved       = 'Saved.';
 $lang->group->errorNotSaved      = 'Failed. Please select actions and groups.';
 $lang->group->viewList           = 'Access Sight';
 $lang->group->object             = 'Manage Object';
 $lang->group->manageProgram      = 'Manage Program';
-$lang->group->manageProject      = 'Manage Project';
+$lang->group->manageProject      = 'Manage ' . $lang->projectCommon;
 $lang->group->manageExecution    = 'Manage ' . $lang->execution->common;
 $lang->group->manageProduct      = 'Manage ' . $lang->productCommon;
 $lang->group->programList        = 'Access Program';
 $lang->group->productList        = 'Access Product';
-$lang->group->projectList        = 'Access Project';
+$lang->group->projectList        = 'Access ' . $lang->projectCommon;
 $lang->group->executionList      = "Access {$lang->execution->common}";
 $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
 $lang->group->noneExecution      = "No {$lang->execution->common}";
-$lang->group->project            = 'Project';
+$lang->group->project            = $lang->projectCommon;
 $lang->group->group              = 'Group';
 $lang->group->more               = 'More';
 $lang->group->allCheck           = 'All';
 $lang->group->noGroup            = 'No group';
 $lang->group->repeat             = "『%s』『%s』exists.Please adjust it and try again.";
-$lang->group->noneProject        = 'No Project';
+$lang->group->noneProject        = 'No ' . $lang->projectCommon;
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Group';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 601728e9a3..9634604479 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = 'Gérer Privilèges par Module';
 $lang->group->byModuleTips       = '<span class="tips">(Shift/Ctrl pour sélection multiple)</span>';
 $lang->group->allTips            = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
 $lang->group->manageMember       = 'Gérer Membres';
-$lang->group->manageProjectAdmin = 'Manage Program Admins';
+$lang->group->manageProjectAdmin = "Manage {$lang->projectCommon} Admins";
 $lang->group->confirmDelete      = "Voulez - vous supprimer '%s'?";
 $lang->group->successSaved       = 'Sauvé.';
 $lang->group->errorNotSaved      = 'Echec. Veuillez sélectionner actions et groupes.';
 $lang->group->viewList           = 'Accès Consultation';
 $lang->group->object             = 'Manage Object';
 $lang->group->manageProgram      = 'Manage Program';
-$lang->group->manageProject      = 'Manage Project';
+$lang->group->manageProject      = 'Manage ' . $lang->projectCommon;
 $lang->group->manageExecution    = 'Manage ' . $lang->execution->common;
 $lang->group->manageProduct      = 'Manage ' . $lang->productCommon;
 $lang->group->programList        = 'Accè Programs';
 $lang->group->productList        = 'Accès ' . $lang->productCommon . 's';
-$lang->group->projectList        = 'Accès ' . $lang->executionCommon . 's';
+$lang->group->projectList        = 'Accès ' . $lang->projectCommon . 's';
 $lang->group->executionList      = "Access {$lang->execution->common}";
 $lang->group->dynamic            = 'Accès Historique';
 $lang->group->noticeVisit        = "Blanc signifie « pas de limitation d'accès ».";
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
 $lang->group->noneExecution      = "No {$lang->execution->common}";
-$lang->group->project            = 'Project';
+$lang->group->project            = $lang->projectCommon;
 $lang->group->group              = 'Group';
 $lang->group->more               = 'More';
 $lang->group->allCheck           = 'All';
 $lang->group->noGroup            = 'Aucun groupe';
 $lang->group->repeat             = "『%s』『%s』exists.Please adjust it and try again.";
-$lang->group->noneProject        = 'No Project';
+$lang->group->noneProject        = 'No ' . $lang->projectCommon;
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Groupe';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 4ffe9a880f..0856980c16 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -22,32 +22,32 @@ $lang->group->managePrivByModule = '按模块分配权限';
 $lang->group->byModuleTips       = '<span class="tips">（可以按住Shift或者Ctrl键进行多选）</span>';
 $lang->group->allTips            = '勾选此项后，管理员可管理系统中所有对象，包括后续创建的对象。';
 $lang->group->manageMember       = '成员维护';
-$lang->group->manageProjectAdmin = '维护项目管理员';
+$lang->group->manageProjectAdmin = "维护{$lang->projectCommon}管理员";
 $lang->group->confirmDelete      = '您确定删除“%s”用户分组吗？';
 $lang->group->successSaved       = '成功保存';
 $lang->group->errorNotSaved      = '没有保存，请确认选择了权限数据。';
 $lang->group->viewList           = '可访问视图';
 $lang->group->object             = '可管理对象';
 $lang->group->manageProgram      = '可管理项目集';
-$lang->group->manageProject      = '可管理项目';
+$lang->group->manageProject      = '可管理' . $lang->projectCommon;
 $lang->group->manageExecution    = '可管理' . $lang->execution->common;
 $lang->group->manageProduct      = '可管理' . $lang->productCommon;
 $lang->group->programList        = '可访问项目集';
 $lang->group->productList        = '可访问' . $lang->productCommon;
-$lang->group->projectList        = '可访问项目';
+$lang->group->projectList        = '可访问' . $lang->projectCommon;
 $lang->group->executionList      = "可访问{$lang->execution->common}";
 $lang->group->dynamic            = '可查看动态';
 $lang->group->noticeVisit        = '空代表没有访问限制';
 $lang->group->noneProgram        = "暂时没有项目集";
 $lang->group->noneProduct        = "暂时没有{$lang->productCommon}";
 $lang->group->noneExecution      = "暂时没有{$lang->execution->common}";
-$lang->group->project            = '项目';
+$lang->group->project            = $lang->projectCommon;
 $lang->group->group              = '分组';
 $lang->group->more               = '更多';
 $lang->group->allCheck           = '全部';
 $lang->group->noGroup            = '暂时没有分组。';
 $lang->group->repeat             = "『%s』已经有『%s』这条记录了，请调整后再试。";
-$lang->group->noneProject        = '暂时没有项目';
+$lang->group->noneProject        = '暂时没有' . $lang->projectCommon;
 
 $lang->group->id       = '编号';
 $lang->group->name     = '分组名称';
diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php
index 05e042641b..6cbe6a9661 100644
--- a/module/programplan/lang/de.php
+++ b/module/programplan/lang/de.php
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt     = 'Gantt Setting';
 $lang->programplan->viewSetting      = 'Setting';
 $lang->programplan->desc             = 'Description';
 
-$lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
-$lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
+$lang->programplan->errorBegin       = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
+$lang->programplan->errorEnd         = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
 $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index 2b5367be28..de3a827009 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt     = 'Gantt Setting';
 $lang->programplan->viewSetting      = 'Setting';
 $lang->programplan->desc             = 'Description';
 
-$lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
-$lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
+$lang->programplan->errorBegin       = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
+$lang->programplan->errorEnd         = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
 $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php
index 05e042641b..6cbe6a9661 100644
--- a/module/programplan/lang/fr.php
+++ b/module/programplan/lang/fr.php
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt     = 'Gantt Setting';
 $lang->programplan->viewSetting      = 'Setting';
 $lang->programplan->desc             = 'Description';
 
-$lang->programplan->errorBegin       = "Project begin date: %s, begin date should be >= project begin date.";
-$lang->programplan->errorEnd         = "Project end date: %s, end date should be <= project end date.";
+$lang->programplan->errorBegin       = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
+$lang->programplan->errorEnd         = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
 $lang->programplan->emptyBegin       = '『Begin』should not be blank';
 $lang->programplan->emptyEnd         = '『End』should not be blank';
 $lang->programplan->checkBegin       = '『Begin』should be valid date';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index 535813cf86..d4d472e133 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->programplan->common        = '项目阶段';
+$lang->programplan->common        = $lang->projectCommon . '阶段';
 $lang->programplan->browse        = '浏览甘特图';
 $lang->programplan->gantt         = '甘特图';
 $lang->programplan->ganttEdit     = '甘特图编辑';
@@ -67,8 +67,8 @@ $lang->programplan->settingGantt     = '设置甘特图';
 $lang->programplan->viewSetting      = '显示设置';
 $lang->programplan->desc             = '描述';
 
-$lang->programplan->errorBegin       = '阶段的开始时间不能小于所属项目的开始时间%s';
-$lang->programplan->errorEnd         = '阶段的结束时间不能大于所属项目的结束时间%s';
+$lang->programplan->errorBegin       = "阶段的开始时间不能小于所属{$lang->projectCommon}的开始时间%s";
+$lang->programplan->errorEnd         = "阶段的结束时间不能大于所属{$lang->projectCommon}的结束时间%s";
 $lang->programplan->emptyBegin       = '『计划开始』日期不能为空';
 $lang->programplan->emptyEnd         = '『计划完成』日期不能为空';
 $lang->programplan->checkBegin       = '『计划开始』应当为合法的日期';
diff --git a/module/projectrelease/lang/zh-cn.php b/module/projectrelease/lang/zh-cn.php
index e015d22931..bf73dd800e 100644
--- a/module/projectrelease/lang/zh-cn.php
+++ b/module/projectrelease/lang/zh-cn.php
@@ -9,7 +9,7 @@
  * @version     $Id: zh-cn.php 4129 2020-11-27 01:58:14Z wwccss $
  * @link        http://www.zentao.net
  */
-$lang->projectrelease->common           = '项目发布';
+$lang->projectrelease->common           = $lang->projectCommon . '发布';
 $lang->projectrelease->create           = "创建发布";
 $lang->projectrelease->edit             = "编辑发布";
 $lang->projectrelease->linkStory        = "关联{$lang->SRCommon}";
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 12957e1b1a..0bee0ac002 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = 'Basis Info';
 $lang->release->id             = 'ID';
 $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Platform/Branch';
-$lang->release->project        = 'Project';
+$lang->release->project        = $lang->projectCommon;
 $lang->release->build          = 'Build';
 $lang->release->includedBuild  = 'Included Builds';
-$lang->release->relatedProject = 'Related Project';
+$lang->release->relatedProject = 'Related ' . $lang->projectCommon;
 $lang->release->name           = 'Name';
 $lang->release->marker         = 'Meilensteine';
 $lang->release->date           = 'Datum';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon} Owner";
 $lang->release->notifyList['QD'] = 'QA Manager';
 $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
-$lang->release->notifyList['PT'] = "Project Team Members";
+$lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 0df632e47a..99b45903e5 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = 'Basic Info';
 $lang->release->id             = 'ID';
 $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Platform/Branch';
-$lang->release->project        = 'Project';
+$lang->release->project        = $lang->projectCommon;
 $lang->release->build          = 'Build';
 $lang->release->includedBuild  = 'Included Builds';
-$lang->release->relatedProject = 'Related Project';
+$lang->release->relatedProject = 'Related ' . $lang->projectCommon;
 $lang->release->name           = 'Name';
 $lang->release->marker         = 'Milestone';
 $lang->release->date           = 'Release Date';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon} Owner";
 $lang->release->notifyList['QD'] = 'QA Manager';
 $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
-$lang->release->notifyList['PT'] = "Project Team Members";
+$lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 902c39a463..f77774dafb 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = 'Infos de Base';
 $lang->release->id             = 'ID';
 $lang->release->product        = $lang->productCommon;
 $lang->release->branch         = 'Plateforme/Branche';
-$lang->release->project        = 'Project';
+$lang->release->project        = $lang->projectCommon;
 $lang->release->build          = 'Build';
 $lang->release->includedBuild  = 'Included Builds';
-$lang->release->relatedProject = 'Related Project';
+$lang->release->relatedProject = 'Related ' . $lang->projectCommon;
 $lang->release->name           = 'Nom';
 $lang->release->marker         = 'Etape Importante';
 $lang->release->date           = 'Date Release';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon} Owner";
 $lang->release->notifyList['QD'] = 'QA Manager';
 $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
-$lang->release->notifyList['PT'] = "Project Team Members";
+$lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index fa0e150c04..47712f13d8 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -35,10 +35,10 @@ $lang->release->basicInfo = '基本信息';
 $lang->release->id             = 'ID';
 $lang->release->product        = "所属{$lang->productCommon}";
 $lang->release->branch         = '平台/分支';
-$lang->release->project        = '所属项目';
+$lang->release->project        = '所属' . $lang->projectCommon;
 $lang->release->build          = '版本';
 $lang->release->includedBuild  = '包含版本';
-$lang->release->relatedProject = '对应项目';
+$lang->release->relatedProject = '对应' . $lang->projectCommon;
 $lang->release->name           = '发布名称';
 $lang->release->marker         = '里程碑';
 $lang->release->date           = '发布日期';
@@ -95,7 +95,7 @@ $lang->release->notifyList['PO'] = "{$lang->productCommon}负责人";
 $lang->release->notifyList['QD'] = '测试负责人';
 $lang->release->notifyList['SC'] = '需求提交人';
 $lang->release->notifyList['ET'] = "所在{$lang->execution->common}团队成员";
-$lang->release->notifyList['PT'] = "所在项目团队成员";
+$lang->release->notifyList['PT'] = "所在{$lang->projectCommon}团队成员";
 $lang->release->notifyList['CT'] = "抄送给";
 
 $lang->release->featureBar['browse']['all']       = '全部';
diff --git a/module/transfer/lang/zh-cn.php b/module/transfer/lang/zh-cn.php
index 85e3e5d51c..1829be7d46 100644
--- a/module/transfer/lang/zh-cn.php
+++ b/module/transfer/lang/zh-cn.php
@@ -3,7 +3,7 @@ $lang->transfer = new stdclass();
 
 $lang->transfer->reservedWord['id']        = '编号';
 $lang->transfer->reservedWord['type']      = '类型';
-$lang->transfer->reservedWord['project']   = "所属项目{$lang->projectCommon}";
+$lang->transfer->reservedWord['project']   = "所属{$lang->projectCommon}";
 $lang->transfer->reservedWord['execution'] = '所属执行';
 $lang->transfer->reservedWord['product']   = "所属{$lang->productCommon}";
 $lang->transfer->reservedWord['code']      = '代号';

From a951a96350afc0fa0841b841fbc5f420273ec6d0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 16:12:53 +0800
Subject: [PATCH 274/319] * Update project common lang.

---
 module/repo/lang/de.php        |  4 ++--
 module/repo/lang/en.php        |  4 ++--
 module/repo/lang/fr.php        |  4 ++--
 module/repo/lang/zh-cn.php     |  4 ++--
 module/search/lang/de.php      |  2 +-
 module/search/lang/en.php      |  2 +-
 module/search/lang/fr.php      |  2 +-
 module/search/lang/zh-cn.php   |  2 +-
 module/testcase/lang/de.php    | 12 ++++++------
 module/testcase/lang/en.php    | 12 ++++++------
 module/testcase/lang/fr.php    | 12 ++++++------
 module/testcase/lang/zh-cn.php |  8 ++++----
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php
index b809e91f2d..73f4cc4a63 100644
--- a/module/repo/lang/de.php
+++ b/module/repo/lang/de.php
@@ -3,8 +3,8 @@ $lang->repo->common          = 'Repo';
 $lang->repo->codeRepo        = 'Code Library';
 $lang->repo->browse          = 'View';
 $lang->repo->viewRevision    = 'View Revision';
-$lang->repo->product         = 'Product';
-$lang->repo->projects        = 'Project';
+$lang->repo->product         = $lang->productCommon;
+$lang->repo->projects        = $lang->projectCommon;
 $lang->repo->execution       = $lang->execution->common;
 $lang->repo->create          = 'Create';
 $lang->repo->maintain        = 'Repo List';
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index b00644d155..2c2c3b9d26 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -3,8 +3,8 @@ $lang->repo->common          = 'Repo';
 $lang->repo->codeRepo        = 'Code Library';
 $lang->repo->browse          = 'View';
 $lang->repo->viewRevision    = 'View Revision';
-$lang->repo->product         = 'Product';
-$lang->repo->projects        = 'Project';
+$lang->repo->product         = $lang->productCommon;
+$lang->repo->projects        = $lang->projectCommon;
 $lang->repo->execution       = $lang->execution->common;
 $lang->repo->create          = 'Create';
 $lang->repo->maintain        = 'Repo List';
diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php
index 78874fd356..3fe607091f 100644
--- a/module/repo/lang/fr.php
+++ b/module/repo/lang/fr.php
@@ -3,8 +3,8 @@ $lang->repo->common          = 'Référentiel';
 $lang->repo->codeRepo        = 'Référentiel';
 $lang->repo->browse          = 'Aff';
 $lang->repo->viewRevision    = 'Aff Modifs';
-$lang->repo->product         = 'Product';
-$lang->repo->projects        = 'Project';
+$lang->repo->product         = $lang->productCommon;
+$lang->repo->projects        = $lang->projectCommon;
 $lang->repo->execution       = $lang->execution->common;
 $lang->repo->create          = 'Créer';
 $lang->repo->maintain        = 'Liste Ref';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index f0a50701ba..42654aa451 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -3,8 +3,8 @@ $lang->repo->common          = '代码';
 $lang->repo->codeRepo        = '代码库';
 $lang->repo->browse          = '浏览';
 $lang->repo->viewRevision    = '查看修订';
-$lang->repo->product         = '所属产品';
-$lang->repo->projects        = '相关项目';
+$lang->repo->product         = '所属' . $lang->productCommon;
+$lang->repo->projects        = '相关' . $lang->projectCommon;
 $lang->repo->execution       = '所属' . $lang->execution->common;
 $lang->repo->create          = '创建';
 $lang->repo->maintain        = '代码库列表';
diff --git a/module/search/lang/de.php b/module/search/lang/de.php
index b605e51f3b..aee53b81b1 100644
--- a/module/search/lang/de.php
+++ b/module/search/lang/de.php
@@ -93,7 +93,7 @@ $lang->search->modules['testsuite']   = 'Test Suite';
 $lang->search->modules['testreport']  = 'Testing Report';
 $lang->search->modules['productplan'] = 'Plan';
 $lang->search->modules['program']     = 'Program';
-$lang->search->modules['project']     = 'Project';
+$lang->search->modules['project']     = $lang->projectCommon;
 $lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = $lang->SRCommon;
 $lang->search->modules['requirement'] = $lang->URCommon;
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 947cca6db0..ea798d7d55 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -93,7 +93,7 @@ $lang->search->modules['testsuite']   = 'Test Suite';
 $lang->search->modules['testreport']  = 'Testing Report';
 $lang->search->modules['productplan'] = 'Plan';
 $lang->search->modules['program']     = 'Program';
-$lang->search->modules['project']     = 'Project';
+$lang->search->modules['project']     = $lang->projectCommon;
 $lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = $lang->SRCommon;
 $lang->search->modules['requirement'] = $lang->URCommon;
diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php
index eae8cad376..b9bf8f9541 100644
--- a/module/search/lang/fr.php
+++ b/module/search/lang/fr.php
@@ -93,7 +93,7 @@ $lang->search->modules['testsuite']   = 'Test Suite';
 $lang->search->modules['testreport']  = 'Testing Report';
 $lang->search->modules['productplan'] = 'Plan';
 $lang->search->modules['program']     = 'Program';
-$lang->search->modules['project']     = 'Project';
+$lang->search->modules['project']     = $lang->projectCommon;
 $lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = $lang->SRCommon;
 $lang->search->modules['requirement'] = $lang->URCommon;
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 81ef10a869..8fc127152c 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -93,7 +93,7 @@ $lang->search->modules['testsuite']   = '测试套件';
 $lang->search->modules['testreport']  = '测试报告';
 $lang->search->modules['productplan'] = '计划';
 $lang->search->modules['program']     = '项目集';
-$lang->search->modules['project']     = '项目';
+$lang->search->modules['project']     = $lang->projectCommon;
 $lang->search->modules['execution']   = $lang->executionCommon;
 $lang->search->modules['story']       = $lang->SRCommon;
 $lang->search->modules['requirement'] = $lang->URCommon;
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 999168bb67..a301beaba7 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -11,8 +11,8 @@
  */
 $lang->testcase->id               = 'ID';
 $lang->testcase->product          = $lang->productCommon;
-$lang->testcase->project          = 'Project';
-$lang->testcase->execution        = 'Execution';
+$lang->testcase->project          = $lang->projectCommon;
+$lang->testcase->execution        = $lang->executionCommon;
 $lang->testcase->linkStory        = 'linkStory';
 $lang->testcase->module           = 'Module';
 $lang->testcase->auto             = 'Test Automation Cases';
@@ -253,10 +253,10 @@ $lang->testcase->selectLibAB   = 'Bibliothek wählen';
 $lang->testcase->action = new stdclass();
 $lang->testcase->action->fromlib               = array('main' => '$date, importiert von <strong>$actor</strong> aus Bibliothek <strong>$extra</strong>.');
 $lang->testcase->action->reviewed              = array('main' => '$date, überprüft von <strong>$actor</strong> und Prüfungsergebnis ist <strong>$extra</strong>.', 'extra' => 'reviewResultList');
-$lang->testcase->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。');
-$lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
+$lang->testcase->action->linked2project        = array('main' => '$date, linked ' . $lang->projectCommon . ' by <strong>$actor</strong> to <strong>$extra</strong>.');
+$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, removed by <strong>$actor</strong> from <strong>$extra</strong>.');
+$lang->testcase->action->linked2execution      = array('main' => '$date, linked ' . $lang->executionCommon . ' by  <strong>$actor</strong> to <strong>$extra</strong>.');
+$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, removed by <strong>$actor</strong> from <strong>$extra</strong>.');
 
 $lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 81b547240b..fbb69e4df6 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -11,8 +11,8 @@
  */
 $lang->testcase->id               = 'ID';
 $lang->testcase->product          = $lang->productCommon;
-$lang->testcase->project          = 'Project';
-$lang->testcase->execution        = 'Execution';
+$lang->testcase->project          = $lang->projectCommon;
+$lang->testcase->execution        = $lang->executionCommon;
 $lang->testcase->linkStory        = 'linkStory';
 $lang->testcase->module           = 'Module';
 $lang->testcase->auto             = 'Test Automation Cases';
@@ -253,10 +253,10 @@ $lang->testcase->selectLibAB   = 'Select Library';
 $lang->testcase->action = new stdclass();
 $lang->testcase->action->fromlib               = array('main' => '$date, imported by <strong>$actor</strong> from <strong>$extra</strong>.');
 $lang->testcase->action->reviewed              = array('main' => '$date, recorded by <strong>$actor</strong> and the review result is <strong>$extra</strong>.', 'extra' => 'reviewResultList');
-$lang->testcase->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。');
-$lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
+$lang->testcase->action->linked2project        = array('main' => '$date, linked ' . $lang->projectCommon . ' by <strong>$actor</strong> to <strong>$extra</strong>.');
+$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, removed by <strong>$actor</strong> from <strong>$extra</strong>.');
+$lang->testcase->action->linked2execution      = array('main' => '$date, linked ' . $lang->executionCommon . ' by  <strong>$actor</strong> to <strong>$extra</strong>.');
+$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, removed by <strong>$actor</strong> from <strong>$extra</strong>.');
 
 $lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 3d027a8e0d..d4af3d8735 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -11,8 +11,8 @@
  */
 $lang->testcase->id               = 'ID';
 $lang->testcase->product          = $lang->productCommon;
-$lang->testcase->project          = 'Project';
-$lang->testcase->execution        = 'Execution';
+$lang->testcase->project          = $lang->projectCommon;
+$lang->testcase->execution        = $lang->executionCommon;
 $lang->testcase->linkStory        = 'linkStory';
 $lang->testcase->module           = 'Module';
 $lang->testcase->auto             = 'Test Automation Cases';
@@ -253,10 +253,10 @@ $lang->testcase->selectLibAB   = 'Sélectionner Library';
 $lang->testcase->action = new stdclass();
 $lang->testcase->action->fromlib               = array('main' => '$date, importé par <strong>$actor</strong> depuis <strong>$extra</strong>.');
 $lang->testcase->action->reviewed              = array('main' => '$date, enregistré par <strong>$actor</strong> et le résultat de validation est <strong>$extra</strong>.', 'extra' => 'reviewResultList');
-$lang->testcase->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。');
-$lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
+$lang->testcase->action->linked2project        = array('main' => '$date, linked ' . $lang->projectCommon . ' by <strong>$actor</strong> to <strong>$extra</strong>.');
+$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, removed by <strong>$actor</strong> from <strong>$extra</strong>.');
+$lang->testcase->action->linked2execution      = array('main' => '$date, linked ' . $lang->executionCommon . ' by  <strong>$actor</strong> to <strong>$extra</strong>.');
+$lang->testcase->action->unlinkedfromexecution = array('main' => '$date, removed by <strong>$actor</strong> from <strong>$extra</strong>.');
 
 $lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 825452b53c..7d4f6386d9 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -11,8 +11,8 @@
  */
 $lang->testcase->id               = '用例编号';
 $lang->testcase->product          = "所属{$lang->productCommon}";
-$lang->testcase->project          = '所属项目';
-$lang->testcase->execution        = '所属执行';
+$lang->testcase->project          = '所属' . $lang->projectCommon;
+$lang->testcase->execution        = '所属' . $lang->executionCommon;
 $lang->testcase->linkStory        = '关联需求';
 $lang->testcase->module           = '所属模块';
 $lang->testcase->auto             = '自动化测试用例';
@@ -253,8 +253,8 @@ $lang->testcase->selectLibAB   = '选择用例库';
 $lang->testcase->action = new stdclass();
 $lang->testcase->action->fromlib               = array('main' => '$date, 由 <strong>$actor</strong> 从用例库 <strong>$extra</strong>导入。');
 $lang->testcase->action->reviewed              = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
-$lang->testcase->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。');
-$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。');
+$lang->testcase->action->linked2project        = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->projectCommon . ' <strong>$extra</strong>。');
+$lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->projectCommon . ' <strong>$extra</strong> 移除。');
 $lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 

From 33a4928c8258fff1309e9695c9c7263f8b13ec22 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 7 Mar 2023 16:19:09 +0800
Subject: [PATCH 275/319] * Adjust code.

---
 module/dev/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index f42d6d641c..6e561cae63 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -836,7 +836,7 @@ class devModel extends model
             $menuItem = $this->getMenuObject($menu, $menuKey, '', ($module == $menuKey and $method == ''), $mainNavPinYin);
 
             $childFunc = 'get' . ucfirst($type) . 'Menus';
-            if($type == 'tag1' and in_array($menuKey, $this->config->dev->projectMenus))
+            if($type == 'tag' and in_array($menuKey, $this->config->dev->projectMenus))
             {
                 if($menuKey != 'project') continue;
                 foreach($this->config->dev->projectMenus as $projectModule)

From cecb8315ac8a101b66555c3cfb5bd19bc445ee03 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 16:34:48 +0800
Subject: [PATCH 276/319] * Modify language items for product,project common.

---
 module/project/lang/de.php    | 284 ++++++++++++++++-----------------
 module/project/lang/en.php    | 202 +++++++++++------------
 module/project/lang/fr.php    | 292 +++++++++++++++++-----------------
 module/project/lang/zh-cn.php | 270 +++++++++++++++----------------
 4 files changed, 524 insertions(+), 524 deletions(-)

diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 3073db4a48..9974b62268 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -3,12 +3,12 @@
 $lang->project->createGuide         = 'Select Template';
 $lang->project->index               = 'Dashboard';
 $lang->project->home                = 'Home';
-$lang->project->create              = 'Create Project';
+$lang->project->create              = "Create {$lang->projectCommon}";
 $lang->project->edit                = 'Edit';
-$lang->project->batchEdit           = 'Batch Edit Projects';
-$lang->project->view                = 'Project View';
-$lang->project->batchEdit           = 'Batch Edit Projects';
-$lang->project->browse              = 'Projects';
+$lang->project->batchEdit           = "Batch Edit {$lang->projectCommon}s";
+$lang->project->view                = "{$lang->projectCommon} View";
+$lang->project->batchEdit           = "Batch Edit {$lang->projectCommon}s";
+$lang->project->browse              = $lang->projectCommon;
 $lang->project->all                 = 'All';
 $lang->project->start               = 'Start';
 $lang->project->finish              = 'Finish';
@@ -24,7 +24,7 @@ $lang->project->manageView          = 'Manage View';
 $lang->project->managePriv          = 'Manage Privilege';
 $lang->project->manageMembers       = 'Manage Team';
 $lang->project->export              = 'Export';
-$lang->project->addProduct          = 'Add product';
+$lang->project->addProduct          = "Add {$lang->productCommon}";
 $lang->project->manageGroupMember   = 'Manage Group';
 $lang->project->moduleSetting       = 'List Settings';
 $lang->project->moduleOpen          = 'Program Name';
@@ -37,63 +37,63 @@ $lang->project->testtask            = 'Test Task';
 $lang->project->build               = 'Build';
 $lang->project->updateOrder         = 'Order';
 $lang->project->sort                = 'Order';
-$lang->project->whitelist           = 'Project Whitelist';
-$lang->project->addWhitelist        = 'Project Add Whitelist';
-$lang->project->unbindWhitelist     = 'Project Remove Whitelist';
-$lang->project->manageProducts      = 'Manage Products';
-$lang->project->manageOtherProducts = 'Manage Other Products';
-$lang->project->manageProductPlan   = 'Manage Products And Plans';
-$lang->project->copyTitle           = 'Please select an project to copy';
-$lang->project->errorSameProducts   = 'Project cannot be associated with multiple identical products.';
-$lang->project->errorSameBranches   = 'Project cannot be associated with multiple identical branches.';
-$lang->project->errorSamePlans      = 'Project cannot be associated with multiple identical plans.';
-$lang->project->errorNoProducts     = 'At least one product is associated';
+$lang->project->whitelist           = "{$lang->projectCommon} Whitelist";
+$lang->project->addWhitelist        = "{$lang->projectCommon} Add Whitelist";
+$lang->project->unbindWhitelist     = "{$lang->projectCommon} Remove Whitelist";
+$lang->project->manageProducts      = "Manage {$lang->productCommon}s";
+$lang->project->manageOtherProducts = "Manage Other {$lang->productCommon}s";
+$lang->project->manageProductPlan   = "Manage {$lang->productCommon}s And Plans";
+$lang->project->copyTitle           = "Please select an {$lang->projectCommon} to copy";
+$lang->project->errorSameProducts   = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}s.";
+$lang->project->errorSameBranches   = "{$lang->projectCommon} cannot be associated with multiple identical branches.";
+$lang->project->errorSamePlans      = "{$lang->projectCommon} cannot be associated with multiple identical plans.";
+$lang->project->errorNoProducts     = "At least one {$lang->productCommon} is associated";
 $lang->project->copyNoProject       = 'There are no items available to copy.';
-$lang->project->searchByName        = 'Enter the project name to search';
-$lang->project->deleted             = 'Gelöscht';
+$lang->project->searchByName        = "Enter the {$lang->projectCommon} name to search";
+$lang->project->deleted             = 'Deleted';
 $lang->project->linkedProducts      = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts    = "Unlinked {$lang->productCommon}s";
-$lang->project->testreport          = 'Testreport';
+$lang->project->testreport          = 'Test Report';
 $lang->project->selectProgram       = 'Program filtering';
 $lang->project->teamMember          = 'Team Member';
 $lang->project->unlinkMember        = 'Remove Member';
-$lang->project->copyTeamTitle       = 'Select a project team to copy';
-$lang->project->daysGreaterProject  = 'Days cannot be greater than days of project『%s』';
+$lang->project->copyTeamTitle       = "Select a {$lang->projectCommon} team to copy";
+$lang->project->daysGreaterProject  = "Days cannot be greater than days of {$lang->projectCommon}『%s』";
 $lang->project->errorHours          = 'Hours/Day cannot be greater than『24』';
 $lang->project->workdaysExceed      = 'No more than『%s』working days';
 $lang->project->teamMembersCount    = ', there are %s team members.';
 $lang->project->budgetNumber        = '『Budget』must be numbers.';
 $lang->project->budgetGe0           = '『Budget』must be greater than or equal to 0.';
-$lang->project->allProjects         = 'All Projects';
+$lang->project->allProjects         = "All {$lang->projectCommon}s";
 $lang->project->ignore              = 'Ignore';
 $lang->project->manageRepo          = 'Manage Repo';
 $lang->project->linkedRepo          = 'Link Repo';
 $lang->project->unlinkedRepo        = 'Unlink Repo';
-$lang->project->disableExecution    = 'Project of disable iteration';
-$lang->project->selectProduct       = 'Select Product';
+$lang->project->disableExecution    = "{$lang->projectCommon} of disable {$lang->executionCommon}";
+$lang->project->selectProduct       = "Select {$lang->productCommon}";
 
 /* Fields. */
-$lang->project->common             = 'Project';
+$lang->project->common             = $lang->projectCommon;
 $lang->project->id                 = 'ID';
-$lang->project->project            = 'Project';
+$lang->project->project            = $lang->projectCommon;
 $lang->project->stage              = 'Stage';
 $lang->project->model              = 'Model';
 $lang->project->PM                 = 'Manager';
-$lang->project->PO                 = 'Project Owner';
+$lang->project->PO                 = "{$lang->projectCommon} Owner";
 $lang->project->QD                 = 'Test Leader';
 $lang->project->RD                 = 'Releaser';
 $lang->project->name               = 'Name';
 $lang->project->category           = 'Category';
 $lang->project->desc               = 'Description';
 $lang->project->code               = 'Code';
-$lang->project->hasProduct         = 'Has Product';
+$lang->project->hasProduct         = "Has {$lang->productCommon}";
 $lang->project->copy               = 'Copy';
-$lang->project->begin              = 'Begin';
-$lang->project->end                = 'End';
+$lang->project->begin              = 'Planned Begin';
+$lang->project->end                = 'Planned End';
 $lang->project->status             = 'Status';
 $lang->project->subStatus          = 'Sub Status';
 $lang->project->type               = 'Type';
-$lang->project->lifetime           = 'Project Cycle';
+$lang->project->lifetime           = "{$lang->projectCommon} Cycle";
 $lang->project->attribute          = 'Stage Type';
 $lang->project->percent            = 'Workload %';
 $lang->project->milestone          = 'Milestone';
@@ -129,19 +129,19 @@ $lang->project->consume            = 'Cost';
 $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
 $lang->project->weekProgress       = 'This Week Progress';
-$lang->project->dateRange          = 'Duration';
+$lang->project->dateRange          = 'Plan Duration';
 $lang->project->to                 = ' to ';
 $lang->project->realBeganAB        = 'Actual Begin';
 $lang->project->realEndAB          = 'Actual End';
-$lang->project->realBegan          = 'Actual Began';
+$lang->project->realBegan          = 'Actual Begin';
 $lang->project->realEnd            = 'Actual End';
 $lang->project->division           = 'Stage Type';
 $lang->project->bygrid             = 'Kanban';
 $lang->project->bylist             = 'List';
 $lang->project->bycard             = 'Card';
 $lang->project->mine               = 'My';
-$lang->project->myProject          = 'Meine Zuständigkeit';
-$lang->project->other              = 'Andere';
+$lang->project->myProject          = 'Mine';
+$lang->project->other              = 'Others';
 $lang->project->acl                = 'ACL';
 $lang->project->setPlanduration    = 'Set Duration';
 $lang->project->auth               = 'Privileges';
@@ -150,11 +150,11 @@ $lang->project->leftStories        = 'Left Stories';
 $lang->project->leftTasks          = 'Left Tasks';
 $lang->project->leftBugs           = 'Left Bugs';
 $lang->project->leftHours          = 'Left Hours';
-$lang->project->children           = 'Child Project';
-$lang->project->parent             = 'Parent Project';
+$lang->project->children           = "Child {$lang->projectCommon}";
+$lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
 $lang->project->doneStories        = 'Finished Stories';
-$lang->project->doneProjects       = 'Erledigt';
+$lang->project->doneProjects       = 'Finished';
 $lang->project->allInput           = 'Total Input';
 $lang->project->weekly             = 'Program Weekly';
 $lang->project->pv                 = 'PV';
@@ -167,15 +167,15 @@ $lang->project->evTitle            = 'Earn Value';
 $lang->project->svTitle            = 'Schedule Variance';
 $lang->project->acTitle            = 'Actual Cost';
 $lang->project->cvTitle            = 'Cost Variance';
-$lang->project->teamCount          = 'Man';
+$lang->project->teamCount          = 'Team';
 $lang->project->teamSumCount       = '%s people in total';
 $lang->project->longTime           = 'Long-Term';
 $lang->project->future             = 'TBD';
-$lang->project->moreProject        = 'More Project';
-$lang->project->days               = 'Manntage';
+$lang->project->moreProject        = "More {$lang->projectCommon}";
+$lang->project->days               = 'Days';
 $lang->project->mailto             = 'Mailto';
 $lang->project->etc                = " , etc";
-$lang->project->product            = 'Product';
+$lang->project->product            = $lang->productCommon;
 $lang->project->branch             = 'Platform/Branch';
 $lang->project->plan               = 'Plan';
 $lang->project->createKanban       = 'Create Kanban';
@@ -183,71 +183,71 @@ $lang->project->kanban             = 'Kanban';
 
 /* Project Kanban. */
 $lang->project->projectTypeList = array();
-$lang->project->projectTypeList[1] = 'Product-based';
-$lang->project->projectTypeList[0] = 'Non-product-based';
+$lang->project->projectTypeList[1] = "{$lang->productCommon}-based";
+$lang->project->projectTypeList[0] = "Non-{$lang->productCommon}-based";
 
 /* Project Kanban. */
 $lang->project->typeList = array();
-$lang->project->typeList['my']    = 'Projects Ownedbyme';
-$lang->project->typeList['other'] = 'Other Projects';
+$lang->project->typeList['my']    = "{$lang->projectCommon}s Ownedbyme";
+$lang->project->typeList['other'] = "Other {$lang->projectCommon}s";
 
-$lang->project->divisionList['0'] = 'Create by project';
-$lang->project->divisionList['1'] = 'Create by product';
+$lang->project->divisionList['0'] = "Create by {$lang->projectCommon}";
+$lang->project->divisionList['1'] = "Create by {$lang->productCommon}";
 
 $lang->project->divisionSwitchList['0'] = 'Close';
 $lang->project->divisionSwitchList['1'] = "Open";
 
-$lang->project->waitProjects    = 'Waiting Projects';
-$lang->project->doingProjects   = 'Ongoing Projects';
+$lang->project->waitProjects    = "Waiting {$lang->projectCommon}s";
+$lang->project->doingProjects   = "Ongoing {$lang->projectCommon}s";
 $lang->project->doingExecutions = 'Ongoing Executions';
-$lang->project->closedProjects  = 'Closed Projects(The recent two projects)';
-$lang->project->closedProject   = 'Closed Projects';
-$lang->project->noProgram       = 'Independent Projects';
+$lang->project->closedProjects  = "Closed {$lang->projectCommon}s(The recent two projects)";
+$lang->project->closedProject   = "Closed {$lang->projectCommon}s";
+$lang->project->noProgram       = "Independent {$lang->projectCommon}s";
 
 $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
 
-$lang->project->productNotEmpty        = 'Please link products or create products.';
-$lang->project->existProductName       = 'Product name already exists.';
-$lang->project->changeProgram          = '%s > Change project';
-$lang->project->changeProgramTip       = 'After modifying the project set, the products linked with the project will also modify the project set to which it belongs. Please confirm whether to modify it.';
-$lang->project->linkedProjectsTip      = 'Linked projects are as follows';
-$lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is a single stage, click [Open] to change to multiple stages, each stage is only associated with one product.";
-$lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->productNotEmpty        = "Please link {$lang->productCommon}s or create {$lang->productCommon}s.";
+$lang->project->existProductName       = "{$lang->productCommon} name already exists.";
+$lang->project->changeProgram          = "%s > Change {$lang->projectCommon}";
+$lang->project->changeProgramTip       = "Once the program is edited, the {$lang->productCommon} that is linked to this program will be changed. Do you want to edit it?";
+$lang->project->linkedProjectsTip      = "Linked {$lang->projectCommon}s are as follows";
+$lang->project->multiLinkedProductsTip = "The following {$lang->productCommon}s linked to this {$lang->projectCommon} are also linked to other {$lang->projectCommon}s, please unlink before proceeding.";
+$lang->project->noticeDivsion          = "The current {$lang->projectCommon} is a single stage, click [Open] to change to multiple stages, each stage is only associated with one {$lang->productCommon}.";
+$lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this {$lang->projectCommon}";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 $lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
-$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
-$lang->project->productTip             = 'After clicking New Product, the project will not be linked to the selected product.';
-$lang->project->noDevStage             = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.';
-$lang->project->budgetOverrun          = "The project's budget exceeds the remaining budget of the parent program:";
+$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this {$lang->projectCommon}. Do you want to remove them from the execution team too?";
+$lang->project->productTip             = "After clicking New {$lang->productCommon}, the {$lang->projectCommon} will not be linked to the selected {$lang->productCommon}.";
+$lang->project->noDevStage             = "There is no R&D stage under this {$lang->projectCommon}, or you do not have access permissions. The creation of builds is not supported at the moment.";
+$lang->project->budgetOverrun          = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the parent program:";
 $lang->project->disabledInputTip       = 'Please cancel %s first';
-$lang->project->linkRepoFailed         = 'Failed to link projects and code repositories.';
+$lang->project->linkRepoFailed         = "Failed to link {$lang->projectCommon}s and code repositories.";
 $lang->project->unLinkProductTip       = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
-$lang->project->summary                = 'Total projects: <strong>%s</strong>.';
-$lang->project->allSummary             = 'Total projects: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.';
+$lang->project->summary                = "Total {$lang->projectCommon}s: <strong>%s</strong>.";
+$lang->project->allSummary             = "Total {$lang->projectCommon}s: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.";
 $lang->project->checkedSummary         = 'Seleted: <strong>%total%</strong>.';
 $lang->project->checkedAllSummary      = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>, Suspended: <strong>%suspended%</strong>, Closed: <strong>%closed%</strong>.';
 
-$lang->project->tenThousand    = '';
+$lang->project->tenThousand    = 'Ten Thousand';
 $lang->project->hundredMillion = 'Hundred Million';
 
 $lang->project->unitList['CNY'] = 'RMB';
 $lang->project->unitList['USD'] = 'USD';
 $lang->project->unitList['HKD'] = 'HKD';
-$lang->project->unitList['NTD'] = 'New Taiwan';
-$lang->project->unitList['EUR'] = 'Euro';
-$lang->project->unitList['DEM'] = 'Deutsche Mark';
-$lang->project->unitList['CHF'] = 'Swiss Franc';
-$lang->project->unitList['FRF'] = 'French Franc';
-$lang->project->unitList['GBP'] = 'Pound';
-$lang->project->unitList['NLG'] = 'Florin';
-$lang->project->unitList['CAD'] = 'Canadian';
-$lang->project->unitList['RUR'] = 'Russian Ruble';
-$lang->project->unitList['INR'] = 'Indian';
-$lang->project->unitList['AUD'] = 'Australian';
-$lang->project->unitList['NZD'] = 'New Zealand';
-$lang->project->unitList['THB'] = 'Thai Baht';
-$lang->project->unitList['SGD'] = 'Singapore';
+$lang->project->unitList['NTD'] = 'NTD';
+$lang->project->unitList['EUR'] = 'EUR';
+$lang->project->unitList['DEM'] = 'DEM';
+$lang->project->unitList['CHF'] = 'CHF';
+$lang->project->unitList['FRF'] = 'FRF';
+$lang->project->unitList['GBP'] = 'GPR';
+$lang->project->unitList['NLG'] = 'NLG';
+$lang->project->unitList['CAD'] = 'CAD';
+$lang->project->unitList['RUR'] = 'RUB';
+$lang->project->unitList['INR'] = 'IDR';
+$lang->project->unitList['AUD'] = 'AUD';
+$lang->project->unitList['NZD'] = 'NZD';
+$lang->project->unitList['THB'] = 'THB';
+$lang->project->unitList['SGD'] = 'SGD';
 
 $lang->project->currencySymbol['CNY'] = '¥';
 $lang->project->currencySymbol['USD'] = '$';
@@ -288,19 +288,19 @@ $lang->project->featureBar['index']['doing']     = 'Doing';
 $lang->project->featureBar['index']['suspended'] = 'Suspended';
 $lang->project->featureBar['index']['closed']    = 'Closed';
 
-$lang->project->featureBar['execution']['all']       = 'Alle';
-$lang->project->featureBar['execution']['undone']    = 'Geschlossen';
-$lang->project->featureBar['execution']['wait']      = 'Wartend';
-$lang->project->featureBar['execution']['doing']     = 'In Arbeit';
-$lang->project->featureBar['execution']['suspended'] = 'Ausgesetzt';
-$lang->project->featureBar['execution']['closed']    = 'Geschlossen';
+$lang->project->featureBar['execution']['all']       = 'All';
+$lang->project->featureBar['execution']['undone']    = 'Unfinished';
+$lang->project->featureBar['execution']['wait']      = 'Waiting';
+$lang->project->featureBar['execution']['doing']     = 'Doing';
+$lang->project->featureBar['execution']['suspended'] = 'Suspended';
+$lang->project->featureBar['execution']['closed']    = 'Closed';
 
 $lang->project->featureBar['bug']['all']        = 'All';
 $lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
 
-$lang->project->featureBar['testcase']['all']         = 'Alle';
-$lang->project->featureBar['testcase']['wait']        = 'Wartend';
-$lang->project->featureBar['testcase']['needconfirm'] = "Story geändert";
+$lang->project->featureBar['testcase']['all']         = 'All';
+$lang->project->featureBar['testcase']['wait']        = 'Waiting';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story Changed";
 $lang->project->featureBar['testcase']['group']       = 'Group View';
 $lang->project->featureBar['testcase']['zerocase']    = "Zero Case {$lang->SRCommon}";
 $lang->project->featureBar['testcase']['suite']       = 'Suite';
@@ -308,25 +308,25 @@ $lang->project->featureBar['testcase']['autocase']    = 'Automated';
 
 $lang->project->featureBar['build']['all'] = 'Build List';
 
-$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
-$lang->project->aclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->aclList["private"] = "Private (For the {$lang->projectCommon} leader, team members and stakeholders only)";
+$lang->project->aclList["open"]    = "Open (accessible with {$lang->projectCommon} view permissions)";
 
 $lang->project->multipleList['1'] = 'Yes';
 $lang->project->multipleList['0'] = 'No';
 
 $lang->project->acls['private'] = 'Private';
-$lang->project->acls['open']    = "Open";
+$lang->project->acls['open']    = 'Open';
 
-$lang->project->subAclList['private'] = "Private (Only the project leader, team members and stakeholders can access)";
-$lang->project->subAclList['open']    = "Open (accessible with project view permissions)";
-$lang->project->subAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members and stakeholders can access)';
+$lang->project->subAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members and stakeholders can access)";
+$lang->project->subAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
+$lang->project->subAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members and stakeholders can access)";
 
-$lang->project->kanbanAclList['private'] = 'Private (For the project leader, team members only)';
-$lang->project->kanbanAclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->kanbanAclList['private'] = "Private (For the {$lang->projectCommon} leader, team members only)";
+$lang->project->kanbanAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
 
-$lang->project->kanbanSubAclList['private'] = "Private (Only the project leader, team members can access)";
-$lang->project->kanbanSubAclList['open']    = "Open (accessible with project view permissions)";
-$lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members can access)';
+$lang->project->kanbanSubAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members can access)";
+$lang->project->kanbanSubAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
+$lang->project->kanbanSubAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members can access)";
 
 global $config;
 if($config->systemMode == 'light')
@@ -335,8 +335,8 @@ if($config->systemMode == 'light')
     unset($lang->project->kanbanSubAclList['program']);
 }
 
-$lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)';
-$lang->project->authList['reset']  = 'Reset (project privilege only)';
+$lang->project->authList['extend'] = "Inherit (system privilege and {$lang->projectCommon} privilege)";
+$lang->project->authList['reset']  = "Reset ({$lang->projectCommon} privilege only)";
 
 $lang->project->statusList['']          = '';
 $lang->project->statusList['wait']      = 'Waiting';
@@ -352,13 +352,13 @@ $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
 $lang->project->scrumTitle         = 'Agile Development Management';
-$lang->project->waterfallTitle     = 'CMMI';
-$lang->project->kanbanTitle        = 'Kanban Project Management';
-$lang->project->agileplusTitle     = 'Agile + Kanban Project Management';
-$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management';
+$lang->project->waterfallTitle     = "Waterfall {$lang->projectCommon} Management";
+$lang->project->kanbanTitle        = "Kanban {$lang->projectCommon} Management";
+$lang->project->agileplusTitle     = "Agile + Kanban {$lang->projectCommon} Management";
+$lang->project->waterfallplusTitle = "Waterfall + Agile + Kanban {$lang->projectCommon} Management";
 $lang->project->moreModelTitle     = 'Please look forward to more models...';
 
-$lang->project->empty                  = 'No project.';
+$lang->project->empty                  = "No {$lang->projectCommon}.";
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
@@ -366,43 +366,43 @@ $lang->project->lastIteration          = "Recent {$lang->executionCommon}";
 $lang->project->lastKanban             = 'Recent Kanban';
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
-$lang->project->waterfall              = 'CMMI';
+$lang->project->waterfall              = 'Waterfall';
 $lang->project->agileplus              = 'Agile +';
 $lang->project->waterfallplus          = 'Waterfall +';
 $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
 $lang->project->emptyPM                = 'No manager';
 $lang->project->emptyBranch            = 'Branch can not be empty!';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
-$lang->project->cannotCancelCat        = "It has child projects, so you cannot unmark the parent.";
+$lang->project->cannotCancelCat        = "It has child {$lang->projectCommon}s, so you cannot unmark the parent.";
 $lang->project->parentBeginEnd         = "Parent begin&end date: %s ~ %s";
-$lang->project->childLongTime          = "If a child as long-term projects, the parent should be long-term too.";
-$lang->project->readjustTime           = 'Change the project begin&end date.';
-$lang->project->notAllowRemoveProducts = 'The story of this product is linked with the project. Unlink it before doing any action.';
+$lang->project->childLongTime          = "If a child as long-term {$lang->projectCommon}s, the parent should be long-term too.";
+$lang->project->readjustTime           = "Change the {$lang->projectCommon} begin&end date.";
+$lang->project->notAllowRemoveProducts = "Stories of this {$lang->productCommon} are linked to {$lang->projectCommon}s or {$lang->execution->common} of this {$lang->projectCommon} is linked to this {$lang->productCommon}. Please unlink it and try again.";
 $lang->project->ge                     = "『%s』should be >= actual begin『%s』.";
 
-$lang->project->programTitle['0']    = 'Hide';
-$lang->project->programTitle['base'] = 'Base-level project only';
-$lang->project->programTitle['end']  = 'End-level project only';
+$lang->project->programTitle['0']    = 'Hidden';
+$lang->project->programTitle['base'] = "Base-level {$lang->projectCommon} only";
+$lang->project->programTitle['end']  = "End-level {$lang->projectCommon} only";
 
-$lang->project->accessDenied         = 'Access denied!';
-$lang->project->chooseProgramType    = 'Select the project management model';
-$lang->project->cannotCreateChild    = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
-$lang->project->hasChildren          = 'This project has a child project, so it cannot be deleted.';
-$lang->project->confirmDelete        = "Do you want to delete [%s]?";
-$lang->project->cannotChangeToCat    = "It is not empty, so you cannot change it to a parent.";
-$lang->project->cannotCancelCat      = "It has child projects, so you cannot unmark the parent.";
-$lang->project->parentBeginEnd       = "Parent begin&end date: %s ~ %s";
+$lang->project->accessDenied         = "Access denied to this {$lang->projectCommon}";
+$lang->project->chooseProgramType    = 'Select management type';
+$lang->project->cannotCreateChild    = "The {$lang->projectCommon} has contents, so you cannot add a child {$lang->projectCommon}. You can create a parent project for this one and then add a child {$lang->projectCommon} for the parent {$lang->projectCommon}.";
+$lang->project->hasChildren          = "This {$lang->projectCommon} has a child {$lang->projectCommon}, so it cannot be deleted.";
+$lang->project->confirmDelete        = 'Do you want to delete \"%s\"?';
+$lang->project->cannotChangeToCat    = "The {$lang->projectCommon} has contents, so you cannot it to a parent {$lang->projectCommon}.";
+$lang->project->cannotCancelCat      = "There are child {$lang->projectCommon}s of this {$lang->projectCommon}. You cannot cancel the parent {$lang->projectCommon} mark.";
+$lang->project->parentBeginEnd       = "The begin and end date of the parent {$lang->projectCommon}: %s ~ %s";
 $lang->project->parentBudget         = "The budget of the parent program: ";
-$lang->project->beginLetterParent    = "The start date of the project is < the start date of the parent program:";
-$lang->project->endGreaterParent     = "The finish date of the project is > the finish date of the parent program:";
-$lang->project->dateExceedParent     = "The start and finish date of the project was > the start and finish date of the parent program:";
-$lang->project->beginGreateChild     = 'The start date of the project should be ≥ the start date of program: %s.';
-$lang->project->endLetterChild       = 'The finish date of the project should be ≤ the finish date of program: %s.';
-$lang->project->begigLetterExecution = 'The start date of project should be ≤ the minimum start date of the execution: %s.';
-$lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
-$lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
-$lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
-$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
+$lang->project->beginLetterParent    = "The start date of the {$lang->projectCommon} is < the start date of the parent program:";
+$lang->project->endGreaterParent     = "The finish date of the {$lang->projectCommon} is > the finish date of the parent program:";
+$lang->project->dateExceedParent     = "The start and finish date of the {$lang->projectCommon} was > the start and finish date of the parent program:";
+$lang->project->beginGreateChild     = "The start date of the {$lang->projectCommon} should be ≥ the start date of program: %s.";
+$lang->project->endLetterChild       = "The finish date of the {$lang->projectCommon} should be ≤ the finish date of program: %s.";
+$lang->project->begigLetterExecution = "The start date of {$lang->projectCommon} should be ≤ the minimum start date of the execution: %s.";
+$lang->project->endGreateExecution   = "The finish date of the {$lang->projectCommon} should be ≥ the maximum finish date of the execution: %s.";
+$lang->project->childLongTime        = "There are long-term {$lang->projectCommon}s in the child {$lang->projectCommon}, and the parent {$lang->projectCommon} should also be a long-term {$lang->projectCommon}.";
+$lang->project->confirmUnlinkMember  = "Do you want to remove this user from {$lang->projectCommon}?";
+$lang->project->divisionTips         = "Created by {$lang->projectCommon} as a single set of stages, and the stage is associated with all {$lang->productCommon}s; created by {$lang->productCommon} as multiple sets of stages, each set of stages is associated with a {$lang->productCommon}";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
@@ -410,14 +410,14 @@ $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $e
 $lang->project->multiple = "Multi {$lang->executionCommon}";
 
 $lang->project->copyProject = new stdClass();
-$lang->project->copyProject->nameTips           = '『Project Name』Cannot be repeated.';
-$lang->project->copyProject->codeTips           = '『Project Code』Cannot be repeated.';
+$lang->project->copyProject->nameTips           = "『{$lang->projectCommon} Name』Cannot be repeated.";
+$lang->project->copyProject->codeTips           = "『{$lang->projectCommon} Code』Cannot be repeated.";
 $lang->project->copyProject->endTips            = '『Schedule End』Cannot be empty.';
 $lang->project->copyProject->daysTips           = '『Available working days』Should be numerical.';
 
-$lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
-$lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
-$lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+$lang->project->linkBranchStoryByPlanTips = "When the {$lang->projectCommon} is scheduled to associate requirements, only the activated requirements associated with the %s of the {$lang->projectCommon} are imported.";
+$lang->project->linkNormalStoryByPlanTips = "When the {$lang->projectCommon} plans to associate requirements, only the requirements that are active are imported.";
+$lang->project->cannotManageProducts      = "This project is a {$lang->projectCommon}-type {$lang->projectCommon} and cannot be associated with {$lang->productCommon}s.";
 
 $lang->project->featureBar['dynamic']['all']       = 'All';
 $lang->project->featureBar['dynamic']['today']     = 'Today';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 79d1e6abb9..9974b62268 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -3,12 +3,12 @@
 $lang->project->createGuide         = 'Select Template';
 $lang->project->index               = 'Dashboard';
 $lang->project->home                = 'Home';
-$lang->project->create              = 'Create Project';
+$lang->project->create              = "Create {$lang->projectCommon}";
 $lang->project->edit                = 'Edit';
-$lang->project->batchEdit           = 'Batch Edit Projects';
-$lang->project->view                = 'Project View';
-$lang->project->batchEdit           = 'Batch Edit';
-$lang->project->browse              = 'Projects';
+$lang->project->batchEdit           = "Batch Edit {$lang->projectCommon}s";
+$lang->project->view                = "{$lang->projectCommon} View";
+$lang->project->batchEdit           = "Batch Edit {$lang->projectCommon}s";
+$lang->project->browse              = $lang->projectCommon;
 $lang->project->all                 = 'All';
 $lang->project->start               = 'Start';
 $lang->project->finish              = 'Finish';
@@ -24,7 +24,7 @@ $lang->project->manageView          = 'Manage View';
 $lang->project->managePriv          = 'Manage Privilege';
 $lang->project->manageMembers       = 'Manage Team';
 $lang->project->export              = 'Export';
-$lang->project->addProduct          = 'Add Product';
+$lang->project->addProduct          = "Add {$lang->productCommon}";
 $lang->project->manageGroupMember   = 'Manage Group';
 $lang->project->moduleSetting       = 'List Settings';
 $lang->project->moduleOpen          = 'Program Name';
@@ -37,19 +37,19 @@ $lang->project->testtask            = 'Test Task';
 $lang->project->build               = 'Build';
 $lang->project->updateOrder         = 'Order';
 $lang->project->sort                = 'Order';
-$lang->project->whitelist           = 'Project Whitelist';
-$lang->project->addWhitelist        = 'Project Add Whitelist';
-$lang->project->unbindWhitelist     = 'Project Remove Whitelist';
-$lang->project->manageProducts      = 'Manage Products';
-$lang->project->manageOtherProducts = 'Manage Other Products';
-$lang->project->manageProductPlan   = 'Manage Products And Plans';
-$lang->project->copyTitle           = 'Please select an project to copy';
-$lang->project->errorSameProducts   = 'Project cannot be associated with multiple identical products.';
-$lang->project->errorSameBranches   = 'Project cannot be associated with multiple identical branches.';
-$lang->project->errorSamePlans      = 'Project cannot be associated with multiple identical plans.';
-$lang->project->errorNoProducts     = 'At least one product is associated';
+$lang->project->whitelist           = "{$lang->projectCommon} Whitelist";
+$lang->project->addWhitelist        = "{$lang->projectCommon} Add Whitelist";
+$lang->project->unbindWhitelist     = "{$lang->projectCommon} Remove Whitelist";
+$lang->project->manageProducts      = "Manage {$lang->productCommon}s";
+$lang->project->manageOtherProducts = "Manage Other {$lang->productCommon}s";
+$lang->project->manageProductPlan   = "Manage {$lang->productCommon}s And Plans";
+$lang->project->copyTitle           = "Please select an {$lang->projectCommon} to copy";
+$lang->project->errorSameProducts   = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}s.";
+$lang->project->errorSameBranches   = "{$lang->projectCommon} cannot be associated with multiple identical branches.";
+$lang->project->errorSamePlans      = "{$lang->projectCommon} cannot be associated with multiple identical plans.";
+$lang->project->errorNoProducts     = "At least one {$lang->productCommon} is associated";
 $lang->project->copyNoProject       = 'There are no items available to copy.';
-$lang->project->searchByName        = 'Enter the project name to retrieve';
+$lang->project->searchByName        = "Enter the {$lang->projectCommon} name to search";
 $lang->project->deleted             = 'Deleted';
 $lang->project->linkedProducts      = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts    = "Unlinked {$lang->productCommon}s";
@@ -57,43 +57,43 @@ $lang->project->testreport          = 'Test Report';
 $lang->project->selectProgram       = 'Program filtering';
 $lang->project->teamMember          = 'Team Member';
 $lang->project->unlinkMember        = 'Remove Member';
-$lang->project->copyTeamTitle       = 'Select a project team to copy';
-$lang->project->daysGreaterProject  = 'Days cannot be greater than days of project『%s』';
+$lang->project->copyTeamTitle       = "Select a {$lang->projectCommon} team to copy";
+$lang->project->daysGreaterProject  = "Days cannot be greater than days of {$lang->projectCommon}『%s』";
 $lang->project->errorHours          = 'Hours/Day cannot be greater than『24』';
 $lang->project->workdaysExceed      = 'No more than『%s』working days';
 $lang->project->teamMembersCount    = ', there are %s team members.';
 $lang->project->budgetNumber        = '『Budget』must be numbers.';
 $lang->project->budgetGe0           = '『Budget』must be greater than or equal to 0.';
-$lang->project->allProjects         = 'All Projects';
+$lang->project->allProjects         = "All {$lang->projectCommon}s";
 $lang->project->ignore              = 'Ignore';
 $lang->project->manageRepo          = 'Manage Repo';
 $lang->project->linkedRepo          = 'Link Repo';
 $lang->project->unlinkedRepo        = 'Unlink Repo';
-$lang->project->disableExecution    = 'Project of disable iteration';
-$lang->project->selectProduct       = 'Select Product';
+$lang->project->disableExecution    = "{$lang->projectCommon} of disable {$lang->executionCommon}";
+$lang->project->selectProduct       = "Select {$lang->productCommon}";
 
 /* Fields. */
-$lang->project->common             = 'Project';
+$lang->project->common             = $lang->projectCommon;
 $lang->project->id                 = 'ID';
-$lang->project->project            = 'Project';
+$lang->project->project            = $lang->projectCommon;
 $lang->project->stage              = 'Stage';
 $lang->project->model              = 'Model';
 $lang->project->PM                 = 'Manager';
-$lang->project->PO                 = 'Project Owner';
+$lang->project->PO                 = "{$lang->projectCommon} Owner";
 $lang->project->QD                 = 'Test Leader';
 $lang->project->RD                 = 'Releaser';
 $lang->project->name               = 'Name';
 $lang->project->category           = 'Category';
 $lang->project->desc               = 'Description';
 $lang->project->code               = 'Code';
-$lang->project->hasProduct         = 'Has Product';
+$lang->project->hasProduct         = "Has {$lang->productCommon}";
 $lang->project->copy               = 'Copy';
 $lang->project->begin              = 'Planned Begin';
 $lang->project->end                = 'Planned End';
 $lang->project->status             = 'Status';
 $lang->project->subStatus          = 'Sub Status';
 $lang->project->type               = 'Type';
-$lang->project->lifetime           = 'Project Cycle';
+$lang->project->lifetime           = "{$lang->projectCommon} Cycle";
 $lang->project->attribute          = 'Stage Type';
 $lang->project->percent            = 'Workload %';
 $lang->project->milestone          = 'Milestone';
@@ -150,7 +150,7 @@ $lang->project->leftStories        = 'Left Stories';
 $lang->project->leftTasks          = 'Left Tasks';
 $lang->project->leftBugs           = 'Left Bugs';
 $lang->project->leftHours          = 'Left Hours';
-$lang->project->children           = 'Child Project';
+$lang->project->children           = "Child {$lang->projectCommon}";
 $lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
 $lang->project->doneStories        = 'Finished Stories';
@@ -171,11 +171,11 @@ $lang->project->teamCount          = 'Team';
 $lang->project->teamSumCount       = '%s people in total';
 $lang->project->longTime           = 'Long-Term';
 $lang->project->future             = 'TBD';
-$lang->project->moreProject        = 'More Project';
+$lang->project->moreProject        = "More {$lang->projectCommon}";
 $lang->project->days               = 'Days';
 $lang->project->mailto             = 'Mailto';
 $lang->project->etc                = " , etc";
-$lang->project->product            = 'Product';
+$lang->project->product            = $lang->productCommon;
 $lang->project->branch             = 'Platform/Branch';
 $lang->project->plan               = 'Plan';
 $lang->project->createKanban       = 'Create Kanban';
@@ -183,48 +183,48 @@ $lang->project->kanban             = 'Kanban';
 
 /* Project Kanban. */
 $lang->project->projectTypeList = array();
-$lang->project->projectTypeList[1] = 'Product-based';
-$lang->project->projectTypeList[0] = 'Non-product-based';
+$lang->project->projectTypeList[1] = "{$lang->productCommon}-based";
+$lang->project->projectTypeList[0] = "Non-{$lang->productCommon}-based";
 
 /* Project Kanban. */
 $lang->project->typeList = array();
-$lang->project->typeList['my']    = 'Projects Ownedbyme';
-$lang->project->typeList['other'] = 'Other Projects';
+$lang->project->typeList['my']    = "{$lang->projectCommon}s Ownedbyme";
+$lang->project->typeList['other'] = "Other {$lang->projectCommon}s";
 
-$lang->project->divisionList['0'] = 'Create by project';
-$lang->project->divisionList['1'] = 'Create by product';
+$lang->project->divisionList['0'] = "Create by {$lang->projectCommon}";
+$lang->project->divisionList['1'] = "Create by {$lang->productCommon}";
 
 $lang->project->divisionSwitchList['0'] = 'Close';
 $lang->project->divisionSwitchList['1'] = "Open";
 
-$lang->project->waitProjects    = 'Waiting Projects';
-$lang->project->doingProjects   = 'Ongoing Projects';
+$lang->project->waitProjects    = "Waiting {$lang->projectCommon}s";
+$lang->project->doingProjects   = "Ongoing {$lang->projectCommon}s";
 $lang->project->doingExecutions = 'Ongoing Executions';
-$lang->project->closedProjects  = 'Closed Projects(The recent two projects)';
-$lang->project->closedProject   = 'Closed Projects';
-$lang->project->noProgram       = 'Independent Projects';
+$lang->project->closedProjects  = "Closed {$lang->projectCommon}s(The recent two projects)";
+$lang->project->closedProject   = "Closed {$lang->projectCommon}s";
+$lang->project->noProgram       = "Independent {$lang->projectCommon}s";
 
 $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
 
-$lang->project->productNotEmpty        = 'Please link products or create products.';
-$lang->project->existProductName       = 'Product name already exists.';
-$lang->project->changeProgram          = '%s > Change project';
-$lang->project->changeProgramTip       = 'Once the program is edited, the product that is linked to this program will be changed. Do you want to edit it?';
-$lang->project->linkedProjectsTip      = 'Linked projects are as follows';
-$lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is a single stage, click [Open] to change to multiple stages, each stage is only associated with one product.";
-$lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->productNotEmpty        = "Please link {$lang->productCommon}s or create {$lang->productCommon}s.";
+$lang->project->existProductName       = "{$lang->productCommon} name already exists.";
+$lang->project->changeProgram          = "%s > Change {$lang->projectCommon}";
+$lang->project->changeProgramTip       = "Once the program is edited, the {$lang->productCommon} that is linked to this program will be changed. Do you want to edit it?";
+$lang->project->linkedProjectsTip      = "Linked {$lang->projectCommon}s are as follows";
+$lang->project->multiLinkedProductsTip = "The following {$lang->productCommon}s linked to this {$lang->projectCommon} are also linked to other {$lang->projectCommon}s, please unlink before proceeding.";
+$lang->project->noticeDivsion          = "The current {$lang->projectCommon} is a single stage, click [Open] to change to multiple stages, each stage is only associated with one {$lang->productCommon}.";
+$lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this {$lang->projectCommon}";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 $lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
-$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
-$lang->project->productTip             = 'After clicking New Product, the project will not be linked to the selected product.';
-$lang->project->noDevStage             = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.';
-$lang->project->budgetOverrun          = "The project's budget exceeds the remaining budget of the parent program:";
+$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this {$lang->projectCommon}. Do you want to remove them from the execution team too?";
+$lang->project->productTip             = "After clicking New {$lang->productCommon}, the {$lang->projectCommon} will not be linked to the selected {$lang->productCommon}.";
+$lang->project->noDevStage             = "There is no R&D stage under this {$lang->projectCommon}, or you do not have access permissions. The creation of builds is not supported at the moment.";
+$lang->project->budgetOverrun          = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the parent program:";
 $lang->project->disabledInputTip       = 'Please cancel %s first';
-$lang->project->linkRepoFailed         = 'Failed to link projects and code repositories.';
+$lang->project->linkRepoFailed         = "Failed to link {$lang->projectCommon}s and code repositories.";
 $lang->project->unLinkProductTip       = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
-$lang->project->summary                = 'Total projects: <strong>%s</strong>.';
-$lang->project->allSummary             = 'Total projects: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.';
+$lang->project->summary                = "Total {$lang->projectCommon}s: <strong>%s</strong>.";
+$lang->project->allSummary             = "Total {$lang->projectCommon}s: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.";
 $lang->project->checkedSummary         = 'Seleted: <strong>%total%</strong>.';
 $lang->project->checkedAllSummary      = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>, Suspended: <strong>%suspended%</strong>, Closed: <strong>%closed%</strong>.';
 
@@ -308,8 +308,8 @@ $lang->project->featureBar['testcase']['autocase']    = 'Automated';
 
 $lang->project->featureBar['build']['all'] = 'Build List';
 
-$lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
-$lang->project->aclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->aclList["private"] = "Private (For the {$lang->projectCommon} leader, team members and stakeholders only)";
+$lang->project->aclList["open"]    = "Open (accessible with {$lang->projectCommon} view permissions)";
 
 $lang->project->multipleList['1'] = 'Yes';
 $lang->project->multipleList['0'] = 'No';
@@ -317,16 +317,16 @@ $lang->project->multipleList['0'] = 'No';
 $lang->project->acls['private'] = 'Private';
 $lang->project->acls['open']    = 'Open';
 
-$lang->project->subAclList['private'] = "Private (Only the project leader, team members and stakeholders can access)";
-$lang->project->subAclList['open']    = "Open (accessible with project view permissions)";
-$lang->project->subAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members and stakeholders can access)';
+$lang->project->subAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members and stakeholders can access)";
+$lang->project->subAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
+$lang->project->subAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members and stakeholders can access)";
 
-$lang->project->kanbanAclList['private'] = 'Private (For the project leader, team members only)';
-$lang->project->kanbanAclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->kanbanAclList['private'] = "Private (For the {$lang->projectCommon} leader, team members only)";
+$lang->project->kanbanAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
 
-$lang->project->kanbanSubAclList['private'] = "Private (Only the project leader, team members can access)";
-$lang->project->kanbanSubAclList['open']    = "Open (accessible with project view permissions)";
-$lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members can access)';
+$lang->project->kanbanSubAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members can access)";
+$lang->project->kanbanSubAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
+$lang->project->kanbanSubAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members can access)";
 
 global $config;
 if($config->systemMode == 'light')
@@ -335,8 +335,8 @@ if($config->systemMode == 'light')
     unset($lang->project->kanbanSubAclList['program']);
 }
 
-$lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)';
-$lang->project->authList['reset']  = 'Reset (project privilege only)';
+$lang->project->authList['extend'] = "Inherit (system privilege and {$lang->projectCommon} privilege)";
+$lang->project->authList['reset']  = "Reset ({$lang->projectCommon} privilege only)";
 
 $lang->project->statusList['']          = '';
 $lang->project->statusList['wait']      = 'Waiting';
@@ -352,13 +352,13 @@ $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
 $lang->project->scrumTitle         = 'Agile Development Management';
-$lang->project->waterfallTitle     = 'Waterfall Project Management';
-$lang->project->kanbanTitle        = 'Kanban Project Management';
-$lang->project->agileplusTitle     = 'Agile + Kanban Project Management';
-$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management';
+$lang->project->waterfallTitle     = "Waterfall {$lang->projectCommon} Management";
+$lang->project->kanbanTitle        = "Kanban {$lang->projectCommon} Management";
+$lang->project->agileplusTitle     = "Agile + Kanban {$lang->projectCommon} Management";
+$lang->project->waterfallplusTitle = "Waterfall + Agile + Kanban {$lang->projectCommon} Management";
 $lang->project->moreModelTitle     = 'Please look forward to more models...';
 
-$lang->project->empty                  = 'No project.';
+$lang->project->empty                  = "No {$lang->projectCommon}.";
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
@@ -373,36 +373,36 @@ $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a c
 $lang->project->emptyPM                = 'No manager';
 $lang->project->emptyBranch            = 'Branch can not be empty!';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
-$lang->project->cannotCancelCat        = "It has child projects, so you cannot unmark the parent.";
+$lang->project->cannotCancelCat        = "It has child {$lang->projectCommon}s, so you cannot unmark the parent.";
 $lang->project->parentBeginEnd         = "Parent begin&end date: %s ~ %s";
-$lang->project->childLongTime          = "If a child as long-term projects, the parent should be long-term too.";
-$lang->project->readjustTime           = 'Change the project begin&end date.';
-$lang->project->notAllowRemoveProducts = "Stories of this product are linked to projects or {$lang->execution->common} of this project is linked to this product. Please unlink it and try again.";
+$lang->project->childLongTime          = "If a child as long-term {$lang->projectCommon}s, the parent should be long-term too.";
+$lang->project->readjustTime           = "Change the {$lang->projectCommon} begin&end date.";
+$lang->project->notAllowRemoveProducts = "Stories of this {$lang->productCommon} are linked to {$lang->projectCommon}s or {$lang->execution->common} of this {$lang->projectCommon} is linked to this {$lang->productCommon}. Please unlink it and try again.";
 $lang->project->ge                     = "『%s』should be >= actual begin『%s』.";
 
 $lang->project->programTitle['0']    = 'Hidden';
-$lang->project->programTitle['base'] = 'Base-level project only';
-$lang->project->programTitle['end']  = 'End-level project only';
+$lang->project->programTitle['base'] = "Base-level {$lang->projectCommon} only";
+$lang->project->programTitle['end']  = "End-level {$lang->projectCommon} only";
 
-$lang->project->accessDenied         = 'Access denied to this project';
+$lang->project->accessDenied         = "Access denied to this {$lang->projectCommon}";
 $lang->project->chooseProgramType    = 'Select management type';
-$lang->project->cannotCreateChild    = 'The project has contents, so you cannot add a child project. You can create a parent project for this one and then add a child project for the parent project.';
-$lang->project->hasChildren          = 'This project has a child project, so it cannot be deleted.';
+$lang->project->cannotCreateChild    = "The {$lang->projectCommon} has contents, so you cannot add a child {$lang->projectCommon}. You can create a parent project for this one and then add a child {$lang->projectCommon} for the parent {$lang->projectCommon}.";
+$lang->project->hasChildren          = "This {$lang->projectCommon} has a child {$lang->projectCommon}, so it cannot be deleted.";
 $lang->project->confirmDelete        = 'Do you want to delete \"%s\"?';
-$lang->project->cannotChangeToCat    = "The project has contents, so you cannot it to a parent project.";
-$lang->project->cannotCancelCat      = "There are child projects of this project. You cannot cancel the parent project mark.";
-$lang->project->parentBeginEnd       = "The begin and end date of the parent project: %s ~ %s";
+$lang->project->cannotChangeToCat    = "The {$lang->projectCommon} has contents, so you cannot it to a parent {$lang->projectCommon}.";
+$lang->project->cannotCancelCat      = "There are child {$lang->projectCommon}s of this {$lang->projectCommon}. You cannot cancel the parent {$lang->projectCommon} mark.";
+$lang->project->parentBeginEnd       = "The begin and end date of the parent {$lang->projectCommon}: %s ~ %s";
 $lang->project->parentBudget         = "The budget of the parent program: ";
-$lang->project->beginLetterParent    = "The start date of the project is < the start date of the parent program:";
-$lang->project->endGreaterParent     = "The finish date of the project is > the finish date of the parent program:";
-$lang->project->dateExceedParent     = "The start and finish date of the project was > the start and finish date of the parent program:";
-$lang->project->beginGreateChild     = 'The start date of the project should be ≥ the start date of program: %s.';
-$lang->project->endLetterChild       = 'The finish date of the project should be ≤ the finish date of program: %s.';
-$lang->project->begigLetterExecution = 'The start date of project should be ≤ the minimum start date of the execution: %s.';
-$lang->project->endGreateExecution   = 'The finish date of the project should be ≥ the maximum finish date of the execution: %s.';
-$lang->project->childLongTime        = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
-$lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
-$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
+$lang->project->beginLetterParent    = "The start date of the {$lang->projectCommon} is < the start date of the parent program:";
+$lang->project->endGreaterParent     = "The finish date of the {$lang->projectCommon} is > the finish date of the parent program:";
+$lang->project->dateExceedParent     = "The start and finish date of the {$lang->projectCommon} was > the start and finish date of the parent program:";
+$lang->project->beginGreateChild     = "The start date of the {$lang->projectCommon} should be ≥ the start date of program: %s.";
+$lang->project->endLetterChild       = "The finish date of the {$lang->projectCommon} should be ≤ the finish date of program: %s.";
+$lang->project->begigLetterExecution = "The start date of {$lang->projectCommon} should be ≤ the minimum start date of the execution: %s.";
+$lang->project->endGreateExecution   = "The finish date of the {$lang->projectCommon} should be ≥ the maximum finish date of the execution: %s.";
+$lang->project->childLongTime        = "There are long-term {$lang->projectCommon}s in the child {$lang->projectCommon}, and the parent {$lang->projectCommon} should also be a long-term {$lang->projectCommon}.";
+$lang->project->confirmUnlinkMember  = "Do you want to remove this user from {$lang->projectCommon}?";
+$lang->project->divisionTips         = "Created by {$lang->projectCommon} as a single set of stages, and the stage is associated with all {$lang->productCommon}s; created by {$lang->productCommon} as multiple sets of stages, each set of stages is associated with a {$lang->productCommon}";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
@@ -410,14 +410,14 @@ $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $e
 $lang->project->multiple = "Multi {$lang->executionCommon}";
 
 $lang->project->copyProject = new stdClass();
-$lang->project->copyProject->nameTips           = '『Project Name』Cannot be repeated.';
-$lang->project->copyProject->codeTips           = '『Project Code』Cannot be repeated.';
+$lang->project->copyProject->nameTips           = "『{$lang->projectCommon} Name』Cannot be repeated.";
+$lang->project->copyProject->codeTips           = "『{$lang->projectCommon} Code』Cannot be repeated.";
 $lang->project->copyProject->endTips            = '『Schedule End』Cannot be empty.';
 $lang->project->copyProject->daysTips           = '『Available working days』Should be numerical.';
 
-$lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
-$lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
-$lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+$lang->project->linkBranchStoryByPlanTips = "When the {$lang->projectCommon} is scheduled to associate requirements, only the activated requirements associated with the %s of the {$lang->projectCommon} are imported.";
+$lang->project->linkNormalStoryByPlanTips = "When the {$lang->projectCommon} plans to associate requirements, only the requirements that are active are imported.";
+$lang->project->cannotManageProducts      = "This project is a {$lang->projectCommon}-type {$lang->projectCommon} and cannot be associated with {$lang->productCommon}s.";
 
 $lang->project->featureBar['dynamic']['all']       = 'All';
 $lang->project->featureBar['dynamic']['today']     = 'Today';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index d5edf94f69..9974b62268 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -3,12 +3,12 @@
 $lang->project->createGuide         = 'Select Template';
 $lang->project->index               = 'Dashboard';
 $lang->project->home                = 'Home';
-$lang->project->create              = 'Create Project';
+$lang->project->create              = "Create {$lang->projectCommon}";
 $lang->project->edit                = 'Edit';
-$lang->project->batchEdit           = 'Batch Edit Projects';
-$lang->project->view                = 'Project View';
-$lang->project->batchEdit           = 'Batch Edit Projects';
-$lang->project->browse              = 'Projects';
+$lang->project->batchEdit           = "Batch Edit {$lang->projectCommon}s";
+$lang->project->view                = "{$lang->projectCommon} View";
+$lang->project->batchEdit           = "Batch Edit {$lang->projectCommon}s";
+$lang->project->browse              = $lang->projectCommon;
 $lang->project->all                 = 'All';
 $lang->project->start               = 'Start';
 $lang->project->finish              = 'Finish';
@@ -24,7 +24,7 @@ $lang->project->manageView          = 'Manage View';
 $lang->project->managePriv          = 'Manage Privilege';
 $lang->project->manageMembers       = 'Manage Team';
 $lang->project->export              = 'Export';
-$lang->project->addProduct          = 'Add Product';
+$lang->project->addProduct          = "Add {$lang->productCommon}";
 $lang->project->manageGroupMember   = 'Manage Group';
 $lang->project->moduleSetting       = 'List Settings';
 $lang->project->moduleOpen          = 'Program Name';
@@ -37,63 +37,63 @@ $lang->project->testtask            = 'Test Task';
 $lang->project->build               = 'Build';
 $lang->project->updateOrder         = 'Order';
 $lang->project->sort                = 'Order';
-$lang->project->whitelist           = 'Project Whitelist';
-$lang->project->addWhitelist        = 'Project Add Whitelist';
-$lang->project->unbindWhitelist     = 'Project Remove Whitelist';
-$lang->project->manageProducts      = 'Manage Products';
-$lang->project->manageOtherProducts = 'Manage Other Products';
-$lang->project->manageProductPlan   = 'Manage Products And Plans';
-$lang->project->copyTitle           = 'Please select an project to copy';
-$lang->project->errorSameProducts   = 'Project cannot be associated with multiple identical products.';
-$lang->project->errorSameBranches   = 'Project cannot be associated with multiple identical branches.';
-$lang->project->errorSamePlans      = 'Project cannot be associated with multiple identical plans.';
-$lang->project->errorNoProducts     = 'At least one product is associated';
+$lang->project->whitelist           = "{$lang->projectCommon} Whitelist";
+$lang->project->addWhitelist        = "{$lang->projectCommon} Add Whitelist";
+$lang->project->unbindWhitelist     = "{$lang->projectCommon} Remove Whitelist";
+$lang->project->manageProducts      = "Manage {$lang->productCommon}s";
+$lang->project->manageOtherProducts = "Manage Other {$lang->productCommon}s";
+$lang->project->manageProductPlan   = "Manage {$lang->productCommon}s And Plans";
+$lang->project->copyTitle           = "Please select an {$lang->projectCommon} to copy";
+$lang->project->errorSameProducts   = "{$lang->projectCommon} cannot be associated with multiple identical {$lang->productCommon}s.";
+$lang->project->errorSameBranches   = "{$lang->projectCommon} cannot be associated with multiple identical branches.";
+$lang->project->errorSamePlans      = "{$lang->projectCommon} cannot be associated with multiple identical plans.";
+$lang->project->errorNoProducts     = "At least one {$lang->productCommon} is associated";
 $lang->project->copyNoProject       = 'There are no items available to copy.';
-$lang->project->searchByName        = 'Enter the project name to retrieve';
-$lang->project->deleted             = 'Supprimé';
+$lang->project->searchByName        = "Enter the {$lang->projectCommon} name to search";
+$lang->project->deleted             = 'Deleted';
 $lang->project->linkedProducts      = "Linked {$lang->productCommon}s";
 $lang->project->unlinkedProducts    = "Unlinked {$lang->productCommon}s";
-$lang->project->testreport          = 'Testreport';
+$lang->project->testreport          = 'Test Report';
 $lang->project->selectProgram       = 'Program filtering';
 $lang->project->teamMember          = 'Team Member';
 $lang->project->unlinkMember        = 'Remove Member';
-$lang->project->copyTeamTitle       = 'Select a project team to copy';
-$lang->project->daysGreaterProject  = 'Days cannot be greater than days of project『%s』';
+$lang->project->copyTeamTitle       = "Select a {$lang->projectCommon} team to copy";
+$lang->project->daysGreaterProject  = "Days cannot be greater than days of {$lang->projectCommon}『%s』";
 $lang->project->errorHours          = 'Hours/Day cannot be greater than『24』';
 $lang->project->workdaysExceed      = 'No more than『%s』working days';
 $lang->project->teamMembersCount    = ', there are %s team members.';
 $lang->project->budgetNumber        = '『Budget』must be numbers.';
 $lang->project->budgetGe0           = '『Budget』must be greater than or equal to 0.';
-$lang->project->allProjects         = 'All Projects';
-$lang->project->ignore              = 'Ignorer';
+$lang->project->allProjects         = "All {$lang->projectCommon}s";
+$lang->project->ignore              = 'Ignore';
 $lang->project->manageRepo          = 'Manage Repo';
 $lang->project->linkedRepo          = 'Link Repo';
 $lang->project->unlinkedRepo        = 'Unlink Repo';
-$lang->project->disableExecution    = 'Project of disable iteration';
-$lang->project->selectProduct       = 'Select Product';
+$lang->project->disableExecution    = "{$lang->projectCommon} of disable {$lang->executionCommon}";
+$lang->project->selectProduct       = "Select {$lang->productCommon}";
 
 /* Fields. */
-$lang->project->common             = 'Projets';
+$lang->project->common             = $lang->projectCommon;
 $lang->project->id                 = 'ID';
-$lang->project->project            = 'Project';
+$lang->project->project            = $lang->projectCommon;
 $lang->project->stage              = 'Stage';
 $lang->project->model              = 'Model';
 $lang->project->PM                 = 'Manager';
-$lang->project->PO                 = 'Project Owner';
+$lang->project->PO                 = "{$lang->projectCommon} Owner";
 $lang->project->QD                 = 'Test Leader';
 $lang->project->RD                 = 'Releaser';
 $lang->project->name               = 'Name';
 $lang->project->category           = 'Category';
 $lang->project->desc               = 'Description';
 $lang->project->code               = 'Code';
-$lang->project->hasProduct         = 'Has Product';
+$lang->project->hasProduct         = "Has {$lang->productCommon}";
 $lang->project->copy               = 'Copy';
-$lang->project->begin              = 'Begin';
-$lang->project->end                = 'End';
+$lang->project->begin              = 'Planned Begin';
+$lang->project->end                = 'Planned End';
 $lang->project->status             = 'Status';
 $lang->project->subStatus          = 'Sub Status';
 $lang->project->type               = 'Type';
-$lang->project->lifetime           = 'Project Cycle';
+$lang->project->lifetime           = "{$lang->projectCommon} Cycle";
 $lang->project->attribute          = 'Stage Type';
 $lang->project->percent            = 'Workload %';
 $lang->project->milestone          = 'Milestone';
@@ -129,11 +129,11 @@ $lang->project->consume            = 'Cost';
 $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
 $lang->project->weekProgress       = 'This Week Progress';
-$lang->project->dateRange          = 'Duration';
+$lang->project->dateRange          = 'Plan Duration';
 $lang->project->to                 = ' to ';
 $lang->project->realBeganAB        = 'Actual Begin';
 $lang->project->realEndAB          = 'Actual End';
-$lang->project->realBegan          = 'Actual Began';
+$lang->project->realBegan          = 'Actual Begin';
 $lang->project->realEnd            = 'Actual End';
 $lang->project->division           = 'Stage Type';
 $lang->project->bygrid             = 'Kanban';
@@ -150,8 +150,8 @@ $lang->project->leftStories        = 'Left Stories';
 $lang->project->leftTasks          = 'Left Tasks';
 $lang->project->leftBugs           = 'Left Bugs';
 $lang->project->leftHours          = 'Left Hours';
-$lang->project->children           = 'Child Project';
-$lang->project->parent             = 'Parent Project';
+$lang->project->children           = "Child {$lang->projectCommon}";
+$lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
 $lang->project->doneStories        = 'Finished Stories';
 $lang->project->doneProjects       = 'Finished';
@@ -167,15 +167,15 @@ $lang->project->evTitle            = 'Earn Value';
 $lang->project->svTitle            = 'Schedule Variance';
 $lang->project->acTitle            = 'Actual Cost';
 $lang->project->cvTitle            = 'Cost Variance';
-$lang->project->teamCount          = 'Man';
+$lang->project->teamCount          = 'Team';
 $lang->project->teamSumCount       = '%s people in total';
 $lang->project->longTime           = 'Long-Term';
 $lang->project->future             = 'TBD';
-$lang->project->moreProject        = 'More Project';
-$lang->project->days               = 'Available Days';
+$lang->project->moreProject        = "More {$lang->projectCommon}";
+$lang->project->days               = 'Days';
 $lang->project->mailto             = 'Mailto';
 $lang->project->etc                = " , etc";
-$lang->project->product            = 'Product';
+$lang->project->product            = $lang->productCommon;
 $lang->project->branch             = 'Platform/Branch';
 $lang->project->plan               = 'Plan';
 $lang->project->createKanban       = 'Create Kanban';
@@ -183,71 +183,71 @@ $lang->project->kanban             = 'Kanban';
 
 /* Project Kanban. */
 $lang->project->projectTypeList = array();
-$lang->project->projectTypeList[1] = 'Product-based';
-$lang->project->projectTypeList[0] = 'Non-product-based';
+$lang->project->projectTypeList[1] = "{$lang->productCommon}-based";
+$lang->project->projectTypeList[0] = "Non-{$lang->productCommon}-based";
 
 /* Project Kanban. */
 $lang->project->typeList = array();
-$lang->project->typeList['my']    = 'Projects Ownedbyme';
-$lang->project->typeList['other'] = 'Other Projects';
+$lang->project->typeList['my']    = "{$lang->projectCommon}s Ownedbyme";
+$lang->project->typeList['other'] = "Other {$lang->projectCommon}s";
 
-$lang->project->divisionList['0'] = 'Create by project';
-$lang->project->divisionList['1'] = 'Create by product';
+$lang->project->divisionList['0'] = "Create by {$lang->projectCommon}";
+$lang->project->divisionList['1'] = "Create by {$lang->productCommon}";
 
 $lang->project->divisionSwitchList['0'] = 'Close';
 $lang->project->divisionSwitchList['1'] = "Open";
 
-$lang->project->waitProjects    = 'Waiting Projects';
-$lang->project->doingProjects   = 'Ongoing Projects';
+$lang->project->waitProjects    = "Waiting {$lang->projectCommon}s";
+$lang->project->doingProjects   = "Ongoing {$lang->projectCommon}s";
 $lang->project->doingExecutions = 'Ongoing Executions';
-$lang->project->closedProjects  = 'Closed Projects(The recent two projects)';
-$lang->project->closedProject   = 'Closed Projects';
-$lang->project->noProgram       = 'Independent Projects';
+$lang->project->closedProjects  = "Closed {$lang->projectCommon}s(The recent two projects)";
+$lang->project->closedProject   = "Closed {$lang->projectCommon}s";
+$lang->project->noProgram       = "Independent {$lang->projectCommon}s";
 
 $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
 
-$lang->project->productNotEmpty        = 'Please link products or create products.';
-$lang->project->existProductName       = 'Product name already exists.';
-$lang->project->changeProgram          = '%s > Change project';
-$lang->project->changeProgramTip       = 'After modifying the project set, the products linked with the project will also modify the project set to which it belongs. Please confirm whether to modify it.';
-$lang->project->linkedProjectsTip      = 'Linked projects are as follows';
-$lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
-$lang->project->noticeDivsion          = "The current project is a single stage, click [Open] to change to multiple stages, each stage is only associated with one product.";
-$lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
+$lang->project->productNotEmpty        = "Please link {$lang->productCommon}s or create {$lang->productCommon}s.";
+$lang->project->existProductName       = "{$lang->productCommon} name already exists.";
+$lang->project->changeProgram          = "%s > Change {$lang->projectCommon}";
+$lang->project->changeProgramTip       = "Once the program is edited, the {$lang->productCommon} that is linked to this program will be changed. Do you want to edit it?";
+$lang->project->linkedProjectsTip      = "Linked {$lang->projectCommon}s are as follows";
+$lang->project->multiLinkedProductsTip = "The following {$lang->productCommon}s linked to this {$lang->projectCommon} are also linked to other {$lang->projectCommon}s, please unlink before proceeding.";
+$lang->project->noticeDivsion          = "The current {$lang->projectCommon} is a single stage, click [Open] to change to multiple stages, each stage is only associated with one {$lang->productCommon}.";
+$lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this {$lang->projectCommon}";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
 $lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
-$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this project. Do you want to remove them from the execution team too?";
-$lang->project->productTip             = 'After clicking New Product, the project will not be linked to the selected product.';
-$lang->project->noDevStage             = "Il n'y a pas de phase R&D dans ce projet, ou vous n'avez pas la permission d'accès. La version ne peut pas être créée pour le moment.";
-$lang->project->budgetOverrun          = "Le budget du projet a dépassé le budget restant du programme parent:";
+$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this {$lang->projectCommon}. Do you want to remove them from the execution team too?";
+$lang->project->productTip             = "After clicking New {$lang->productCommon}, the {$lang->projectCommon} will not be linked to the selected {$lang->productCommon}.";
+$lang->project->noDevStage             = "There is no R&D stage under this {$lang->projectCommon}, or you do not have access permissions. The creation of builds is not supported at the moment.";
+$lang->project->budgetOverrun          = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the parent program:";
 $lang->project->disabledInputTip       = 'Please cancel %s first';
-$lang->project->linkRepoFailed         = 'Failed to link projects and code repositories.';
+$lang->project->linkRepoFailed         = "Failed to link {$lang->projectCommon}s and code repositories.";
 $lang->project->unLinkProductTip       = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
-$lang->project->summary                = 'Total projects: <strong>%s</strong>.';
-$lang->project->allSummary             = 'Total projects: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.';
+$lang->project->summary                = "Total {$lang->projectCommon}s: <strong>%s</strong>.";
+$lang->project->allSummary             = "Total {$lang->projectCommon}s: <strong>%s</strong>, Wait: <strong>%s</strong>, Doing: <strong>%s</strong>, Suspended: <strong>%s</strong>, Closed: <strong>%s</strong>.";
 $lang->project->checkedSummary         = 'Seleted: <strong>%total%</strong>.';
 $lang->project->checkedAllSummary      = 'Seleted: <strong>%total%</strong>, Wait: <strong>%wait%</strong>, Doing: <strong>%doing%</strong>, Suspended: <strong>%suspended%</strong>, Closed: <strong>%closed%</strong>.';
 
-$lang->project->tenThousand    = '';
+$lang->project->tenThousand    = 'Ten Thousand';
 $lang->project->hundredMillion = 'Hundred Million';
 
 $lang->project->unitList['CNY'] = 'RMB';
 $lang->project->unitList['USD'] = 'USD';
 $lang->project->unitList['HKD'] = 'HKD';
-$lang->project->unitList['NTD'] = 'New Taiwan';
-$lang->project->unitList['EUR'] = 'Euro';
-$lang->project->unitList['DEM'] = 'Deutsche Mark';
-$lang->project->unitList['CHF'] = 'Swiss Franc';
-$lang->project->unitList['FRF'] = 'French Franc';
-$lang->project->unitList['GBP'] = 'Pound';
-$lang->project->unitList['NLG'] = 'Florin';
-$lang->project->unitList['CAD'] = 'Canadian';
-$lang->project->unitList['RUR'] = 'Russian Ruble';
-$lang->project->unitList['INR'] = 'Indian';
-$lang->project->unitList['AUD'] = 'Australian';
-$lang->project->unitList['NZD'] = 'New Zealand';
-$lang->project->unitList['THB'] = 'Thai Baht';
-$lang->project->unitList['SGD'] = 'Singapore';
+$lang->project->unitList['NTD'] = 'NTD';
+$lang->project->unitList['EUR'] = 'EUR';
+$lang->project->unitList['DEM'] = 'DEM';
+$lang->project->unitList['CHF'] = 'CHF';
+$lang->project->unitList['FRF'] = 'FRF';
+$lang->project->unitList['GBP'] = 'GPR';
+$lang->project->unitList['NLG'] = 'NLG';
+$lang->project->unitList['CAD'] = 'CAD';
+$lang->project->unitList['RUR'] = 'RUB';
+$lang->project->unitList['INR'] = 'IDR';
+$lang->project->unitList['AUD'] = 'AUD';
+$lang->project->unitList['NZD'] = 'NZD';
+$lang->project->unitList['THB'] = 'THB';
+$lang->project->unitList['SGD'] = 'SGD';
 
 $lang->project->currencySymbol['CNY'] = '¥';
 $lang->project->currencySymbol['USD'] = '$';
@@ -275,11 +275,11 @@ $lang->project->modelList['agileplus'] = "Agile +";
 if(helper::hasFeature('waterfallplus')) $lang->project->modelList['waterfallplus'] = "Waterfall +";
 
 $lang->project->featureBar['browse']['all']       = 'All';
-$lang->project->featureBar['browse']['undone']    = 'Non Terminées';
-$lang->project->featureBar['browse']['wait']      = 'En Attente';
-$lang->project->featureBar['browse']['doing']     = 'En Cours';
-$lang->project->featureBar['browse']['suspended'] = 'Suspendues';
-$lang->project->featureBar['browse']['closed']    = 'Fermées';
+$lang->project->featureBar['browse']['undone']    = 'Unfinished';
+$lang->project->featureBar['browse']['wait']      = 'Waiting';
+$lang->project->featureBar['browse']['doing']     = 'Doing';
+$lang->project->featureBar['browse']['suspended'] = 'Suspended';
+$lang->project->featureBar['browse']['closed']    = 'Closed';
 
 $lang->project->featureBar['index']['all']       = 'All';
 $lang->project->featureBar['index']['undone']    = 'Unfinished';
@@ -288,19 +288,19 @@ $lang->project->featureBar['index']['doing']     = 'Doing';
 $lang->project->featureBar['index']['suspended'] = 'Suspended';
 $lang->project->featureBar['index']['closed']    = 'Closed';
 
-$lang->project->featureBar['execution']['all']       = "Tous les {$lang->executionCommon}s";
-$lang->project->featureBar['execution']['undone']    = 'Non Terminé';
-$lang->project->featureBar['execution']['wait']      = 'En attente';
-$lang->project->featureBar['execution']['doing']     = 'En cours';
-$lang->project->featureBar['execution']['suspended'] = 'Suspendu';
-$lang->project->featureBar['execution']['closed']    = 'Fermé';
+$lang->project->featureBar['execution']['all']       = 'All';
+$lang->project->featureBar['execution']['undone']    = 'Unfinished';
+$lang->project->featureBar['execution']['wait']      = 'Waiting';
+$lang->project->featureBar['execution']['doing']     = 'Doing';
+$lang->project->featureBar['execution']['suspended'] = 'Suspended';
+$lang->project->featureBar['execution']['closed']    = 'Closed';
 
 $lang->project->featureBar['bug']['all']        = 'All';
 $lang->project->featureBar['bug']['unresolved'] = 'Unresolved';
 
-$lang->project->featureBar['testcase']['all']         = 'Tous';
-$lang->project->featureBar['testcase']['wait']        = 'En Attente';
-$lang->project->featureBar['testcase']['needconfirm'] = "Story Changée";
+$lang->project->featureBar['testcase']['all']         = 'All';
+$lang->project->featureBar['testcase']['wait']        = 'Waiting';
+$lang->project->featureBar['testcase']['needconfirm'] = "Story Changed";
 $lang->project->featureBar['testcase']['group']       = 'Group View';
 $lang->project->featureBar['testcase']['zerocase']    = "Zero Case {$lang->SRCommon}";
 $lang->project->featureBar['testcase']['suite']       = 'Suite';
@@ -308,25 +308,25 @@ $lang->project->featureBar['testcase']['autocase']    = 'Automated';
 
 $lang->project->featureBar['build']['all'] = 'Build List';
 
-$lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
-$lang->project->aclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->aclList["private"] = "Private (For the {$lang->projectCommon} leader, team members and stakeholders only)";
+$lang->project->aclList["open"]    = "Open (accessible with {$lang->projectCommon} view permissions)";
 
 $lang->project->multipleList['1'] = 'Yes';
 $lang->project->multipleList['0'] = 'No';
 
 $lang->project->acls['private'] = 'Private';
-$lang->project->acls['open']    = "Open";
+$lang->project->acls['open']    = 'Open';
 
-$lang->project->subAclList['private'] = "Private (Only the project leader, team members and stakeholders can access)";
-$lang->project->subAclList['open']    = "Open (accessible with project view permissions)";
-$lang->project->subAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members and stakeholders can access)';
+$lang->project->subAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members and stakeholders can access)";
+$lang->project->subAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
+$lang->project->subAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members and stakeholders can access)";
 
-$lang->project->kanbanAclList['private'] = 'Private (For the project leader, team members only)';
-$lang->project->kanbanAclList['open']    = "Open (accessible with project view permissions)";
+$lang->project->kanbanAclList['private'] = "Private (For the {$lang->projectCommon} leader, team members only)";
+$lang->project->kanbanAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
 
-$lang->project->kanbanSubAclList['private'] = "Private (Only the project leader, team members can access)";
-$lang->project->kanbanSubAclList['open']    = "Open (accessible with project view permissions)";
-$lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members can access)';
+$lang->project->kanbanSubAclList['private'] = "Private (Only the {$lang->projectCommon} leader, team members can access)";
+$lang->project->kanbanSubAclList['open']    = "Open (accessible with {$lang->projectCommon} view permissions)";
+$lang->project->kanbanSubAclList['program'] = "Open in the program (all upper-level program team leaders and stakeholders, the {$lang->projectCommon} leader, team members can access)";
 
 global $config;
 if($config->systemMode == 'light')
@@ -335,8 +335,8 @@ if($config->systemMode == 'light')
     unset($lang->project->kanbanSubAclList['program']);
 }
 
-$lang->project->authList['extend'] = 'Inherit (system privilege and project privilege)';
-$lang->project->authList['reset']  = 'Reset (project privilege only)';
+$lang->project->authList['extend'] = "Inherit (system privilege and {$lang->projectCommon} privilege)";
+$lang->project->authList['reset']  = "Reset ({$lang->projectCommon} privilege only)";
 
 $lang->project->statusList['']          = '';
 $lang->project->statusList['wait']      = 'Waiting';
@@ -352,13 +352,13 @@ $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
 $lang->project->scrumTitle         = 'Agile Development Management';
-$lang->project->waterfallTitle     = 'Waterfall Project Management';
-$lang->project->kanbanTitle        = 'Kanban Project Management';
-$lang->project->agileplusTitle     = 'Agile + Kanban Project Management';
-$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management';
+$lang->project->waterfallTitle     = "Waterfall {$lang->projectCommon} Management";
+$lang->project->kanbanTitle        = "Kanban {$lang->projectCommon} Management";
+$lang->project->agileplusTitle     = "Agile + Kanban {$lang->projectCommon} Management";
+$lang->project->waterfallplusTitle = "Waterfall + Agile + Kanban {$lang->projectCommon} Management";
 $lang->project->moreModelTitle     = 'Please look forward to more models...';
 
-$lang->project->empty                  = 'No project.';
+$lang->project->empty                  = "No {$lang->projectCommon}.";
 $lang->project->nextStep               = 'Next step';
 $lang->project->hoursUnit              = '%s hours';
 $lang->project->membersUnit            = '%s men';
@@ -366,43 +366,43 @@ $lang->project->lastIteration          = "Recent {$lang->executionCommon}";
 $lang->project->lastKanban             = 'Recent Kanban';
 $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
-$lang->project->waterfall              = 'CMMI';
+$lang->project->waterfall              = 'Waterfall';
 $lang->project->agileplus              = 'Agile +';
 $lang->project->waterfallplus          = 'Waterfall +';
 $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
 $lang->project->emptyPM                = 'No manager';
 $lang->project->emptyBranch            = 'Branch can not be empty!';
 $lang->project->cannotChangeToCat      = "It is not empty, so you cannot change it to a parent.";
-$lang->project->cannotCancelCat        = "It has child projects, so you cannot unmark the parent.";
+$lang->project->cannotCancelCat        = "It has child {$lang->projectCommon}s, so you cannot unmark the parent.";
 $lang->project->parentBeginEnd         = "Parent begin&end date: %s ~ %s";
-$lang->project->childLongTime          = "If a child as long-term projects, the parent should be long-term too.";
-$lang->project->readjustTime           = 'Change the project begin&end date.';
-$lang->project->notAllowRemoveProducts = 'The story of this product is linked with the project. Unlink it before doing any action.';
+$lang->project->childLongTime          = "If a child as long-term {$lang->projectCommon}s, the parent should be long-term too.";
+$lang->project->readjustTime           = "Change the {$lang->projectCommon} begin&end date.";
+$lang->project->notAllowRemoveProducts = "Stories of this {$lang->productCommon} are linked to {$lang->projectCommon}s or {$lang->execution->common} of this {$lang->projectCommon} is linked to this {$lang->productCommon}. Please unlink it and try again.";
 $lang->project->ge                     = "『%s』should be >= actual begin『%s』.";
 
-$lang->project->programTitle['0']    = 'Hide';
-$lang->project->programTitle['base'] = 'Base-level project only';
-$lang->project->programTitle['end']  = 'End-level project only';
+$lang->project->programTitle['0']    = 'Hidden';
+$lang->project->programTitle['base'] = "Base-level {$lang->projectCommon} only";
+$lang->project->programTitle['end']  = "End-level {$lang->projectCommon} only";
 
-$lang->project->accessDenied         = 'Access denied!';
-$lang->project->chooseProgramType    = 'Select the project management model';
-$lang->project->cannotCreateChild    = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
-$lang->project->hasChildren          = 'This project has a child project, so it cannot be deleted.';
-$lang->project->confirmDelete        = "Do you want to delete [%s]?";
-$lang->project->cannotChangeToCat    = "It is not empty, so you cannot change it to a parent.";
-$lang->project->cannotCancelCat      = "It has child projects, so you cannot unmark the parent.";
-$lang->project->parentBeginEnd       = "Parent begin&end date: %s ~ %s";
-$lang->project->parentBudget         = "The budget of the parent project: ";
-$lang->project->beginLetterParent    = "La date de début du projet était < à la date de début du programme parent:";
-$lang->project->endGreaterParent     = "La date de fin du projet était > à la date de fin du programme parent:";
-$lang->project->dateExceedParent     = "La date de début et de fin du project était > à la date de début et de fin du programme parent:";
-$lang->project->beginGreateChild     = 'La date de début du projets "%s" doit être ≥ à la date de début du programme "%s" : %s.';
-$lang->project->endLetterChild       = 'La date de fin du projets doit être ≤ à la date de fin du programme: %s.';
-$lang->project->begigLetterExecution = 'La date de début du projet "%s" doit être ≤ à la date de début minimum d\'excution: %s';
-$lang->project->endGreateExecution   = 'La date de fin du projet "%s" doit être ≥ à la date de fin maximale d\'exécution: %s.';
-$lang->project->childLongTime        = "If a child as long-term projects, the parent should be long-term too.";
-$lang->project->confirmUnlinkMember  = "Do you want to remove this user from project?";
-$lang->project->divisionTips         = "Created by project as a single set of stages, and the stage is associated with all products; created by product as multiple sets of stages, each set of stages is associated with a product";
+$lang->project->accessDenied         = "Access denied to this {$lang->projectCommon}";
+$lang->project->chooseProgramType    = 'Select management type';
+$lang->project->cannotCreateChild    = "The {$lang->projectCommon} has contents, so you cannot add a child {$lang->projectCommon}. You can create a parent project for this one and then add a child {$lang->projectCommon} for the parent {$lang->projectCommon}.";
+$lang->project->hasChildren          = "This {$lang->projectCommon} has a child {$lang->projectCommon}, so it cannot be deleted.";
+$lang->project->confirmDelete        = 'Do you want to delete \"%s\"?';
+$lang->project->cannotChangeToCat    = "The {$lang->projectCommon} has contents, so you cannot it to a parent {$lang->projectCommon}.";
+$lang->project->cannotCancelCat      = "There are child {$lang->projectCommon}s of this {$lang->projectCommon}. You cannot cancel the parent {$lang->projectCommon} mark.";
+$lang->project->parentBeginEnd       = "The begin and end date of the parent {$lang->projectCommon}: %s ~ %s";
+$lang->project->parentBudget         = "The budget of the parent program: ";
+$lang->project->beginLetterParent    = "The start date of the {$lang->projectCommon} is < the start date of the parent program:";
+$lang->project->endGreaterParent     = "The finish date of the {$lang->projectCommon} is > the finish date of the parent program:";
+$lang->project->dateExceedParent     = "The start and finish date of the {$lang->projectCommon} was > the start and finish date of the parent program:";
+$lang->project->beginGreateChild     = "The start date of the {$lang->projectCommon} should be ≥ the start date of program: %s.";
+$lang->project->endLetterChild       = "The finish date of the {$lang->projectCommon} should be ≤ the finish date of program: %s.";
+$lang->project->begigLetterExecution = "The start date of {$lang->projectCommon} should be ≤ the minimum start date of the execution: %s.";
+$lang->project->endGreateExecution   = "The finish date of the {$lang->projectCommon} should be ≥ the maximum finish date of the execution: %s.";
+$lang->project->childLongTime        = "There are long-term {$lang->projectCommon}s in the child {$lang->projectCommon}, and the parent {$lang->projectCommon} should also be a long-term {$lang->projectCommon}.";
+$lang->project->confirmUnlinkMember  = "Do you want to remove this user from {$lang->projectCommon}?";
+$lang->project->divisionTips         = "Created by {$lang->projectCommon} as a single set of stages, and the stage is associated with all {$lang->productCommon}s; created by {$lang->productCommon} as multiple sets of stages, each set of stages is associated with a {$lang->productCommon}";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
@@ -410,14 +410,14 @@ $lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $e
 $lang->project->multiple = "Multi {$lang->executionCommon}";
 
 $lang->project->copyProject = new stdClass();
-$lang->project->copyProject->nameTips           = '『Project Name』Cannot be repeated.';
-$lang->project->copyProject->codeTips           = '『Project Code』Cannot be repeated.';
+$lang->project->copyProject->nameTips           = "『{$lang->projectCommon} Name』Cannot be repeated.";
+$lang->project->copyProject->codeTips           = "『{$lang->projectCommon} Code』Cannot be repeated.";
 $lang->project->copyProject->endTips            = '『Schedule End』Cannot be empty.';
 $lang->project->copyProject->daysTips           = '『Available working days』Should be numerical.';
 
-$lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
-$lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
-$lang->project->cannotManageProducts      = "This project is a project-type project and cannot be associated with products.";
+$lang->project->linkBranchStoryByPlanTips = "When the {$lang->projectCommon} is scheduled to associate requirements, only the activated requirements associated with the %s of the {$lang->projectCommon} are imported.";
+$lang->project->linkNormalStoryByPlanTips = "When the {$lang->projectCommon} plans to associate requirements, only the requirements that are active are imported.";
+$lang->project->cannotManageProducts      = "This project is a {$lang->projectCommon}-type {$lang->projectCommon} and cannot be associated with {$lang->productCommon}s.";
 
 $lang->project->featureBar['dynamic']['all']       = 'All';
 $lang->project->featureBar['dynamic']['today']     = 'Today';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 370f6d6741..a720e3b6c1 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -1,30 +1,30 @@
 <?php
 /* Actions. */
-$lang->project->createGuide         = '选择项目模板';
-$lang->project->index               = '项目仪表盘';
-$lang->project->home                = '项目主页';
-$lang->project->create              = '创建项目';
-$lang->project->edit                = '编辑项目';
-$lang->project->batchEdit           = '批量编辑项目';
-$lang->project->view                = '项目概况';
+$lang->project->createGuide         = "选择{$lang->projectCommon}模板";
+$lang->project->index               = "{$lang->projectCommon}仪表盘";
+$lang->project->home                = "{$lang->projectCommon}主页";
+$lang->project->create              = "创建{$lang->projectCommon}";
+$lang->project->edit                = "编辑{$lang->projectCommon}";
+$lang->project->batchEdit           = "批量编辑{$lang->projectCommon}";
+$lang->project->view                = "{$lang->projectCommon}概况";
 $lang->project->batchEdit           = '批量编辑';
-$lang->project->browse              = '项目列表';
-$lang->project->all                 = '所有项目';
-$lang->project->start               = '启动项目';
-$lang->project->finish              = '完成项目';
-$lang->project->suspend             = '挂起项目';
-$lang->project->delete              = '删除项目';
-$lang->project->close               = '关闭项目';
-$lang->project->activate            = '激活项目';
-$lang->project->group               = '项目权限分组';
-$lang->project->createGroup         = '项目创建分组';
-$lang->project->editGroup           = '项目编辑分组';
-$lang->project->copyGroup           = '项目复制分组';
-$lang->project->manageView          = '项目维护视野';
-$lang->project->managePriv          = '项目维护权限';
+$lang->project->browse              = "{$lang->projectCommon}列表";
+$lang->project->all                 = "所有{$lang->projectCommon}";
+$lang->project->start               = "启动{$lang->projectCommon}";
+$lang->project->finish              = "完成{$lang->projectCommon}";
+$lang->project->suspend             = "挂起{$lang->projectCommon}";
+$lang->project->delete              = "删除{$lang->projectCommon}";
+$lang->project->close               = "关闭{$lang->projectCommon}";
+$lang->project->activate            = "激活{$lang->projectCommon}";
+$lang->project->group               = "{$lang->projectCommon}权限分组";
+$lang->project->createGroup         = "{$lang->projectCommon}创建分组";
+$lang->project->editGroup           = "{$lang->projectCommon}编辑分组";
+$lang->project->copyGroup           = "{$lang->projectCommon}复制分组";
+$lang->project->manageView          = "{$lang->projectCommon}维护视野";
+$lang->project->managePriv          = "{$lang->projectCommon}维护权限";
 $lang->project->manageMembers       = '团队管理';
 $lang->project->export              = '导出';
-$lang->project->addProduct          = '新建产品';
+$lang->project->addProduct          = "新建{$lang->productCommon}";
 $lang->project->manageGroupMember   = '维护分组用户';
 $lang->project->moduleSetting       = '列表设置';
 $lang->project->moduleOpen          = '显示项目集名';
@@ -36,64 +36,64 @@ $lang->project->testcase            = '用例列表';
 $lang->project->testtask            = '测试单';
 $lang->project->build               = '版本';
 $lang->project->updateOrder         = '排序';
-$lang->project->sort                = '项目排序';
-$lang->project->whitelist           = '项目白名单';
-$lang->project->addWhitelist        = '项目添加白名单';
-$lang->project->unbindWhitelist     = '项目删除白名单';
-$lang->project->manageProducts      = '关联产品';
-$lang->project->manageOtherProducts = '关联其他产品';
-$lang->project->manageProductPlan   = '关联产品和计划';
-$lang->project->copyTitle           = '请选择要复制的项目';
-$lang->project->errorSameProducts   = '项目不能关联多个相同的产品。';
-$lang->project->errorSameBranches   = '项目不能关联多个相同的分支。';
-$lang->project->errorSamePlans      = '项目不能关联多个相同的计划。';
-$lang->project->errorNoProducts     = '最少关联一个产品';
-$lang->project->copyNoProject       = '没有可用的项目来复制';
-$lang->project->searchByName        = '输入项目名称进行检索';
+$lang->project->sort                = "{$lang->projectCommon}排序";
+$lang->project->whitelist           = "{$lang->projectCommon}白名单";
+$lang->project->addWhitelist        = "{$lang->projectCommon}添加白名单";
+$lang->project->unbindWhitelist     = "{$lang->projectCommon}删除白名单";
+$lang->project->manageProducts      = "关联{$lang->productCommon}";
+$lang->project->manageOtherProducts = "关联其他{$lang->productCommon}";
+$lang->project->manageProductPlan   = "关联{$lang->productCommon}和计划";
+$lang->project->copyTitle           = "请选择要复制的{$lang->projectCommon}";
+$lang->project->errorSameProducts   = "{$lang->projectCommon}不能关联多个相同的{$lang->productCommon}。";
+$lang->project->errorSameBranches   = "{$lang->projectCommon}不能关联多个相同的分支。";
+$lang->project->errorSamePlans      = "{$lang->projectCommon}不能关联多个相同的计划。";
+$lang->project->errorNoProducts     = "最少关联一个{$lang->productCommon}";
+$lang->project->copyNoProject       = "没有可用的{$lang->projectCommon}来复制";
+$lang->project->searchByName        = "输入{$lang->projectCommon}名称进行检索";
 $lang->project->deleted             = '已删除';
-$lang->project->linkedProducts      = '已关联产品';
+$lang->project->linkedProducts      = "已关联{$lang->productCommon}";
 $lang->project->unlinkedProducts    = '未关联';
 $lang->project->testreport          = '测试报告';
 $lang->project->selectProgram       = '项目集筛选';
 $lang->project->teamMember          = '团队成员';
 $lang->project->unlinkMember        = '移除成员';
-$lang->project->copyTeamTitle       = '选择一个项目团队来复制';
-$lang->project->daysGreaterProject  = '可用工日不能大于项目的可用工日『%s』';
+$lang->project->copyTeamTitle       = "选择一个{$lang->projectCommon}团队来复制";
+$lang->project->daysGreaterProject  = "可用工日不能大于{$lang->projectCommon}的可用工日『%s』";
 $lang->project->errorHours          = '可用工时/天不能大于『24』';
 $lang->project->workdaysExceed      = '可用工作日不能超过『%s』天';
 $lang->project->teamMembersCount    = '，团队成员共%s人。';
 $lang->project->budgetNumber        = '『预算』金额必须为数字。';
 $lang->project->budgetGe0           = '『预算』金额必须大于等于0。';
-$lang->project->allProjects         = '所有项目';
+$lang->project->allProjects         = "所有{$lang->projectCommon}";
 $lang->project->ignore              = '忽略';
 $lang->project->manageRepo          = '关联代码库';
 $lang->project->linkedRepo          = '已关联代码库';
 $lang->project->unlinkedRepo        = '未关联代码库';
-$lang->project->disableExecution    = '不启用迭代的项目';
-$lang->project->selectProduct       = '选择产品';
+$lang->project->disableExecution    = "不启用{$lang->executionCommon}的{$lang->projectCommon}";
+$lang->project->selectProduct       = "选择{$lang->productCommon}";
 
 /* Fields. */
-$lang->project->common             = '项目';
-$lang->project->id                 = '项目ID';
-$lang->project->project            = '所属项目';
+$lang->project->common             = "{$lang->projectCommon}";
+$lang->project->id                 = "{$lang->projectCommon}ID";
+$lang->project->project            = "所属{$lang->projectCommon}";
 $lang->project->stage              = '阶段';
-$lang->project->model              = '项目管理方式';
+$lang->project->model              = "{$lang->projectCommon}管理方式";
 $lang->project->PM                 = '负责人';
-$lang->project->PO                 = '项目负责人';
+$lang->project->PO                 = "{$lang->projectCommon}负责人";
 $lang->project->QD                 = '测试负责人';
 $lang->project->RD                 = '发布负责人';
-$lang->project->name               = '项目名称';
-$lang->project->category           = '项目类型';
-$lang->project->desc               = '项目描述';
-$lang->project->code               = '项目代号';
-$lang->project->hasProduct         = '是否关联产品';
-$lang->project->copy               = '复制项目';
+$lang->project->name               = "{$lang->projectCommon}名称";
+$lang->project->category           = "{$lang->projectCommon}类型";
+$lang->project->desc               = "{$lang->projectCommon}描述";
+$lang->project->code               = "{$lang->projectCommon}代号";
+$lang->project->hasProduct         = "是否关联{$lang->productCommon}";
+$lang->project->copy               = "复制{$lang->projectCommon}";
 $lang->project->begin              = '计划开始';
 $lang->project->end                = '计划完成';
 $lang->project->status             = '状态';
 $lang->project->subStatus          = '子状态';
-$lang->project->type               = '项目类型';
-$lang->project->lifetime           = '项目周期';
+$lang->project->type               = "{$lang->projectCommon}类型";
+$lang->project->lifetime           = "{$lang->projectCommon}周期";
 $lang->project->attribute          = '阶段类型';
 $lang->project->percent            = '工作量占比';
 $lang->project->milestone          = '里程碑';
@@ -123,7 +123,7 @@ $lang->project->suspendedDate      = '暂停日期';
 $lang->project->vision             = '界面';
 $lang->project->displayCards       = '每列最大卡片数';
 $lang->project->fluidBoard         = '列宽度';
-$lang->project->template           = '项目模板';
+$lang->project->template           = "{$lang->projectCommon}模板";
 $lang->project->estimate           = '预计';
 $lang->project->consume            = '消耗';
 $lang->project->surplus            = '剩余';
@@ -150,13 +150,13 @@ $lang->project->leftStories        = '剩余需求';
 $lang->project->leftTasks          = '剩余任务';
 $lang->project->leftBugs           = '剩余Bug';
 $lang->project->leftHours          = '剩余工时';
-$lang->project->children           = '子项目';
+$lang->project->children           = "子{$lang->projectCommon}";
 $lang->project->parent             = '所属项目集';
 $lang->project->allStories         = '总需求';
 $lang->project->doneStories        = '已完成';
 $lang->project->doneProjects       = '已结束';
-$lang->project->allInput           = '项目总投入';
-$lang->project->weekly             = '项目周报';
+$lang->project->allInput           = "{$lang->projectCommon}总投入";
+$lang->project->weekly             = "{$lang->projectCommon}周报";
 $lang->project->pv                 = 'PV';
 $lang->project->ev                 = 'EV';
 $lang->project->sv                 = 'SV';
@@ -171,11 +171,11 @@ $lang->project->teamCount          = '人数';
 $lang->project->teamSumCount       = '共%s人';
 $lang->project->longTime           = '长期';
 $lang->project->future             = '待定';
-$lang->project->moreProject        = '更多项目';
+$lang->project->moreProject        = "更多{$lang->projectCommon}";
 $lang->project->days               = '可用工作日';
 $lang->project->mailto             = '抄送给';
 $lang->project->etc                = "等";
-$lang->project->product            = '所属产品';
+$lang->project->product            = "所属{$lang->productCommon}";
 $lang->project->branch             = '平台/分支';
 $lang->project->plan               = '所属计划';
 $lang->project->createKanban       = '添加看板';
@@ -183,50 +183,50 @@ $lang->project->kanban             = '看板';
 
 /* Project Kanban. */
 $lang->project->projectTypeList = array();
-$lang->project->projectTypeList[1] = '产品型项目';
-$lang->project->projectTypeList[0] = '项目型项目';
+$lang->project->projectTypeList[1] = "{$lang->productCommon}型{$lang->projectCommon}";
+$lang->project->projectTypeList[0] = "{$lang->projectCommon}型{$lang->projectCommon}";
 
 /* Project Kanban. */
 $lang->project->typeList = array();
-$lang->project->typeList['my']    = '我负责的项目';
-$lang->project->typeList['other'] = '其他项目';
+$lang->project->typeList['my']    = "我负责的{$lang->projectCommon}";
+$lang->project->typeList['other'] = "其他{$lang->projectCommon}";
 
-$lang->project->divisionList['0'] = '按项目创建';
+$lang->project->divisionList['0'] = "按{$lang->projectCommon}创建";
 $lang->project->divisionList['1'] = "按{$lang->productCommon}创建";
 
 $lang->project->divisionSwitchList['0'] = '关闭';
 $lang->project->divisionSwitchList['1'] = "开启";
 
-$lang->project->waitProjects    = '未开始的项目';
-$lang->project->doingProjects   = '进行中的项目';
+$lang->project->waitProjects    = "未开始的{$lang->projectCommon}";
+$lang->project->doingProjects   = "进行中的{$lang->projectCommon}";
 $lang->project->doingExecutions = '进行中的执行(最近1个)';
-$lang->project->closedProjects  = '已关闭的项目(最近2个)';
-$lang->project->closedProject   = '已关闭的项目';
-$lang->project->noProgram       = '无项目集归属项目';
+$lang->project->closedProjects  = "已关闭的{$lang->projectCommon}(最近2个)";
+$lang->project->closedProject   = "已关闭的{$lang->projectCommon}";
+$lang->project->noProgram       = "无项目集归属{$lang->projectCommon}";
 
 $lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
 
-$lang->project->productNotEmpty        = '请关联产品或创建产品。';
-$lang->project->existProductName       = '产品名称已存在。';
+$lang->project->productNotEmpty        = "请关联{$lang->productCommon}或创建{$lang->productCommon}。";
+$lang->project->existProductName       = "{$lang->productCommon}名称已存在。";
 $lang->project->changeProgram          = '%s > 修改项目集';
-$lang->project->changeProgramTip       = '修改项目集后，该项目关联产品的项目集也会被修改，请确认是否修改。';
-$lang->project->linkedProjectsTip      = '关联的项目如下';
-$lang->project->multiLinkedProductsTip = '该项目关联的如下产品还关联了其他项目，请取消关联后再操作';
-$lang->project->noticeDivsion          = "当前项目为单套阶段，点击[开启]可以变为多套阶段，每套阶段只关联一个{$lang->productCommon}。";
-$lang->project->linkStoryByPlanTips    = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此项目中";
-$lang->project->createExecution        = "该项目下没有{$lang->executionCommon}，请先创建{$lang->executionCommon}";
+$lang->project->changeProgramTip       = "修改项目集后，该{$lang->projectCommon}关联{$lang->productCommon}的项目集也会被修改，请确认是否修改。";
+$lang->project->linkedProjectsTip      = "关联的{$lang->projectCommon}如下";
+$lang->project->multiLinkedProductsTip = "该{$lang->projectCommon}关联的如下{$lang->productCommon}还关联了其他{$lang->projectCommon}，请取消关联后再操作";
+$lang->project->noticeDivsion          = "当前{$lang->projectCommon}为单套阶段，点击[开启]可以变为多套阶段，每套阶段只关联一个{$lang->productCommon}。";
+$lang->project->linkStoryByPlanTips    = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->projectCommon}中";
+$lang->project->createExecution        = "该{$lang->projectCommon}下没有{$lang->executionCommon}，请先创建{$lang->executionCommon}";
 $lang->project->unlinkExecutionMember  = "该用户参与了%s%s%s个{$lang->execution->common}，是否同时将其移除？（该用户所产生的数据不会受影响。）";
-$lang->project->unlinkExecutionMembers = "移除的团队成员还参与了项目下的执行，是否同步从执行团队中移除？";
-$lang->project->productTip             = '点击新建产品后，项目将不会关联已选中的产品。';
-$lang->project->noDevStage             = '该项目下没有研发类型的阶段，或者您没有权限访问，暂时不支持创建版本。';
-$lang->project->budgetOverrun          = '项目的预算超出了父项目集的剩余预算：';
+$lang->project->unlinkExecutionMembers = "移除的团队成员还参与了{$lang->projectCommon}下的执行，是否同步从执行团队中移除？";
+$lang->project->productTip             = "点击新建{$lang->productCommon}后，{$lang->projectCommon}将不会关联已选中的{$lang->productCommon}。";
+$lang->project->noDevStage             = "该{$lang->projectCommon}下没有研发类型的阶段，或者您没有权限访问，暂时不支持创建版本。";
+$lang->project->budgetOverrun          = "{$lang->projectCommon}的预算超出了父项目集的剩余预算：";
 $lang->project->disabledInputTip       = '请先取消%s';
 $lang->project->linkRepoFailed         = '关联代码库失败';
 $lang->project->unLinkProductTip       = "您确认要取消与%s的关联关系吗？（不影响已关联的需求）";
-$lang->project->summary                = '本页共 <strong>%s</strong> 个项目。';
-$lang->project->allSummary             = '本页共 <strong>%s</strong> 个项目，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，已挂起 <strong>%s</strong>，已关闭 <strong>%s</strong> 。';
-$lang->project->checkedSummary         = '选中 <strong>%total%</strong> 个项目。';
-$lang->project->checkedAllSummary      = '选中 <strong>%total%</strong> 个项目，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，已挂起 <strong>%suspended%</strong>，已关闭 <strong>%closed%</strong> 。';
+$lang->project->summary                = "本页共 <strong>%s</strong> 个{$lang->projectCommon}。";
+$lang->project->allSummary             = "本页共 <strong>%s</strong> 个{$lang->projectCommon}，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，已挂起 <strong>%s</strong>，已关闭 <strong>%s</strong> 。";
+$lang->project->checkedSummary         = "选中 <strong>%total%</strong> 个{$lang->projectCommon}。";
+$lang->project->checkedAllSummary      = "选中 <strong>%total%</strong> 个{$lang->projectCommon}，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，已挂起 <strong>%suspended%</strong>，已关闭 <strong>%closed%</strong> 。";
 
 $lang->project->tenThousand    = '万';
 $lang->project->hundredMillion = '亿';
@@ -308,8 +308,8 @@ $lang->project->featureBar['testcase']['autocase']    = '自动化';
 
 $lang->project->featureBar['build']['all'] = '全部版本';
 
-$lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
-$lang->project->aclList['open']    = "公开 (有项目视图权限即可访问)";
+$lang->project->aclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员和干系人可访问)";
+$lang->project->aclList['open']    = "公开 (有{$lang->projectCommon}视图权限即可访问)";
 
 $lang->project->multipleList['1'] = '是';
 $lang->project->multipleList['0'] = '否';
@@ -317,16 +317,16 @@ $lang->project->multipleList['0'] = '否';
 $lang->project->acls['private'] = '私有';
 $lang->project->acls['open']    = '公开';
 
-$lang->project->subAclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
-$lang->project->subAclList['open']    = "公开 (有项目视图权限即可访问)";
-$lang->project->subAclList['program'] = '项目集内公开（所有上级项目集负责人和干系人、项目负责人、团队成员和干系人可访问）';
+$lang->project->subAclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员和干系人可访问)";
+$lang->project->subAclList['open']    = "公开 (有{$lang->projectCommon}视图权限即可访问)";
+$lang->project->subAclList['program'] = "项目集内公开（所有上级项目集负责人和干系人、{$lang->projectCommon}负责人、团队成员和干系人可访问）";
 
-$lang->project->kanbanAclList['private'] = "私有 (只有项目负责人、团队成员可访问)";
-$lang->project->kanbanAclList['open']    = "公开 (有项目视图权限即可访问)";
+$lang->project->kanbanAclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员可访问)";
+$lang->project->kanbanAclList['open']    = "公开 (有{$lang->projectCommon}视图权限即可访问)";
 
-$lang->project->kanbanSubAclList['private'] = "私有 (只有项目负责人、团队成员可访问)";
-$lang->project->kanbanSubAclList['open']    = "公开 (有项目视图权限即可访问)";
-$lang->project->kanbanSubAclList['program'] = '项目集内公开（所有上级项目集负责人和干系人、项目负责人、团队成员可访问）';
+$lang->project->kanbanSubAclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员可访问)";
+$lang->project->kanbanSubAclList['open']    = "公开 (有{$lang->projectCommon}视图权限即可访问)";
+$lang->project->kanbanSubAclList['program'] = "项目集内公开（所有上级项目集负责人和干系人、{$lang->projectCommon}负责人、团队成员可访问）";
 
 global $config;
 if($config->systemMode == 'light')
@@ -335,8 +335,8 @@ if($config->systemMode == 'light')
     unset($lang->project->kanbanSubAclList['program']);
 }
 
-$lang->project->authList['extend'] = '继承 (取系统权限与项目权限的合集)';
-$lang->project->authList['reset']  = '重新定义 (只取项目权限)';
+$lang->project->authList['extend'] = "继承 (取系统权限与{$lang->projectCommon}权限的合集)";
+$lang->project->authList['reset']  = "重新定义 (只取{$lang->projectCommon}权限)";
 
 $lang->project->statusList['']          = '';
 $lang->project->statusList['wait']      = '未开始';
@@ -351,14 +351,14 @@ $lang->project->endList[186] = '半年';
 $lang->project->endList[365] = '一年';
 $lang->project->endList[999] = '长期';
 
-$lang->project->scrumTitle         = '敏捷开发全流程项目管理';
-$lang->project->waterfallTitle     = '瀑布式项目管理';
-$lang->project->kanbanTitle        = '专业研发看板项目管理';
-$lang->project->agileplusTitle     = '敏捷+看板项目管理';
-$lang->project->waterfallplusTitle = '瀑布+敏捷+看板项目管理';
+$lang->project->scrumTitle         = "敏捷开发全流程{$lang->projectCommon}管理";
+$lang->project->waterfallTitle     = "瀑布式{$lang->projectCommon}管理";
+$lang->project->kanbanTitle        = "专业研发看板{$lang->projectCommon}管理";
+$lang->project->agileplusTitle     = "敏捷+看板{$lang->projectCommon}管理";
+$lang->project->waterfallplusTitle = "瀑布+敏捷+看板{$lang->projectCommon}管理";
 $lang->project->moreModelTitle     = '更多模型敬请期待...';
 
-$lang->project->empty                  = '暂时没有项目';
+$lang->project->empty                  = "暂时没有{$lang->projectCommon}";
 $lang->project->nextStep               = '下一步';
 $lang->project->hoursUnit              = '%s 工时';
 $lang->project->membersUnit            = '%s人';
@@ -369,40 +369,40 @@ $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = '瀑布';
 $lang->project->agileplus              = '融合敏捷';
 $lang->project->waterfallplus          = '融合瀑布';
-$lang->project->cannotCreateChild      = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
+$lang->project->cannotCreateChild      = "该{$lang->projectCommon}已经有实际的内容，无法直接添加子{$lang->projectCommon}。您可以为当前{$lang->projectCommon}创建一个父{$lang->projectCommon}，然后在新的父{$lang->projectCommon}下面添加子{$lang->projectCommon}。";
 $lang->project->emptyPM                = '暂无';
 $lang->project->emptyBranch            = '分支不能为空！';
-$lang->project->cannotChangeToCat      = "该项目已经有实际的内容，无法修改为父项目";
-$lang->project->cannotCancelCat        = "该项目下已经有子项目，无法取消父项目标记";
-$lang->project->parentBeginEnd         = "父项目起止时间：%s ~ %s";
-$lang->project->childLongTime          = "子项目中有长期项目，父项目也应该是长期项目";
-$lang->project->readjustTime           = '重新调整项目起止时间';
-$lang->project->notAllowRemoveProducts = "该产品中的需求与项目进行了关联或者项目下的{$lang->execution->common}关联了该产品，请取消关联后再操作。";
+$lang->project->cannotChangeToCat      = "该{$lang->projectCommon}已经有实际的内容，无法修改为父{$lang->projectCommon}";
+$lang->project->cannotCancelCat        = "该{$lang->projectCommon}下已经有子{$lang->projectCommon}，无法取消父{$lang->projectCommon}标记";
+$lang->project->parentBeginEnd         = "父{$lang->projectCommon}起止时间：%s ~ %s";
+$lang->project->childLongTime          = "子{$lang->projectCommon}中有长期{$lang->projectCommon}，父{$lang->projectCommon}也应该是长期{$lang->projectCommon}";
+$lang->project->readjustTime           = "重新调整{$lang->projectCommon}起止时间";
+$lang->project->notAllowRemoveProducts = "该{$lang->productCommon}中的需求与{$lang->projectCommon}进行了关联或者{$lang->projectCommon}下的{$lang->execution->common}关联了该{$lang->productCommon}，请取消关联后再操作。";
 $lang->project->ge                     = "『%s』应当不小于实际开始时间『%s』。";
 
 $lang->project->programTitle['0']    = '不显示';
 $lang->project->programTitle['base'] = '只显示一级项目集';
 $lang->project->programTitle['end']  = '只显示最后一级项目集';
 
-$lang->project->accessDenied         = '您无权访问该项目！';
-$lang->project->chooseProgramType    = '选择项目管理方式';
-$lang->project->cannotCreateChild    = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
-$lang->project->hasChildren          = '该项目有子项目存在，不能删除。';
-$lang->project->confirmDelete        = '您确定删除项目“%s”吗？';
-$lang->project->cannotChangeToCat    = "该项目已经有实际的内容，无法修改为父项目";
-$lang->project->cannotCancelCat      = "该项目下已经有子项目，无法取消父项目标记";
-$lang->project->parentBeginEnd       = "父项目起止时间：%s ~ %s";
+$lang->project->accessDenied         = "您无权访问该{$lang->projectCommon}！";
+$lang->project->chooseProgramType    = "选择{$lang->projectCommon}管理方式";
+$lang->project->cannotCreateChild    = "该{$lang->projectCommon}已经有实际的内容，无法直接添加子{$lang->projectCommon}。您可以为当前{$lang->projectCommon}创建一个父{$lang->projectCommon}，然后在新的父{$lang->projectCommon}下面添加子{$lang->projectCommon}。";
+$lang->project->hasChildren          = "该{$lang->projectCommon}有子{$lang->projectCommon}存在，不能删除。";
+$lang->project->confirmDelete        = "您确定删除{$lang->projectCommon}“%s”吗？";
+$lang->project->cannotChangeToCat    = "该{$lang->projectCommon}已经有实际的内容，无法修改为父{$lang->projectCommon}";
+$lang->project->cannotCancelCat      = "该{$lang->projectCommon}下已经有子{$lang->projectCommon}，无法取消父{$lang->projectCommon}标记";
+$lang->project->parentBeginEnd       = "父{$lang->projectCommon}起止时间：%s ~ %s";
 $lang->project->parentBudget         = "父项目集预算：";
-$lang->project->beginLetterParent    = "项目的开始日期小于了父项目集的开始日期：";
-$lang->project->endGreaterParent     = "项目的完成日期大于了父项目集的完成日期：";
-$lang->project->dateExceedParent     = "项目的起止日期已超出父项目集的起止日期：";
-$lang->project->beginGreateChild     = '项目的开始日期应大于等于项目集的最小开始日期：%s';
-$lang->project->endLetterChild       = '项目的完成日期应小于等于项目集的最大完成日期：%s';
-$lang->project->begigLetterExecution = '项目的开始日期应小于等于执行的最小开始日期：%s';
-$lang->project->endGreateExecution   = '项目的完成日期应大于等于执行的最大完成日期：%s';
-$lang->project->childLongTime        = "子项目中有长期项目，父项目也应该是长期项目";
-$lang->project->confirmUnlinkMember  = "您确定从该项目中移除该用户吗？";
-$lang->project->divisionTips         = "按项目创建为单套阶段，阶段关联所有{$lang->productCommon}；按{$lang->productCommon}创建为多套阶段，每套阶段关联一个{$lang->productCommon}。";
+$lang->project->beginLetterParent    = "{$lang->projectCommon}的开始日期小于了父项目集的开始日期：";
+$lang->project->endGreaterParent     = "{$lang->projectCommon}的完成日期大于了父项目集的完成日期：";
+$lang->project->dateExceedParent     = "{$lang->projectCommon}的起止日期已超出父项目集的起止日期：";
+$lang->project->beginGreateChild     = "{$lang->projectCommon}的开始日期应大于等于项目集的最小开始日期：%s";
+$lang->project->endLetterChild       = "{$lang->projectCommon}的完成日期应小于等于项目集的最大完成日期：%s";
+$lang->project->begigLetterExecution = "{$lang->projectCommon}的开始日期应小于等于执行的最小开始日期：%s";
+$lang->project->endGreateExecution   = "{$lang->projectCommon}的完成日期应大于等于执行的最大完成日期：%s";
+$lang->project->childLongTime        = "子{$lang->projectCommon}中有长期{$lang->projectCommon}，父{$lang->projectCommon}也应该是长期{$lang->projectCommon}";
+$lang->project->confirmUnlinkMember  = "您确定从该{$lang->projectCommon}中移除该用户吗？";
+$lang->project->divisionTips         = "按{$lang->projectCommon}创建为单套阶段，阶段关联所有{$lang->productCommon}；按{$lang->productCommon}创建为多套阶段，每套阶段关联一个{$lang->productCommon}。";
 
 $lang->project->action = new stdclass();
 $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
@@ -410,14 +410,14 @@ $lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$
 $lang->project->multiple = "启用{$lang->executionCommon}";
 
 $lang->project->copyProject = new stdClass();
-$lang->project->copyProject->nameTips           = '『项目名称』不可重复需要修改。';
-$lang->project->copyProject->codeTips           = '『项目代号』不可重复需要修改。';
+$lang->project->copyProject->nameTips           = "『{$lang->projectCommon}名称』不可重复需要修改。";
+$lang->project->copyProject->codeTips           = "『{$lang->projectCommon}代号』不可重复需要修改。";
 $lang->project->copyProject->endTips            = '『计划完成』不能为空。';
 $lang->project->copyProject->daysTips           = '『可用工作日』应当是数字。';
 
-$lang->project->linkBranchStoryByPlanTips = "项目按计划关联需求时，只导入本项目所关联%s的激活状态的需求。";
-$lang->project->linkNormalStoryByPlanTips = "项目按计划关联需求时，只导入激活状态的需求。";
-$lang->project->cannotManageProducts      = "该项目为项目型项目，不能关联产品。";
+$lang->project->linkBranchStoryByPlanTips = "{$lang->projectCommon}按计划关联需求时，只导入本{$lang->projectCommon}所关联%s的激活状态的需求。";
+$lang->project->linkNormalStoryByPlanTips = "{$lang->projectCommon}按计划关联需求时，只导入激活状态的需求。";
+$lang->project->cannotManageProducts      = "该{$lang->projectCommon}为{$lang->projectCommon}型{$lang->projectCommon}，不能关联{$lang->productCommon}。";
 
 $lang->project->featureBar['dynamic']['all']       = '全部';
 $lang->project->featureBar['dynamic']['today']     = '今天';

From 1d6825f5b63b0dcb87da9846a4be47b2512eaa07 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Mar 2023 17:03:52 +0800
Subject: [PATCH 277/319] * Modify language items for project,product common.

---
 module/bug/lang/de.php       |  2 +-
 module/bug/lang/en.php       |  2 +-
 module/bug/lang/fr.php       |  2 +-
 module/bug/lang/zh-cn.php    |  2 +-
 module/custom/lang/de.php    |  6 +++---
 module/custom/lang/en.php    |  6 +++---
 module/custom/lang/fr.php    |  6 +++---
 module/custom/lang/zh-cn.php | 32 ++++++++++++++++----------------
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index a8f0e551d5..d08ee36c26 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -166,7 +166,7 @@ $lang->bug->openedByMeAB   = 'Von mir erstellt';
 $lang->bug->resolvedByMeAB = 'Von mir gelöst';
 
 $lang->bug->ditto          = 'Dito';
-$lang->bug->dittoNotice    = 'This bug is not linked to the same product as the last one!';
+$lang->bug->dittoNotice    = "This bug is not linked to the same {$lang->productCommon} as the last one is!";
 $lang->bug->noAssigned     = 'Zuweisen';
 $lang->bug->noBug          = 'Keine Bugs. ';
 $lang->bug->noModule       = '<div>Sie haben keine Module</div><div>Jetzt verwalten</div>';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 71da5d016e..1e3c5a687f 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -166,7 +166,7 @@ $lang->bug->openedByMeAB   = 'ReportedByMe';
 $lang->bug->resolvedByMeAB = 'ResolvedByMe';
 
 $lang->bug->ditto          = 'Ditto';
-$lang->bug->dittoNotice    = 'This bug is not linked to the same product as the last one is!';
+$lang->bug->dittoNotice    = "This bug is not linked to the same {$lang->productCommon} as the last one is!";
 $lang->bug->noAssigned     = 'Unassigned';
 $lang->bug->noBug          = 'No bugs yet.';
 $lang->bug->noModule       = '<div>You have no modules.</div><div>Manage now</div>';
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index d4978f3f53..afdb271cbc 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -166,7 +166,7 @@ $lang->bug->openedByMeAB   = 'Signalés par Moi';
 $lang->bug->resolvedByMeAB = 'Résolus par Moi';
 
 $lang->bug->ditto          = 'Idem';
-$lang->bug->dittoNotice    = "Ce bug n'est pas lié au même product que le précédent !";
+$lang->bug->dittoNotice    = 'This bug is not linked to the same product as the last one!';
 $lang->bug->noAssigned     = 'Non affectés';
 $lang->bug->noBug          = "Pas de bug pour l'instant. Bravo !";
 $lang->bug->noModule       = "<div>Vous n'avez pas de modules.</div><div>Gérer Modules maintenant</div>";
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index ccef9854e8..3b98c2d36c 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -166,7 +166,7 @@ $lang->bug->openedByMeAB   = '由我创建';
 $lang->bug->resolvedByMeAB = '由我解决';
 
 $lang->bug->ditto          = '同上';
-$lang->bug->dittoNotice    = '该bug与上一bug不属于同一产品！';
+$lang->bug->dittoNotice    = "该bug与上一bug不属于同一{$lang->productCommon}！";
 $lang->bug->noAssigned     = '未指派';
 $lang->bug->noBug          = '暂时没有Bug。';
 $lang->bug->noModule       = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 205db35f80..2536a8eb8c 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -200,8 +200,8 @@ $lang->custom->notice->confirmReviewCase   = 'Set the case in Wait to Normal?';
 $lang->custom->notice->storyReviewTip      = 'After selecting by individual, position, and department, take the union of these three filters. ';
 $lang->custom->notice->selectAllTip        = 'After selecting all people, the reviewers will be emptied and grayed out while hiding their positions and departments.';
 $lang->custom->notice->repeatKey           = 'Repeat Key %s';
-$lang->custom->notice->readOnlyOfCode      = 'A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of product, project, and execution in the system will be displayed in the creation, editing, detail, and list pages.';
-$lang->custom->notice->readOnlyOfPercent   = 'The "Workload Ratio" is used to divide the workload of a project into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the "Workload Ratio", users have to fill in the ratio fields when setting up the stages in the Waterfall project and Waterfall Plus project management models.';
+$lang->custom->notice->readOnlyOfCode      = "A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of {$lang->productCommon}, {$lang->projectCommon}, and execution in the system will be displayed in the creation, editing, detail, and list pages.";
+$lang->custom->notice->readOnlyOfPercent   = "The \"Workload Ratio\" is used to divide the workload of a {$lang->projectCommon} into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the \"Workload Ratio\", users have to fill in the ratio fields when setting up the stages in the Waterfall {$lang->projectCommon} and Waterfall Plus {$lang->projectCommon} management models.";
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to go to Product Homepage?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to go to Project Homepage?";
@@ -247,7 +247,7 @@ $lang->custom->useLight          = 'Use Light Mode';
 $lang->custom->useALM            = 'Use ALM Mode';
 $lang->custom->currentModeTips   = 'You are currently using %s, you can switch to the %s.';
 $lang->custom->changeModeTips    = 'Please double confirm to switch to %s Mode.';
-$lang->custom->selectProgramTips = 'After switching to the Light Mode, in order to ensure the consistency of the data structure, you need to select a program as the default program, and subsequent new product and project data are associated with this default program.';
+$lang->custom->selectProgramTips = "After switching to the Light Mode, in order to ensure the consistency of the data structure, you need to select a program as the default program, and subsequent new {$lang->productCommon} and {$lang->projectCommon} data are associated with this default program.";
 
 $lang->custom->modeList['light'] = 'Light Mode';
 $lang->custom->modeList['ALM']   = 'ALM Mode';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index b929cb6ce3..a77d4a37cf 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -200,8 +200,8 @@ $lang->custom->notice->confirmReviewCase   = 'Set the case in Wait to Normal?';
 $lang->custom->notice->storyReviewTip      = 'After selecting by individual, position, and department, take the union of these three filters. ';
 $lang->custom->notice->selectAllTip        = 'After selecting all people, the reviewers will be emptied and grayed out while hiding their positions and departments.';
 $lang->custom->notice->repeatKey           = 'Repeat Key %s';
-$lang->custom->notice->readOnlyOfCode      = 'A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of product, project, and execution in the system will be displayed in the creation, editing, detail, and list pages.';
-$lang->custom->notice->readOnlyOfPercent   = 'The "Workload Ratio" is used to divide the workload of a project into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the "Workload Ratio", users have to fill in the ratio fields when setting up the stages in the Waterfall project and Waterfall Plus project management models.';
+$lang->custom->notice->readOnlyOfCode      = "A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of {$lang->productCommon}, {$lang->projectCommon}, and execution in the system will be displayed in the creation, editing, detail, and list pages.";
+$lang->custom->notice->readOnlyOfPercent   = "The \"Workload Ratio\" is used to divide the workload of a {$lang->projectCommon} into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the \"Workload Ratio\", users have to fill in the ratio fields when setting up the stages in the Waterfall {$lang->projectCommon} and Waterfall Plus {$lang->projectCommon} management models.";
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home?";
@@ -247,7 +247,7 @@ $lang->custom->useLight          = 'Use Light Mode';
 $lang->custom->useALM            = 'Use ALM Mode';
 $lang->custom->currentModeTips   = 'You are currently using %s, you can switch to the %s.';
 $lang->custom->changeModeTips    = 'Please double confirm to switch to %s Mode.';
-$lang->custom->selectProgramTips = 'After switching to the Light Mode, in order to ensure the consistency of the data structure, you need to select a program as the default program, and subsequent new product and project data are associated with this default program.';
+$lang->custom->selectProgramTips = "After switching to the Light Mode, in order to ensure the consistency of the data structure, you need to select a program as the default program, and subsequent new {$lang->productCommon} and {$lang->projectCommon} data are associated with this default program.";
 
 $lang->custom->modeList['light'] = 'Light Mode';
 $lang->custom->modeList['ALM']   = 'ALM Mode';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 243193c2f9..a1bc98bc02 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -200,8 +200,8 @@ $lang->custom->notice->confirmReviewCase   = 'Set the case in Wait to Normal?';
 $lang->custom->notice->storyReviewTip      = 'After selecting by individual, position, and department, take the union of these three filters. ';
 $lang->custom->notice->selectAllTip        = 'After selecting all people, the reviewers will be emptied and grayed out while hiding their positions and departments.';
 $lang->custom->notice->repeatKey           = 'Repeat Key %s';
-$lang->custom->notice->readOnlyOfCode      = "Le code est un terme de gestion utilisé pour la confidentialité ou comme alias. Lorsque la gestion du code est activée, le produit, le projet et l'exécution dans le système afficheront les informations de code sur les pages de création, de modification, de détails et de liste.";
-$lang->custom->notice->readOnlyOfPercent   = 'The "Workload Ratio" is used to divide the workload of a project into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the "Workload Ratio", users have to fill in the ratio fields when setting up the stages in the Waterfall project and Waterfall Plus project management models.';
+$lang->custom->notice->readOnlyOfCode      = "A code is a management term that exists for secrecy or as an antonym. When code management is enabled, the code information of {$lang->productCommon}, {$lang->projectCommon}, and execution in the system will be displayed in the creation, editing, detail, and list pages.";
+$lang->custom->notice->readOnlyOfPercent   = "The \"Workload Ratio\" is used to divide the workload of a {$lang->projectCommon} into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the \"Workload Ratio\", users have to fill in the ratio fields when setting up the stages in the Waterfall {$lang->projectCommon} and Waterfall Plus {$lang->projectCommon} management models.";
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ possède une page d'accueil. Voulez-vous consulter la page d'accueil du produit ?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ possède une page d'accueil. Voulez-vous consulter la page d'accueil du produit ?";
@@ -247,7 +247,7 @@ $lang->custom->useLight          = 'Use Light Mode';
 $lang->custom->useALM            = 'Use ALM Mode';
 $lang->custom->currentModeTips   = 'You are currently using %s, you can switch to the %s.';
 $lang->custom->changeModeTips    = 'Please double confirm to switch to %s Mode.';
-$lang->custom->selectProgramTips = 'After switching to the Light Mode, in order to ensure the consistency of the data structure, you need to select a program as the default program, and subsequent new product and project data are associated with this default program.';
+$lang->custom->selectProgramTips = "After switching to the Light Mode, in order to ensure the consistency of the data structure, you need to select a program as the default program, and subsequent new {$lang->productCommon} and {$lang->projectCommon} data are associated with this default program.";
 
 $lang->custom->modeList['light'] = 'Light Mode';
 $lang->custom->modeList['ALM']   = 'ALM Mode';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index c6cf74ef8f..6e6d54e7fd 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -69,10 +69,10 @@ $lang->custom->unitList['hours']      = '小时';
 $lang->custom->unitList['days']       = '天';
 $lang->custom->unitList['loc']        = 'KLOC';
 
-$lang->custom->tipProgressList['SPI'] = '项目进度绩效(SPI)';
+$lang->custom->tipProgressList['SPI'] = "{$lang->projectCommon}进度绩效(SPI)";
 $lang->custom->tipProgressList['SV']  = '进度偏差率(SV%)';
 
-$lang->custom->tipCostList['CPI'] = '项目成本绩效(CPI)';
+$lang->custom->tipCostList['CPI'] = "{$lang->projectCommon}成本绩效(CPI)";
 $lang->custom->tipCostList['CV']  = '成本偏差率(CV%)';
 
 $lang->custom->tipRangeList[0]  = '否';
@@ -200,8 +200,8 @@ $lang->custom->notice->confirmReviewCase   = '是否将待评审的用例修改
 $lang->custom->notice->storyReviewTip      = '按人员、职位、部门勾选后，取所有人员的并集。';
 $lang->custom->notice->selectAllTip        = '勾选所有人员后，会清空并置灰评审人员，同时隐藏职位、部门。';
 $lang->custom->notice->repeatKey           = '%s键重复';
-$lang->custom->notice->readOnlyOfCode      = '代号是一种管理话术，主要便于保密或作为别名存在。启用代号管理后，系统中的产品、项目、执行在创建、编辑、详情、列表等页面均会展示代号信息。';
-$lang->custom->notice->readOnlyOfPercent   = '工作量占比用于划分项目中存在多个阶段时的工作量的占比，同一级阶段的百分比之和最高为100%。启用工作量占比后，系统中的瀑布项目和融合瀑布项目模型中设置阶段时需要维护阶段的工作量占比。';
+$lang->custom->notice->readOnlyOfCode      = "代号是一种管理话术，主要便于保密或作为别名存在。启用代号管理后，系统中的{$lang->productCommon}、{$lang->projectCommon}、执行在创建、编辑、详情、列表等页面均会展示代号信息。";
+$lang->custom->notice->readOnlyOfPercent   = "工作量占比用于划分{$lang->projectCommon}中存在多个阶段时的工作量的占比，同一级阶段的百分比之和最高为100%。启用工作量占比后，系统中的瀑布{$lang->projectCommon}和融合瀑布{$lang->projectCommon}模型中设置阶段时需要维护阶段的工作量占比。";
 
 $lang->custom->notice->indexPage['product'] = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
 $lang->custom->notice->indexPage['project'] = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
@@ -247,23 +247,23 @@ $lang->custom->useLight          = '使用轻量管理模式';
 $lang->custom->useALM            = '使用全生命周期管理模式';
 $lang->custom->currentModeTips   = '您当前使用的是%s, 您可以切换到%s';
 $lang->custom->changeModeTips    = '您确定要切换到%s吗？';
-$lang->custom->selectProgramTips = '切换到轻量管理模式后，为确保数据结构一致，需要选择一个项目集作为默认项目集，后续新增的产品和项目数据都关联在这个默认的项目集下。';
+$lang->custom->selectProgramTips = "切换到轻量管理模式后，为确保数据结构一致，需要选择一个项目集作为默认项目集，后续新增的{$lang->productCommon}和{$lang->projectCommon}数据都关联在这个默认的项目集下。";
 
 $lang->custom->modeList['light'] = '轻量级管理模式';
 $lang->custom->modeList['ALM']   = '全生命周期管理模式';
 
-$lang->custom->modeIntroductionList['light'] = '提供了项目管理的核心功能，适用于小型研发团队';
+$lang->custom->modeIntroductionList["light"] = "提供了{$lang->projectCommon}管理的核心功能，适用于小型研发团队";
 $lang->custom->modeIntroductionList['ALM']   = '概念更加完整、严谨，功能更加丰富，适用于中大型研发团队';
 
 $lang->custom->features['program']              = '项目集';
-$lang->custom->features['productRR']            = '产品-研发需求';
-$lang->custom->features['productUR']            = '产品-用户需求';
-$lang->custom->features['productLine']          = '产品-产品线';
-$lang->custom->features['projectScrum']         = '项目-敏捷模型';
-$lang->custom->features['projectWaterfall']     = '项目-瀑布模型';
-$lang->custom->features['projectKanban']        = '项目-看板模型';
-$lang->custom->features['projectAgileplus']     = '项目-融合敏捷模型';
-$lang->custom->features['projectWaterfallplus'] = '项目-融合瀑布模型';
+$lang->custom->features["productRR"]            = "{$lang->productCommon}-研发需求";
+$lang->custom->features["productUR"]            = "{$lang->productCommon}-用户需求";
+$lang->custom->features["productLine"]          = "{$lang->productCommon}-{$lang->productCommon}线";
+$lang->custom->features["projectScrum"]         = "{$lang->projectCommon}-敏捷模型";
+$lang->custom->features["projectWaterfall"]     = "{$lang->projectCommon}-瀑布模型";
+$lang->custom->features["projectKanban"]        = "{$lang->projectCommon}-看板模型";
+$lang->custom->features["projectAgileplus"]     = "{$lang->projectCommon}-融合敏捷模型";
+$lang->custom->features["projectWaterfallplus"] = "{$lang->projectCommon}-融合瀑布模型";
 $lang->custom->features['execution']            = '执行';
 $lang->custom->features['qa']                   = '测试';
 $lang->custom->features['devops']               = 'DevOps';
@@ -280,8 +280,8 @@ $lang->custom->features['workflow']             = '工作流';
 $lang->custom->features['admin']                = '后台';
 $lang->custom->features['vision']               = '研发综合界面、运营管理界面';
 
-$lang->custom->needClosedFunctions['waterfall']     = '瀑布项目';
-$lang->custom->needClosedFunctions['waterfallplus'] = '融合瀑布项目';
+$lang->custom->needClosedFunctions["waterfall"]     = "瀑布{$lang->projectCommon}";
+$lang->custom->needClosedFunctions["waterfallplus"] = "融合瀑布{$lang->projectCommon}";
 $lang->custom->needClosedFunctions['URStory']       = '用户需求';
 if($config->edition == 'max') $lang->custom->needClosedFunctions['assetLib'] = '资产库';
 

From d650f561160fc88e401380e4c9847f2b40bb80ee Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Mar 2023 08:49:47 +0800
Subject: [PATCH 278/319] * Restore code.

---
 module/execution/lang/de.php            | 4 ----
 module/execution/lang/en.php            | 4 ----
 module/execution/lang/fr.php            | 4 ----
 module/execution/lang/zh-cn.php         | 4 ----
 module/execution/view/testtask.html.php | 4 +---
 module/testreport/lang/de.php           | 2 --
 module/testreport/lang/en.php           | 2 --
 module/testreport/lang/fr.php           | 2 --
 module/testreport/lang/zh-cn.php        | 2 --
 module/testreport/view/browse.html.php  | 4 +---
 10 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index d7d33bb011..855f728f20 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -554,10 +554,6 @@ $lang->execution->featureBar['story']['reviewing'] = 'Reviewing';
 
 $lang->execution->featureBar['testcase']['all'] = 'All';
 
-$lang->execution->featureBar['testtask']['browse'] = 'Test Request';
-
-$lang->execution->featureBar['testreport']['browse'] = 'Testing Reports';
-
 $lang->execution->myExecutions = 'Ich bin beteiligt.';
 $lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index a83b1fd492..59c16443cc 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -554,10 +554,6 @@ $lang->execution->featureBar['story']['reviewing'] = 'Reviewing';
 
 $lang->execution->featureBar['testcase']['all'] = 'All';
 
-$lang->execution->featureBar['testtask']['browse'] = 'Test Request';
-
-$lang->execution->featureBar['testreport']['browse'] = 'Testing Reports';
-
 $lang->execution->myExecutions = 'Mine';
 $lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 996c1dd684..36b1363946 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -554,10 +554,6 @@ $lang->execution->featureBar['story']['reviewing'] = 'Reviewing';
 
 $lang->execution->featureBar['testcase']['all'] = 'All';
 
-$lang->execution->featureBar['testtask']['browse'] = 'Test Request';
-
-$lang->execution->featureBar['testreport']['browse'] = 'Testing Reports';
-
 $lang->execution->myExecutions = "J'étais impliqué";
 $lang->execution->doingProject = "Ongoing {$lang->projectCommon}s";
 
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index cc83363168..8895df1d31 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -554,10 +554,6 @@ $lang->execution->featureBar['story']['reviewing'] = '评审中';
 
 $lang->execution->featureBar['testcase']['all'] = '全部';
 
-$lang->execution->featureBar['testtask']['browse'] = '测试单列表';
-
-$lang->execution->featureBar['testreport']['browse'] = '报告列表';
-
 $lang->execution->myExecutions = '我参与的';
 $lang->execution->doingProject = "进行中的{$lang->projectCommon}";
 
diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php
index 4a94974021..58e4978310 100644
--- a/module/execution/view/testtask.html.php
+++ b/module/execution/view/testtask.html.php
@@ -26,12 +26,10 @@
     <?php endif;?>
     <?php $total = 0;?>
     <?php foreach($tasks as $productTasks) $total += count($productTasks);?>
-    <?php foreach($this->lang->execution->featureBar['testtask'] as $label):?>
     <a href='' class='btn btn-link btn-active-text'>
-      <span class='text'><?php echo $label;?></span>
+      <span class='text'><?php echo $lang->testtask->browse;?></span>
       <span class="label label-light label-badge"><?php echo $total;?></span>
     </a>
-    <?php endforeach;?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('execution', $execution)):?>
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index ce321fba03..9b19536d85 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -94,5 +94,3 @@ Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-war
 <strong>%s</strong> Bugs found from the running of cases<a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
 Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs-reported-from-cases rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
-
-$lang->testreport->featureBar['browse']['browse'] = 'Testing Reports';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index 87c53a4aff..23e0374c4a 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -94,5 +94,3 @@ Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-war
 <strong>%s</strong> Bugs found from the running of cases<a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
 Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs-reported-from-cases rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
-
-$lang->testreport->featureBar['browse']['browse'] = 'Testing Reports';
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index fb49e49d2b..080ad01334 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -94,5 +94,3 @@ Total <strong>%s</strong> Bugs reported <a data-toggle='tooltip' class='text-war
 <strong>%s</strong> Bugs found from the running of cases<a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>.
 Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='Resolution is resolved or delayed / status is resolved or closed'><i class='icon-help'></i></a>: <strong>%s</strong>，Bugs-reported-from-cases rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-help'></i></a>: <strong>%s</strong>
 EOD;
-
-$lang->testreport->featureBar['browse']['browse'] = 'Testing Reports';
diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 3e74246e91..08f0fb63ca 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -94,5 +94,3 @@ $lang->testreport->bugSummary = <<<EOD
 用例执行产生<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-help'></i></a>。
 有效Bug率（方案为已解决或延期 / 状态为已解决或已关闭）：<strong>%s</strong>，用例发现Bug率（用例创建的Bug / 发现Bug数）：<strong>%s</strong>
 EOD;
-
-$lang->testreport->featureBar['browse']['browse'] = '报告列表';
diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php
index d553ae28e6..91e5d1238e 100644
--- a/module/testreport/view/browse.html.php
+++ b/module/testreport/view/browse.html.php
@@ -14,12 +14,10 @@
 <?php if($config->global->flow == 'full'):?>
 <div id='mainMenu' class='clearfix'>
   <div class='pull-left btn-toolbar'>
-    <?php foreach($this->lang->{$app->rawModule}->featureBar[$app->rawMethod] as $label):?>
     <span class='btn btn-link btn-active-text'>
-      <span class='text'><?php echo $label;?></span>
+      <span class='text'><?php echo $lang->testreport->browse;?></span>
       <span class="label label-light label-badge"><?php echo $pager->recTotal;?></span>
     </span>
-    <?php endforeach;?>
   </div>
   <div class='pull-right btn-toolbar'>
     <?php if($objectType == 'product' and $canBeChanged) common::printLink('testreport', 'create', "objectID=0&objectType=testtask&productID=$objectID", "<i class='icon icon-plus'></i> " . $lang->testreport->create, '', "class='btn btn-primary'");?>

From 4ac15934cd454522f3b0aea8ddd9f3397f651111 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Mar 2023 08:53:44 +0800
Subject: [PATCH 279/319] * Modify language items for project common.

---
 module/action/lang/de.php    | 14 +++++-----
 module/action/lang/en.php    | 14 +++++-----
 module/action/lang/fr.php    | 14 +++++-----
 module/action/lang/zh-cn.php | 50 ++++++++++++++++++------------------
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index e68cd357ef..7c0204e1b9 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -56,7 +56,7 @@ $lang->action->needEdit           = '%s existiert bereits. Bitte bearbeiten.';
 $lang->action->historyEdit        = 'Der Verlauf darf nicht leer sein.';
 $lang->action->noDynamic          = 'Kein Verlauf. ';
 $lang->action->undeletedTips      = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
-$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
 $lang->action->repoNoServer       = 'The repo does not belong to a server,please restore the server first';
 $lang->action->hasCreatedTask     = 'Tasks have been created in this parent phase and cannot be restored!';
 $lang->action->hasDeletedParent   = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
@@ -208,8 +208,8 @@ $lang->action->desc->managed              = '$date, by <strong>$actor</strong> m
 $lang->action->desc->estimated            = '$date, by <strong>$actor</strong> estimated.' . "\n";
 $lang->action->desc->run                  = '$date, by <strong>$actor</strong> executed.' . "\n";
 $lang->action->desc->syncprogram          = '$date, started by <strong>$actor</strong>(starting the project sets the program status as Ongoing).' . "\n";
-$lang->action->desc->syncproject          = '$date, starting the execution sets the project status as Ongoing.' . "\n";
-$lang->action->desc->syncmultipleproject  = '$date, starting the task sets the project status as Ongoing.' . "\n";
+$lang->action->desc->syncproject          = '$date, starting the execution sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n";
+$lang->action->desc->syncmultipleproject  = '$date, starting the task sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n";
 $lang->action->desc->syncexecution        = '$date, starting the task sets the execution status as Ongoing.' . "\n";
 $lang->action->desc->syncexecutionbychild = '$date, starting the sub stage sets the execution status as Ongoing.' . "\n";
 $lang->action->desc->importfromgitlab     = '$date, Issue associate created from gitlab by <strong>$actor</strong>.' . "\n";
@@ -313,8 +313,8 @@ $lang->action->label->marked                = 'marked';
 $lang->action->label->linked2execution      = "Link {$lang->executionCommon}";
 $lang->action->label->unlinkedfromexecution = "Unlink {$lang->executionCommon}";
 $lang->action->label->linked2kanban         = 'linked to kanban';
-$lang->action->label->linked2project        = "Link Project";
-$lang->action->label->unlinkedfromproject   = "Unlink Project";
+$lang->action->label->linked2project        = "linked to {$lang->projectCommon}";
+$lang->action->label->unlinkedfromproject   = "unlinked from {$lang->projectCommon}";
 $lang->action->label->unlinkedfrombuild     = "Unlink Build";
 $lang->action->label->linked2release        = "Link Release";
 $lang->action->label->unlinkedfromrelease   = "Unlink Release";
@@ -911,8 +911,8 @@ $lang->action->apiTitle->marked                = 'Marked';
 $lang->action->apiTitle->linked2execution      = "Linked to {$lang->executionCommon}";
 $lang->action->apiTitle->unlinkedfromexecution = "Unlinked from {$lang->executionCommon}";
 $lang->action->apiTitle->linked2kanban         = 'Linked to Kanban';
-$lang->action->apiTitle->linked2project        = "Linked to project";
-$lang->action->apiTitle->unlinkedfromproject   = "Unlinked from project";
+$lang->action->apiTitle->linked2project        = "Linked to {$lang->projectCommon}";
+$lang->action->apiTitle->unlinkedfromproject   = "Unlinked from {$lang->projectCommon}";
 $lang->action->apiTitle->unlinkedfrombuild     = "Unlinked from build";
 $lang->action->apiTitle->linked2release        = "Linked to release";
 $lang->action->apiTitle->unlinkedfromrelease   = "Unlinked from release";
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 8a272d697e..6b767aa920 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -56,7 +56,7 @@ $lang->action->needEdit           = '%s that you want to restore. Please edit it
 $lang->action->historyEdit        = 'The history EditBy cannot be empty.';
 $lang->action->noDynamic          = 'No dynamics. ';
 $lang->action->undeletedTips      = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
-$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
 $lang->action->repoNoServer       = 'The repo does not belong to a server,please restore the server first';
 $lang->action->hasCreatedTask     = 'Tasks have been created in this parent phase and cannot be restored!';
 $lang->action->hasDeletedParent   = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
@@ -208,8 +208,8 @@ $lang->action->desc->managed              = '$date, by <strong>$actor</strong> m
 $lang->action->desc->estimated            = '$date, by <strong>$actor</strong> estimated.' . "\n";
 $lang->action->desc->run                  = '$date, by <strong>$actor</strong> executed.' . "\n";
 $lang->action->desc->syncprogram          = '$date, started by <strong>$actor</strong>(starting the project sets the program status as Ongoing).' . "\n";
-$lang->action->desc->syncproject          = '$date, starting the execution sets the project status as Ongoing.' . "\n";
-$lang->action->desc->syncmultipleproject  = '$date, starting the task sets the project status as Ongoing.' . "\n";
+$lang->action->desc->syncproject          = '$date, starting the execution sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n";
+$lang->action->desc->syncmultipleproject  = '$date, starting the task sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n";
 $lang->action->desc->syncexecution        = '$date, starting the task sets the execution status as Ongoing.' . "\n";
 $lang->action->desc->syncexecutionbychild = '$date, starting the sub stage sets the execution status as Ongoing.' . "\n";
 $lang->action->desc->importfromgitlab     = '$date, Issue associate created from gitlab by <strong>$actor</strong>.' . "\n";
@@ -313,8 +313,8 @@ $lang->action->label->marked                = 'marked';
 $lang->action->label->linked2execution      = "linked to {$lang->executionCommon}";
 $lang->action->label->unlinkedfromexecution = "unlinked from {$lang->executionCommon}";
 $lang->action->label->linked2kanban         = 'linked to kanban';
-$lang->action->label->linked2project        = "linked to project";
-$lang->action->label->unlinkedfromproject   = "unlinked from project";
+$lang->action->label->linked2project        = "linked to {$lang->projectCommon}";
+$lang->action->label->unlinkedfromproject   = "unlinked from {$lang->projectCommon}";
 $lang->action->label->unlinkedfrombuild     = "unlinked Build ";
 $lang->action->label->linked2release        = "linked Release ";
 $lang->action->label->unlinkedfromrelease   = "unlinked Release ";
@@ -911,8 +911,8 @@ $lang->action->apiTitle->marked                = 'Marked';
 $lang->action->apiTitle->linked2execution      = "Linked to {$lang->executionCommon}";
 $lang->action->apiTitle->unlinkedfromexecution = "Unlinked from {$lang->executionCommon}";
 $lang->action->apiTitle->linked2kanban         = 'Linked to Kanban';
-$lang->action->apiTitle->linked2project        = "Linked to project";
-$lang->action->apiTitle->unlinkedfromproject   = "Unlinked from project";
+$lang->action->apiTitle->linked2project        = "Linked to {$lang->projectCommon}";
+$lang->action->apiTitle->unlinkedfromproject   = "Unlinked from {$lang->projectCommon}";
 $lang->action->apiTitle->unlinkedfrombuild     = "Unlinked from build";
 $lang->action->apiTitle->linked2release        = "Linked to release";
 $lang->action->apiTitle->unlinkedfromrelease   = "Unlinked from release";
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 2dac56f632..ec675417be 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -56,7 +56,7 @@ $lang->action->needEdit           = '%s que vous voulez restaurer. SVP éditez l
 $lang->action->historyEdit        = "l'historique Edité Par ne peut pas être vide.";
 $lang->action->noDynamic          = "Pas d'historique.";
 $lang->action->undeletedTips      = 'This data did not participate in the merging process during the version upgrade process, so restore is not supported.';
-$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
 $lang->action->repoNoServer       = 'The repo does not belong to a server,please restore the server first';
 $lang->action->hasCreatedTask     = 'Tasks have been created in this parent phase and cannot be restored!';
 $lang->action->hasDeletedParent   = 'Restoring this phase requires restoring the deleted parent phase %s at the same time.';
@@ -208,8 +208,8 @@ $lang->action->desc->managed              = '$date, by <strong>$actor</strong> m
 $lang->action->desc->estimated            = '$date, by <strong>$actor</strong> estimated.' . "\n";
 $lang->action->desc->run                  = '$date, by <strong>$actor</strong> executed.' . "\n";
 $lang->action->desc->syncprogram          = '$date, started by <strong>$actor</strong>(starting the project sets the program status as Ongoing).' . "\n";
-$lang->action->desc->syncproject          = '$date, starting the execution sets the project status as Ongoing.' . "\n";
-$lang->action->desc->syncmultipleproject  = '$date, starting the task sets the project status as Ongoing.' . "\n";
+$lang->action->desc->syncproject          = '$date, starting the execution sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n";
+$lang->action->desc->syncmultipleproject  = '$date, starting the task sets the ' . $lang->projectCommon . ' status as Ongoing.' . "\n";
 $lang->action->desc->syncexecution        = '$date, starting the task sets the execution status as Ongoing.' . "\n";
 $lang->action->desc->syncexecutionbychild = '$date, starting the sub stage sets the execution status as Ongoing.' . "\n";
 $lang->action->desc->importfromgitlab     = '$date, Issue associate created from gitlab by <strong>$actor</strong>.' . "\n";
@@ -313,8 +313,8 @@ $lang->action->label->marked                = 'a marqué';
 $lang->action->label->linked2execution      = "a ajouté à {$lang->executionCommon}";
 $lang->action->label->unlinkedfromexecution = "a enlevé de {$lang->executionCommon}";
 $lang->action->label->linked2kanban         = 'linked to kanban';
-$lang->action->label->linked2project        = "Link Project";
-$lang->action->label->unlinkedfromproject   = "Unlink Project";
+$lang->action->label->linked2project        = "linked to {$lang->projectCommon}";
+$lang->action->label->unlinkedfromproject   = "unlinked from {$lang->projectCommon}";
 $lang->action->label->unlinkedfrombuild     = "a enlevé du Build ";
 $lang->action->label->linked2release        = "a ajouté à une Release ";
 $lang->action->label->unlinkedfromrelease   = "a enlevé de la Release ";
@@ -911,8 +911,8 @@ $lang->action->apiTitle->marked                = 'Marked';
 $lang->action->apiTitle->linked2execution      = "Linked to {$lang->executionCommon}";
 $lang->action->apiTitle->unlinkedfromexecution = "Unlinked from {$lang->executionCommon}";
 $lang->action->apiTitle->linked2kanban         = 'Linked to Kanban';
-$lang->action->apiTitle->linked2project        = "Linked to project";
-$lang->action->apiTitle->unlinkedfromproject   = "Unlinked from project";
+$lang->action->apiTitle->linked2project        = "Linked to {$lang->projectCommon}";
+$lang->action->apiTitle->unlinkedfromproject   = "Unlinked from {$lang->projectCommon}";
 $lang->action->apiTitle->unlinkedfrombuild     = "Unlinked from build";
 $lang->action->apiTitle->linked2release        = "Linked to release";
 $lang->action->apiTitle->unlinkedfromrelease   = "Unlinked from release";
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index a10c166bba..cda9c316ed 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -14,7 +14,7 @@ global $config;
 $lang->action->common        = '系统日志';
 $lang->action->id            = '编号';
 $lang->action->product       = $lang->productCommon;
-$lang->action->project       = '项目';
+$lang->action->project       = $lang->projectCommon;
 $lang->action->execution     = $lang->execution->common;
 $lang->action->objectType    = '对象类型';
 $lang->action->objectID      = '对象ID';
@@ -56,7 +56,7 @@ $lang->action->needEdit           = '要还原%s的名称或代号已经存在
 $lang->action->historyEdit        = '历史记录编辑不能为空。';
 $lang->action->noDynamic          = '暂时没有动态。';
 $lang->action->undeletedTips      = '该数据在版本升级过程中未参与数据归并流程，不支持还原。';
-$lang->action->executionNoProject = '该执行没有所属的项目，请先还原项目再还原执行';
+$lang->action->executionNoProject = "该执行没有所属的{$lang->projectCommon}，请先还原{$lang->projectCommon}再还原执行";
 $lang->action->repoNoServer       = '该代码库没有所属的服务器，请先还原服务器再还原代码库';
 $lang->action->hasCreatedTask     = '该父阶段已创建任务，无法恢复！';
 $lang->action->hasDeletedParent   = '恢复该阶段需要同时恢复已删除的父阶段%s，';
@@ -99,7 +99,7 @@ $lang->action->objectTypes['design']           = '设计';
 $lang->action->objectTypes['productplan']      = '计划';
 $lang->action->objectTypes['release']          = '发布';
 $lang->action->objectTypes['program']          = '项目集';
-$lang->action->objectTypes['project']          = '项目';
+$lang->action->objectTypes['project']          = $lang->projectCommon;
 $lang->action->objectTypes['execution']        = '执行';
 $lang->action->objectTypes['task']             = '任务';
 $lang->action->objectTypes['build']            = '版本';
@@ -207,9 +207,9 @@ $lang->action->desc->resolved             = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->managed              = '$date, 由 <strong>$actor</strong> 维护。' . "\n";
 $lang->action->desc->estimated            = '$date, 由 <strong>$actor</strong> 估算。' . "\n";
 $lang->action->desc->run                  = '$date, 由 <strong>$actor</strong> 执行。' . "\n";
-$lang->action->desc->syncprogram          = '$date, 由 <strong>$actor</strong> 启动(因项目开始而启动项目集)。' . "\n";
-$lang->action->desc->syncproject          = '$date, 系统判断由于' . $lang->executionCommon .'开始，将项目状态置为进行中。' . "\n";
-$lang->action->desc->syncmultipleproject  = '$date, 系统判断由于任务开始，将项目状态置为进行中。' . "\n";
+$lang->action->desc->syncprogram          = '$date, 由 <strong>$actor</strong> 启动(因' . $lang->projectCommon . '开始而启动项目集)。' . "\n";
+$lang->action->desc->syncproject          = '$date, 系统判断由于' . $lang->executionCommon .'开始，将' . $lang->projectCommon . '状态置为进行中。' . "\n";
+$lang->action->desc->syncmultipleproject  = '$date, 系统判断由于任务开始，将' . $lang->projectCommon . '状态置为进行中。' . "\n";
 $lang->action->desc->syncexecution        = '$date, 系统判断由于任务开始，将' . $lang->executionCommon . '状态置为进行中。' . "\n";
 $lang->action->desc->syncexecutionbychild = '$date, 系统判断由于子阶段开始，将' . $lang->executionCommon . '状态置为进行中。' . "\n";
 $lang->action->desc->importfromgitlab     = '$date, 由 <strong>$actor</strong> 从Gitlab的Issue关联创建。' . "\n";
@@ -218,8 +218,8 @@ $lang->action->desc->restore              = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->importedcard         = '$date, 由 <strong>$actor</strong> 从看板 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->importedproductplan  = '$date, 由 <strong>$actor</strong> 从' . $lang->productCommon . '计划 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->importedrelease      = '$date, 由 <strong>$actor</strong> 从' . $lang->productCommon . '发布 <strong>$extra</strong> 导入。' . "\n";
-$lang->action->desc->importedexecution    = '$date, 由 <strong>$actor</strong> 从项目执行 <strong>$extra</strong> 导入。' . "\n";
-$lang->action->desc->importedbuild        = '$date, 由 <strong>$actor</strong> 从项目版本 <strong>$extra</strong> 导入。' . "\n";
+$lang->action->desc->importedexecution    = '$date, 由 <strong>$actor</strong> 从' . $lang->projectCommon . '执行 <strong>$extra</strong> 导入。' . "\n";
+$lang->action->desc->importedbuild        = '$date, 由 <strong>$actor</strong> 从' . $lang->projectCommon . '版本 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->importedticket       = '$date, 由 <strong>$actor</strong> 从反馈工单 <strong>$extra</strong> 导入。' . "\n";
 $lang->action->desc->fromsonarqube        = '$date, 由 <strong>$actor</strong> 从<strong>SonarQube问题</strong>转化而来。' . "\n";
 $lang->action->desc->tolib                = '$date, 由 <strong>$actor</strong> 导入。' . "\n";
@@ -235,7 +235,7 @@ $lang->action->desc->reboot               = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->destroy              = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
 $lang->action->desc->boot                 = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
 $lang->action->desc->relieved             = '$date, 由 <strong>$actor</strong> 解除孪生需求关系。' . "\n";
-$lang->action->desc->switchtolight        = '$date, 由于 <strong>'. $lang->admin->system .'</strong> 从全生命周期管理模式切换为轻量管理模式，项目访问控制由项目集内公开调整为私有。' . "\n";
+$lang->action->desc->switchtolight        = '$date, 由于 <strong>'. $lang->admin->system .'</strong> 从全生命周期管理模式切换为轻量管理模式，' . $lang->projectCommon . '访问控制由项目集内公开调整为私有。' . "\n";
 $lang->action->desc->getvnc               = '$date, <strong>$actor</strong>对执行节点 <strong>$extra</strong> 进行了远程操控。' . "\n";
 $lang->action->desc->unlinkproduct        = '$date, 系统判断由于' . $lang->executionCommon . '所属' . $lang->projectCommon . '与$extra取消关联，同步将' . $lang->executionCommon . '与$extra取消关联。' . "\n";
 $lang->action->desc->createdsnapshot      = '$date, <strong>$actor</strong> 创建了快照 <strong>$extra</strong>。' . "\n";
@@ -313,8 +313,8 @@ $lang->action->label->marked                = '编辑了';
 $lang->action->label->linked2execution      = "关联了{$lang->executionCommon}";
 $lang->action->label->unlinkedfromexecution = "移除了{$lang->executionCommon}";
 $lang->action->label->linked2kanban         = '关联了看板';
-$lang->action->label->linked2project        = "关联了项目";
-$lang->action->label->unlinkedfromproject   = "移除了项目";
+$lang->action->label->linked2project        = "关联了{$lang->projectCommon}";
+$lang->action->label->unlinkedfromproject   = "移除了{$lang->projectCommon}";
 $lang->action->label->unlinkedfrombuild     = "移除了版本";
 $lang->action->label->linked2release        = "关联了发布";
 $lang->action->label->unlinkedfromrelease   = "移除了发布";
@@ -376,7 +376,7 @@ $lang->action->label->syncprogram           = '开始了';
 $lang->action->label->syncproject           = '开始了';
 $lang->action->label->syncexecution         = '开始了';
 $lang->action->label->syncexecutionbychild  = '开始了';
-$lang->action->label->startProgram          = '（因项目开始而启动项目集）';
+$lang->action->label->startProgram          = "（因{$lang->projectCommon}开始而启动项目集）";
 $lang->action->label->createmr              = '合并请求关联了';
 $lang->action->label->deletemr              = '合并请求取消了';
 $lang->action->label->mergedmr              = '合并请求合并了';
@@ -422,7 +422,7 @@ $lang->action->label->synctwins             = '同步修改了';
 $lang->action->label->relieved              = '解除了';
 $lang->action->label->switchtolight         = '从全生命周期管理模式切换为轻量管理模式';
 $lang->action->label->linkedrepo            = '关联代码库到';
-$lang->action->label->unlinkedrepo          = '取消了项目与代码库的关联';
+$lang->action->label->unlinkedrepo          = "取消了{$lang->projectCommon}与代码库的关联";
 $lang->action->label->unlinkproduct         = "取消了与{$lang->productCommon}的关联";
 $lang->action->label->createdsnapshot       = '创建了快照';
 $lang->action->label->restoredsnapshot      = '还原了快照';
@@ -447,12 +447,12 @@ $lang->action->dynamicAction->program['activated'] = '激活项目集';
 $lang->action->dynamicAction->program['deleted']   = '删除项目集';
 $lang->action->dynamicAction->program['closed']    = '关闭项目集';
 
-$lang->action->dynamicAction->project['opened']        = '创建项目';
-$lang->action->dynamicAction->project['edited']        = '编辑项目';
-$lang->action->dynamicAction->project['started']       = '开始项目';
-$lang->action->dynamicAction->project['suspended']     = '延期项目';
-$lang->action->dynamicAction->project['activated']     = '激活项目';
-$lang->action->dynamicAction->project['closed']        = '关闭项目';
+$lang->action->dynamicAction->project['opened']        = "创建{$lang->projectCommon}";
+$lang->action->dynamicAction->project['edited']        = "编辑{$lang->projectCommon}";
+$lang->action->dynamicAction->project['started']       = "开始{$lang->projectCommon}";
+$lang->action->dynamicAction->project['suspended']     = "延期{$lang->projectCommon}";
+$lang->action->dynamicAction->project['activated']     = "激活{$lang->projectCommon}";
+$lang->action->dynamicAction->project['closed']        = "关闭{$lang->projectCommon}";
 $lang->action->dynamicAction->project['switchtolight'] = '切换模式';
 
 $lang->action->dynamicAction->product['opened']    = '创建' . $lang->productCommon;
@@ -504,7 +504,7 @@ $lang->action->dynamicAction->story['linked2revision']       = "{$lang->SRCommon
 $lang->action->dynamicAction->story['unlinkedfromrevision']  = "{$lang->SRCommon}取消关联代码提交";
 $lang->action->dynamicAction->story['linked2build']          = "{$lang->SRCommon}关联版本";
 $lang->action->dynamicAction->story['unlinkedfrombuild']     = "版本移除{$lang->SRCommon}";
-$lang->action->dynamicAction->story['unlinkedfromproject']   = '移除项目';
+$lang->action->dynamicAction->story['unlinkedfromproject']   = "移除{$lang->projectCommon}";
 $lang->action->dynamicAction->story['undeleted']             = "还原{$lang->SRCommon}";
 $lang->action->dynamicAction->story['hidden']                = "隐藏{$lang->SRCommon}";
 $lang->action->dynamicAction->story['linked2execution']      = "关联$lang->SRCommon";
@@ -731,7 +731,7 @@ $lang->action->label->productplan = "计划|productplan|view|productID=%s";
 $lang->action->label->release     = '发布|release|view|productID=%s';
 $lang->action->label->story       = "{$lang->SRCommon}|story|view|storyID=%s";
 $lang->action->label->program     = "项目集|program|product|programID=%s";
-$lang->action->label->project     = "项目|project|index|projectID=%s";
+$lang->action->label->project     = "{$lang->projectCommon}|project|index|projectID=%s";
 $lang->action->label->execution   = "执行|execution|task|executionID=%s";
 
 $lang->action->label->task         = '任务|task|view|taskID=%s';
@@ -772,7 +772,7 @@ $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
 $lang->action->search->objectTypeList['product']     = $lang->productCommon;
 $lang->action->search->objectTypeList['program']     = '项目集';
-$lang->action->search->objectTypeList['project']     = '项目';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = '执行';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = '用例';
@@ -911,8 +911,8 @@ $lang->action->apiTitle->marked                = '编辑';
 $lang->action->apiTitle->linked2execution      = "关联{$lang->executionCommon}";
 $lang->action->apiTitle->unlinkedfromexecution = "移除{$lang->executionCommon}";
 $lang->action->apiTitle->linked2kanban         = '关联看板';
-$lang->action->apiTitle->linked2project        = "关联项目";
-$lang->action->apiTitle->unlinkedfromproject   = "移除项目";
+$lang->action->apiTitle->linked2project        = "关联{$lang->projectCommon}";
+$lang->action->apiTitle->unlinkedfromproject   = "移除{$lang->projectCommon}";
 $lang->action->apiTitle->unlinkedfrombuild     = "移除版本";
 $lang->action->apiTitle->linked2release        = "关联发布";
 $lang->action->apiTitle->unlinkedfromrelease   = "移除发布";
@@ -951,4 +951,4 @@ $lang->action->desc->mergedmr                     = '$date, 由 <strong>$actor</
 $lang->action->desc->approve                      = '$date, 由 <strong>$actor</strong> 审核通过。';
 $lang->action->desc->reject                       = '$date, 由 <strong>$actor</strong> 拒绝。';
 $lang->action->desc->linkedrepo                   = '$date, 由 <strong>$actor</strong> 关联代码库 $extra';
-$lang->action->desc->unlinkedrepo                 = '$date, 由 <strong>$actor</strong> 取消了项目与代码库 $extra 的关联';
+$lang->action->desc->unlinkedrepo                 = '$date, 由 <strong>$actor</strong> 取消了' . $lang->projectCommon . '与代码库 $extra 的关联';

From a67515ae02fc9fbf77a32154736cd7364a2beafa Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Mar 2023 09:21:58 +0800
Subject: [PATCH 280/319] * Modify language items for project common.

---
 module/action/lang/de.php | 22 +++++++++++-----------
 module/action/lang/en.php | 22 +++++++++++-----------
 module/action/lang/fr.php | 22 +++++++++++-----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 7c0204e1b9..9c78f6e716 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -14,7 +14,7 @@ global $config;
 $lang->action->common        = 'Log';
 $lang->action->id            = 'ID';
 $lang->action->product       = $lang->productCommon;
-$lang->action->project       = 'Project';
+$lang->action->project       = $lang->projectCommon;
 $lang->action->execution     = $lang->execution->common;
 $lang->action->objectType    = 'Object Type';
 $lang->action->objectID      = 'ID';
@@ -99,7 +99,7 @@ $lang->action->objectTypes['design']           = 'Design';
 $lang->action->objectTypes['productplan']      = 'Plan';
 $lang->action->objectTypes['release']          = 'Release';
 $lang->action->objectTypes['program']          = 'Program';
-$lang->action->objectTypes['project']          = 'Project';
+$lang->action->objectTypes['project']          = $lang->projectCommon;
 $lang->action->objectTypes['execution']        = $lang->executionCommon;
 $lang->action->objectTypes['task']             = 'Aufgabe';
 $lang->action->objectTypes['build']            = 'Build';
@@ -447,12 +447,12 @@ $lang->action->dynamicAction->program['activated'] = 'Activate Program';
 $lang->action->dynamicAction->program['deleted']   = 'Delete Program';
 $lang->action->dynamicAction->program['closed']    = 'Close Program';
 
-$lang->action->dynamicAction->project['opened']        = 'Create Project';
-$lang->action->dynamicAction->project['edited']        = 'Edit Project';
-$lang->action->dynamicAction->project['started']       = 'Start Project';
-$lang->action->dynamicAction->project['suspended']     = 'Suspend Project';
-$lang->action->dynamicAction->project['activated']     = 'Activate Project';
-$lang->action->dynamicAction->project['closed']        = 'Close Project';
+$lang->action->dynamicAction->project['opened']        = "Create {$lang->projectCommon}";
+$lang->action->dynamicAction->project['edited']        = "Edit {$lang->projectCommon}";
+$lang->action->dynamicAction->project['started']       = "Start {$lang->projectCommon}";
+$lang->action->dynamicAction->project['suspended']     = "Suspend {$lang->projectCommon}";
+$lang->action->dynamicAction->project['activated']     = "Activate {$lang->projectCommon}";
+$lang->action->dynamicAction->project['closed']        = "Close {$lang->projectCommon}";
 $lang->action->dynamicAction->project['switchtolight'] = 'Switch Mode';
 
 $lang->action->dynamicAction->product['opened']    = 'Create ' . $lang->productCommon;
@@ -504,7 +504,7 @@ $lang->action->dynamicAction->story['linked2revision']       = 'Link Story to Re
 $lang->action->dynamicAction->story['unlinkedfromrevision']  = 'Unlink Story from Revision';
 $lang->action->dynamicAction->story['linked2build']          = 'Link Story to Build';
 $lang->action->dynamicAction->story['unlinkedfrombuild']     = 'Unlink Story from Build';
-$lang->action->dynamicAction->story['unlinkedfromproject']   = 'Unlink Project';
+$lang->action->dynamicAction->story['unlinkedfromproject']   = "Unlink {$lang->projectCommon}";
 $lang->action->dynamicAction->story['undeleted']             = 'Restore Story';
 $lang->action->dynamicAction->story['hidden']                = 'Hide Story';
 $lang->action->dynamicAction->story['linked2execution']      = "Link Story";
@@ -731,7 +731,7 @@ $lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
 $lang->action->label->release     = 'Release|release|view|productID=%s';
 $lang->action->label->story       = 'Story|story|view|storyID=%s';
 $lang->action->label->program     = "Program|program|pgmproduct|programID=%s";
-$lang->action->label->project     = "Project|project|index|projectID=%s";
+$lang->action->label->project     = "{$lang->projectCommon}|project|index|projectID=%s";
 $lang->action->label->execution   = "Execution|execution|task|executionID=%s";
 
 $lang->action->label->task         = 'Aufgaben|task|view|taskID=%s';
@@ -772,7 +772,7 @@ $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
 $lang->action->search->objectTypeList['product']     = $lang->productCommon;
 $lang->action->search->objectTypeList['program']     = 'Program';
-$lang->action->search->objectTypeList['project']     = 'Project';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = 'Fälle';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 6b767aa920..11a1112438 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -14,7 +14,7 @@ global $config;
 $lang->action->common        = 'Log';
 $lang->action->id            = 'ID';
 $lang->action->product       = $lang->productCommon;
-$lang->action->project       = 'Project';
+$lang->action->project       = $lang->projectCommon;
 $lang->action->execution     = $lang->execution->common;
 $lang->action->objectType    = 'Object Type';
 $lang->action->objectID      = 'ID';
@@ -99,7 +99,7 @@ $lang->action->objectTypes['design']           = 'Design';
 $lang->action->objectTypes['productplan']      = 'Plan';
 $lang->action->objectTypes['release']          = 'Release';
 $lang->action->objectTypes['program']          = 'Program';
-$lang->action->objectTypes['project']          = 'Project';
+$lang->action->objectTypes['project']          = $lang->projectCommon;
 $lang->action->objectTypes['execution']        = $lang->executionCommon;
 $lang->action->objectTypes['task']             = 'Task';
 $lang->action->objectTypes['build']            = 'Build';
@@ -447,12 +447,12 @@ $lang->action->dynamicAction->program['activated'] = 'Activate Program';
 $lang->action->dynamicAction->program['deleted']   = 'Delete Program';
 $lang->action->dynamicAction->program['closed']    = 'Close Program';
 
-$lang->action->dynamicAction->project['opened']        = 'Create Project';
-$lang->action->dynamicAction->project['edited']        = 'Edit Project';
-$lang->action->dynamicAction->project['started']       = 'Start Project';
-$lang->action->dynamicAction->project['suspended']     = 'Suspend Project';
-$lang->action->dynamicAction->project['activated']     = 'Activate Project';
-$lang->action->dynamicAction->project['closed']        = 'Close Project';
+$lang->action->dynamicAction->project['opened']        = "Create {$lang->projectCommon}";
+$lang->action->dynamicAction->project['edited']        = "Edit {$lang->projectCommon}";
+$lang->action->dynamicAction->project['started']       = "Start {$lang->projectCommon}";
+$lang->action->dynamicAction->project['suspended']     = "Suspend {$lang->projectCommon}";
+$lang->action->dynamicAction->project['activated']     = "Activate {$lang->projectCommon}";
+$lang->action->dynamicAction->project['closed']        = "Close {$lang->projectCommon}";
 $lang->action->dynamicAction->project['switchtolight'] = 'Switch Mode';
 
 $lang->action->dynamicAction->product['opened']    = 'Create ' . $lang->productCommon;
@@ -504,7 +504,7 @@ $lang->action->dynamicAction->story['linked2revision']       = 'Link Story to Re
 $lang->action->dynamicAction->story['unlinkedfromrevision']  = 'Unlink Story from Revision';
 $lang->action->dynamicAction->story['linked2build']          = 'Link Story to Build';
 $lang->action->dynamicAction->story['unlinkedfrombuild']     = 'Unlink Story from Build';
-$lang->action->dynamicAction->story['unlinkedfromproject']   = 'Unlink Project';
+$lang->action->dynamicAction->story['unlinkedfromproject']   = "Unlink {$lang->projectCommon}";
 $lang->action->dynamicAction->story['undeleted']             = 'Restore Story';
 $lang->action->dynamicAction->story['hidden']                = 'Hide Story';
 $lang->action->dynamicAction->story['linked2execution']      = "Link Story";
@@ -731,7 +731,7 @@ $lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
 $lang->action->label->release     = 'Release|release|view|productID=%s';
 $lang->action->label->story       = 'Story|story|view|storyID=%s';
 $lang->action->label->program     = "Program|program|product|programID=%s";
-$lang->action->label->project     = "Project|project|index|projectID=%s";
+$lang->action->label->project     = "{$lang->projectCommon}|project|index|projectID=%s";
 $lang->action->label->execution   = "Execution|execution|task|executionID=%s";
 
 $lang->action->label->task         = 'Task|task|view|taskID=%s';
@@ -772,7 +772,7 @@ $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
 $lang->action->search->objectTypeList['product']     = $lang->productCommon;
 $lang->action->search->objectTypeList['program']     = 'Program';
-$lang->action->search->objectTypeList['project']     = 'Project';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = 'Case';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index ec675417be..9b83041321 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -14,7 +14,7 @@ global $config;
 $lang->action->common        = 'Log';
 $lang->action->id            = 'ID';
 $lang->action->product       = $lang->productCommon;
-$lang->action->project       = 'Project';
+$lang->action->project       = $lang->projectCommon;
 $lang->action->execution     = $lang->execution->common;
 $lang->action->objectType    = "Type d'objet";
 $lang->action->objectID      = 'ID';
@@ -99,7 +99,7 @@ $lang->action->objectTypes['design']           = 'Design';
 $lang->action->objectTypes['productplan']      = 'Plan';
 $lang->action->objectTypes['release']          = 'Release';
 $lang->action->objectTypes['program']          = 'Program';
-$lang->action->objectTypes['project']          = 'Project';
+$lang->action->objectTypes['project']          = $lang->projectCommon;
 $lang->action->objectTypes['execution']        = $lang->executionCommon;
 $lang->action->objectTypes['task']             = 'Tâche';
 $lang->action->objectTypes['build']            = 'Build';
@@ -447,12 +447,12 @@ $lang->action->dynamicAction->program['activated'] = 'Activate Program';
 $lang->action->dynamicAction->program['deleted']   = 'Delete Program';
 $lang->action->dynamicAction->program['closed']    = 'Close Program';
 
-$lang->action->dynamicAction->project['opened']        = 'Créer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['edited']        = 'Editer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['started']       = 'Commencer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['suspended']     = 'Suspendre ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['activated']     = 'Activer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['closed']        = 'Fermer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['opened']        = "Create {$lang->projectCommon}";
+$lang->action->dynamicAction->project['edited']        = "Edit {$lang->projectCommon}";
+$lang->action->dynamicAction->project['started']       = "Start {$lang->projectCommon}";
+$lang->action->dynamicAction->project['suspended']     = "Suspend {$lang->projectCommon}";
+$lang->action->dynamicAction->project['activated']     = "Activate {$lang->projectCommon}";
+$lang->action->dynamicAction->project['closed']        = "Close {$lang->projectCommon}";
 $lang->action->dynamicAction->project['switchtolight'] = 'Switch Mode';
 
 $lang->action->dynamicAction->product['opened']    = 'Créer ' . $lang->productCommon;
@@ -504,7 +504,7 @@ $lang->action->dynamicAction->story['linked2revision']       = 'Inclure Story à
 $lang->action->dynamicAction->story['unlinkedfromrevision']  = 'Unlink Story from Revision';
 $lang->action->dynamicAction->story['linked2build']          = 'Ajouter Story au Build';
 $lang->action->dynamicAction->story['unlinkedfrombuild']     = 'Détacher Story du Build';
-$lang->action->dynamicAction->story['unlinkedfromproject']   = 'Détacher du Project';
+$lang->action->dynamicAction->story['unlinkedfromproject']   = "Unlink {$lang->projectCommon}";
 $lang->action->dynamicAction->story['undeleted']             = 'Restaurer Story';
 $lang->action->dynamicAction->story['hidden']                = 'Masquer Story';
 $lang->action->dynamicAction->story['linked2execution']      = "Link Story";
@@ -731,7 +731,7 @@ $lang->action->label->productplan = 'Plan|productplan|view|productID=%s';
 $lang->action->label->release     = 'Release|release|view|productID=%s';
 $lang->action->label->story       = 'Story|story|view|storyID=%s';
 $lang->action->label->program     = "Program|program|pgmproduct|programID=%s";
-$lang->action->label->project     = "Project|program|index|projectID=%s";
+$lang->action->label->project     = "{$lang->projectCommon}|project|index|projectID=%s";
 $lang->action->label->execution   = "Execution|execution|task|executionID=%s";
 
 $lang->action->label->task         = 'Tâche|task|view|taskID=%s';
@@ -772,7 +772,7 @@ $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
 $lang->action->search->objectTypeList['product']     = $lang->productCommon;
 $lang->action->search->objectTypeList['program']     = 'Program';
-$lang->action->search->objectTypeList['project']     = 'Project';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = 'Execution';
 $lang->action->search->objectTypeList['bug']         = 'Bug';
 $lang->action->search->objectTypeList['case']        = 'CasTest';

From 6ac75ed33c1f3740bd340a763e7e3302692e066e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 09:31:31 +0800
Subject: [PATCH 281/319] * Modify project common lang.

---
 module/block/lang/de.php    | 72 ++++++++++++++++++-------------------
 module/block/lang/en.php    | 72 ++++++++++++++++++-------------------
 module/block/lang/fr.php    | 72 ++++++++++++++++++-------------------
 module/block/lang/zh-cn.php | 44 +++++++++++------------
 4 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 04422a62d9..e9e9ba99be 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -114,10 +114,10 @@ $lang->block->left            = 'Remain';
 $lang->block->titleList['flowchart']      = 'Flow Chart';
 $lang->block->titleList['guide']          = 'Guides';
 $lang->block->titleList['statistic']      = 'Statistic';
-$lang->block->titleList['recentproject']  = 'Recent Project';
+$lang->block->titleList['recentproject']  = "Recent {$lang->projectCommon}";
 $lang->block->titleList['assigntome']     = 'Assign to me';
-$lang->block->titleList['projectteam']    = 'Project manpower input';
-$lang->block->titleList['project']        = 'Project List';
+$lang->block->titleList['projectteam']    = "{$lang->projectCommon} manpower input";
+$lang->block->titleList['project']        = "{$lang->projectCommon} List";
 $lang->block->titleList['dynamic']        = 'Dynamic';
 $lang->block->titleList['list']           = 'Todo List';
 $lang->block->titleList['contribute']     = 'Contribute';
@@ -125,20 +125,20 @@ $lang->block->titleList['scrumoverview']  = 'Scrumoverview';
 $lang->block->titleList['scrumtest']      = 'Scrum Test';
 $lang->block->titleList['scrumlist']      = 'Scrum List';
 $lang->block->titleList['sprint']         = 'Sprint';
-$lang->block->titleList['projectdynamic'] = 'Project Dynamic';
+$lang->block->titleList['projectdynamic'] = "{$lang->projectCommon} Dynamic";
 $lang->block->titleList['bug']            = 'Bug';
 $lang->block->titleList['case']           = 'Case';
 $lang->block->titleList['testtask']       = 'Test Task';
 
 $lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = 'project';
+$lang->block->default['waterfall']['project']['3']['source'] = $lang->projectCommon;
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = 'project';
+$lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCommon;
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
@@ -288,9 +288,9 @@ $lang->block->default['full']['my']['4']['grid']            = 4;
 $lang->block->default['full']['my']['4']['source']          = 'todo';
 $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['5']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon} Statistic";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
-$lang->block->default['full']['my']['5']['source']          = 'project';
+$lang->block->default['full']['my']['5']['source']          = $lang->projectCommon;
 $lang->block->default['full']['my']['5']['grid']            = 8;
 $lang->block->default['full']['my']['5']['params']['count'] = '20';
 
@@ -299,9 +299,9 @@ $lang->block->default['full']['my']['6']['block']  = 'contribute';
 $lang->block->default['full']['my']['6']['source'] = '';
 $lang->block->default['full']['my']['6']['grid']   = 4;
 
-$lang->block->default['full']['my']['7']['title']  = 'Recent Project';
-$lang->block->default['full']['my']['7']['block']  = 'recentproject';
-$lang->block->default['full']['my']['7']['source'] = 'project';
+$lang->block->default['full']['my']['7']['title']  = "Recent {$lang->projectCommon}s";
+$lang->block->default['full']['my']['7']['block']  = "recent{$lang->projectCommon}";
+$lang->block->default['full']['my']['7']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['7']['grid']   = 8;
 
 $lang->block->default['full']['my']['8']['title']  = 'Todo';
@@ -321,12 +321,12 @@ $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
-$lang->block->default['full']['my']['9']['source'] = 'project';
+$lang->block->default['full']['my']['9']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
-$lang->block->default['full']['my']['10']['title']  = 'Project List';
-$lang->block->default['full']['my']['10']['block']  = 'project';
-$lang->block->default['full']['my']['10']['source'] = 'project';
+$lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon} List";
+$lang->block->default['full']['my']['10']['block']  = $lang->projectCommon;
+$lang->block->default['full']['my']['10']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['10']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -356,21 +356,21 @@ $lang->block->availableBlocks->feedback    = 'Feedbacks';
 $lang->block->availableBlocks->ticket      = 'Tickets';
 
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['project']   = 'Project';
+$lang->block->moduleList['project']   = $lang->projectCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'QA';
 $lang->block->moduleList['todo']      = 'Todos';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project       = 'Project List';
-$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Project';
-$lang->block->modules['project']->availableBlocks->statistic     = 'Project Statistic';
-$lang->block->modules['project']->availableBlocks->projectteam = 'Project Human Input';
+$lang->block->modules['project']->availableBlocks->project       = "{$lang->projectCommon} List";
+$lang->block->modules['project']->availableBlocks->recentproject = "Recent {$lang->projectCommon}";
+$lang->block->modules['project']->availableBlocks->statistic     = "{$lang->projectCommon} Statistic";
+$lang->block->modules['project']->availableBlocks->projectteam   = "{$lang->projectCommon} Manpower Input";
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = 'Project Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon} Overview";
 $lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
 $lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = 'Test Version';
@@ -423,10 +423,10 @@ $lang->block->orderByList->product['status_asc']  = 'Status Aufsteigend';
 $lang->block->orderByList->product['status_desc'] = 'Status Absteigend';
 
 $lang->block->orderByList->project = array();
-$lang->block->orderByList->project['id_asc']      = 'ID Aufsteigend';
-$lang->block->orderByList->project['id_desc']     = 'ID Absteigend';
-$lang->block->orderByList->project['status_asc']  = 'Status Aufsteigend';
-$lang->block->orderByList->project['status_desc'] = 'Status Absteigend';
+$lang->block->orderByList->project['id_asc']      = "{$lang->projectCommon} ID ASC";
+$lang->block->orderByList->project['id_desc']     = "{$lang->projectCommon} ID DESC";
+$lang->block->orderByList->project['status_asc']  = "{$lang->projectCommon} Status ASC";
+$lang->block->orderByList->project['status_desc'] = "{$lang->projectCommon} Status DESC";
 
 $lang->block->orderByList->execution = array();
 $lang->block->orderByList->execution['id_asc']      = 'ID Aufsteigend';
@@ -529,18 +529,18 @@ $lang->block->typeList->testtask['done']    = 'Erledigt';
 $lang->block->typeList->testtask['all']     = 'Alle';
 
 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = 'project|browse|';
-$lang->block->modules['project']->moreLinkList->statistic      = 'project|browse|';
-$lang->block->modules['project']->moreLinkList->project        = 'project|browse|';
+$lang->block->modules['project']->moreLinkList->recentproject  = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->statistic      = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->project        = "{$lang->projectCommon}|browse|";
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = "{$lang->projectCommon}|execution|";
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = "{$lang->projectCommon}|execution|";
+$lang->block->modules['project']->moreLinkList->projectdynamic = "{$lang->projectCommon}|dynamic|";
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
@@ -588,7 +588,7 @@ $lang->block->zentaoapp->storyCompleteRate    = 'Story CompleteRate';
 $lang->block->zentaoapp->latestExecution      = 'Latest Execution';
 $lang->block->zentaoapp->involvedExecution    = 'Involved Execution';
 $lang->block->zentaoapp->mangedProduct        = "Manged {$lang->productCommon}";
-$lang->block->zentaoapp->involvedProject      = 'Involved Project';
+$lang->block->zentaoapp->involvedProject      = "Involved {$lang->projectCommon}";
 $lang->block->zentaoapp->customIndexCard      = 'Custom Index Cards';
 $lang->block->zentaoapp->createStory          = 'Story Create';
 $lang->block->zentaoapp->createEffort         = 'Effort Create';
@@ -599,7 +599,7 @@ $lang->block->zentaoapp->notSupportKanban     = 'The mobile terminal does not su
 $lang->block->zentaoapp->notSupportVersion    = 'This version of ZenTao is not currently supported on the mobile terminal';
 $lang->block->zentaoapp->incompatibleVersion  = 'The current version of ZenTao is lower, please upgrade to the latest version and try again';
 $lang->block->zentaoapp->canNotGetVersion     = 'Failed to get ZenTao version, please confirm if the URL is correct';
-$lang->block->zentaoapp->desc                 = 'ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking project progress, and enhancing the flexibility and agility of project management.';
+$lang->block->zentaoapp->desc                 = "ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking {$lang->projectCommon} progress, and enhancing the flexibility and agility of {$lang->projectCommon} management.";
 $lang->block->zentaoapp->downloadTip          = 'Scan QR code to download';
 
 $lang->block->zentaoclient = new stdClass();
@@ -632,11 +632,11 @@ $lang->block->visionTitle            = 'The user interface of ZenTao is divided
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = 'Full feature interface';
-$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle project management solution.";
+$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle {$lang->projectCommon} management solution.";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = 'Operation Management Interface';
-$lang->block->visions['lite']->text  = 'Specially designed for Non-R&D teams, and based on the visual Kanban project management model.';
+$lang->block->visions['lite']->text  = "Specially designed for Non-R&D teams, and based on the visual Kanban {$lang->projectCommon} management model.";
 
 $lang->block->customModes['light'] = 'Light Mode';
 $lang->block->customModes['ALM']   = 'ALM Mode';
@@ -644,4 +644,4 @@ $lang->block->customModes['ALM']   = 'ALM Mode';
 $lang->block->customModeTip = new stdClass();
 $lang->block->customModeTip->common = 'There are 2 running modes of ZenTao:  Light Mode and ALM Mode.';
 $lang->block->customModeTip->ALM    = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams.';
-$lang->block->customModeTip->light  = 'Provides the core function of project management, suitable for small R&D teams.';
+$lang->block->customModeTip->light  = "Provides the core function of {$lang->projectCommon} management, suitable for small R&D teams.";
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 5d5ddacb78..b152ca08d3 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -114,10 +114,10 @@ $lang->block->left            = 'Remain';
 $lang->block->titleList['flowchart']      = 'Flow Chart';
 $lang->block->titleList['guide']          = 'Guides';
 $lang->block->titleList['statistic']      = 'Statistic';
-$lang->block->titleList['recentproject']  = 'Recent Project';
+$lang->block->titleList['recentproject']  = "Recent {$lang->projectCommon}";
 $lang->block->titleList['assigntome']     = 'Assign to me';
-$lang->block->titleList['projectteam']    = 'Project manpower input';
-$lang->block->titleList['project']        = 'Project List';
+$lang->block->titleList['projectteam']    = "{$lang->projectCommon} manpower input";
+$lang->block->titleList['project']        = "{$lang->projectCommon} List";
 $lang->block->titleList['dynamic']        = 'Dynamic';
 $lang->block->titleList['list']           = 'Todo List';
 $lang->block->titleList['contribute']     = 'Contribute';
@@ -125,20 +125,20 @@ $lang->block->titleList['scrumoverview']  = 'Scrumoverview';
 $lang->block->titleList['scrumtest']      = 'Scrum Test';
 $lang->block->titleList['scrumlist']      = 'Scrum List';
 $lang->block->titleList['sprint']         = 'Sprint';
-$lang->block->titleList['projectdynamic'] = 'Project Dynamic';
+$lang->block->titleList['projectdynamic'] = "{$lang->projectCommon} Dynamic";
 $lang->block->titleList['bug']            = 'Bug';
 $lang->block->titleList['case']           = 'Case';
 $lang->block->titleList['testtask']       = 'Test Task';
 
 $lang->block->default['waterfall']['project']['3']['title']  = "Plan Gantt Chart";
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = 'project';
+$lang->block->default['waterfall']['project']['3']['source'] = $lang->projectCommon;
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = 'project';
+$lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCommon;
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
@@ -288,9 +288,9 @@ $lang->block->default['full']['my']['4']['grid']            = 4;
 $lang->block->default['full']['my']['4']['source']          = 'todo';
 $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['5']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon} Statistic";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
-$lang->block->default['full']['my']['5']['source']          = 'project';
+$lang->block->default['full']['my']['5']['source']          = $lang->projectCommon;
 $lang->block->default['full']['my']['5']['grid']            = 8;
 $lang->block->default['full']['my']['5']['params']['count'] = '20';
 
@@ -299,9 +299,9 @@ $lang->block->default['full']['my']['6']['block']  = 'contribute';
 $lang->block->default['full']['my']['6']['source'] = '';
 $lang->block->default['full']['my']['6']['grid']   = 4;
 
-$lang->block->default['full']['my']['7']['title']  = 'Recent Projects';
-$lang->block->default['full']['my']['7']['block']  = 'recentproject';
-$lang->block->default['full']['my']['7']['source'] = 'project';
+$lang->block->default['full']['my']['7']['title']  = "Recent {$lang->projectCommon}s";
+$lang->block->default['full']['my']['7']['block']  = "recent{$lang->projectCommon}";
+$lang->block->default['full']['my']['7']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['7']['grid']   = 8;
 
 $lang->block->default['full']['my']['8']['title']  = 'Todo';
@@ -321,12 +321,12 @@ $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
 $lang->block->default['full']['my']['9']['title']  = 'Manpower Input';
 $lang->block->default['full']['my']['9']['block']  = 'projectteam';
-$lang->block->default['full']['my']['9']['source'] = 'project';
+$lang->block->default['full']['my']['9']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
-$lang->block->default['full']['my']['10']['title']  = 'Project List';
-$lang->block->default['full']['my']['10']['block']  = 'project';
-$lang->block->default['full']['my']['10']['source'] = 'project';
+$lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon} List";
+$lang->block->default['full']['my']['10']['block']  = $lang->projectCommon;
+$lang->block->default['full']['my']['10']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['10']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -356,21 +356,21 @@ $lang->block->availableBlocks->feedback    = 'Feedbacks';
 $lang->block->availableBlocks->ticket      = 'Tickets';
 
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['project']   = 'Project';
+$lang->block->moduleList['project']   = $lang->projectCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'Test';
 $lang->block->moduleList['todo']      = 'Todo';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project       = 'Project List';
-$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Project';
-$lang->block->modules['project']->availableBlocks->statistic     = 'Project Statistic';
-$lang->block->modules['project']->availableBlocks->projectteam   = 'Project Manpower Input';
+$lang->block->modules['project']->availableBlocks->project       = "{$lang->projectCommon} List";
+$lang->block->modules['project']->availableBlocks->recentproject = "Recent {$lang->projectCommon}";
+$lang->block->modules['project']->availableBlocks->statistic     = "{$lang->projectCommon} Statistic";
+$lang->block->modules['project']->availableBlocks->projectteam   = "{$lang->projectCommon} Manpower Input";
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = 'Project Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon} Overview";
 $lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
 $lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = 'Test Version';
@@ -423,10 +423,10 @@ $lang->block->orderByList->product['status_asc']  = 'Product Status ASC';
 $lang->block->orderByList->product['status_desc'] = 'Product Status DESC';
 
 $lang->block->orderByList->project = array();
-$lang->block->orderByList->project['id_asc']      = 'Project ID ASC';
-$lang->block->orderByList->project['id_desc']     = 'Project ID DESC';
-$lang->block->orderByList->project['status_asc']  = 'Project Status ASC';
-$lang->block->orderByList->project['status_desc'] = 'Project Status DESC';
+$lang->block->orderByList->project['id_asc']      = "{$lang->projectCommon} ID ASC";
+$lang->block->orderByList->project['id_desc']     = "{$lang->projectCommon} ID DESC";
+$lang->block->orderByList->project['status_asc']  = "{$lang->projectCommon} Status ASC";
+$lang->block->orderByList->project['status_desc'] = "{$lang->projectCommon} Status DESC";
 
 $lang->block->orderByList->execution = array();
 $lang->block->orderByList->execution['id_asc']      = 'Execution ID ASC';
@@ -529,18 +529,18 @@ $lang->block->typeList->testtask['done']    = 'Done';
 $lang->block->typeList->testtask['all']     = 'All';
 
 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = 'project|browse|';
-$lang->block->modules['project']->moreLinkList->statistic      = 'project|browse|';
-$lang->block->modules['project']->moreLinkList->project        = 'project|browse|';
+$lang->block->modules['project']->moreLinkList->recentproject  = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->statistic      = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->project        = "{$lang->projectCommon}|browse|";
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = "{$lang->projectCommon}|execution|";
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = "{$lang->projectCommon}|execution|";
+$lang->block->modules['project']->moreLinkList->projectdynamic = "{$lang->projectCommon}|dynamic|";
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
@@ -588,7 +588,7 @@ $lang->block->zentaoapp->storyCompleteRate    = 'Story CompleteRate';
 $lang->block->zentaoapp->latestExecution      = 'Latest Execution';
 $lang->block->zentaoapp->involvedExecution    = 'Involved Execution';
 $lang->block->zentaoapp->mangedProduct        = "Manged {$lang->productCommon}";
-$lang->block->zentaoapp->involvedProject      = 'Involved Project';
+$lang->block->zentaoapp->involvedProject      = "Involved {$lang->projectCommon}";
 $lang->block->zentaoapp->customIndexCard      = 'Custom Index Cards';
 $lang->block->zentaoapp->createStory          = 'Story Create';
 $lang->block->zentaoapp->createEffort         = 'Effort Create';
@@ -599,7 +599,7 @@ $lang->block->zentaoapp->notSupportKanban     = 'The mobile terminal does not su
 $lang->block->zentaoapp->notSupportVersion    = 'This version of ZenTao is not currently supported on the mobile terminal';
 $lang->block->zentaoapp->incompatibleVersion  = 'The current version of ZenTao is lower, please upgrade to the latest version and try again';
 $lang->block->zentaoapp->canNotGetVersion     = 'Failed to get ZenTao version, please confirm if the URL is correct';
-$lang->block->zentaoapp->desc                 = 'ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking project progress, and enhancing the flexibility and agility of project management.';
+$lang->block->zentaoapp->desc                 = "ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking {$lang->projectCommon} progress, and enhancing the flexibility and agility of {$lang->projectCommon} management.";
 $lang->block->zentaoapp->downloadTip          = 'Scan QR code to download';
 
 $lang->block->zentaoclient = new stdClass();
@@ -632,11 +632,11 @@ $lang->block->visionTitle            = 'The user interface of ZenTao is divided
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = 'Full feature interface';
-$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle project management solution.";
+$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle {$lang->projectCommon} management solution.";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = 'Operation Management Interface';
-$lang->block->visions['lite']->text  = 'Specially designed for Non-R&D teams, and based on the visual Kanban project management model.';
+$lang->block->visions['lite']->text  = "Specially designed for Non-R&D teams, and based on the visual Kanban {$lang->projectCommon} management model.";
 
 $lang->block->customModes['light'] = 'Light Mode';
 $lang->block->customModes['ALM']   = 'ALM Mode';
@@ -644,4 +644,4 @@ $lang->block->customModes['ALM']   = 'ALM Mode';
 $lang->block->customModeTip = new stdClass();
 $lang->block->customModeTip->common = 'There are 2 running modes of ZenTao:  Light Mode and ALM Mode.';
 $lang->block->customModeTip->ALM    = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams.';
-$lang->block->customModeTip->light  = 'Provides the core function of project management, suitable for small R&D teams.';
+$lang->block->customModeTip->light  = "Provides the core function of {$lang->projectCommon} management, suitable for small R&D teams.";
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 9fd05f8828..b2d27a74a1 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -114,10 +114,10 @@ $lang->block->left            = 'Remain';
 $lang->block->titleList['flowchart']      = 'Flow Chart';
 $lang->block->titleList['guide']          = 'Guides';
 $lang->block->titleList['statistic']      = 'Statistic';
-$lang->block->titleList['recentproject']  = 'Recent Project';
+$lang->block->titleList['recentproject']  = "Recent {$lang->projectCommon}";
 $lang->block->titleList['assigntome']     = 'Assign to me';
-$lang->block->titleList['projectteam']    = 'Project manpower input';
-$lang->block->titleList['project']        = 'Project List';
+$lang->block->titleList['projectteam']    = "{$lang->projectCommon} manpower input";
+$lang->block->titleList['project']        = "{$lang->projectCommon} List";
 $lang->block->titleList['dynamic']        = 'Dynamic';
 $lang->block->titleList['list']           = 'Todo List';
 $lang->block->titleList['contribute']     = 'Contribute';
@@ -125,20 +125,20 @@ $lang->block->titleList['scrumoverview']  = 'Scrumoverview';
 $lang->block->titleList['scrumtest']      = 'Scrum Test';
 $lang->block->titleList['scrumlist']      = 'Scrum List';
 $lang->block->titleList['sprint']         = 'Sprint';
-$lang->block->titleList['projectdynamic'] = 'Project Dynamic';
+$lang->block->titleList['projectdynamic'] = "{$lang->projectCommon} Dynamic";
 $lang->block->titleList['bug']            = 'Bug';
 $lang->block->titleList['case']           = 'Case';
 $lang->block->titleList['testtask']       = 'Test Task';
 
 $lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = 'project';
+$lang->block->default['waterfall']['project']['3']['source'] = $lang->projectCommon;
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'dynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = '';
+$lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCommon;
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
@@ -288,9 +288,9 @@ $lang->block->default['full']['my']['4']['grid']   = 4;
 $lang->block->default['full']['my']['4']['source'] = 'todo';
 $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['5']['title']           = 'Project Statistic';
+$lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon} Statistic";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
-$lang->block->default['full']['my']['5']['source']          = 'project';
+$lang->block->default['full']['my']['5']['source']          = $lang->projectCommon;
 $lang->block->default['full']['my']['5']['grid']            = 8;
 $lang->block->default['full']['my']['5']['params']['count'] = '20';
 
@@ -299,9 +299,9 @@ $lang->block->default['full']['my']['6']['block']  = 'recentproject';
 $lang->block->default['full']['my']['6']['source'] = 'project';
 $lang->block->default['full']['my']['6']['grid']   = 8;
 
-$lang->block->default['full']['my']['7']['title']  = 'Todo';
-$lang->block->default['full']['my']['7']['block']  = 'assigntome';
-$lang->block->default['full']['my']['7']['source'] = '';
+$lang->block->default['full']['my']['7']['title']  = "Recent {$lang->projectCommon}s";
+$lang->block->default['full']['my']['7']['block']  = "recent{$lang->projectCommon}";
+$lang->block->default['full']['my']['7']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['7']['grid']   = 8;
 
 $lang->block->default['full']['my']['8']['title']  = 'Human Input';
@@ -321,12 +321,12 @@ $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
-$lang->block->default['full']['my']['9']['source'] = 'project';
+$lang->block->default['full']['my']['9']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
-$lang->block->default['full']['my']['10']['title']  = 'Project List';
-$lang->block->default['full']['my']['10']['block']  = 'project';
-$lang->block->default['full']['my']['10']['source'] = 'project';
+$lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon} List";
+$lang->block->default['full']['my']['10']['block']  = $lang->projectCommon;
+$lang->block->default['full']['my']['10']['source'] = $lang->projectCommon;
 $lang->block->default['full']['my']['10']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -356,21 +356,21 @@ $lang->block->availableBlocks->feedback    = 'Feedbacks';
 $lang->block->availableBlocks->ticket      = 'Tickets';
 
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['project']   = 'Project';
+$lang->block->moduleList['project']   = $lang->projectCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = 'Test';
 $lang->block->moduleList['todo']      = 'Todo';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project       = 'Project List';
-$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Projects';
-$lang->block->modules['project']->availableBlocks->statistic     = 'Project Statistic';
-$lang->block->modules['project']->availableBlocks->projectteam   = 'Project Human Input';
+$lang->block->modules['project']->availableBlocks->project       = "{$lang->projectCommon} List";
+$lang->block->modules['project']->availableBlocks->recentproject = "Recent {$lang->projectCommon}";
+$lang->block->modules['project']->availableBlocks->statistic     = "{$lang->projectCommon} Statistic";
+$lang->block->modules['project']->availableBlocks->projectteam   = "{$lang->projectCommon} Manpower Input";
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = 'Project Overview';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon} Overview";
 $lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
 $lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = 'Test Version';
@@ -423,10 +423,10 @@ $lang->block->orderByList->product['status_asc']  = 'Tri par Statut ASC';
 $lang->block->orderByList->product['status_desc'] = 'Tri par Statut DESC';
 
 $lang->block->orderByList->project = array();
-$lang->block->orderByList->project['id_asc']      = 'Tri par ID Projet ASC';
-$lang->block->orderByList->project['id_desc']     = 'Tri par ID Projet DESC';
-$lang->block->orderByList->project['status_asc']  = 'Tri par Statut ASC';
-$lang->block->orderByList->project['status_desc'] = 'Tri par Statut DESC';
+$lang->block->orderByList->project['id_asc']      = "{$lang->projectCommon} ID ASC";
+$lang->block->orderByList->project['id_desc']     = "{$lang->projectCommon} ID DESC";
+$lang->block->orderByList->project['status_asc']  = "{$lang->projectCommon} Status ASC";
+$lang->block->orderByList->project['status_desc'] = "{$lang->projectCommon} Status DESC";
 
 $lang->block->orderByList->execution = array();
 $lang->block->orderByList->execution['id_asc']      = 'Tri par ID Execution ASC';
@@ -529,18 +529,18 @@ $lang->block->typeList->testtask['done']    = 'Jouées';
 $lang->block->typeList->testtask['all']     = 'Toutes';
 
 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = 'project|browse|';
-$lang->block->modules['project']->moreLinkList->statistic      = 'project|browse|';
-$lang->block->modules['project']->moreLinkList->project        = 'project|browse|';
+$lang->block->modules['project']->moreLinkList->recentproject  = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->statistic      = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->project        = "{$lang->projectCommon}|browse|";
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = 'project|execution|';
+$lang->block->modules['project']->moreLinkList->scrumlist      = "{$lang->projectCommon}|execution|";
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = 'project|execution|';
-$lang->block->modules['project']->moreLinkList->projectdynamic = 'project|dynamic|';
+$lang->block->modules['project']->moreLinkList->sprint         = "{$lang->projectCommon}|execution|";
+$lang->block->modules['project']->moreLinkList->projectdynamic = "{$lang->projectCommon}|dynamic|";
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
@@ -588,7 +588,7 @@ $lang->block->zentaoapp->storyCompleteRate    = 'Story CompleteRate';
 $lang->block->zentaoapp->latestExecution      = 'Latest Execution';
 $lang->block->zentaoapp->involvedExecution    = 'Involved Execution';
 $lang->block->zentaoapp->mangedProduct        = "Manged {$lang->productCommon}";
-$lang->block->zentaoapp->involvedProject      = 'Involved Project';
+$lang->block->zentaoapp->involvedProject      = "Involved {$lang->projectCommon}";
 $lang->block->zentaoapp->customIndexCard      = 'Custom Index Cards';
 $lang->block->zentaoapp->createStory          = 'Story Create';
 $lang->block->zentaoapp->createEffort         = 'Effort Create';
@@ -599,7 +599,7 @@ $lang->block->zentaoapp->notSupportKanban     = 'The mobile terminal does not su
 $lang->block->zentaoapp->notSupportVersion    = 'This version of ZenTao is not currently supported on the mobile terminal';
 $lang->block->zentaoapp->incompatibleVersion  = 'The current version of ZenTao is lower, please upgrade to the latest version and try again';
 $lang->block->zentaoapp->canNotGetVersion     = 'Failed to get ZenTao version, please confirm if the URL is correct';
-$lang->block->zentaoapp->desc                 = 'ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking project progress, and enhancing the flexibility and agility of project management.';
+$lang->block->zentaoapp->desc                 = "ZenTao mobile app provides you with a mobile work environment, which is convenient for managing personal to-do tasks at any time, tracking {$lang->projectCommon} progress, and enhancing the flexibility and agility of {$lang->projectCommon} management.";
 $lang->block->zentaoapp->downloadTip          = 'Scan QR code to download';
 
 $lang->block->zentaoclient = new stdClass();
@@ -632,11 +632,11 @@ $lang->block->visionTitle            = 'The user interface of ZenTao is divided
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = 'Full feature interface';
-$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle project management solution.";
+$lang->block->visions['rnd']->text   = "Integrate the program, {$lang->productCommon}, {$lang->projectCommon}, execution, test, etc., and provide the lifecycle {$lang->projectCommon} management solution.";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = 'Operation Management Interface';
-$lang->block->visions['lite']->text  = 'Specially designed for Non-R&D teams, and based on the visual Kanban project management model.';
+$lang->block->visions['lite']->text  = "Specially designed for Non-R&D teams, and based on the visual Kanban {$lang->projectCommon} management model.";
 
 $lang->block->customModes['light'] = 'Light Mode';
 $lang->block->customModes['ALM']   = 'ALM Mode';
@@ -644,4 +644,4 @@ $lang->block->customModes['ALM']   = 'ALM Mode';
 $lang->block->customModeTip = new stdClass();
 $lang->block->customModeTip->common = 'There are 2 running modes of ZenTao:  Light Mode and ALM Mode.';
 $lang->block->customModeTip->ALM    = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams.';
-$lang->block->customModeTip->light  = 'Provides the core function of project management, suitable for small R&D teams.';
+$lang->block->customModeTip->light  = "Provides the core function of {$lang->projectCommon} management, suitable for small R&D teams.";
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index d27055f926..823755e666 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -113,15 +113,15 @@ $lang->block->left            = '剩余';
 
 $lang->block->titleList['flowchart']      = '流程图';
 $lang->block->titleList['guide']          = '使用帮助';
-$lang->block->titleList['statistic']      = '项目统计';
-$lang->block->titleList['recentproject']  = '我近期参与的项目';
+$lang->block->titleList['statistic']      = "{$lang->projectCommon}统计";
+$lang->block->titleList['recentproject']  = "我近期参与的{$lang->projectCommon}";
 $lang->block->titleList['assigntome']     = '待处理';
-$lang->block->titleList['projectteam']    = '项目人力投入';
-$lang->block->titleList['project']        = '项目列表';
+$lang->block->titleList['projectteam']    = "{$lang->projectCommon}人力投入";
+$lang->block->titleList['project']        = "{$lang->projectCommon}列表";
 $lang->block->titleList['dynamic']        = '最新动态';
 $lang->block->titleList['list']           = '我的待办';
 $lang->block->titleList['contribute']     = '我的贡献';
-$lang->block->titleList['scrumoverview']  = '项目概况';
+$lang->block->titleList['scrumoverview']  = "{$lang->projectCommon}概况";
 $lang->block->titleList['scrumtest']      = '待测版本';
 $lang->block->titleList['scrumlist']      = '迭代列表';
 $lang->block->titleList['sprint']         = '迭代总览';
@@ -130,7 +130,7 @@ $lang->block->titleList['bug']            = '指派给我的Bug';
 $lang->block->titleList['case']           = '指派给我的用例';
 $lang->block->titleList['testtask']       = '待测版本列表';
 
-$lang->block->default['waterfall']['project']['3']['title']  = "项目计划";
+$lang->block->default['waterfall']['project']['3']['title']  = "{$lang->projectCommon}计划";
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
 $lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
@@ -288,7 +288,7 @@ $lang->block->default['full']['my']['4']['grid']            = 4;
 $lang->block->default['full']['my']['4']['source']          = 'todo';
 $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
-$lang->block->default['full']['my']['5']['title']           = '项目统计';
+$lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon}统计";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
 $lang->block->default['full']['my']['5']['source']          = 'project';
 $lang->block->default['full']['my']['5']['grid']            = 8;
@@ -299,7 +299,7 @@ $lang->block->default['full']['my']['6']['block']  = 'contribute';
 $lang->block->default['full']['my']['6']['source'] = '';
 $lang->block->default['full']['my']['6']['grid']   = 4;
 
-$lang->block->default['full']['my']['7']['title']  = '我近期参与的项目';
+$lang->block->default['full']['my']['7']['title']  = "我近期参与的{$lang->projectCommon}";
 $lang->block->default['full']['my']['7']['block']  = 'recentproject';
 $lang->block->default['full']['my']['7']['source'] = 'project';
 $lang->block->default['full']['my']['7']['grid']   = 8;
@@ -319,12 +319,12 @@ $lang->block->default['full']['my']['8']['params']['reviewCount']   = '20';
 $lang->block->default['full']['my']['8']['params']['meetingCount']  = '20';
 $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
-$lang->block->default['full']['my']['9']['title']  = '项目人力投入';
+$lang->block->default['full']['my']['9']['title']  = "{$lang->projectCommon}人力投入";
 $lang->block->default['full']['my']['9']['block']  = 'projectteam';
 $lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
-$lang->block->default['full']['my']['10']['title']  = '项目列表';
+$lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon}列表";
 $lang->block->default['full']['my']['10']['block']  = 'project';
 $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
@@ -356,21 +356,21 @@ $lang->block->availableBlocks->feedback    = '反馈';
 $lang->block->availableBlocks->ticket      = '工单';
 
 $lang->block->moduleList['product']   = $lang->productCommon;
-$lang->block->moduleList['project']   = '项目';
+$lang->block->moduleList['project']   = $lang->projectCommon;
 $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']        = '测试';
 $lang->block->moduleList['todo']      = '待办';
 
 $lang->block->modules['project'] = new stdclass();
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project       = '项目列表';
-$lang->block->modules['project']->availableBlocks->recentproject = '近期项目';
-$lang->block->modules['project']->availableBlocks->statistic     = '项目统计';
-$lang->block->modules['project']->availableBlocks->projectteam   = '项目人力投入';
+$lang->block->modules['project']->availableBlocks->project       = "{$lang->projectCommon}列表";
+$lang->block->modules['project']->availableBlocks->recentproject = "近期{$lang->projectCommon}";
+$lang->block->modules['project']->availableBlocks->statistic     = "{$lang->projectCommon}统计";
+$lang->block->modules['project']->availableBlocks->projectteam   = "{$lang->projectCommon}人力投入";
 
 $lang->block->modules['scrum']['index'] = new stdclass();
 $lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = '项目概况';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon}概况";
 $lang->block->modules['scrum']['index']->availableBlocks->scrumlist      = $lang->executionCommon . '列表';
 $lang->block->modules['scrum']['index']->availableBlocks->sprint         = $lang->executionCommon . '总览';
 $lang->block->modules['scrum']['index']->availableBlocks->scrumtest      = '待测版本';
@@ -380,7 +380,7 @@ $lang->block->modules['agileplus']['index'] = $lang->block->modules['scrum']['in
 
 $lang->block->modules['waterfall']['index'] = new stdclass();
 $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass();
-$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt    = "项目计划";
+$lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt    = "{$lang->projectCommon}计划";
 $lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic    = '最新动态';
 
 $lang->block->modules['waterfallplus']['index'] = $lang->block->modules['waterfall']['index'];
@@ -588,7 +588,7 @@ $lang->block->zentaoapp->storyCompleteRate    = '需求完成率';
 $lang->block->zentaoapp->latestExecution      = '近期执行';
 $lang->block->zentaoapp->involvedExecution    = '我参与的执行';
 $lang->block->zentaoapp->mangedProduct        = "负责{$lang->productCommon}";
-$lang->block->zentaoapp->involvedProject      = '参与项目';
+$lang->block->zentaoapp->involvedProject      = "参与{$lang->projectCommon}";
 $lang->block->zentaoapp->customIndexCard      = '定制首页卡片';
 $lang->block->zentaoapp->createStory          = '提需求';
 $lang->block->zentaoapp->createEffort         = '记日志';
@@ -599,7 +599,7 @@ $lang->block->zentaoapp->notSupportKanban     = '移动端暂不支持研发看
 $lang->block->zentaoapp->notSupportVersion    = '移动端暂不支持该禅道版本';
 $lang->block->zentaoapp->incompatibleVersion  = '当前禅道版本较低，请升级至最新版本后再试';
 $lang->block->zentaoapp->canNotGetVersion     = '获取禅道版本失败，请确认网址是否正确';
-$lang->block->zentaoapp->desc                 = '禅道移动端为您提供移动办公的环境，方便随时管理个人待办事务，跟进项目进度，增强了项目管理的灵活性和敏捷性。';
+$lang->block->zentaoapp->desc                 = "禅道移动端为您提供移动办公的环境，方便随时管理个人待办事务，跟进{$lang->projectCommon}进度，增强了{$lang->projectCommon}管理的灵活性和敏捷性。";
 $lang->block->zentaoapp->downloadTip          = '扫描二维码下载';
 
 $lang->block->zentaoclient = new stdClass();
@@ -632,11 +632,11 @@ $lang->block->visionTitle            = '禅道使用界面分为【研发综合
 $lang->block->visions['rnd']         = new stdclass();
 $lang->block->visions['rnd']->key    = 'rnd';
 $lang->block->visions['rnd']->title  = '研发综合界面';
-$lang->block->visions['rnd']->text   = "集项目集、{$lang->productCommon}、项目、执行、测试等多维度管理于一体，提供全过程项目管理解决方案。";
+$lang->block->visions['rnd']->text   = "集项目集、{$lang->productCommon}、{$lang->projectCommon}、执行、测试等多维度管理于一体，提供全过程{$lang->projectCommon}管理解决方案。";
 $lang->block->visions['lite']        = new stdclass();
 $lang->block->visions['lite']->key   = 'lite';
 $lang->block->visions['lite']->title = '运营管理界面';
-$lang->block->visions['lite']->text  = '专为非研发团队打造，主要以直观、可视化的看板项目管理模型为主。';
+$lang->block->visions['lite']->text  = "专为非研发团队打造，主要以直观、可视化的看板{$lang->projectCommon}管理模型为主。";
 
 $lang->block->customModes['light'] = '轻量管理模式';
 $lang->block->customModes['ALM']   = '全生命周期管理模式';
@@ -644,4 +644,4 @@ $lang->block->customModes['ALM']   = '全生命周期管理模式';
 $lang->block->customModeTip = new stdClass();
 $lang->block->customModeTip->common = '禅道运行模式分为【轻量级管理模式】和【全生命周期管理模式】。';
 $lang->block->customModeTip->ALM    = '适用于中大型团队的管理模式，概念更加完整、严谨，功能更丰富。';
-$lang->block->customModeTip->light  = '适用于小型研发团队的管理模式，提供项目管理的核心功能。';
+$lang->block->customModeTip->light  = "适用于小型研发团队的管理模式，提供{$lang->projectCommon}管理的核心功能。";

From 6e7c9e25e80d3f04d521fd2da1c5994fb313010d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 09:36:56 +0800
Subject: [PATCH 282/319] * Update project common lang.

---
 module/custom/lang/de.php    |  4 ++--
 module/custom/lang/en.php    |  4 ++--
 module/custom/lang/fr.php    |  4 ++--
 module/custom/lang/zh-cn.php | 10 +++++-----
 module/dev/lang/de.php       | 14 +++++++-------
 module/dev/lang/en.php       | 14 +++++++-------
 module/dev/lang/fr.php       | 14 +++++++-------
 module/dev/lang/zh-cn.php    | 16 ++++++++--------
 8 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 2536a8eb8c..299ca41420 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -204,7 +204,7 @@ $lang->custom->notice->readOnlyOfCode      = "A code is a management term that e
 $lang->custom->notice->readOnlyOfPercent   = "The \"Workload Ratio\" is used to divide the workload of a {$lang->projectCommon} into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the \"Workload Ratio\", users have to fill in the ratio fields when setting up the stages in the Waterfall {$lang->projectCommon} and Waterfall Plus {$lang->projectCommon} management models.";
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to go to Product Homepage?";
-$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to go to Project Homepage?";
+$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has {$lang->projectCommon} Home. Do you want to go to {$lang->projectCommon} Home?";
 $lang->custom->notice->indexPage['qa']      = "ZenTao 8.2+ has QA Homepage. Do you want to go to QA Homepage?";
 
 $lang->custom->notice->invalidStrlen['ten']        = 'The length of the key must be less than 10 characters.';
@@ -252,7 +252,7 @@ $lang->custom->selectProgramTips = "After switching to the Light Mode, in order
 $lang->custom->modeList['light'] = 'Light Mode';
 $lang->custom->modeList['ALM']   = 'ALM Mode';
 
-$lang->custom->modeIntroductionList['light'] = 'Provides the core function of project management, suitable for small R&D teams';
+$lang->custom->modeIntroductionList['light'] = "Provides the core function of {$lang->projectCommon} management, suitable for small R&D teams";
 $lang->custom->modeIntroductionList['ALM']   = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
 
 $lang->custom->features['program']              = 'Program';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index a77d4a37cf..832a41fcf7 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -204,7 +204,7 @@ $lang->custom->notice->readOnlyOfCode      = "A code is a management term that e
 $lang->custom->notice->readOnlyOfPercent   = "The \"Workload Ratio\" is used to divide the workload of a {$lang->projectCommon} into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the \"Workload Ratio\", users have to fill in the ratio fields when setting up the stages in the Waterfall {$lang->projectCommon} and Waterfall Plus {$lang->projectCommon} management models.";
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
-$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home?";
+$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has {$lang->projectCommon} Home. Do you want to go to {$lang->projectCommon} Home?";
 $lang->custom->notice->indexPage['qa']      = "ZenTao 8.2+ has Test Homepage. Do you want to go to Test Homepage?";
 
 $lang->custom->notice->invalidStrlen['ten']        = 'The key should be <= 10 characters.';
@@ -252,7 +252,7 @@ $lang->custom->selectProgramTips = "After switching to the Light Mode, in order
 $lang->custom->modeList['light'] = 'Light Mode';
 $lang->custom->modeList['ALM']   = 'ALM Mode';
 
-$lang->custom->modeIntroductionList['light'] = 'Provides the core function of project management, suitable for small R&D teams';
+$lang->custom->modeIntroductionList['light'] = "Provides the core function of {$lang->projectCommon} management, suitable for small R&D teams";
 $lang->custom->modeIntroductionList['ALM']   = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
 
 $lang->custom->features['program']              = 'Program';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index a1bc98bc02..5ed792a28a 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -204,7 +204,7 @@ $lang->custom->notice->readOnlyOfCode      = "A code is a management term that e
 $lang->custom->notice->readOnlyOfPercent   = "The \"Workload Ratio\" is used to divide the workload of a {$lang->projectCommon} into different stages. The sum of the percentages of the same level stages cannot exceed 100%. After enabling the \"Workload Ratio\", users have to fill in the ratio fields when setting up the stages in the Waterfall {$lang->projectCommon} and Waterfall Plus {$lang->projectCommon} management models.";
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ possède une page d'accueil. Voulez-vous consulter la page d'accueil du produit ?";
-$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ possède une page d'accueil. Voulez-vous consulter la page d'accueil du produit ?";
+$lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has {$lang->projectCommon} Home. Do you want to go to {$lang->projectCommon} Home?";
 $lang->custom->notice->indexPage['qa']      = "ZenTao 8.2+ possède une FAQ. Voulez-vous consulter la FAQ ?";
 
 $lang->custom->notice->invalidStrlen['ten']        = 'La clé devrait être <= 10 caractères.';
@@ -252,7 +252,7 @@ $lang->custom->selectProgramTips = "After switching to the Light Mode, in order
 $lang->custom->modeList['light'] = 'Light Mode';
 $lang->custom->modeList['ALM']   = 'ALM Mode';
 
-$lang->custom->modeIntroductionList['light'] = 'Provides the core function of project management, suitable for small R&D teams';
+$lang->custom->modeIntroductionList['light'] = "Provides the core function of {$lang->projectCommon} management, suitable for small R&D teams";
 $lang->custom->modeIntroductionList['ALM']   = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
 
 $lang->custom->features['program']              = 'Program';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 6e6d54e7fd..ed4f019b2f 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -28,7 +28,7 @@ $lang->custom->region               = '区间';
 $lang->custom->tips                 = '提示语';
 $lang->custom->setTips              = '设置提示语';
 $lang->custom->isRange              = '是否目标控制范围';
-$lang->custom->concept              = "项目概念";
+$lang->custom->concept              = "{$lang->projectCommon}概念";
 $lang->custom->URStory              = "用户需求";
 $lang->custom->SRStory              = "软件需求";
 $lang->custom->epic                 = "史诗";
@@ -204,7 +204,7 @@ $lang->custom->notice->readOnlyOfCode      = "代号是一种管理话术，主
 $lang->custom->notice->readOnlyOfPercent   = "工作量占比用于划分{$lang->projectCommon}中存在多个阶段时的工作量的占比，同一级阶段的百分比之和最高为100%。启用工作量占比后，系统中的瀑布{$lang->projectCommon}和融合瀑布{$lang->projectCommon}模型中设置阶段时需要维护阶段的工作量占比。";
 
 $lang->custom->notice->indexPage['product'] = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
-$lang->custom->notice->indexPage['project'] = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
+$lang->custom->notice->indexPage['project'] = "从8.2版本起增加了{$lang->projectCommon}主页视图，是否默认进入{$lang->projectCommon}主页？";
 $lang->custom->notice->indexPage['qa']      = "从8.2版本起增加了测试主页视图，是否默认进入测试主页？";
 
 $lang->custom->notice->invalidStrlen['ten']        = '键的长度必须小于10个字符！';
@@ -233,8 +233,8 @@ $lang->custom->restDayList[6] = '周六休息';
 $lang->custom->restDayList[0] = '周天休息';
 
 global $config;
-$lang->custom->sprintConceptList[0] = '项目 产品 迭代';
-$lang->custom->sprintConceptList[1] = '项目 产品 冲刺';
+$lang->custom->sprintConceptList[0] = "{$lang->projectCommon} 产品 迭代";
+$lang->custom->sprintConceptList[1] = "{$lang->projectCommon} 产品 冲刺";
 
 $lang->custom->workingList['full'] = '完整研发管理工具';
 
@@ -320,7 +320,7 @@ $lang->custom->conceptOptions->hourPoint['1'] = '故事点';
 $lang->custom->conceptOptions->hourPoint['2'] = '功能点';
 
 $lang->custom->scrum = new stdclass();
-$lang->custom->scrum->setConcept = '设置项目概念';
+$lang->custom->scrum->setConcept = "设置{$lang->projectCommon}概念";
 
 $lang->custom->reviewRules['allpass']  = '全部通过通过';
 $lang->custom->reviewRules['halfpass'] = '半数以上通过通过';
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index 1e3781665b..ff90bc3a20 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -62,12 +62,12 @@ $lang->dev->tableList['module']                = 'Modul';
 $lang->dev->tableList['program']               = 'Program';
 $lang->dev->tableList['product']               = $lang->productCommon;
 $lang->dev->tableList['productplan']           = $lang->productCommon . 'Plan';
-$lang->dev->tableList['project']               = 'Project';
-$lang->dev->tableList['programplan']           = 'Project Stage';
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['programplan']           = "{$lang->projectCommon} Stage";
 $lang->dev->tableList['weekly']                = 'Weekly';
 $lang->dev->tableList['sonarqube']             = 'Sonarqube';
-$lang->dev->tableList['projectproduct']        = 'Project' . $lang->productCommon;
-$lang->dev->tableList['projectstory']          = 'Project Story';
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = "{$lang->projectCommon} Story";
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['release']               = 'Release';
 $lang->dev->tableList['story']                 = 'Story';
@@ -151,8 +151,8 @@ $lang->dev->tableList['kanbangroup']           = 'Kanban Group';
 $lang->dev->tableList['kanbanregion']          = 'Kanban Region';
 $lang->dev->tableList['kanbanspace']           = 'Kanban Space';
 $lang->dev->tableList['personnel']             = 'Personnel';
-$lang->dev->tableList['projectbuild']          = 'Project Build';
-$lang->dev->tableList['projectrelease']        = 'Project Release';
+$lang->dev->tableList['projectbuild']          = "{$lang->projectCommon} Build";
+$lang->dev->tableList['projectrelease']        = "{$lang->projectCommon} Release";
 $lang->dev->tableList['design']                = 'Design';
 $lang->dev->tableList['stage']                 = 'Stage';
 $lang->dev->tableList['gitlab']                = 'Gitlab';
@@ -170,7 +170,7 @@ $lang->dev->tableList['license']               = 'License';
 $lang->dev->groupList['my']        = 'Dashboard';
 $lang->dev->groupList['program']   = 'Program';
 $lang->dev->groupList['product']   = $lang->productCommon;
-$lang->dev->groupList['project']   = 'project';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['kanban']    = 'Kanban';
 $lang->dev->groupList['qa']        = 'QA';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index a5e680386d..024a0761ce 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -62,12 +62,12 @@ $lang->dev->tableList['module']                = 'Module';
 $lang->dev->tableList['program']               = 'Program';
 $lang->dev->tableList['product']               = $lang->productCommon;
 $lang->dev->tableList['productplan']           = $lang->productCommon . 'Plan';
-$lang->dev->tableList['project']               = 'Project';
-$lang->dev->tableList['programplan']           = 'Project Stage';
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['programplan']           = "{$lang->projectCommon} Stage";
 $lang->dev->tableList['weekly']                = 'Weekly';
 $lang->dev->tableList['sonarqube']             = 'Sonarqube';
-$lang->dev->tableList['projectproduct']        = 'Project' . $lang->productCommon;
-$lang->dev->tableList['projectstory']          = 'Project Story';
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = "{$lang->projectCommon} Story";
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['release']               = 'Release';
 $lang->dev->tableList['story']                 = 'Story';
@@ -151,8 +151,8 @@ $lang->dev->tableList['kanbangroup']           = 'Kanban Group';
 $lang->dev->tableList['kanbanregion']          = 'Kanban Region';
 $lang->dev->tableList['kanbanspace']           = 'Kanban Space';
 $lang->dev->tableList['personnel']             = 'Personnel';
-$lang->dev->tableList['projectbuild']          = 'Project Build';
-$lang->dev->tableList['projectrelease']        = 'Project Release';
+$lang->dev->tableList['projectbuild']          = "{$lang->projectCommon} Build";
+$lang->dev->tableList['projectrelease']        = "{$lang->projectCommon} Release";
 $lang->dev->tableList['design']                = 'Design';
 $lang->dev->tableList['stage']                 = 'Stage';
 $lang->dev->tableList['gitlab']                = 'Gitlab';
@@ -170,7 +170,7 @@ $lang->dev->tableList['license']               = 'License';
 $lang->dev->groupList['my']        = 'Dashboard';
 $lang->dev->groupList['program']   = 'Program';
 $lang->dev->groupList['product']   = $lang->productCommon;
-$lang->dev->groupList['project']   = 'Project';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['kanban']    = 'Kanban';
 $lang->dev->groupList['qa']        = 'Test';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index a5e680386d..024a0761ce 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -62,12 +62,12 @@ $lang->dev->tableList['module']                = 'Module';
 $lang->dev->tableList['program']               = 'Program';
 $lang->dev->tableList['product']               = $lang->productCommon;
 $lang->dev->tableList['productplan']           = $lang->productCommon . 'Plan';
-$lang->dev->tableList['project']               = 'Project';
-$lang->dev->tableList['programplan']           = 'Project Stage';
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['programplan']           = "{$lang->projectCommon} Stage";
 $lang->dev->tableList['weekly']                = 'Weekly';
 $lang->dev->tableList['sonarqube']             = 'Sonarqube';
-$lang->dev->tableList['projectproduct']        = 'Project' . $lang->productCommon;
-$lang->dev->tableList['projectstory']          = 'Project Story';
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = "{$lang->projectCommon} Story";
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['release']               = 'Release';
 $lang->dev->tableList['story']                 = 'Story';
@@ -151,8 +151,8 @@ $lang->dev->tableList['kanbangroup']           = 'Kanban Group';
 $lang->dev->tableList['kanbanregion']          = 'Kanban Region';
 $lang->dev->tableList['kanbanspace']           = 'Kanban Space';
 $lang->dev->tableList['personnel']             = 'Personnel';
-$lang->dev->tableList['projectbuild']          = 'Project Build';
-$lang->dev->tableList['projectrelease']        = 'Project Release';
+$lang->dev->tableList['projectbuild']          = "{$lang->projectCommon} Build";
+$lang->dev->tableList['projectrelease']        = "{$lang->projectCommon} Release";
 $lang->dev->tableList['design']                = 'Design';
 $lang->dev->tableList['stage']                 = 'Stage';
 $lang->dev->tableList['gitlab']                = 'Gitlab';
@@ -170,7 +170,7 @@ $lang->dev->tableList['license']               = 'License';
 $lang->dev->groupList['my']        = 'Dashboard';
 $lang->dev->groupList['program']   = 'Program';
 $lang->dev->groupList['product']   = $lang->productCommon;
-$lang->dev->groupList['project']   = 'Project';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['kanban']    = 'Kanban';
 $lang->dev->groupList['qa']        = 'Test';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index d1db87ec39..890f5b8bcb 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -65,12 +65,12 @@ $lang->dev->tableList['module']                = '模块';
 $lang->dev->tableList['program']               = '项目集';
 $lang->dev->tableList['product']               = $lang->productCommon;
 $lang->dev->tableList['productplan']           = $lang->productCommon . '计划';
-$lang->dev->tableList['project']               = '项目';
-$lang->dev->tableList['programplan']           = '项目阶段';
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['programplan']           = "{$lang->projectCommon}阶段";
 $lang->dev->tableList['weekly']                = '周报';
 $lang->dev->tableList['sonarqube']             = 'Sonarqube';
-$lang->dev->tableList['projectproduct']        = '项目' .  $lang->productCommon;
-$lang->dev->tableList['projectstory']          = '项目' .  $lang->SRCommon;
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = $lang->projectCommon . $lang->SRCommon;
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['release']               = '发布';
 $lang->dev->tableList['story']                 = $lang->SRCommon;
@@ -154,15 +154,15 @@ $lang->dev->tableList['kanbangroup']           = '看板组';
 $lang->dev->tableList['kanbanregion']          = '看板区域';
 $lang->dev->tableList['kanbanspace']           = '看板空间';
 $lang->dev->tableList['personnel']             = '可访问人员';
-$lang->dev->tableList['projectbuild']          = '项目版本';
-$lang->dev->tableList['projectrelease']        = '项目发布';
+$lang->dev->tableList['projectbuild']          = "{$lang->projectCommon}版本";
+$lang->dev->tableList['projectrelease']        = "{$lang->projectCommon}发布";
 $lang->dev->tableList['design']                = '设计';
 $lang->dev->tableList['stage']                 = '阶段';
 $lang->dev->tableList['gitlab']                = 'Gitlab';
 $lang->dev->tableList['gitea']                 = 'Gitea';
 $lang->dev->tableList['gogs']                  = 'Gogs';
 $lang->dev->tableList['holiday']               = '节假日';
-$lang->dev->tableList['projectplan']           = '项目计划';
+$lang->dev->tableList['projectplan']           = "{$lang->projectCommon}计划";
 $lang->dev->tableList['im']                    = '喧喧';
 $lang->dev->tableList['transfer']              = '转换';
 $lang->dev->tableList['client']                = '客户端版本更新';
@@ -173,7 +173,7 @@ $lang->dev->tableList['license']               = '授权';
 $lang->dev->groupList['my']        = '我的地盘';
 $lang->dev->groupList['program']   = '项目集';
 $lang->dev->groupList['product']   = $lang->productCommon;
-$lang->dev->groupList['project']   = '项目';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['kanban']    = '看板';
 $lang->dev->groupList['qa']        = '测试';

From 624c2cc1e37bd76e08e4c2b4b7431b7d57372047 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 09:39:50 +0800
Subject: [PATCH 283/319] * Update project common lang.

---
 module/report/lang/de.php    |  6 +++---
 module/report/lang/en.php    |  8 ++++----
 module/report/lang/fr.php    |  6 +++---
 module/report/lang/zh-cn.php | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/module/report/lang/de.php b/module/report/lang/de.php
index 02ef153578..6c195d81f9 100644
--- a/module/report/lang/de.php
+++ b/module/report/lang/de.php
@@ -18,7 +18,7 @@ $lang->report->percent            = '%';
 $lang->report->undefined          = 'Undefiniert';
 $lang->report->query              = 'Abfrage';
 $lang->report->annual             = 'Annual Summary';
-$lang->report->project            = 'Project';
+$lang->report->project            = $lang->projectCommon;
 $lang->report->PO                 = 'PO';
 $lang->report->viewEveryoneAnnual = 'View everyone annual summary';
 
@@ -51,7 +51,7 @@ $lang->report->beginAndEnd      = ' : von';
 $lang->report->begin            = 'Begin';
 $lang->report->end              = 'End';
 $lang->report->dept             = 'Abteilung';
-$lang->report->deviationChart   = 'Projektabweichungskurve';
+$lang->report->deviationChart   = "{$lang->projectCommon} Deviation Chart";
 
 $lang->reportList = new stdclass();
 $lang->reportList->product = new stdclass();
@@ -212,7 +212,7 @@ $lang->report->annualData->todoStatus['undone'] = 'Undone';
 $lang->report->annualData->todoStatus['done']   = 'Done';
 
 $lang->report->annualData->radarItems['product']   = "Product";
-$lang->report->annualData->radarItems['execution'] = "Project";
+$lang->report->annualData->radarItems['execution'] = $lang->projectCommon;
 $lang->report->annualData->radarItems['devel']     = "Development";
 $lang->report->annualData->radarItems['qa']        = "QA";
 $lang->report->annualData->radarItems['other']     = "Other";
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 2b602f160a..3d94449e8a 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -18,7 +18,7 @@ $lang->report->percent            = '%';
 $lang->report->undefined          = 'Undefined';
 $lang->report->query              = 'Query';
 $lang->report->annual             = 'Annual Summary';
-$lang->report->project            = 'Project';
+$lang->report->project            = $lang->projectCommon;
 $lang->report->PO                 = 'PO';
 $lang->report->viewEveryoneAnnual = 'View everyone annual summary';
 
@@ -51,7 +51,7 @@ $lang->report->beginAndEnd      = ' From';
 $lang->report->begin            = ' Begin';
 $lang->report->end              = ' End';
 $lang->report->dept             = 'Department';
-$lang->report->deviationChart   = 'Project Deviation Chart';
+$lang->report->deviationChart   = "{$lang->projectCommon} Deviation Chart";
 
 $lang->reportList = new stdclass();
 $lang->reportList->product = new stdclass();
@@ -211,8 +211,8 @@ $lang->report->annualData->todoStatus['all']    = 'All';
 $lang->report->annualData->todoStatus['undone'] = 'Undone';
 $lang->report->annualData->todoStatus['done']   = 'Done';
 
-$lang->report->annualData->radarItems['product']   = "Product";
-$lang->report->annualData->radarItems['execution'] = "Project";
+$lang->report->annualData->radarItems['product']   = 'Product';
+$lang->report->annualData->radarItems['execution'] = $lang->projectCommon;
 $lang->report->annualData->radarItems['devel']     = "Development";
 $lang->report->annualData->radarItems['qa']        = "QA";
 $lang->report->annualData->radarItems['other']     = "Other";
diff --git a/module/report/lang/fr.php b/module/report/lang/fr.php
index 93d7e7b525..1f7d244c33 100644
--- a/module/report/lang/fr.php
+++ b/module/report/lang/fr.php
@@ -18,7 +18,7 @@ $lang->report->percent            = '%';
 $lang->report->undefined          = 'N/D';
 $lang->report->query              = 'Requête';
 $lang->report->annual             = 'Résumé Annuel';
-$lang->report->project            = 'Project';
+$lang->report->project            = $lang->projectCommon;
 $lang->report->PO                 = 'PO';
 $lang->report->viewEveryoneAnnual = 'View everyone annual summary';
 
@@ -51,7 +51,7 @@ $lang->report->beginAndEnd      = ' de';
 $lang->report->begin            = 'Begin';
 $lang->report->end              = 'End';
 $lang->report->dept             = 'Compartiment';
-$lang->report->deviationChart   = 'Courbe de déviation du projet';
+$lang->report->deviationChart   = "{$lang->projectCommon} Deviation Chart";
 
 $lang->reportList = new stdclass();
 $lang->reportList->product = new stdclass();
@@ -212,7 +212,7 @@ $lang->report->annualData->todoStatus['undone'] = 'Undone';
 $lang->report->annualData->todoStatus['done']   = 'Done';
 
 $lang->report->annualData->radarItems['product']   = "Product";
-$lang->report->annualData->radarItems['execution'] = "Project";
+$lang->report->annualData->radarItems['execution'] = $lang->projectCommon;
 $lang->report->annualData->radarItems['devel']     = "Development";
 $lang->report->annualData->radarItems['qa']        = "QA";
 $lang->report->annualData->radarItems['other']     = "Other";
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index a5aa0d95dc..a5f43f8c0d 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -18,7 +18,7 @@ $lang->report->percent            = '百分比';
 $lang->report->undefined          = '未设定';
 $lang->report->query              = '查询';
 $lang->report->annual             = '年度总结';
-$lang->report->project            = '项目';
+$lang->report->project            = $lang->projectCommon;
 $lang->report->PO                 = 'PO';
 $lang->report->viewEveryoneAnnual = '查看所有人年度总结';
 
@@ -212,7 +212,7 @@ $lang->report->annualData->todoStatus['undone'] = '未完成';
 $lang->report->annualData->todoStatus['done']   = '已完成';
 
 $lang->report->annualData->radarItems['product']   = '产品管理';
-$lang->report->annualData->radarItems['execution'] = '项目管理';
+$lang->report->annualData->radarItems['execution'] = "{$lang->projectCommon}管理";
 $lang->report->annualData->radarItems['devel']     = "研发";
 $lang->report->annualData->radarItems['qa']        = "测试";
 $lang->report->annualData->radarItems['other']     = "其他";
@@ -230,6 +230,6 @@ $lang->report->caseOutput          = "用例产出";
 $lang->report->bugProgress         = "Bug进展";
 $lang->report->productProgress     = "产品进展";
 $lang->report->executionProgress   = "执行进展";
-$lang->report->projectProgress     = "项目进展";
-$lang->report->yearProjectOverview = "年度项目总览";
-$lang->report->projectOverview     = "截止目前项目总览";
+$lang->report->projectProgress     = "{$lang->projectCommon}进展";
+$lang->report->yearProjectOverview = "年度{$lang->projectCommon}总览";
+$lang->report->projectOverview     = "截止目前{$lang->projectCommon}总览";

From 44b97bdab1fc66ebc9100e6dec613d717da128ed Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Mar 2023 09:44:16 +0800
Subject: [PATCH 284/319] * Modify language items for project,product common.

---
 module/product/lang/de.php | 8 ++++----
 module/product/lang/en.php | 8 ++++----
 module/product/lang/fr.php | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index f26eaac21c..a463d021f0 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -53,7 +53,7 @@ $lang->product->plans       = 'Plan';
 $lang->product->releases    = 'Release';
 $lang->product->docs        = 'Dok';
 $lang->product->bugs        = 'Verknüpfte Bugs';
-$lang->product->projects    = "Linked Project";
+$lang->product->projects    = "Linked {$lang->projectCommon}";
 $lang->product->executions  = "Verknüpfte {$lang->execution->common}";
 $lang->product->cases       = 'Fälle';
 $lang->product->builds      = 'Builds';
@@ -158,9 +158,9 @@ $lang->product->viewByUser     = 'By User';
 $lang->product->assignedByMe   = 'AssignedByMe';
 
 /* Product Kanban. */
-$lang->product->myProduct             = 'Products Ownedbyme';
-$lang->product->otherProduct          = 'Other Products';
-$lang->product->unclosedProduct       = 'Open Products';
+$lang->product->myProduct             = "{$lang->productCommon}s Ownedbyme";
+$lang->product->otherProduct          = "Other {$lang->productCommon}s";
+$lang->product->unclosedProduct       = "Open {$lang->productCommon}s";
 $lang->product->unexpiredPlan         = 'Unexpired Plans';
 $lang->product->doing                 = 'Doing';
 $lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 1ba4200b89..7478d9deb5 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -53,7 +53,7 @@ $lang->product->plans       = 'Plans';
 $lang->product->releases    = 'Releases';
 $lang->product->docs        = 'Doc';
 $lang->product->bugs        = 'Linked Bug';
-$lang->product->projects    = "Linked Project";
+$lang->product->projects    = "Linked {$lang->projectCommon}";
 $lang->product->executions  = "Linked {$lang->execution->common}";
 $lang->product->cases       = 'Case';
 $lang->product->builds      = 'Build';
@@ -158,9 +158,9 @@ $lang->product->viewByUser     = 'By User';
 $lang->product->assignedByMe   = 'AssignedByMe';
 
 /* Product Kanban. */
-$lang->product->myProduct             = 'Products Ownedbyme';
-$lang->product->otherProduct          = 'Other Products';
-$lang->product->unclosedProduct       = 'Open Products';
+$lang->product->myProduct             = "{$lang->productCommon}s Ownedbyme";
+$lang->product->otherProduct          = "Other {$lang->productCommon}s";
+$lang->product->unclosedProduct       = "Open {$lang->productCommon}s";
 $lang->product->unexpiredPlan         = 'Unexpired Plans';
 $lang->product->doing                 = 'Doing';
 $lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 4d167eabb3..6d27f88dd8 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -158,9 +158,9 @@ $lang->product->viewByUser     = 'Par Utilisateur';
 $lang->product->assignedByMe   = 'AssignedByMe';
 
 /* Product Kanban. */
-$lang->product->myProduct             = 'Products Ownedbyme';
-$lang->product->otherProduct          = 'Other Products';
-$lang->product->unclosedProduct       = 'Open Products';
+$lang->product->myProduct             = "{$lang->productCommon}s Ownedbyme";
+$lang->product->otherProduct          = "Other {$lang->productCommon}s";
+$lang->product->unclosedProduct       = "Open {$lang->productCommon}s";
 $lang->product->unexpiredPlan         = 'Unexpired Plans';
 $lang->product->doing                 = 'Doing';
 $lang->product->doingProject          = "Ongoing {$lang->projectCommon}s";

From eeae074475edb861334764bdc248f6706dae5213 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 09:46:27 +0800
Subject: [PATCH 285/319] * Update project common lang.

---
 module/block/lang/de.php    | 2 +-
 module/block/lang/en.php    | 2 +-
 module/block/lang/fr.php    | 2 +-
 module/block/lang/zh-cn.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index e9e9ba99be..c567b32647 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -142,7 +142,7 @@ $lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCom
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
-$lang->block->default['scrum']['project']['1']['title'] =  'Project Overall';
+$lang->block->default['scrum']['project']['1']['title'] = $lang->projectCommon . ' Overall';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index b152ca08d3..1c9a88a325 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -142,7 +142,7 @@ $lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCom
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
-$lang->block->default['scrum']['project']['1']['title'] =  'Project Overview';
+$lang->block->default['scrum']['project']['1']['title'] = $lang->projectCommon . ' Overview';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index b2d27a74a1..effdaf9980 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -142,7 +142,7 @@ $lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCom
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
-$lang->block->default['scrum']['project']['1']['title'] =  'Project Overall';
+$lang->block->default['scrum']['project']['1']['title'] = $lang->projectCommon . ' Overall';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 823755e666..0af3f1887a 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -142,7 +142,7 @@ $lang->block->default['waterfall']['project']['6']['source'] = 'project';
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
-$lang->block->default['scrum']['project']['1']['title'] =  '项目概况';
+$lang->block->default['scrum']['project']['1']['title'] = $lang->projectCommon . '概况';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
 

From f9fdc67892424113cd6e76c18a923297fa0c19e8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Mar 2023 09:51:30 +0800
Subject: [PATCH 286/319] * Modify language items for project,product common.

---
 module/program/lang/de.php    | 10 +++++-----
 module/program/lang/en.php    | 10 +++++-----
 module/program/lang/fr.php    | 10 +++++-----
 module/program/lang/zh-cn.php |  8 ++++----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index c4752510ab..eb7aa7496e 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -60,7 +60,7 @@ $lang->program->browse                  = 'Programs';
 $lang->program->kanbanAction            = 'Kanban';
 $lang->program->view                    = 'Program Detail';
 $lang->program->copy                    = 'Copy Program';
-$lang->program->product                 = 'Products';
+$lang->program->product                 = "{$lang->productCommon}s";
 $lang->program->project                 = "Program {$lang->projectCommon} List";
 $lang->program->all                     = 'All Programs';
 $lang->program->start                   = 'Start';
@@ -100,7 +100,7 @@ $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed programs.';
-$lang->program->tips               = "If a parent program is selected, the products under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a product with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
+$lang->program->tips               = "If a parent program is selected, the {$lang->productCommon}s under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a {$lang->productCommon} with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = 'The start date of the program is less than the start date of the parent program:';
 $lang->program->endGreaterParent   = 'The finish date of the program is greater than the finish date of the parent program:';
@@ -110,7 +110,7 @@ $lang->program->endLetterChild     = "The finish date of the program is less tha
 $lang->program->dateExceedChild    = "The start and finish date of the program no longer include the date scope of the subprogram or {$lang->projectCommon}:";
 $lang->program->closeErrorMessage  = "There are subprograms or {$lang->projectCommon}s that are not closed";
 $lang->program->hasChildren        = "The program has a child program or the {$lang->projectCommon} exists and can not be deleted.";
-$lang->program->hasProduct         = 'It has products. You cannot delete it.';
+$lang->program->hasProduct         = "The program has {$lang->productCommon}s exist and can not be deleted.";
 $lang->program->confirmDelete      = "Do you want to delete it?";
 $lang->program->confirmUnlink      = 'Do you want to remove the Stakeholder?';
 $lang->program->readjustTime       = 'Change the program begin&end date.';
@@ -125,7 +125,7 @@ $lang->program->endList[186] = 'Half year';
 $lang->program->endList[365] = 'One year';
 $lang->program->endList[999] = 'Longtime';
 
-$lang->program->aclList['private'] = "Private (accessible to project portfolio holders and stakeholders, stakeholders can follow up maintenance)";
+$lang->program->aclList['private'] = "Private (accessible to {$lang->projectCommon} portfolio holders and stakeholders, stakeholders can follow up maintenance)";
 $lang->program->aclList['open']    = "Default(user who can visit the program can access it)";
 
 $lang->program->subAclList['private'] = "Private (accessible to this program set leader and stakeholders, stakeholders can follow up maintenance)";
@@ -167,7 +167,7 @@ $lang->program->kanban->common             = 'Program Kanban';
 $lang->program->kanban->typeList['my']     = 'My Programs';
 $lang->program->kanban->typeList['others'] = 'Others';
 
-$lang->program->kanban->openProducts    = 'Open Products';
+$lang->program->kanban->openProducts    = "Open {$lang->productCommon}s";
 $lang->program->kanban->unexpiredPlans  = 'Unexpired Plans';
 $lang->program->kanban->waitingProjects = "Waiting {$lang->projectCommon}s";
 $lang->program->kanban->doingProjects   = "Ongoing {$lang->projectCommon}s";
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 6263da2997..2b3cf44f0a 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -60,7 +60,7 @@ $lang->program->browse                  = 'Programs';
 $lang->program->kanbanAction            = 'Kanban';
 $lang->program->view                    = 'Program Detail';
 $lang->program->copy                    = 'Copy Program';
-$lang->program->product                 = 'Products';
+$lang->program->product                 = "{$lang->productCommon}s";
 $lang->program->project                 = "Program {$lang->projectCommon} List";
 $lang->program->all                     = 'All Programs';
 $lang->program->start                   = 'Start';
@@ -100,7 +100,7 @@ $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed';
-$lang->program->tips               = "If a parent program is selected, the products under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a product with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
+$lang->program->tips               = "If a parent program is selected, the {$lang->productCommon}s under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a {$lang->productCommon} with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = 'The start date of the program is less than the start date of the parent program:';
 $lang->program->endGreaterParent   = 'The finish date of the program is greater than the finish date of the parent program:';
@@ -110,7 +110,7 @@ $lang->program->endLetterChild     = "The finish date of the program is less tha
 $lang->program->dateExceedChild    = "The start and finish date of the program no longer include the date scope of the subprogram or {$lang->projectCommon}:";
 $lang->program->closeErrorMessage  = "There are subprograms or {$lang->projectCommon}s that are not closed";
 $lang->program->hasChildren        = "The program has a child program or the {$lang->projectCommon} exists and can not be deleted.";
-$lang->program->hasProduct         = 'The program has products exist and can not be deleted.';
+$lang->program->hasProduct         = "The program has {$lang->productCommon}s exist and can not be deleted.";
 $lang->program->confirmDelete      = 'Do you want to delete the \"%s\" Program?';
 $lang->program->confirmUnlink      = 'Do you want to remove the Stakeholder?';
 $lang->program->readjustTime       = 'Change the program begin&end date.';
@@ -125,7 +125,7 @@ $lang->program->endList[186] = 'Half year';
 $lang->program->endList[365] = 'One year';
 $lang->program->endList[999] = 'Longtime';
 
-$lang->program->aclList['private'] = "Private (accessible to project portfolio holders and stakeholders, stakeholders can follow up maintenance)";
+$lang->program->aclList['private'] = "Private (accessible to {$lang->projectCommon} portfolio holders and stakeholders, stakeholders can follow up maintenance)";
 $lang->program->aclList['open']    = "Default(user who can visit the program can access it)";
 
 $lang->program->subAclList['private'] = "Private (accessible to this program set leader and stakeholders, stakeholders can follow up maintenance)";
@@ -167,7 +167,7 @@ $lang->program->kanban->common             = 'Program Kanban';
 $lang->program->kanban->typeList['my']     = 'My Programs';
 $lang->program->kanban->typeList['others'] = 'Others';
 
-$lang->program->kanban->openProducts    = 'Open Products';
+$lang->program->kanban->openProducts    = "Open {$lang->productCommon}s";
 $lang->program->kanban->unexpiredPlans  = 'Unexpired Plans';
 $lang->program->kanban->waitingProjects = "Waiting {$lang->projectCommon}s";
 $lang->program->kanban->doingProjects   = "Ongoing {$lang->projectCommon}s";
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 5dc38a4b1d..54978a97cd 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -60,7 +60,7 @@ $lang->program->browse                  = 'Programs';
 $lang->program->kanbanAction            = 'Kanban';
 $lang->program->view                    = 'Program Detail';
 $lang->program->copy                    = 'Copy Program';
-$lang->program->product                 = 'Products';
+$lang->program->product                 = "{$lang->productCommon}s";
 $lang->program->project                 = "Program {$lang->projectCommon} List";
 $lang->program->all                     = 'All Programs';
 $lang->program->start                   = 'Start';
@@ -100,7 +100,7 @@ $lang->program->stakeholderTypeList['outside'] = 'Outside';
 
 $lang->program->noProgram          = 'No program.';
 $lang->program->showClosed         = 'Closed programs.';
-$lang->program->tips               = "If a parent program is selected, the products under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a product with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
+$lang->program->tips               = "If a parent program is selected, the {$lang->productCommon}s under the parent program can be associated. If no program is selected for the {$lang->projectCommon}, a {$lang->productCommon} with the same name as the {$lang->projectCommon} is created and associated with the {$lang->projectCommon} by default.";
 $lang->program->confirmBatchUnlink = "Do you want to batch unlink these stakeholders?";
 $lang->program->beginLetterParent  = 'La date de début du programme était < à la date de début du programme parent:';
 $lang->program->endGreaterParent   = 'La date de fin du programme était > à la date de fin du programme parent:';
@@ -110,7 +110,7 @@ $lang->program->endLetterChild     = "The finish date of the program is less tha
 $lang->program->dateExceedChild    = "The start and finish date of the program no longer include the date scope of the subprogram or {$lang->projectCommon}:";
 $lang->program->closeErrorMessage  = "There are subprograms or {$lang->projectCommon}s that are not closed";
 $lang->program->hasChildren        = "The program has a child program or the {$lang->projectCommon} exists and can not be deleted.";
-$lang->program->hasProduct         = 'It has products. You cannot delete it.';
+$lang->program->hasProduct         = "The program has {$lang->productCommon}s exist and can not be deleted.";
 $lang->program->confirmDelete      = "Do you want to delete it?";
 $lang->program->confirmUnlink      = 'Voulez - vous retirer les intervenants?';
 $lang->program->readjustTime       = 'Change the program begin&end date.';
@@ -125,7 +125,7 @@ $lang->program->endList[186] = 'Half year';
 $lang->program->endList[365] = 'One year';
 $lang->program->endList[999] = 'Longtime';
 
-$lang->program->aclList['private'] = "Private (accessible to project portfolio holders and stakeholders, stakeholders can follow up maintenance)";
+$lang->program->aclList['private'] = "Private (accessible to {$lang->projectCommon} portfolio holders and stakeholders, stakeholders can follow up maintenance)";
 $lang->program->aclList['open']    = "Default(user who can visit the program can access it)";
 
 $lang->program->subAclList['private'] = "Private (accessible to this program set leader and stakeholders, stakeholders can follow up maintenance)";
@@ -167,7 +167,7 @@ $lang->program->kanban->common             = 'Program Kanban';
 $lang->program->kanban->typeList['my']     = 'My Programs';
 $lang->program->kanban->typeList['others'] = 'Others';
 
-$lang->program->kanban->openProducts    = 'Open Products';
+$lang->program->kanban->openProducts    = "Open {$lang->productCommon}s";
 $lang->program->kanban->unexpiredPlans  = 'Unexpired Plans';
 $lang->program->kanban->waitingProjects = "Waiting {$lang->projectCommon}s";
 $lang->program->kanban->doingProjects   = "Ongoing {$lang->projectCommon}s";
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 0b8eb772d2..c08ab6811c 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -60,7 +60,7 @@ $lang->program->browse                  = '项目集列表';
 $lang->program->kanbanAction            = '项目集看板';
 $lang->program->view                    = '项目集详情';
 $lang->program->copy                    = '复制项目集';
-$lang->program->product                 = '产品列表';
+$lang->program->product                 = "{$lang->productCommon}列表";
 $lang->program->project                 = "项目集{$lang->projectCommon}列表";
 $lang->program->all                     = '所有项目集';
 $lang->program->start                   = '启动项目集';
@@ -100,7 +100,7 @@ $lang->program->stakeholderTypeList['outside'] = '外部';
 
 $lang->program->noProgram          = '暂时没有项目集';
 $lang->program->showClosed         = '显示已关闭';
-$lang->program->tips               = "选择了父项目集，则可关联该父项目集下的产品。如果{$lang->projectCommon}未选择任何项目集，则系统会默认创建一个和该{$lang->projectCommon}同名的产品并关联该{$lang->projectCommon}。";
+$lang->program->tips               = "选择了父项目集，则可关联该父项目集下的{$lang->productCommon}。如果{$lang->projectCommon}未选择任何项目集，则系统会默认创建一个和该{$lang->projectCommon}同名的{$lang->productCommon}并关联该{$lang->projectCommon}。";
 $lang->program->confirmBatchUnlink = "您确定要批量移除这些干系人吗？";
 $lang->program->beginLetterParent  = '项目集的开始日期小于了父项目集的开始日期：';
 $lang->program->endGreaterParent   = '项目集的完成日期大于了父项目集的完成日期：';
@@ -110,7 +110,7 @@ $lang->program->endLetterChild     = "项目集的完成日期小于了子项目
 $lang->program->dateExceedChild    = "项目集的起止日期已不包含子项目集或{$lang->projectCommon}的日期范围";
 $lang->program->closeErrorMessage  = "存在子项目集或{$lang->projectCommon}为未关闭状态";
 $lang->program->hasChildren        = "该项目集有子项目集或{$lang->projectCommon}存在，不能删除。";
-$lang->program->hasProduct         = '该项目集有产品存在，不能删除。';
+$lang->program->hasProduct         = "该项目集有{$lang->productCommon}存在，不能删除。";
 $lang->program->confirmDelete      = '您确定要删除\“%s\”项目集吗？';
 $lang->program->confirmUnlink      = '您确定要移除干系人吗？';
 $lang->program->readjustTime       = '重新调整项目集起止时间';
@@ -167,7 +167,7 @@ $lang->program->kanban->common             = '项目集看板';
 $lang->program->kanban->typeList['my']     = '我参与的项目集';
 $lang->program->kanban->typeList['others'] = '其他项目集';
 
-$lang->program->kanban->openProducts    = '未关闭的产品';
+$lang->program->kanban->openProducts    = "未关闭的{$lang->productCommon}";
 $lang->program->kanban->unexpiredPlans  = '未过期的计划';
 $lang->program->kanban->waitingProjects = '未开始的' . $lang->projectCommon;
 $lang->program->kanban->doingProjects   = '进行中的' . $lang->projectCommon;

From 2e35bcb624b4e8a4a9cbfd7d994f2177e6231cd3 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 09:58:33 +0800
Subject: [PATCH 287/319] * Update project common lang.

---
 module/common/lang/de.php    | 6 +++---
 module/common/lang/en.php    | 6 +++---
 module/common/lang/fr.php    | 6 +++---
 module/common/lang/zh-cn.php | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 8c4350fb04..ca5edacdbc 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -338,7 +338,7 @@ $lang->searchObjects['doc']         = 'Doc';
 $lang->searchObjects['caselib']     = 'Case Library';
 $lang->searchObjects['testreport']  = 'Test-Bericht';
 $lang->searchObjects['program']     = 'Program';
-$lang->searchObjects['project']     = 'Project';
+$lang->searchObjects['project']     = $lang->projectCommon;
 $lang->searchObjects['execution']   = $lang->executionCommon;
 $lang->searchObjects['user']        = 'User';
 $lang->searchTips                   = '';
@@ -367,8 +367,8 @@ $lang->createObjects['story']       = 'Story';
 $lang->createObjects['task']        = 'Task';
 $lang->createObjects['testcase']    = 'Case';
 $lang->createObjects['execution']   = $lang->execution->common;
-$lang->createObjects['project']     = 'Project';
-$lang->createObjects['product']     = 'Product';
+$lang->createObjects['project']     = $lang->projectCommon;
+$lang->createObjects['product']     = $lang->productCommon;
 $lang->createObjects['program']     = 'Program';
 $lang->createObjects['doc']         = 'Doc';
 $lang->createObjects['kanbanspace'] = 'Space';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 296662eff4..0249557bfc 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -338,7 +338,7 @@ $lang->searchObjects['doc']         = 'Document';
 $lang->searchObjects['caselib']     = 'Case Library';
 $lang->searchObjects['testreport']  = 'Test Report';
 $lang->searchObjects['program']     = 'Program';
-$lang->searchObjects['project']     = 'Project';
+$lang->searchObjects['project']     = $lang->projectCommon;
 $lang->searchObjects['execution']   = $lang->executionCommon;
 $lang->searchObjects['user']        = 'User';
 $lang->searchTips                   = 'ID (ctrl+g)';
@@ -367,8 +367,8 @@ $lang->createObjects['story']       = 'Story';
 $lang->createObjects['task']        = 'Task';
 $lang->createObjects['testcase']    = 'Case';
 $lang->createObjects['execution']   = $lang->execution->common;
-$lang->createObjects['project']     = 'Project';
-$lang->createObjects['product']     = 'Product';
+$lang->createObjects['project']     = $lang->projectCommon;
+$lang->createObjects['product']     = $lang->productCommon;
 $lang->createObjects['program']     = 'Program';
 $lang->createObjects['doc']         = 'Doc';
 $lang->createObjects['kanbanspace'] = 'Space';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 03d20b96d7..9a3446dae2 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -338,7 +338,7 @@ $lang->searchObjects['doc']         = 'Document';
 $lang->searchObjects['caselib']     = 'Case Library';
 $lang->searchObjects['testreport']  = 'CR de Test';
 $lang->searchObjects['program']     = 'Program';
-$lang->searchObjects['project']     = 'Project';
+$lang->searchObjects['project']     = $lang->projectCommon;
 $lang->searchObjects['execution']   = $lang->executionCommon;
 $lang->searchObjects['user']        = 'User';
 $lang->searchTips                   = '';
@@ -367,8 +367,8 @@ $lang->createObjects['story']       = 'Story';
 $lang->createObjects['task']        = 'Task';
 $lang->createObjects['testcase']    = 'Case';
 $lang->createObjects['execution']   = $lang->execution->common;
-$lang->createObjects['project']     = 'Project';
-$lang->createObjects['product']     = 'Product';
+$lang->createObjects['project']     = $lang->projectCommon;
+$lang->createObjects['product']     = $lang->productCommon;
 $lang->createObjects['program']     = 'Program';
 $lang->createObjects['doc']         = 'Doc';
 $lang->createObjects['kanbanspace'] = 'Space';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 35824d6254..42f7ab1140 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -338,7 +338,7 @@ $lang->searchObjects['doc']         = '文档';
 $lang->searchObjects['caselib']     = '用例库';
 $lang->searchObjects['testreport']  = '测试报告';
 $lang->searchObjects['program']     = '项目集';
-$lang->searchObjects['project']     = '项目';
+$lang->searchObjects['project']     = $lang->projectCommon;
 $lang->searchObjects['execution']   = $lang->executionCommon;
 $lang->searchObjects['user']        = '用户';
 $lang->searchTips                   = '编号(ctrl+g)';
@@ -367,7 +367,7 @@ $lang->createObjects['story']       = '需求';
 $lang->createObjects['task']        = '任务';
 $lang->createObjects['testcase']    = '用例';
 $lang->createObjects['execution']   = '执行';
-$lang->createObjects['project']     = '项目';
+$lang->createObjects['project']     = $lang->projectCommon;
 $lang->createObjects['product']     = '产品';
 $lang->createObjects['program']     = '项目集';
 $lang->createObjects['doc']         = '文档';

From cea165d8bbae393edb4bb3b2253f6f2cdc51cce0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:06:49 +0800
Subject: [PATCH 288/319] * Update product common lang.

---
 module/common/lang/zh-cn.php | 2 +-
 module/report/lang/de.php    | 2 +-
 module/report/lang/en.php    | 2 +-
 module/report/lang/fr.php    | 2 +-
 module/report/lang/zh-cn.php | 4 ++--
 module/tree/lang/zh-cn.php   | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 42f7ab1140..31ab2b399f 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -368,7 +368,7 @@ $lang->createObjects['task']        = '任务';
 $lang->createObjects['testcase']    = '用例';
 $lang->createObjects['execution']   = '执行';
 $lang->createObjects['project']     = $lang->projectCommon;
-$lang->createObjects['product']     = '产品';
+$lang->createObjects['product']     = $lang->productCommon;
 $lang->createObjects['program']     = '项目集';
 $lang->createObjects['doc']         = '文档';
 $lang->createObjects['kanbanspace'] = '空间';
diff --git a/module/report/lang/de.php b/module/report/lang/de.php
index 6c195d81f9..5bd608b6b3 100644
--- a/module/report/lang/de.php
+++ b/module/report/lang/de.php
@@ -211,7 +211,7 @@ $lang->report->annualData->todoStatus['all']    = 'All';
 $lang->report->annualData->todoStatus['undone'] = 'Undone';
 $lang->report->annualData->todoStatus['done']   = 'Done';
 
-$lang->report->annualData->radarItems['product']   = "Product";
+$lang->report->annualData->radarItems['product']   = $lang->productCommon;
 $lang->report->annualData->radarItems['execution'] = $lang->projectCommon;
 $lang->report->annualData->radarItems['devel']     = "Development";
 $lang->report->annualData->radarItems['qa']        = "QA";
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 3d94449e8a..c64a6806fe 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -211,7 +211,7 @@ $lang->report->annualData->todoStatus['all']    = 'All';
 $lang->report->annualData->todoStatus['undone'] = 'Undone';
 $lang->report->annualData->todoStatus['done']   = 'Done';
 
-$lang->report->annualData->radarItems['product']   = 'Product';
+$lang->report->annualData->radarItems['product']   = $lang->productCommon;
 $lang->report->annualData->radarItems['execution'] = $lang->projectCommon;
 $lang->report->annualData->radarItems['devel']     = "Development";
 $lang->report->annualData->radarItems['qa']        = "QA";
diff --git a/module/report/lang/fr.php b/module/report/lang/fr.php
index 1f7d244c33..9c95511a67 100644
--- a/module/report/lang/fr.php
+++ b/module/report/lang/fr.php
@@ -211,7 +211,7 @@ $lang->report->annualData->todoStatus['all']    = 'All';
 $lang->report->annualData->todoStatus['undone'] = 'Undone';
 $lang->report->annualData->todoStatus['done']   = 'Done';
 
-$lang->report->annualData->radarItems['product']   = "Product";
+$lang->report->annualData->radarItems['product']   = $lang->productCommon;
 $lang->report->annualData->radarItems['execution'] = $lang->projectCommon;
 $lang->report->annualData->radarItems['devel']     = "Development";
 $lang->report->annualData->radarItems['qa']        = "QA";
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index a5f43f8c0d..39448860f0 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -211,7 +211,7 @@ $lang->report->annualData->todoStatus['all']    = '所有待办';
 $lang->report->annualData->todoStatus['undone'] = '未完成';
 $lang->report->annualData->todoStatus['done']   = '已完成';
 
-$lang->report->annualData->radarItems['product']   = '产品管理';
+$lang->report->annualData->radarItems['product']   = "{$lang->productCommon}管理";
 $lang->report->annualData->radarItems['execution'] = "{$lang->projectCommon}管理";
 $lang->report->annualData->radarItems['devel']     = "研发";
 $lang->report->annualData->radarItems['qa']        = "测试";
@@ -228,7 +228,7 @@ $lang->report->taskOutput          = "任务产出";
 $lang->report->bugOutput           = "Bug产出";
 $lang->report->caseOutput          = "用例产出";
 $lang->report->bugProgress         = "Bug进展";
-$lang->report->productProgress     = "产品进展";
+$lang->report->productProgress     = "{$lang->productCommon}进展";
 $lang->report->executionProgress   = "执行进展";
 $lang->report->projectProgress     = "{$lang->projectCommon}进展";
 $lang->report->yearProjectOverview = "年度{$lang->projectCommon}总览";
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index 660c4cf85e..8415221ee3 100755
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -51,7 +51,7 @@ $lang->tree->successSave          = '成功保存';
 $lang->tree->successFixed         = '成功修正数据！';
 $lang->tree->repeatName           = '模块名“%s”已经存在！';
 $lang->tree->shouldNotBlank       = '模块名不能为空格！';
-$lang->tree->syncProductModule    = '同步产品模块';
+$lang->tree->syncProductModule    = "同步{$lang->productCommon}模块";
 
 $lang->tree->module       = '模块';
 $lang->tree->name         = '模块名称';
@@ -59,7 +59,7 @@ $lang->tree->wordName     = '名称';
 $lang->tree->line         = "{$lang->productCommon}线名称";
 $lang->tree->cate         = '分类名称';
 $lang->tree->dir          = '目录名称';
-$lang->tree->root         = '所属产品';
+$lang->tree->root         = "所属{$lang->productCommon}";
 $lang->tree->branch       = '平台/分支';
 $lang->tree->path         = '路径';
 $lang->tree->type         = '类型';

From c35e4d97a6b19b450210d3664cfe982bd17d6313 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:11:44 +0800
Subject: [PATCH 289/319] * Adjust code for handleSaveFormDraft .

---
 www/js/my.full.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 5681684425..658f22faeb 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -8,7 +8,7 @@
      */
     function handleSaveFormDraft()
     {
-        if(config.currentMethod === 'login') return;
+        if(config.currentMethod === 'login' || config.currentMethod.indexOf('edit') != -1) return;
         setTimeout(function() {
             var form = $('.table-form').parent();
             if(form.length)
@@ -112,7 +112,7 @@
                      $.zui.store.set(formDataID, $(form).serializeArray());
                  }).on('success.form.zui', function(event, res)
                  {
-                     if(res.result === 'fail' || res.status === 'fail') $.zui.store.remove(formDataID);
+                     if(res.result === 'success' || res.status === 'success') $.zui.store.remove(formDataID);
                  })  
              }   
          }, 500);

From d95f23ee8b2fe485fd5a3a6ce3a73dd39d4b032a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:12:11 +0800
Subject: [PATCH 290/319] * Update product common lang.

---
 module/design/lang/de.php    | 4 ++--
 module/design/lang/en.php    | 4 ++--
 module/design/lang/fr.php    | 4 ++--
 module/design/lang/zh-cn.php | 4 ++--
 module/job/lang/de.php       | 2 +-
 module/job/lang/en.php       | 2 +-
 module/job/lang/fr.php       | 2 +-
 module/job/lang/zh-cn.php    | 2 +-
 module/zanode/lang/de.php    | 2 +-
 module/zanode/lang/en.php    | 2 +-
 module/zanode/lang/fr.php    | 2 +-
 module/zanode/lang/zh-cn.php | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/module/design/lang/de.php b/module/design/lang/de.php
index 9fe4690a63..1edb3e5b2e 100644
--- a/module/design/lang/de.php
+++ b/module/design/lang/de.php
@@ -20,12 +20,12 @@ $lang->design->version       = 'Revision';
 $lang->design->assignedTo    = 'AssignedTo';
 $lang->design->actions       = 'Actions';
 $lang->design->byQuery       = 'Search';
-$lang->design->products      = 'Linked Product';
+$lang->design->products      = "Linked {$lang->productCommon}";
 $lang->design->story         = 'Story';
 $lang->design->file          = 'File';
 $lang->design->desc          = 'Description';
 $lang->design->range          = 'Impact';
-$lang->design->product       = 'Linked Product';
+$lang->design->product       = "Linked {$lang->productCommon}";
 $lang->design->basicInfo     = 'Basic Information';
 $lang->design->commitBy      = 'Commit By';
 $lang->design->commitDate    = 'Committed Date';
diff --git a/module/design/lang/en.php b/module/design/lang/en.php
index 166f1458f9..f336569e2e 100644
--- a/module/design/lang/en.php
+++ b/module/design/lang/en.php
@@ -20,12 +20,12 @@ $lang->design->version       = 'Revision';
 $lang->design->assignedTo    = 'AssignedTo';
 $lang->design->actions       = 'Actions';
 $lang->design->byQuery       = 'Search';
-$lang->design->products      = 'Linked Product';
+$lang->design->products      = "Linked {$lang->productCommon}";
 $lang->design->story         = 'Linked Story';
 $lang->design->file          = 'File';
 $lang->design->desc          = 'Description';
 $lang->design->range          = 'Impact';
-$lang->design->product       = 'Linked Product';
+$lang->design->product       = "Linked {$lang->productCommon}";
 $lang->design->basicInfo     = 'Basic Information';
 $lang->design->commitBy      = 'Commit By';
 $lang->design->commitDate    = 'Committed Date';
diff --git a/module/design/lang/fr.php b/module/design/lang/fr.php
index 33a0580b41..3eea7032a8 100644
--- a/module/design/lang/fr.php
+++ b/module/design/lang/fr.php
@@ -20,12 +20,12 @@ $lang->design->version       = 'Revision';
 $lang->design->assignedTo    = 'AssignedTo';
 $lang->design->actions       = 'Actions';
 $lang->design->byQuery       = 'Search';
-$lang->design->products      = 'Linked Product';
+$lang->design->products      = "Linked {$lang->productCommon}";
 $lang->design->story         = 'Story';
 $lang->design->file          = 'File';
 $lang->design->desc          = 'Description';
 $lang->design->range          = 'Impact';
-$lang->design->product       = 'Linked Product';
+$lang->design->product       = "Linked {$lang->productCommon}";
 $lang->design->basicInfo     = 'Basic Information';
 $lang->design->commitBy      = 'Commit By';
 $lang->design->commitDate    = 'Committed Date';
diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php
index 372ec8dca6..fe0158ee3f 100644
--- a/module/design/lang/zh-cn.php
+++ b/module/design/lang/zh-cn.php
@@ -20,12 +20,12 @@ $lang->design->version       = '版本号';
 $lang->design->assignedTo    = '指派给';
 $lang->design->actions       = '操作';
 $lang->design->byQuery       = '搜索';
-$lang->design->products      = '所属产品';
+$lang->design->products      = "所属{$lang->productCommon}";
 $lang->design->story         = '相关需求';
 $lang->design->file          = '附件';
 $lang->design->desc          = '设计描述';
 $lang->design->range         = '影响范围';
-$lang->design->product       = '所属产品';
+$lang->design->product       = "所属{$lang->productCommon}";
 $lang->design->basicInfo     = '基础信息';
 $lang->design->commitBy      = '由谁提交';
 $lang->design->commitDate    = '提交时间';
diff --git a/module/job/lang/de.php b/module/job/lang/de.php
index 5fd9c49559..87ff9aeedd 100644
--- a/module/job/lang/de.php
+++ b/module/job/lang/de.php
@@ -83,7 +83,7 @@ $lang->job->frameList['sonarqube'] = 'SonarQube';
 $lang->job->paramValueList['']                 = '';
 $lang->job->paramValueList['$zentao_version']  = 'Current version';
 $lang->job->paramValueList['$zentao_account']  = 'Current user';
-$lang->job->paramValueList['$zentao_product']  = 'Current product ID';
+$lang->job->paramValueList['$zentao_product']  = "Current {$lang->productCommon} ID";
 $lang->job->paramValueList['$zentao_repopath'] = 'Current version library path';
 
 $lang->job->engineList = array();
diff --git a/module/job/lang/en.php b/module/job/lang/en.php
index 0356380338..c29f1a3a5a 100644
--- a/module/job/lang/en.php
+++ b/module/job/lang/en.php
@@ -83,7 +83,7 @@ $lang->job->frameList['sonarqube'] = 'SonarQube';
 $lang->job->paramValueList['']                 = '';
 $lang->job->paramValueList['$zentao_version']  = 'Current version';
 $lang->job->paramValueList['$zentao_account']  = 'Current user';
-$lang->job->paramValueList['$zentao_product']  = 'Current product ID';
+$lang->job->paramValueList['$zentao_product']  = "Current {$lang->productCommon} ID";
 $lang->job->paramValueList['$zentao_repopath'] = 'Current version library path';
 
 $lang->job->engineList = array();
diff --git a/module/job/lang/fr.php b/module/job/lang/fr.php
index 09f6f216bf..573e26035e 100644
--- a/module/job/lang/fr.php
+++ b/module/job/lang/fr.php
@@ -83,7 +83,7 @@ $lang->job->frameList['sonarqube'] = 'SonarQube';
 $lang->job->paramValueList['']                 = '';
 $lang->job->paramValueList['$zentao_version']  = 'Current version';
 $lang->job->paramValueList['$zentao_account']  = 'Current user';
-$lang->job->paramValueList['$zentao_product']  = 'Current product ID';
+$lang->job->paramValueList['$zentao_product']  = "Current {$lang->productCommon} ID";
 $lang->job->paramValueList['$zentao_repopath'] = 'Current version library path';
 
 $lang->job->engineList = array();
diff --git a/module/job/lang/zh-cn.php b/module/job/lang/zh-cn.php
index f10093ea5b..7719656d11 100644
--- a/module/job/lang/zh-cn.php
+++ b/module/job/lang/zh-cn.php
@@ -83,7 +83,7 @@ $lang->job->frameList['sonarqube'] = 'SonarQube';
 $lang->job->paramValueList['']                 = '';
 $lang->job->paramValueList['$zentao_version']  = '当前版本号';
 $lang->job->paramValueList['$zentao_account']  = '当前用户名';
-$lang->job->paramValueList['$zentao_product']  = '当前产品ID';
+$lang->job->paramValueList['$zentao_product']  = "当前{$lang->productCommon}ID";
 $lang->job->paramValueList['$zentao_repopath'] = '当前版本库路径';
 
 $lang->job->engineList = array();
diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php
index 2d269e533c..a3f4e4e192 100644
--- a/module/zanode/lang/de.php
+++ b/module/zanode/lang/de.php
@@ -163,5 +163,5 @@ $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %
 $lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
 $lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.';
 $lang->zanode->shellTips  = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
-$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
+$lang->zanode->automationTips = "Before executing the test task on the execution node, you need to set up the execution node corresponding to the {$lang->productCommon}, the directory of the automated test script, and the custom Shell command to execute.";
 $lang->zanode->nameUnique     = $lang->zanode->name . 'already exist';
diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php
index 996e12770c..6ea6e5acbd 100644
--- a/module/zanode/lang/en.php
+++ b/module/zanode/lang/en.php
@@ -163,5 +163,5 @@ $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %
 $lang->zanode->tips           = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
 $lang->zanode->scriptTips     = 'Write the directory where the script is located on the execution node.';
 $lang->zanode->shellTips      = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
-$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
+$lang->zanode->automationTips = "Before executing the test task on the execution node, you need to set up the execution node corresponding to the {$lang->productCommon}, the directory of the automated test script, and the custom Shell command to execute.";
 $lang->zanode->nameUnique     = $lang->zanode->name . 'already exist';
diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php
index 2d269e533c..a3f4e4e192 100644
--- a/module/zanode/lang/fr.php
+++ b/module/zanode/lang/fr.php
@@ -163,5 +163,5 @@ $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %
 $lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
 $lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.';
 $lang->zanode->shellTips  = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
-$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
+$lang->zanode->automationTips = "Before executing the test task on the execution node, you need to set up the execution node corresponding to the {$lang->productCommon}, the directory of the automated test script, and the custom Shell command to execute.";
 $lang->zanode->nameUnique     = $lang->zanode->name . 'already exist';
diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php
index abfcbd593d..8e0215ced4 100644
--- a/module/zanode/lang/zh-cn.php
+++ b/module/zanode/lang/zh-cn.php
@@ -163,5 +163,5 @@ $lang->zanode->init->initDesc       = "- 在执行节点上执行命令：%s %s
 $lang->zanode->tips           = '执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境，在执行节点配置自动化测试环境后可以自动执行脚本，结果可以在禅道对应用例执行结果中查看。';
 $lang->zanode->scriptTips     = '填写执行节点上自动化测试脚本所在的目录。';
 $lang->zanode->shellTips      = '在执行节点上运行自动化测试脚本前，可以执行自定义的shell命令。';
-$lang->zanode->automationTips = '在执行节点上执行测试任务前，需要设置产品对应的执行节点，自动化测试脚本的目录以及需要执行的自定义Shell命令。';
+$lang->zanode->automationTips = "在执行节点上执行测试任务前，需要设置{$lang->productCommon}对应的执行节点，自动化测试脚本的目录以及需要执行的自定义Shell命令。";
 $lang->zanode->nameUnique     = $lang->zanode->name . '已存在';

From 6d4d57ab92e06f63327eb48f5a8d40bd79bc8ba1 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:15:08 +0800
Subject: [PATCH 291/319] * Update product common lang.

---
 module/productplan/lang/de.php    | 4 ++--
 module/productplan/lang/en.php    | 4 ++--
 module/productplan/lang/fr.php    | 4 ++--
 module/productplan/lang/zh-cn.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php
index 1592ad972d..9bf8801cd3 100644
--- a/module/productplan/lang/de.php
+++ b/module/productplan/lang/de.php
@@ -133,8 +133,8 @@ $lang->productplan->beginLetterParent    = "The start date of the parent plan: %
 $lang->productplan->endGreaterParent     = "The completion date of the parent plan: %s, the completion date cannot be greater than the completion date of the parent plan.";
 $lang->productplan->beginGreaterChild    = "The start date of the child plan: %s, the start date cannot be greater than the start date of the child plan.";
 $lang->productplan->endLetterChild       = "The completion date of the child plan: %s, the completion date cannot be less than the completion date of the child plan.";
-$lang->productplan->noLinkedProject      = "The current product has not been linked with a {$lang->projectCommon}. Please enter the list of the product to link or create a {$lang->projectCommon}.";
-$lang->productplan->enterProjectList     = "Enter the list of the product";
+$lang->productplan->noLinkedProject      = "The current {$lang->productCommon} has not been linked with a {$lang->projectCommon}. Please enter the list of the {$lang->productCommon} to link or create a {$lang->projectCommon}.";
+$lang->productplan->enterProjectList     = "Enter the list of the {$lang->productCommon}";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index 406fac8684..ba33c2fc9d 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -133,8 +133,8 @@ $lang->productplan->beginLetterParent    = "The start date of the parent plan: %
 $lang->productplan->endGreaterParent     = "The completion date of the parent plan: %s, the completion date cannot be greater than the completion date of the parent plan.";
 $lang->productplan->beginGreaterChild    = "The start date of the child plan: %s, the start date cannot be greater than the start date of the child plan.";
 $lang->productplan->endLetterChild       = "The completion date of the child plan: %s, the completion date cannot be less than the completion date of the child plan.";
-$lang->productplan->noLinkedProject      = "The current product has not been linked with a {$lang->projectCommon}. Please enter the list of the product to link or create a {$lang->projectCommon}.";
-$lang->productplan->enterProjectList     = "Enter the list of the product";
+$lang->productplan->noLinkedProject      = "The current {$lang->productCommon} has not been linked with a {$lang->projectCommon}. Please enter the list of the {$lang->productCommon} to link or create a {$lang->projectCommon}.";
+$lang->productplan->enterProjectList     = "Enter the list of the {$lang->productCommon}";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php
index 217e90a285..6e4d35f423 100644
--- a/module/productplan/lang/fr.php
+++ b/module/productplan/lang/fr.php
@@ -133,8 +133,8 @@ $lang->productplan->beginLetterParent    = "The start date of the parent plan: %
 $lang->productplan->endGreaterParent     = "The completion date of the parent plan: %s, the completion date cannot be greater than the completion date of the parent plan.";
 $lang->productplan->beginGreaterChild    = "The start date of the child plan: %s, the start date cannot be greater than the start date of the child plan.";
 $lang->productplan->endLetterChild       = "The completion date of the child plan: %s, the completion date cannot be less than the completion date of the child plan.";
-$lang->productplan->noLinkedProject      = "The current product has not been linked with a {$lang->projectCommon}. Please enter the list of the product to link or create a {$lang->projectCommon}.";
-$lang->productplan->enterProjectList     = "Enter the list of the product";
+$lang->productplan->noLinkedProject      = "The current {$lang->productCommon} has not been linked with a {$lang->projectCommon}. Please enter the list of the {$lang->productCommon} to link or create a {$lang->projectCommon}.";
+$lang->productplan->enterProjectList     = "Enter the list of the {$lang->productCommon}";
 $lang->productplan->beginGreaterChildTip = "The start date of the parent plan[%s]: %s, cannot be greater than the start date of the child plan: %s.";
 $lang->productplan->endLetterChildTip    = "The completion date of the parent plan[%s]: %s, cannot be less than the completion date of the child plan: %s.";
 $lang->productplan->beginLetterParentTip = "The start date of the child plan[%s]: %s, cannot be less than the start date of the parent plan: %s.";
diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php
index 0d0b2d441f..c8a03e6487 100644
--- a/module/productplan/lang/zh-cn.php
+++ b/module/productplan/lang/zh-cn.php
@@ -133,8 +133,8 @@ $lang->productplan->beginLetterParent    = "父计划的开始日期：%s，开
 $lang->productplan->endGreaterParent     = "父计划的完成日期：%s，完成日期不能大于父计划的完成日期";
 $lang->productplan->beginGreaterChild    = "子计划的开始日期：%s，开始日期不能大于子计划的开始日期";
 $lang->productplan->endLetterChild       = "子计划的完成日期：%s，完成日期不能小于子计划的完成日期";
-$lang->productplan->noLinkedProject      = "当前产品还未关联{$lang->projectCommon}，请进入产品的{$lang->projectCommon}列表关联或创建一个{$lang->projectCommon}";
-$lang->productplan->enterProjectList     = "进入产品的{$lang->projectCommon}列表";
+$lang->productplan->noLinkedProject      = "当前{$lang->productCommon}还未关联{$lang->projectCommon}，请进入{$lang->productCommon}的{$lang->projectCommon}列表关联或创建一个{$lang->projectCommon}";
+$lang->productplan->enterProjectList     = "进入{$lang->productCommon}的{$lang->projectCommon}列表";
 $lang->productplan->beginGreaterChildTip = "父计划[%s]的开始日期：%s，不能大于子计划的开始日期: %s";
 $lang->productplan->endLetterChildTip    = "父计划[%s]的完成日期：%s，不能小于子计划的完成日期: %s";
 $lang->productplan->beginLetterParentTip = "子计划[%s]的开始日期：%s，不能小于父计划的开始日期: %s";

From a18a7560cfe72dabad0c07e9c12d6be53b068a8a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:30:52 +0800
Subject: [PATCH 292/319] * Modify project common lang.

---
 extension/lite/dev/ext/lang/de/lite.php    | 8 ++++----
 extension/lite/dev/ext/lang/en/lite.php    | 8 ++++----
 extension/lite/dev/ext/lang/fr/lite.php    | 8 ++++----
 extension/lite/dev/ext/lang/zh-cn/lite.php | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/extension/lite/dev/ext/lang/de/lite.php b/extension/lite/dev/ext/lang/de/lite.php
index 3521a92056..8af156a1a6 100644
--- a/extension/lite/dev/ext/lang/de/lite.php
+++ b/extension/lite/dev/ext/lang/de/lite.php
@@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv']             = 'Group Privilege';
 $lang->dev->tableList['history']               = 'History';
 $lang->dev->tableList['lang']                  = 'Language';
 $lang->dev->tableList['module']                = 'Module';
-$lang->dev->tableList['project']               = 'Project';
-$lang->dev->tableList['projectproduct']        = 'Project' . $lang->productCommon;
-$lang->dev->tableList['projectstory']          = 'Project' . $lang->SRCommon;
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = $lang->projectCommon . $lang->SRCommon;
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['story']                 = $lang->SRCommon;
 $lang->dev->tableList['storyspec']             = "{$lang->SRCommon} Description";
@@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice']         = 'Im User Device';
 
 $lang->dev->groupList = array();
 $lang->dev->groupList['my']        = 'My';
-$lang->dev->groupList['project']   = 'Project';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['doc']       = 'Document';
 $lang->dev->groupList['company']   = 'Company';
diff --git a/extension/lite/dev/ext/lang/en/lite.php b/extension/lite/dev/ext/lang/en/lite.php
index 3521a92056..8af156a1a6 100644
--- a/extension/lite/dev/ext/lang/en/lite.php
+++ b/extension/lite/dev/ext/lang/en/lite.php
@@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv']             = 'Group Privilege';
 $lang->dev->tableList['history']               = 'History';
 $lang->dev->tableList['lang']                  = 'Language';
 $lang->dev->tableList['module']                = 'Module';
-$lang->dev->tableList['project']               = 'Project';
-$lang->dev->tableList['projectproduct']        = 'Project' . $lang->productCommon;
-$lang->dev->tableList['projectstory']          = 'Project' . $lang->SRCommon;
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = $lang->projectCommon . $lang->SRCommon;
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['story']                 = $lang->SRCommon;
 $lang->dev->tableList['storyspec']             = "{$lang->SRCommon} Description";
@@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice']         = 'Im User Device';
 
 $lang->dev->groupList = array();
 $lang->dev->groupList['my']        = 'My';
-$lang->dev->groupList['project']   = 'Project';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['doc']       = 'Document';
 $lang->dev->groupList['company']   = 'Company';
diff --git a/extension/lite/dev/ext/lang/fr/lite.php b/extension/lite/dev/ext/lang/fr/lite.php
index 3521a92056..8af156a1a6 100644
--- a/extension/lite/dev/ext/lang/fr/lite.php
+++ b/extension/lite/dev/ext/lang/fr/lite.php
@@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv']             = 'Group Privilege';
 $lang->dev->tableList['history']               = 'History';
 $lang->dev->tableList['lang']                  = 'Language';
 $lang->dev->tableList['module']                = 'Module';
-$lang->dev->tableList['project']               = 'Project';
-$lang->dev->tableList['projectproduct']        = 'Project' . $lang->productCommon;
-$lang->dev->tableList['projectstory']          = 'Project' . $lang->SRCommon;
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = $lang->projectCommon . $lang->SRCommon;
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['story']                 = $lang->SRCommon;
 $lang->dev->tableList['storyspec']             = "{$lang->SRCommon} Description";
@@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice']         = 'Im User Device';
 
 $lang->dev->groupList = array();
 $lang->dev->groupList['my']        = 'My';
-$lang->dev->groupList['project']   = 'Project';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['doc']       = 'Document';
 $lang->dev->groupList['company']   = 'Company';
diff --git a/extension/lite/dev/ext/lang/zh-cn/lite.php b/extension/lite/dev/ext/lang/zh-cn/lite.php
index 176a623270..b0916fd876 100644
--- a/extension/lite/dev/ext/lang/zh-cn/lite.php
+++ b/extension/lite/dev/ext/lang/zh-cn/lite.php
@@ -16,9 +16,9 @@ $lang->dev->tableList['grouppriv']             = '组权限';
 $lang->dev->tableList['history']               = '操作历史';
 $lang->dev->tableList['lang']                  = '语言定义';
 $lang->dev->tableList['module']                = '模块';
-$lang->dev->tableList['project']               = '项目';
-$lang->dev->tableList['projectproduct']        = '项目' .  $lang->productCommon;
-$lang->dev->tableList['projectstory']          = '项目' .  $lang->SRCommon;
+$lang->dev->tableList['project']               = $lang->projectCommon;
+$lang->dev->tableList['projectproduct']        = $lang->projectCommon . $lang->productCommon;
+$lang->dev->tableList['projectstory']          = $lang->projectCommon . $lang->SRCommon;
 $lang->dev->tableList['execution']             = $lang->executionCommon;
 $lang->dev->tableList['story']                 = $lang->SRCommon;
 $lang->dev->tableList['storyspec']             = "{$lang->SRCommon}描述";
@@ -73,7 +73,7 @@ $lang->dev->tableList['im_userdevice']         = 'im用户设备';
 
 $lang->dev->groupList = array();
 $lang->dev->groupList['my']        = '我的地盘';
-$lang->dev->groupList['project']   = '项目';
+$lang->dev->groupList['project']   = $lang->projectCommon;
 $lang->dev->groupList['execution'] = $lang->executionCommon;
 $lang->dev->groupList['doc']       = '文档';
 $lang->dev->groupList['company']   = '组织';

From 21c915dc366e0966a66d04190b227ef82968c8ed Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 8 Mar 2023 02:33:35 +0000
Subject: [PATCH 293/319] * Fixed #bug86288.

---
 module/action/model.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index b148865057..41432da860 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -483,16 +483,17 @@ class actionModel extends model
             }
             elseif(strpos('feedback,ticket', $action->objectType) === false and $actionName == 'tostory')
 	    {
-		$projectID = 0;
 		$productShadow = $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in($action->product)->fetch('shadow');
 		$title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
 		$defaultExtra = "#$action->extra ".$title;
 		if($productShadow === "1")
 		{
 		    $projectID = $this->dao->select('project')->from(TABLE_PROJECTPRODUCT)->where('product')->in($action->product)->fetch('project');
-		    if($title) $action->extra = common::hasPriv('projectstory','story') && $projectID ? html::a(helper::createLink('projectstory','story',"projectID=$projectID"),"#$action->extra ".$title) : $defaultExtra;
-		}else{
-		    if($title) $action->extra = common::hasPriv('story', 'view') ?  html::a(helper::createLink('story', 'view', "storyID=$action->extra"), "#$action->extra " . $title) : $defaultExtra;
+		    if($title) $action->extra = common::hasPriv('projectstory','story') && $projectID ? html::a(helper::createLink('projectstory','story',"projectID=$projectID"),$defaultExtra) : $defaultExtra;
+		}
+		else
+		{
+		    if($title) $action->extra = common::hasPriv('story', 'view') ?  html::a(helper::createLink('story', 'view', "storyID=$action->extra"), $defaultExtra) : $defaultExtra;
 		}
             }
             elseif($actionName == 'importedcard')

From 490d001153bc6507f882640fa2488bbf2fbf5982 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:34:12 +0800
Subject: [PATCH 294/319] * Update project common lang.

---
 extension/lite/common/ext/lang/de/lite.php       | 10 +++++-----
 extension/lite/common/ext/lang/en/lite.php       | 10 +++++-----
 extension/lite/common/ext/lang/fr/lite.php       | 10 +++++-----
 extension/lite/common/ext/lang/zh-cn/lite.php    |  2 +-
 extension/lite/execution/ext/lang/de/lite.php    |  4 ++--
 extension/lite/execution/ext/lang/en/lite.php    |  4 ++--
 extension/lite/execution/ext/lang/fr/lite.php    |  4 ++--
 extension/lite/execution/ext/lang/zh-cn/lite.php |  4 ++--
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php
index 32b9d67573..5aaca40bd0 100644
--- a/extension/lite/common/ext/lang/de/lite.php
+++ b/extension/lite/common/ext/lang/de/lite.php
@@ -30,7 +30,7 @@ if($config->edition != 'open')
 /* Menu order. */
 $lang->mainNav->menuOrder     = array();
 $lang->mainNav->menuOrder[5]  = 'my';
-$lang->mainNav->menuOrder[10] = 'project';
+$lang->mainNav->menuOrder[10] = $lang->projectCommon;
 $lang->mainNav->menuOrder[15] = 'kanban';
 $lang->mainNav->menuOrder[35] = 'doc';
 $lang->mainNav->menuOrder[45] = 'system';
@@ -137,7 +137,7 @@ $lang->doc->menuOrder[5]  = 'dashboard';
 $lang->doc->menuOrder[10] = 'recent';
 $lang->doc->menuOrder[15] = 'my';
 $lang->doc->menuOrder[20] = 'collect';
-$lang->doc->menuOrder[25] = 'project';
+$lang->doc->menuOrder[25] = $lang->projectCommon;
 $lang->doc->menuOrder[30] = 'custom';
 
 $lang->doc->menu->project['subMenu'] = new stdclass();
@@ -152,15 +152,15 @@ $lang->searchObjects['todo']      = 'Todo';
 $lang->searchObjects['story']     = 'Story';
 $lang->searchObjects['task']      = 'Task';
 $lang->searchObjects['doc']       = 'Doc';
-$lang->searchObjects['project']   = 'Project';
+$lang->searchObjects['project']   = $lang->projectCommon;
 $lang->searchObjects['execution'] = 'Kanban';
 $lang->searchObjects['user']      = 'User';
 
 if($config->edition != 'open') $lang->searchObjects['feedback'] = 'Feedback';
 if($config->visions == ',lite,') unset($lang->searchObjects['feedback']);
 
-$lang->navGroup->task      = 'project';
-$lang->navGroup->execution = 'project';
+$lang->navGroup->task      = $lang->projectCommon;
+$lang->navGroup->execution = $lang->projectCommon;
 
 unset($lang->searchObjects['bug']);
 unset($lang->searchObjects['testcase']);
diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php
index 32b9d67573..5aaca40bd0 100644
--- a/extension/lite/common/ext/lang/en/lite.php
+++ b/extension/lite/common/ext/lang/en/lite.php
@@ -30,7 +30,7 @@ if($config->edition != 'open')
 /* Menu order. */
 $lang->mainNav->menuOrder     = array();
 $lang->mainNav->menuOrder[5]  = 'my';
-$lang->mainNav->menuOrder[10] = 'project';
+$lang->mainNav->menuOrder[10] = $lang->projectCommon;
 $lang->mainNav->menuOrder[15] = 'kanban';
 $lang->mainNav->menuOrder[35] = 'doc';
 $lang->mainNav->menuOrder[45] = 'system';
@@ -137,7 +137,7 @@ $lang->doc->menuOrder[5]  = 'dashboard';
 $lang->doc->menuOrder[10] = 'recent';
 $lang->doc->menuOrder[15] = 'my';
 $lang->doc->menuOrder[20] = 'collect';
-$lang->doc->menuOrder[25] = 'project';
+$lang->doc->menuOrder[25] = $lang->projectCommon;
 $lang->doc->menuOrder[30] = 'custom';
 
 $lang->doc->menu->project['subMenu'] = new stdclass();
@@ -152,15 +152,15 @@ $lang->searchObjects['todo']      = 'Todo';
 $lang->searchObjects['story']     = 'Story';
 $lang->searchObjects['task']      = 'Task';
 $lang->searchObjects['doc']       = 'Doc';
-$lang->searchObjects['project']   = 'Project';
+$lang->searchObjects['project']   = $lang->projectCommon;
 $lang->searchObjects['execution'] = 'Kanban';
 $lang->searchObjects['user']      = 'User';
 
 if($config->edition != 'open') $lang->searchObjects['feedback'] = 'Feedback';
 if($config->visions == ',lite,') unset($lang->searchObjects['feedback']);
 
-$lang->navGroup->task      = 'project';
-$lang->navGroup->execution = 'project';
+$lang->navGroup->task      = $lang->projectCommon;
+$lang->navGroup->execution = $lang->projectCommon;
 
 unset($lang->searchObjects['bug']);
 unset($lang->searchObjects['testcase']);
diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php
index 32b9d67573..5aaca40bd0 100644
--- a/extension/lite/common/ext/lang/fr/lite.php
+++ b/extension/lite/common/ext/lang/fr/lite.php
@@ -30,7 +30,7 @@ if($config->edition != 'open')
 /* Menu order. */
 $lang->mainNav->menuOrder     = array();
 $lang->mainNav->menuOrder[5]  = 'my';
-$lang->mainNav->menuOrder[10] = 'project';
+$lang->mainNav->menuOrder[10] = $lang->projectCommon;
 $lang->mainNav->menuOrder[15] = 'kanban';
 $lang->mainNav->menuOrder[35] = 'doc';
 $lang->mainNav->menuOrder[45] = 'system';
@@ -137,7 +137,7 @@ $lang->doc->menuOrder[5]  = 'dashboard';
 $lang->doc->menuOrder[10] = 'recent';
 $lang->doc->menuOrder[15] = 'my';
 $lang->doc->menuOrder[20] = 'collect';
-$lang->doc->menuOrder[25] = 'project';
+$lang->doc->menuOrder[25] = $lang->projectCommon;
 $lang->doc->menuOrder[30] = 'custom';
 
 $lang->doc->menu->project['subMenu'] = new stdclass();
@@ -152,15 +152,15 @@ $lang->searchObjects['todo']      = 'Todo';
 $lang->searchObjects['story']     = 'Story';
 $lang->searchObjects['task']      = 'Task';
 $lang->searchObjects['doc']       = 'Doc';
-$lang->searchObjects['project']   = 'Project';
+$lang->searchObjects['project']   = $lang->projectCommon;
 $lang->searchObjects['execution'] = 'Kanban';
 $lang->searchObjects['user']      = 'User';
 
 if($config->edition != 'open') $lang->searchObjects['feedback'] = 'Feedback';
 if($config->visions == ',lite,') unset($lang->searchObjects['feedback']);
 
-$lang->navGroup->task      = 'project';
-$lang->navGroup->execution = 'project';
+$lang->navGroup->task      = $lang->projectCommon;
+$lang->navGroup->execution = $lang->projectCommon;
 
 unset($lang->searchObjects['bug']);
 unset($lang->searchObjects['testcase']);
diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index 39dbd0bf2c..14ec03eca2 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -152,7 +152,7 @@ $lang->searchObjects['todo']      = '待办';
 $lang->searchObjects['story']     = '目标';
 $lang->searchObjects['task']      = '任务';
 $lang->searchObjects['doc']       = '文档';
-$lang->searchObjects['project']   = '项目';
+$lang->searchObjects['project']   = $lang->projectCommon;
 $lang->searchObjects['execution'] = '看板';
 $lang->searchObjects['user']      = '用户';
 
diff --git a/extension/lite/execution/ext/lang/de/lite.php b/extension/lite/execution/ext/lang/de/lite.php
index 5eba267b99..1c5a05ff81 100644
--- a/extension/lite/execution/ext/lang/de/lite.php
+++ b/extension/lite/execution/ext/lang/de/lite.php
@@ -22,6 +22,6 @@ $lang->execution->icons['gantt']     = 'lane';
 $lang->execution->icons['tree']      = 'treemap';
 $lang->execution->icons['grouptask'] = 'sitemap';
 
-$lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)";
+$lang->execution->aclList['private'] = "Private (Accessible to team members and {$lang->projectCommon} leaders)";
 
-$lang->execution->common = 'Project Execution';
+$lang->execution->common = "{$lang->projectCommon} Execution";
diff --git a/extension/lite/execution/ext/lang/en/lite.php b/extension/lite/execution/ext/lang/en/lite.php
index 5eba267b99..1c5a05ff81 100644
--- a/extension/lite/execution/ext/lang/en/lite.php
+++ b/extension/lite/execution/ext/lang/en/lite.php
@@ -22,6 +22,6 @@ $lang->execution->icons['gantt']     = 'lane';
 $lang->execution->icons['tree']      = 'treemap';
 $lang->execution->icons['grouptask'] = 'sitemap';
 
-$lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)";
+$lang->execution->aclList['private'] = "Private (Accessible to team members and {$lang->projectCommon} leaders)";
 
-$lang->execution->common = 'Project Execution';
+$lang->execution->common = "{$lang->projectCommon} Execution";
diff --git a/extension/lite/execution/ext/lang/fr/lite.php b/extension/lite/execution/ext/lang/fr/lite.php
index 5eba267b99..1c5a05ff81 100644
--- a/extension/lite/execution/ext/lang/fr/lite.php
+++ b/extension/lite/execution/ext/lang/fr/lite.php
@@ -22,6 +22,6 @@ $lang->execution->icons['gantt']     = 'lane';
 $lang->execution->icons['tree']      = 'treemap';
 $lang->execution->icons['grouptask'] = 'sitemap';
 
-$lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)";
+$lang->execution->aclList['private'] = "Private (Accessible to team members and {$lang->projectCommon} leaders)";
 
-$lang->execution->common = 'Project Execution';
+$lang->execution->common = "{$lang->projectCommon} Execution";
diff --git a/extension/lite/execution/ext/lang/zh-cn/lite.php b/extension/lite/execution/ext/lang/zh-cn/lite.php
index 268f3efa1b..098fe779d5 100644
--- a/extension/lite/execution/ext/lang/zh-cn/lite.php
+++ b/extension/lite/execution/ext/lang/zh-cn/lite.php
@@ -22,6 +22,6 @@ $lang->execution->icons['gantt']     = 'lane';
 $lang->execution->icons['tree']      = 'treemap';
 $lang->execution->icons['grouptask'] = 'sitemap';
 
-$lang->execution->aclList['private'] = "私有（团队成员和项目负责人可访问）";
+$lang->execution->aclList['private'] = "私有（团队成员和{$lang->projectCommon}负责人可访问）";
 
-$lang->execution->common = '项目看板';
+$lang->execution->common = "{$lang->projectCommon}看板";

From c96040e1dd8d26bd58527e6ac6fedc4af9a6cde5 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:35:00 +0800
Subject: [PATCH 295/319] * Update project common lang.

---
 extension/lite/doc/ext/lang/de/lite.php     | 2 +-
 extension/lite/doc/ext/lang/en/lite.php     | 2 +-
 extension/lite/doc/ext/lang/fr/lite.php     | 2 +-
 extension/lite/doc/ext/lang/zh-cn/lite.php  | 2 +-
 extension/lite/task/ext/lang/de/lite.php    | 2 +-
 extension/lite/task/ext/lang/en/lite.php    | 2 +-
 extension/lite/task/ext/lang/fr/lite.php    | 2 +-
 extension/lite/task/ext/lang/zh-cn/lite.php | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extension/lite/doc/ext/lang/de/lite.php b/extension/lite/doc/ext/lang/de/lite.php
index e1084db219..f978274997 100644
--- a/extension/lite/doc/ext/lang/de/lite.php
+++ b/extension/lite/doc/ext/lang/de/lite.php
@@ -1,4 +1,4 @@
 <?php
 $lang->doc->libTypeList = array();
-$lang->doc->libTypeList['project'] = 'Project Library';
+$lang->doc->libTypeList['project'] = "{$lang->projectCommon} Library";
 $lang->doc->libTypeList['custom']  = 'Custom Library';
diff --git a/extension/lite/doc/ext/lang/en/lite.php b/extension/lite/doc/ext/lang/en/lite.php
index e1084db219..f978274997 100644
--- a/extension/lite/doc/ext/lang/en/lite.php
+++ b/extension/lite/doc/ext/lang/en/lite.php
@@ -1,4 +1,4 @@
 <?php
 $lang->doc->libTypeList = array();
-$lang->doc->libTypeList['project'] = 'Project Library';
+$lang->doc->libTypeList['project'] = "{$lang->projectCommon} Library";
 $lang->doc->libTypeList['custom']  = 'Custom Library';
diff --git a/extension/lite/doc/ext/lang/fr/lite.php b/extension/lite/doc/ext/lang/fr/lite.php
index e1084db219..f978274997 100644
--- a/extension/lite/doc/ext/lang/fr/lite.php
+++ b/extension/lite/doc/ext/lang/fr/lite.php
@@ -1,4 +1,4 @@
 <?php
 $lang->doc->libTypeList = array();
-$lang->doc->libTypeList['project'] = 'Project Library';
+$lang->doc->libTypeList['project'] = "{$lang->projectCommon} Library";
 $lang->doc->libTypeList['custom']  = 'Custom Library';
diff --git a/extension/lite/doc/ext/lang/zh-cn/lite.php b/extension/lite/doc/ext/lang/zh-cn/lite.php
index f6d01c3474..bc3d8bfaf3 100644
--- a/extension/lite/doc/ext/lang/zh-cn/lite.php
+++ b/extension/lite/doc/ext/lang/zh-cn/lite.php
@@ -1,4 +1,4 @@
 <?php
 $lang->doc->libTypeList = array();
-$lang->doc->libTypeList['project'] = '项目文档库';
+$lang->doc->libTypeList['project'] = "{$lang->projectCommon}文档库";
 $lang->doc->libTypeList['custom']  = '自定义文档库';
diff --git a/extension/lite/task/ext/lang/de/lite.php b/extension/lite/task/ext/lang/de/lite.php
index fd2960d8e1..a4f0b3a012 100644
--- a/extension/lite/task/ext/lang/de/lite.php
+++ b/extension/lite/task/ext/lang/de/lite.php
@@ -61,7 +61,7 @@ $lang->task->confirmRecord         = '"Left Hour" is 0. Do you want to set the t
 $lang->task->confirmTransfer       = '"Left Hour" is 0，Do you want to transfer task?';
 $lang->task->noTask                = 'No tasks yet. ';
 $lang->task->kanbanDenied          = 'Please create a Kanban first';
-$lang->task->createDenied          = 'Create Task is denied in this project';
+$lang->task->createDenied          = "Create Task is denied in this {$lang->projectCommon}";
 $lang->task->cannotDeleteParent    = 'Cannot delete parent task';
 $lang->task->addChildTask          = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
 
diff --git a/extension/lite/task/ext/lang/en/lite.php b/extension/lite/task/ext/lang/en/lite.php
index fd2960d8e1..a4f0b3a012 100644
--- a/extension/lite/task/ext/lang/en/lite.php
+++ b/extension/lite/task/ext/lang/en/lite.php
@@ -61,7 +61,7 @@ $lang->task->confirmRecord         = '"Left Hour" is 0. Do you want to set the t
 $lang->task->confirmTransfer       = '"Left Hour" is 0，Do you want to transfer task?';
 $lang->task->noTask                = 'No tasks yet. ';
 $lang->task->kanbanDenied          = 'Please create a Kanban first';
-$lang->task->createDenied          = 'Create Task is denied in this project';
+$lang->task->createDenied          = "Create Task is denied in this {$lang->projectCommon}";
 $lang->task->cannotDeleteParent    = 'Cannot delete parent task';
 $lang->task->addChildTask          = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
 
diff --git a/extension/lite/task/ext/lang/fr/lite.php b/extension/lite/task/ext/lang/fr/lite.php
index fd2960d8e1..a4f0b3a012 100644
--- a/extension/lite/task/ext/lang/fr/lite.php
+++ b/extension/lite/task/ext/lang/fr/lite.php
@@ -61,7 +61,7 @@ $lang->task->confirmRecord         = '"Left Hour" is 0. Do you want to set the t
 $lang->task->confirmTransfer       = '"Left Hour" is 0，Do you want to transfer task?';
 $lang->task->noTask                = 'No tasks yet. ';
 $lang->task->kanbanDenied          = 'Please create a Kanban first';
-$lang->task->createDenied          = 'Create Task is denied in this project';
+$lang->task->createDenied          = "Create Task is denied in this {$lang->projectCommon}";
 $lang->task->cannotDeleteParent    = 'Cannot delete parent task';
 $lang->task->addChildTask          = 'Because the task has cost hours, ZenTao will create a child task with the same name to record the cost housrs to ensure data consistency.';
 
diff --git a/extension/lite/task/ext/lang/zh-cn/lite.php b/extension/lite/task/ext/lang/zh-cn/lite.php
index d90924f223..a8e772b5d3 100644
--- a/extension/lite/task/ext/lang/zh-cn/lite.php
+++ b/extension/lite/task/ext/lang/zh-cn/lite.php
@@ -61,7 +61,7 @@ $lang->task->confirmRecord         = '"剩余"为0，任务将标记为"已完
 $lang->task->confirmTransfer       = '"当前剩余"为0，任务将被转交，您确定吗？';
 $lang->task->noTask                = '暂时没有任务。';
 $lang->task->kanbanDenied          = '请先创建看板';
-$lang->task->createDenied          = '你不能在该项目添加任务';
+$lang->task->createDenied          = "你不能在该{$lang->projectCommon}添加任务";
 $lang->task->cannotDeleteParent    = '不能删除父任务。';
 $lang->task->addChildTask          = '因该任务已经产生消耗，为保证数据一致性，我们会帮您创建一条同名子任务记录该消耗。';
 

From 4db7af7e52d20a531bd30aaea112c6ab51a01572 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 8 Mar 2023 02:37:40 +0000
Subject: [PATCH 296/319] * Fixed #bug86288.

---
 module/action/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 41432da860..d0133ef7fd 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -485,11 +485,11 @@ class actionModel extends model
 	    {
 		$productShadow = $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in($action->product)->fetch('shadow');
 		$title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
-		$defaultExtra = "#$action->extra ".$title;
+		$defaultExtra = "#$action->extra ". $title;
 		if($productShadow === "1")
 		{
 		    $projectID = $this->dao->select('project')->from(TABLE_PROJECTPRODUCT)->where('product')->in($action->product)->fetch('project');
-		    if($title) $action->extra = common::hasPriv('projectstory','story') && $projectID ? html::a(helper::createLink('projectstory','story',"projectID=$projectID"),$defaultExtra) : $defaultExtra;
+		    if($title) $action->extra = common::hasPriv('projectstory', 'story') && $projectID ? html::a(helper::createLink('projectstory', 'story', "projectID=$projectID"), $defaultExtra) : $defaultExtra;
 		}
 		else
 		{

From c2d21c97487a8382b34daa7ece99f7b295b114a7 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:40:22 +0800
Subject: [PATCH 297/319] * Update project common lang.

---
 extension/lite/action/ext/lang/de/lite.php     | 6 +++---
 extension/lite/action/ext/lang/en/lite.php     | 6 +++---
 extension/lite/action/ext/lang/fr/lite.php     | 6 +++---
 extension/lite/action/ext/lang/zh-cn/lite.php  | 6 +++---
 extension/lite/company/ext/lang/de/lite.php    | 2 +-
 extension/lite/company/ext/lang/en/lite.php    | 2 +-
 extension/lite/company/ext/lang/fr/lite.php    | 2 +-
 extension/lite/company/ext/lang/zh-cn/lite.php | 2 +-
 extension/lite/project/ext/lang/de/lite.php    | 2 +-
 extension/lite/project/ext/lang/en/lite.php    | 2 +-
 extension/lite/project/ext/lang/fr/lite.php    | 2 +-
 extension/lite/project/ext/lang/zh-cn/lite.php | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/extension/lite/action/ext/lang/de/lite.php b/extension/lite/action/ext/lang/de/lite.php
index 5de99b7955..faff3dbc75 100644
--- a/extension/lite/action/ext/lang/de/lite.php
+++ b/extension/lite/action/ext/lang/de/lite.php
@@ -4,11 +4,11 @@ $lang->action->label->task      = 'Task|task|view|taskID=%s';
 $lang->action->label->module    = 'Katalog|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
 
 /* Object type. */
-$lang->action->objectTypes['execution'] = 'Project' . $lang->executionCommon;
+$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon;
 
 $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
-$lang->action->search->objectTypeList['project']     = 'Project';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = 'Kanban';
 $lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = 'Task';
@@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory     = '$date, <strong>$actor</strong> Link
 $lang->action->desc->unlinkparentstory   = '$date, <strong>$actor</strong> From parent story<strong>$extra</strong>CanceledLink。' . "\n";
 $lang->action->desc->deletechildrenstory = '$date, <strong>$actor</strong> Deleted child story<strong>$extra</strong>。' . "\n";
 
-$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
diff --git a/extension/lite/action/ext/lang/en/lite.php b/extension/lite/action/ext/lang/en/lite.php
index 799d2dc98e..c59495ba5d 100644
--- a/extension/lite/action/ext/lang/en/lite.php
+++ b/extension/lite/action/ext/lang/en/lite.php
@@ -4,11 +4,11 @@ $lang->action->label->task      = 'Task|task|view|taskID=%s';
 $lang->action->label->module    = 'Catalog|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
 
 /* Object type. */
-$lang->action->objectTypes['execution'] = 'Project' . $lang->executionCommon;
+$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon;
 
 $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
-$lang->action->search->objectTypeList['project']     = 'Project';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = 'Kanban';
 $lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = 'Task';
@@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory     = '$date, <strong>$actor</strong> Link
 $lang->action->desc->unlinkparentstory   = '$date, <strong>$actor</strong> From parent story<strong>$extra</strong>CanceledLink。' . "\n";
 $lang->action->desc->deletechildrenstory = '$date, <strong>$actor</strong> Deleted child story<strong>$extra</strong>。' . "\n";
 
-$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
diff --git a/extension/lite/action/ext/lang/fr/lite.php b/extension/lite/action/ext/lang/fr/lite.php
index f638a8c466..aa5d3f7a22 100644
--- a/extension/lite/action/ext/lang/fr/lite.php
+++ b/extension/lite/action/ext/lang/fr/lite.php
@@ -4,11 +4,11 @@ $lang->action->label->task      = 'Task|task|view|taskID=%s';
 $lang->action->label->module    = 'Table des matières|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
 
 /* Object type. */
-$lang->action->objectTypes['execution'] = 'Project' . $lang->executionCommon;
+$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon;
 
 $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
-$lang->action->search->objectTypeList['project']     = 'Project';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = 'Kanban';
 $lang->action->search->objectTypeList['story']       = "$lang->SRCommon/$lang->URCommon";
 $lang->action->search->objectTypeList['task']        = 'Task';
@@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory     = '$date, <strong>$actor</strong> Link
 $lang->action->desc->unlinkparentstory   = '$date, <strong>$actor</strong> From parent story<strong>$extra</strong>CanceledLink。' . "\n";
 $lang->action->desc->deletechildrenstory = '$date, <strong>$actor</strong> Deleted child story<strong>$extra</strong>。' . "\n";
 
-$lang->action->executionNoProject = 'The execution does not belong to a project,please restore the project first';
+$lang->action->executionNoProject = "The execution does not belong to a {$lang->projectCommon},please restore the {$lang->projectCommon} first";
diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php
index 2c1a1e482c..24c52948ed 100644
--- a/extension/lite/action/ext/lang/zh-cn/lite.php
+++ b/extension/lite/action/ext/lang/zh-cn/lite.php
@@ -4,11 +4,11 @@ $lang->action->label->task      = '任务|task|view|taskID=%s';
 $lang->action->label->module    = '目录|tree|browse|productid=%s&type=story&currentModuleID=0&branch=all';
 
 /* Object type. */
-$lang->action->objectTypes['execution'] = '项目' . $lang->executionCommon;
+$lang->action->objectTypes['execution'] = $lang->projectCommon . $lang->executionCommon;
 
 $lang->action->search = new stdclass();
 $lang->action->search->objectTypeList['']            = '';
-$lang->action->search->objectTypeList['project']     = '项目';
+$lang->action->search->objectTypeList['project']     = $lang->projectCommon;
 $lang->action->search->objectTypeList['execution']   = '看板';
 $lang->action->search->objectTypeList['story']       = "目标";
 $lang->action->search->objectTypeList['task']        = '任务';
@@ -109,4 +109,4 @@ $lang->action->desc->linkparentstory     = '$date, 由 <strong>$actor</strong> 
 $lang->action->desc->unlinkparentstory   = '$date, 由 <strong>$actor</strong> 从父目标<strong>$extra</strong>取消关联。' . "\n";
 $lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目标<strong>$extra</strong>。' . "\n";
 
-$lang->action->executionNoProject = '该项目看板没有所属的项目，请先还原项目再还原项目看板';
+$lang->action->executionNoProject = "该{$lang->projectCommon}看板没有所属的{$lang->projectCommon}，请先还原{$lang->projectCommon}再还原{$lang->projectCommon}看板";
diff --git a/extension/lite/company/ext/lang/de/lite.php b/extension/lite/company/ext/lang/de/lite.php
index 5e6c107296..7e71bc3dad 100644
--- a/extension/lite/company/ext/lang/de/lite.php
+++ b/extension/lite/company/ext/lang/de/lite.php
@@ -1,3 +1,3 @@
 <?php
 $lang->company->execution = 'Kanban';
-$lang->company->product   = 'Project';
+$lang->company->product   = $lang->projectCommon;
diff --git a/extension/lite/company/ext/lang/en/lite.php b/extension/lite/company/ext/lang/en/lite.php
index 5e6c107296..7e71bc3dad 100644
--- a/extension/lite/company/ext/lang/en/lite.php
+++ b/extension/lite/company/ext/lang/en/lite.php
@@ -1,3 +1,3 @@
 <?php
 $lang->company->execution = 'Kanban';
-$lang->company->product   = 'Project';
+$lang->company->product   = $lang->projectCommon;
diff --git a/extension/lite/company/ext/lang/fr/lite.php b/extension/lite/company/ext/lang/fr/lite.php
index 5e6c107296..7e71bc3dad 100644
--- a/extension/lite/company/ext/lang/fr/lite.php
+++ b/extension/lite/company/ext/lang/fr/lite.php
@@ -1,3 +1,3 @@
 <?php
 $lang->company->execution = 'Kanban';
-$lang->company->product   = 'Project';
+$lang->company->product   = $lang->projectCommon;
diff --git a/extension/lite/company/ext/lang/zh-cn/lite.php b/extension/lite/company/ext/lang/zh-cn/lite.php
index f09b1918cf..82d069353e 100644
--- a/extension/lite/company/ext/lang/zh-cn/lite.php
+++ b/extension/lite/company/ext/lang/zh-cn/lite.php
@@ -1,3 +1,3 @@
 <?php
 $lang->company->execution = '看板';
-$lang->company->product   = '项目';
+$lang->company->product   = $lang->projectCommon;
diff --git a/extension/lite/project/ext/lang/de/lite.php b/extension/lite/project/ext/lang/de/lite.php
index cd8e094b83..3f4dd0fa95 100644
--- a/extension/lite/project/ext/lang/de/lite.php
+++ b/extension/lite/project/ext/lang/de/lite.php
@@ -4,4 +4,4 @@ $lang->project->doingExecutions = 'Doing Kanban';
 $lang->project->select          = "Select {$lang->project->common}";
 $lang->project->noProject       = "No {$lang->project->common} yet. ";
 
-$lang->project->aclList['private'] = "Private (Accessible to project leaders and team members)";
+$lang->project->aclList['private'] = "Private (Accessible to {$lang->projectCommon} leaders and team members)";
diff --git a/extension/lite/project/ext/lang/en/lite.php b/extension/lite/project/ext/lang/en/lite.php
index cd8e094b83..3f4dd0fa95 100644
--- a/extension/lite/project/ext/lang/en/lite.php
+++ b/extension/lite/project/ext/lang/en/lite.php
@@ -4,4 +4,4 @@ $lang->project->doingExecutions = 'Doing Kanban';
 $lang->project->select          = "Select {$lang->project->common}";
 $lang->project->noProject       = "No {$lang->project->common} yet. ";
 
-$lang->project->aclList['private'] = "Private (Accessible to project leaders and team members)";
+$lang->project->aclList['private'] = "Private (Accessible to {$lang->projectCommon} leaders and team members)";
diff --git a/extension/lite/project/ext/lang/fr/lite.php b/extension/lite/project/ext/lang/fr/lite.php
index cd8e094b83..3f4dd0fa95 100644
--- a/extension/lite/project/ext/lang/fr/lite.php
+++ b/extension/lite/project/ext/lang/fr/lite.php
@@ -4,4 +4,4 @@ $lang->project->doingExecutions = 'Doing Kanban';
 $lang->project->select          = "Select {$lang->project->common}";
 $lang->project->noProject       = "No {$lang->project->common} yet. ";
 
-$lang->project->aclList['private'] = "Private (Accessible to project leaders and team members)";
+$lang->project->aclList['private'] = "Private (Accessible to {$lang->projectCommon} leaders and team members)";
diff --git a/extension/lite/project/ext/lang/zh-cn/lite.php b/extension/lite/project/ext/lang/zh-cn/lite.php
index 109b554f69..ff31eedd46 100644
--- a/extension/lite/project/ext/lang/zh-cn/lite.php
+++ b/extension/lite/project/ext/lang/zh-cn/lite.php
@@ -4,4 +4,4 @@ $lang->project->doingExecutions = '进行中的看板(最近1个)';
 $lang->project->select          = "请选择{$lang->project->common}";
 $lang->project->noProject       = "暂时没有{$lang->project->common}。";
 
-$lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员可访问)";
+$lang->project->aclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员可访问)";

From 01481058b264dac65de983f671ddeb2898575792 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 8 Mar 2023 02:40:26 +0000
Subject: [PATCH 298/319] Fix bug #86289.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index f8da167db9..bbce386b3f 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -126,7 +126,7 @@ class execution extends control
 
         if(!isset($_SESSION['limitedExecutions'])) $this->execution->getLimitedExecution();
 
-	if($executionID) $this->session->set("storyList",$this->createLink("execution","story","&executionID=".$executionID));
+	if($executionID) $this->session->set("storyList", $this->createLink("execution", "story", "&executionID=" . $executionID));
 
         /* Set browse type. */
         $browseType = strtolower($status);

From 258ca0a73997ec1f25765cc9241396b035520fe4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 10:41:05 +0800
Subject: [PATCH 299/319] * Update project common lang.

---
 extension/lite/block/ext/lang/de/lite.php    | 4 ++--
 extension/lite/block/ext/lang/en/lite.php    | 4 ++--
 extension/lite/block/ext/lang/fr/lite.php    | 4 ++--
 extension/lite/block/ext/lang/zh-cn/lite.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extension/lite/block/ext/lang/de/lite.php b/extension/lite/block/ext/lang/de/lite.php
index 2b2566c658..ff2e678e75 100644
--- a/extension/lite/block/ext/lang/de/lite.php
+++ b/extension/lite/block/ext/lang/de/lite.php
@@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count']   = '15';
 
 $lang->block->modules['kanban']['index'] = new stdclass();
 $lang->block->modules['kanban']['index']->availableBlocks = new stdclass();
-$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = 'Project Overview';
+$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon} Overview";
 $lang->block->modules['kanban']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
 $lang->block->modules['kanban']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = 'Dynamics';
 
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project = 'Project List';
+$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon} List";
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
diff --git a/extension/lite/block/ext/lang/en/lite.php b/extension/lite/block/ext/lang/en/lite.php
index 2b2566c658..ff2e678e75 100644
--- a/extension/lite/block/ext/lang/en/lite.php
+++ b/extension/lite/block/ext/lang/en/lite.php
@@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count']   = '15';
 
 $lang->block->modules['kanban']['index'] = new stdclass();
 $lang->block->modules['kanban']['index']->availableBlocks = new stdclass();
-$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = 'Project Overview';
+$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon} Overview";
 $lang->block->modules['kanban']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
 $lang->block->modules['kanban']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = 'Dynamics';
 
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project = 'Project List';
+$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon} List";
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
diff --git a/extension/lite/block/ext/lang/fr/lite.php b/extension/lite/block/ext/lang/fr/lite.php
index 2b2566c658..ff2e678e75 100644
--- a/extension/lite/block/ext/lang/fr/lite.php
+++ b/extension/lite/block/ext/lang/fr/lite.php
@@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count']   = '15';
 
 $lang->block->modules['kanban']['index'] = new stdclass();
 $lang->block->modules['kanban']['index']->availableBlocks = new stdclass();
-$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = 'Project Overview';
+$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon} Overview";
 $lang->block->modules['kanban']['index']->availableBlocks->scrumlist      = $lang->executionCommon . ' List';
 $lang->block->modules['kanban']['index']->availableBlocks->sprint         = $lang->executionCommon . ' Overview';
 $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = 'Dynamics';
 
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project = 'Project List';
+$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon} List";
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();
diff --git a/extension/lite/block/ext/lang/zh-cn/lite.php b/extension/lite/block/ext/lang/zh-cn/lite.php
index 4c60831543..96983d404a 100644
--- a/extension/lite/block/ext/lang/zh-cn/lite.php
+++ b/extension/lite/block/ext/lang/zh-cn/lite.php
@@ -33,13 +33,13 @@ $lang->block->default['full']['my']['5']['params']['count']   = '15';
 
 $lang->block->modules['kanban']['index'] = new stdclass();
 $lang->block->modules['kanban']['index']->availableBlocks = new stdclass();
-$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = '项目概况';
+$lang->block->modules['kanban']['index']->availableBlocks->scrumoverview  = "{$lang->projectCommon}概况";
 $lang->block->modules['kanban']['index']->availableBlocks->scrumlist      = $lang->executionCommon . '列表';
 $lang->block->modules['kanban']['index']->availableBlocks->sprint         = $lang->executionCommon . '总览';
 $lang->block->modules['kanban']['index']->availableBlocks->projectdynamic = '最新动态';
 
 $lang->block->modules['project']->availableBlocks = new stdclass();
-$lang->block->modules['project']->availableBlocks->project = '项目列表';
+$lang->block->modules['project']->availableBlocks->project = "{$lang->projectCommon}列表";
 
 $lang->block->modules['execution'] = new stdclass();
 $lang->block->modules['execution']->availableBlocks = new stdclass();

From 9f3a92179ce59efcd0f4ca67c3ca8c56dc9f5607 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 11:10:31 +0800
Subject: [PATCH 300/319] * Adjust code.

---
 module/block/lang/de.php | 24 ++++++++++++------------
 module/block/lang/en.php | 24 ++++++++++++------------
 module/block/lang/fr.php | 24 ++++++++++++------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index c567b32647..978f144d63 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -132,13 +132,13 @@ $lang->block->titleList['testtask']       = 'Test Task';
 
 $lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = $lang->projectCommon;
+$lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCommon;
+$lang->block->default['waterfall']['project']['6']['source'] = 'project';
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
@@ -290,7 +290,7 @@ $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon} Statistic";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
-$lang->block->default['full']['my']['5']['source']          = $lang->projectCommon;
+$lang->block->default['full']['my']['5']['source']          = 'project';
 $lang->block->default['full']['my']['5']['grid']            = 8;
 $lang->block->default['full']['my']['5']['params']['count'] = '20';
 
@@ -301,7 +301,7 @@ $lang->block->default['full']['my']['6']['grid']   = 4;
 
 $lang->block->default['full']['my']['7']['title']  = "Recent {$lang->projectCommon}s";
 $lang->block->default['full']['my']['7']['block']  = "recent{$lang->projectCommon}";
-$lang->block->default['full']['my']['7']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['7']['source'] = 'project';
 $lang->block->default['full']['my']['7']['grid']   = 8;
 
 $lang->block->default['full']['my']['8']['title']  = 'Todo';
@@ -321,12 +321,12 @@ $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
-$lang->block->default['full']['my']['9']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon} List";
 $lang->block->default['full']['my']['10']['block']  = $lang->projectCommon;
-$lang->block->default['full']['my']['10']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -529,18 +529,18 @@ $lang->block->typeList->testtask['done']    = 'Erledigt';
 $lang->block->typeList->testtask['all']     = 'Alle';
 
 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = "{$lang->projectCommon}|browse|";
-$lang->block->modules['project']->moreLinkList->statistic      = "{$lang->projectCommon}|browse|";
-$lang->block->modules['project']->moreLinkList->project        = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->recentproject  = "project|browse|";
+$lang->block->modules['project']->moreLinkList->statistic      = "project|browse|";
+$lang->block->modules['project']->moreLinkList->project        = "project|browse|";
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = "{$lang->projectCommon}|execution|";
+$lang->block->modules['project']->moreLinkList->scrumlist      = "project|execution|";
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = "{$lang->projectCommon}|execution|";
-$lang->block->modules['project']->moreLinkList->projectdynamic = "{$lang->projectCommon}|dynamic|";
+$lang->block->modules['project']->moreLinkList->sprint         = "project|execution|";
+$lang->block->modules['project']->moreLinkList->projectdynamic = "project|dynamic|";
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 1c9a88a325..2a19a3bcec 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -132,13 +132,13 @@ $lang->block->titleList['testtask']       = 'Test Task';
 
 $lang->block->default['waterfall']['project']['3']['title']  = "Plan Gantt Chart";
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = $lang->projectCommon;
+$lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCommon;
+$lang->block->default['waterfall']['project']['6']['source'] = 'project';
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
@@ -290,7 +290,7 @@ $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon} Statistic";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
-$lang->block->default['full']['my']['5']['source']          = $lang->projectCommon;
+$lang->block->default['full']['my']['5']['source']          = 'project';
 $lang->block->default['full']['my']['5']['grid']            = 8;
 $lang->block->default['full']['my']['5']['params']['count'] = '20';
 
@@ -301,7 +301,7 @@ $lang->block->default['full']['my']['6']['grid']   = 4;
 
 $lang->block->default['full']['my']['7']['title']  = "Recent {$lang->projectCommon}s";
 $lang->block->default['full']['my']['7']['block']  = "recent{$lang->projectCommon}";
-$lang->block->default['full']['my']['7']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['7']['source'] = 'project';
 $lang->block->default['full']['my']['7']['grid']   = 8;
 
 $lang->block->default['full']['my']['8']['title']  = 'Todo';
@@ -321,12 +321,12 @@ $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
 $lang->block->default['full']['my']['9']['title']  = 'Manpower Input';
 $lang->block->default['full']['my']['9']['block']  = 'projectteam';
-$lang->block->default['full']['my']['9']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon} List";
 $lang->block->default['full']['my']['10']['block']  = $lang->projectCommon;
-$lang->block->default['full']['my']['10']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -529,18 +529,18 @@ $lang->block->typeList->testtask['done']    = 'Done';
 $lang->block->typeList->testtask['all']     = 'All';
 
 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = "{$lang->projectCommon}|browse|";
-$lang->block->modules['project']->moreLinkList->statistic      = "{$lang->projectCommon}|browse|";
-$lang->block->modules['project']->moreLinkList->project        = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->recentproject  = "project|browse|";
+$lang->block->modules['project']->moreLinkList->statistic      = "project|browse|";
+$lang->block->modules['project']->moreLinkList->project        = "project|browse|";
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = "{$lang->projectCommon}|execution|";
+$lang->block->modules['project']->moreLinkList->scrumlist      = "project|execution|";
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = "{$lang->projectCommon}|execution|";
-$lang->block->modules['project']->moreLinkList->projectdynamic = "{$lang->projectCommon}|dynamic|";
+$lang->block->modules['project']->moreLinkList->sprint         = "project|execution|";
+$lang->block->modules['project']->moreLinkList->projectdynamic = "project|dynamic|";
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index effdaf9980..65d0842c33 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -132,13 +132,13 @@ $lang->block->titleList['testtask']       = 'Test Task';
 
 $lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
-$lang->block->default['waterfall']['project']['3']['source'] = $lang->projectCommon;
+$lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'dynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
-$lang->block->default['waterfall']['project']['6']['source'] = $lang->projectCommon;
+$lang->block->default['waterfall']['project']['6']['source'] = 'project';
 
 $lang->block->default['waterfallplus'] = $lang->block->default['waterfall'];
 
@@ -290,7 +290,7 @@ $lang->block->default['full']['my']['4']['params']['count'] = '20';
 
 $lang->block->default['full']['my']['5']['title']           = "{$lang->projectCommon} Statistic";
 $lang->block->default['full']['my']['5']['block']           = 'statistic';
-$lang->block->default['full']['my']['5']['source']          = $lang->projectCommon;
+$lang->block->default['full']['my']['5']['source']          = 'project';
 $lang->block->default['full']['my']['5']['grid']            = 8;
 $lang->block->default['full']['my']['5']['params']['count'] = '20';
 
@@ -301,7 +301,7 @@ $lang->block->default['full']['my']['6']['grid']   = 8;
 
 $lang->block->default['full']['my']['7']['title']  = "Recent {$lang->projectCommon}s";
 $lang->block->default['full']['my']['7']['block']  = "recent{$lang->projectCommon}";
-$lang->block->default['full']['my']['7']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['7']['source'] = 'project';
 $lang->block->default['full']['my']['7']['grid']   = 8;
 
 $lang->block->default['full']['my']['8']['title']  = 'Human Input';
@@ -321,12 +321,12 @@ $lang->block->default['full']['my']['8']['params']['feedbackCount'] = '20';
 
 $lang->block->default['full']['my']['9']['title']  = 'Project List';
 $lang->block->default['full']['my']['9']['block']  = 'project';
-$lang->block->default['full']['my']['9']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['9']['source'] = 'project';
 $lang->block->default['full']['my']['9']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['title']  = "{$lang->projectCommon} List";
 $lang->block->default['full']['my']['10']['block']  = $lang->projectCommon;
-$lang->block->default['full']['my']['10']['source'] = $lang->projectCommon;
+$lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
 
 $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc';
@@ -529,18 +529,18 @@ $lang->block->typeList->testtask['done']    = 'Jouées';
 $lang->block->typeList->testtask['all']     = 'Toutes';
 
 $lang->block->modules['project']->moreLinkList = new stdclass();
-$lang->block->modules['project']->moreLinkList->recentproject  = "{$lang->projectCommon}|browse|";
-$lang->block->modules['project']->moreLinkList->statistic      = "{$lang->projectCommon}|browse|";
-$lang->block->modules['project']->moreLinkList->project        = "{$lang->projectCommon}|browse|";
+$lang->block->modules['project']->moreLinkList->recentproject  = "project|browse|";
+$lang->block->modules['project']->moreLinkList->statistic      = "project|browse|";
+$lang->block->modules['project']->moreLinkList->project        = "project|browse|";
 $lang->block->modules['project']->moreLinkList->cmmireport     = 'weekly|index|';
 $lang->block->modules['project']->moreLinkList->cmmiestimate   = 'workestimation|index|';
 $lang->block->modules['project']->moreLinkList->cmmiissue      = 'issue|browse|';
 $lang->block->modules['project']->moreLinkList->cmmirisk       = 'risk|browse|';
-$lang->block->modules['project']->moreLinkList->scrumlist      = "{$lang->projectCommon}|execution|";
+$lang->block->modules['project']->moreLinkList->scrumlist      = "project|execution|";
 $lang->block->modules['project']->moreLinkList->scrumtest      = 'testtask|browse|';
 $lang->block->modules['project']->moreLinkList->scrumproduct   = 'product|all|';
-$lang->block->modules['project']->moreLinkList->sprint         = "{$lang->projectCommon}|execution|";
-$lang->block->modules['project']->moreLinkList->projectdynamic = "{$lang->projectCommon}|dynamic|";
+$lang->block->modules['project']->moreLinkList->sprint         = "project|execution|";
+$lang->block->modules['project']->moreLinkList->projectdynamic = "project|dynamic|";
 
 $lang->block->modules['product']->moreLinkList        = new stdclass();
 $lang->block->modules['product']->moreLinkList->list  = 'product|all|';

From afee92dcf37864e90730eb7624b47fd1e9ee3d62 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 11:14:02 +0800
Subject: [PATCH 301/319] * Update block name.

---
 module/block/lang/fr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index 65d0842c33..0485e43e45 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -136,7 +136,7 @@ $lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
-$lang->block->default['waterfall']['project']['6']['block']  = 'dynamic';
+$lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
 $lang->block->default['waterfall']['project']['6']['source'] = 'project';
 

From e5c211bf86af3718ab3589a52ff238ff9a94509c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 03:24:46 +0000
Subject: [PATCH 302/319] * Finish task #85648.

---
 module/bug/control.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 00574f77cf..4e22536a39 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1166,7 +1166,14 @@ class bug extends control
         unset($productBugs[$bugID]);
 
         $executions = array(0 => '') + $this->product->getExecutionPairsByProduct($bug->product, $bug->branch, 'id_desc', $bug->project);
-        if(!empty($bug->execution) and empty($executions[$bug->execution])) $executions[$execution->id] = $execution->name;
+        if(!empty($bug->execution) and empty($executions[$bug->execution])) $executions[$execution->id] = $execution->name . "({$this->lang->bug->deleted})";
+
+        $projects = array(0 => '') + $this->product->getProjectPairsByProduct($productID, $bug->branch);
+        if(!empty($bug->project) and empty($projects[$bug->project]))
+        {
+            $project = $this->loadModel('project')->getByID($bug->project);
+            $projects[$project->id] = $project->name . "({$this->lang->bug->deleted})";
+        }
 
         if($product->shadow) $this->view->project = $this->loadModel('project')->getByShadowProduct($bug->product);
 
@@ -1176,7 +1183,7 @@ class bug extends control
         $this->view->productBugs           = $productBugs;
         $this->view->productName           = $this->products[$productID];
         $this->view->plans                 = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
-        $this->view->projects              = array(0 => '') + $this->product->getProjectPairsByProduct($productID, $bug->branch, $bug->project);
+        $this->view->projects              = $projects;
         $this->view->projectExecutionPairs = $this->loadModel('project')->getProjectExecutionPairs();
         $this->view->moduleOptionMenu      = $moduleOptionMenu;
         $this->view->currentModuleID       = $currentModuleID;

From b317cd89a5fc46796d7a8855b8a74ff10ac9e2c3 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Mar 2023 13:23:51 +0800
Subject: [PATCH 303/319] * Modify case of dev module.

---
 module/dev/model.php         | 2 +-
 test/model/dev/sortmenus.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 6e561cae63..9e1b065031 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -666,7 +666,7 @@ class devModel extends model
     public function getTagMenus($module, $moduleName = '', $methodName = '')
     {
         $menus = array();
-        if($this->config->vision == 'lite' and $module == 'execution') return $menus;
+        if(!$module or ($this->config->vision == 'lite' and $module == 'execution')) return $menus;
 
         $titleList  = array();
         $tagMethods = array();
diff --git a/test/model/dev/sortmenus.php b/test/model/dev/sortmenus.php
index 56f82f37ea..65c083ecc9 100644
--- a/test/model/dev/sortmenus.php
+++ b/test/model/dev/sortmenus.php
@@ -13,14 +13,14 @@ cid=1
 pid=1
 
 检查传入空值时的情况 >> 0
-检查传入地盘导航顺序 >> index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,
+检查传入产品导航顺序 >> dashboard,story,plan,project,release,roadmap,track,doc,dynamic,settings,
 
 */
 
 global $tester;
 $menuList[0] = array();
-$menuList[1] = $tester->lang->my->menu;
+$menuList[1] = $tester->lang->product->menu;
 
 $devTester = new devTest();
 r($devTester->sortMenusTest($menuList[0])) && p() && e('0');                                                                              // 检查传入空值时的情况
-r($devTester->sortMenusTest($menuList[1])) && p() && e('index,calendar,work,audit,project,execution,contribute,dynamic,score,contacts,'); // 检查传入地盘导航顺序
+r($devTester->sortMenusTest($menuList[1])) && p() && e('dashboard,story,plan,project,release,roadmap,track,doc,dynamic,settings,'); // 检查传入产品导航顺序

From 6ffc053bcf9379bc1c334011a32efd12ea9598a5 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 13:50:38 +0800
Subject: [PATCH 304/319] * Modify tag lang menu tree.

---
 module/dev/model.php | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 9e1b065031..33f396ffe3 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -727,7 +727,7 @@ class devModel extends model
 
                             if($label == '@branch@') $label = $this->lang->dev->branch;
 
-                            /* Get the three-level menu under the drop mene . */
+                            /* Get the three-level menu under the drop menu. */
                             $moduleList = array($thisModule);
                             if(isset($subMenuValue['subModule'])) $moduleList = array_merge($moduleList, explode(',', $subMenuValue['subModule']));
                             $moduleList = array_unique($moduleList);
@@ -742,6 +742,18 @@ class devModel extends model
                                 }
 
                                 $this->app->loadLang($moduleKey);
+
+                                /* Construct secondary menu subitems. */
+                                if(isset($this->lang->$moduleKey->featureBar[$menuKey][$subMenuKey]))
+                                {
+                                    $titleList[]  = $label;
+                                    $tagMethods[] = $thisMethod;
+
+                                    $methodKey = "{$thisMethod}_{$subMenuKey}";
+                                    $subMenu->children[] = $this->getMenuObject($label, $moduleKey, $methodKey, ($methodName == $methodKey and $moduleName == $moduleKey));
+                                    $hasFeatureBar = true;
+                                }
+
                                 /* Replace secondary menu. */
                                 if(isset($this->lang->$moduleKey->featureBar[$thisMethod]))
                                 {
@@ -758,17 +770,6 @@ class devModel extends model
                                     $menus["$moduleKey-$thisMethod"] = $subMenu;
                                     $hasFeatureBar = false;
                                 }
-
-                                /* Construct secondary menu subitems. */
-                                if(isset($this->lang->$moduleKey->featureBar[$menuKey][$subMenuKey]))
-                                {
-                                    $titleList[]  = $label;
-                                    $tagMethods[] = $thisMethod;
-
-                                    $methodKey = "{$thisMethod}_{$subMenuKey}";
-                                    $subMenu->children[] = $this->getMenuObject($label, $moduleKey, $methodKey, ($methodName == $methodKey and $moduleName == $moduleKey));
-                                    $hasFeatureBar = true;
-                                }
                             }
                         }
                     }
@@ -779,17 +780,20 @@ class devModel extends model
         }
 
         /* Merge other feature bar menu tree. */
-        $this->app->loadLang($module);
-        if(isset($this->lang->$module->featureBar))
+        if($this->config->vision == 'rnd')
         {
-            foreach($this->lang->$module->featureBar as $method => $tags)
+            $this->app->loadLang($module);
+            if(isset($this->lang->$module->featureBar))
             {
-                if(in_array($method, $tagMethods)) continue;
+                foreach($this->lang->$module->featureBar as $method => $tags)
+                {
+                    if(in_array($method, $tagMethods)) continue;
 
-                $label        = zget($this->lang->$module, $method, $this->lang->$module->common);
-                $titleList[]  = $label;
-                $tagMethods[] = $method;
-                $menus[]      = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
+                    $label        = zget($this->lang->$module, $method, $this->lang->$module->common);
+                    $titleList[]  = $label;
+                    $tagMethods[] = $method;
+                    $menus[]      = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
+                }
             }
         }
 

From d5c74fe0aa48be4294376d051e1df56435f4ac87 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 14:41:38 +0800
Subject: [PATCH 305/319] * Modify menu tree.

---
 module/dev/model.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 33f396ffe3..0a6d869234 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -697,6 +697,8 @@ class devModel extends model
                     list($thisModule, $thisMethod) = $this->config->dev->linkMethods[$module]["{$thisModule}-{$thisMethod}"];
                 }
 
+                if($this->config->vision == 'lite' and $module == 'kanbanProject' and $thisMethod == 'index') continue;
+
                 $subMenu      = $this->getMenuObject($label, $thisModule, $thisMethod, ($methodName == $thisMethod and $moduleName == $thisModule));
                 $titleList[]  = $subMenu->title;
                 $tagMethods[] = $thisMethod;
@@ -780,7 +782,7 @@ class devModel extends model
         }
 
         /* Merge other feature bar menu tree. */
-        if($this->config->vision == 'rnd')
+        if($this->config->vision == 'rnd' or in_array($module, $this->config->dev->onlyMainMenu))
         {
             $this->app->loadLang($module);
             if(isset($this->lang->$module->featureBar))
@@ -789,10 +791,10 @@ class devModel extends model
                 {
                     if(in_array($method, $tagMethods)) continue;
 
-                    $label        = zget($this->lang->$module, $method, $this->lang->$module->common);
-                    $titleList[]  = $label;
-                    $tagMethods[] = $method;
-                    $menus[]      = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
+                    $label          = zget($this->lang->$module, $method, $this->lang->$module->common);
+                    $titleList[]    = $label;
+                    $tagMethods[]   = $method;
+                    $menus[$method] = $this->getMenuObject($label, $module, $method, ($methodName == $method and $moduleName == $module));
                 }
             }
         }

From 1edf4259a4928db724b4ed2743141e886e021679 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 8 Mar 2023 16:25:18 +0800
Subject: [PATCH 306/319] * Adjust code for handleSaveFormDraft .

---
 www/js/my.full.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 658f22faeb..481bda0289 100755
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -8,11 +8,12 @@
      */
     function handleSaveFormDraft()
     {
-        if(config.currentMethod === 'login' || config.currentMethod.indexOf('edit') != -1) return;
+        if(config.currentMethod === 'login' || config.currentMethod.indexOf('edit') != -1 || config.currentMethod.indexOf('import') != -1) return;
         setTimeout(function() {
             var form = $('.table-form').parent();
             if(form.length)
             {
+                if($(form).attr('target') == 'hiddenwin') return;
                 var formDataID     = config.currentMethod + '-' + config.currentModule + '-' + $(form).attr("id");
                 var formDataStored = $.zui.store.get(formDataID);
                 if(formDataStored)
@@ -36,7 +37,14 @@
                                         /* formItem === checkbox or formItem === multipleSelect */
                                         if(item.name.indexOf('[]') != -1)
                                         {
-                                            var formItem = $('[name^=' + item.name.replace('[]', '') + ']');
+                                            if((item.name.indexOf(']') != -1) && (item.name.indexOf('[') != -1))
+                                            {
+                                                var formItem = $('[name^=' + item.name.replace('[]', '').replace('[', '').replace(']', '') + ']');
+                                            }
+                                            else
+                                            {
+                                                var formItem = $('[name^=' + item.name.replace('[]', '') + ']');
+                                            }
                                         }
                                         else if((item.name.indexOf(']') != -1) && (item.name.indexOf('[') != -1))
                                         {

From 1364c7923b1b5cf8d91b2ef0f478e1afb0880420 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 16:41:51 +0800
Subject: [PATCH 307/319] * Fix bug #28114.

---
 module/product/control.php        | 2 +-
 module/product/js/create.js       | 4 ++--
 module/product/js/edit.js         | 4 ++--
 module/product/view/edit.html.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index ad41bc1d3e..f112722ee9 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1096,7 +1096,7 @@ class product extends control
         if(empty($productID) or $programID) $lines = $this->product->getLinePairs($programID);
 
         if($productID)  return print(html::select("lines[$productID]", array('' => '') + $lines, '', "class='form-control picker-select'"));
-        if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control chosen'"));
+        if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control picker-select'"));
     }
 
     /**
diff --git a/module/product/js/create.js b/module/product/js/create.js
index f44249c54f..548053f0ae 100644
--- a/module/product/js/create.js
+++ b/module/product/js/create.js
@@ -40,9 +40,9 @@ $('#program').change(function()
 
     $.get(createLink('product', 'ajaxGetLine', 'programID=' + programID), function(data)
     {
-        $('#line_chosen').remove();
         $('#line').replaceWith(data);
-        $('#line').chosen();
+        $('#line').siblings('.picker').remove();
+        $('#line').picker();
     })
 })
 
diff --git a/module/product/js/edit.js b/module/product/js/edit.js
index a62f015281..78c8f46ed5 100644
--- a/module/product/js/edit.js
+++ b/module/product/js/edit.js
@@ -10,8 +10,8 @@ $('#program').change(function()
 
     $.get(createLink('product', 'ajaxGetLine', 'programID=' + programID), function(data)
     {
-        $('#line_chosen').remove();
         $('#line').replaceWith(data);
-        $('#line').chosen();
+        $('#line').siblings('.picker').remove();
+        $('#line').picker();
     })
 });
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 69ae505779..ac976603a5 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -40,7 +40,7 @@
           </tr>
           <tr>
             <th class='w-140px'><?php echo $lang->product->line;?></th>
-            <td><?php echo html::select('line', $lines, $product->line, "class='form-control chosen'");?></td><td></td>
+            <td><?php echo html::select('line', $lines, $product->line, "class='form-control picker-select'");?></td><td></td>
           </tr>
           <?php endif;?>
           <tr>

From beaa4768b1dd7d59d05affaddb1f36f8070f3d90 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 17:06:31 +0800
Subject: [PATCH 308/319] * Fix bug #28726.

---
 module/productplan/view/view.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 7f5f527c0b..f5d67eff0b 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -102,7 +102,7 @@
         <?php if(common::hasPriv('productplan', 'linkStory')):?>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-story' data-ride="" method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
+        <form class='main-table table-story<?php if($link === 'true' and $type == 'story') echo " hidden";?>' data-ride="" method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
           <table class='table has-sort-head' id='storyList'>
             <?php
             $canBatchUnlink       = common::hasPriv('productPlan', 'batchUnlinkStory');
@@ -402,7 +402,7 @@
         </div>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-bug' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
+        <form class='main-table table-bug<?php if($link === 'true' and $type == 'bug') echo " hidden";?>' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
           <table class='table has-sort-head' id='bugList'>
             <?php
             $canBatchUnlink     = common::hasPriv('productplan', 'batchUnlinkBug');

From e409352d473431a8e1f85760a992e8f31544cb85 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 17:09:27 +0800
Subject: [PATCH 309/319] * Code for bug #28726.

---
 module/build/view/view.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 7c8103e77c..8ae0e72f7e 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -74,7 +74,7 @@ tbody tr td:first-child input {display: none;}
         <div class='actions'><?php echo html::a("javascript:showLink($build->id, \"story\")", '<i class="icon-link"></i> ' . $lang->build->linkStory, '', "class='btn btn-primary'");?></div>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-story' data-ride='table' method='post' target='hiddenwin' action='<?php echo $this->createLink($module, 'batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
+        <form class='main-table table-story<?php if($link === 'true' and $type == 'story') echo " hidden";?>' data-ride='table' method='post' target='hiddenwin' action='<?php echo $this->createLink($module, 'batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
           <table class='table has-sort-head' id='storyList'>
             <?php $canBatchUnlink = ($canBeChanged and common::hasPriv($module, 'batchUnlinkStory'));?>
             <?php $vars = "buildID={$build->id}&type=story&link=$link&param=$param&orderBy=%s";?>
@@ -192,7 +192,7 @@ tbody tr td:first-child input {display: none;}
         <div class='actions'><?php echo html::a("javascript:showLink($build->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->build->linkBug, '', "class='btn btn-primary'");?></div>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-bug' data-ride='table' method='post' target='hiddenwin' action="<?php echo $this->createLink($module, 'batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
+        <form class='main-table table-bug<?php if($link === 'true' and $type == 'bug') echo " hidden";?>' data-ride='table' method='post' target='hiddenwin' action="<?php echo $this->createLink($module, 'batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
           <table class='table has-sort-head' id='bugList'>
             <?php $canBatchUnlink = $canBeChanged and common::hasPriv($module, 'batchUnlinkBug');?>
             <?php $vars = "buildID={$build->id}&type=bug&link=$link&param=$param&orderBy=%s";?>

From 7e5fc5ade442b361cbd0af2938a41a10abc06406 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 17:11:44 +0800
Subject: [PATCH 310/319] * Code for bug #28726.

---
 module/release/view/view.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index cf7abb2bc2..e0e24011da 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -54,7 +54,7 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-story' method='post' id='linkedStoriesForm' data-ride="table">
+            <form class='main-table table-story<?php if($link === 'true' and $type == 'story') echo " hidden";?>' method='post' id='linkedStoriesForm' data-ride="table">
               <table class='table has-sort-head' id='storyList'>
                 <?php
                 $canBatchUnlink = common::hasPriv('release', 'batchUnlinkStory');
@@ -154,7 +154,7 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-bug' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
+            <form class='main-table table-bug<?php if($link === 'true' and $type == 'bug') echo " hidden";?>' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
               <table class='table has-sort-head' id='bugList'>
                 <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
                 <?php $canBatchClose  = common::hasPriv('bug', 'batchClose');?>
@@ -247,7 +247,7 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"leftBug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
+            <form class='main-table table-bug<?php if($link === 'true' and $type == 'leftBug') echo " hidden";?>' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
               <table class='table has-sort-head' id='leftBugList'>
                 <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
                 <?php $vars = "releaseID={$release->id}&type=leftBug&link=$link&param=$param&orderBy=%s";?>

From eeafdf767102543e410241f3963b2e9a38bf2b49 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Mar 2023 17:18:26 +0800
Subject: [PATCH 311/319] * Revmoe console code.

---
 module/api/js/create.js    | 1 -
 module/api/js/edit.js      | 1 -
 module/story/js/common.js  | 1 -
 module/zanode/js/common.js | 1 -
 4 files changed, 4 deletions(-)

diff --git a/module/api/js/create.js b/module/api/js/create.js
index e073d9d82e..8d0e441826 100644
--- a/module/api/js/create.js
+++ b/module/api/js/create.js
@@ -41,7 +41,6 @@ var app = new Vue({
     },
     methods: {
         changeAttr(val) {
-            // console.log('更新之前', JSON.stringify(val))
             this.body = val;
         },
         changeType(val) {
diff --git a/module/api/js/edit.js b/module/api/js/edit.js
index 1dc4d3074b..50ca3eb7f8 100644
--- a/module/api/js/edit.js
+++ b/module/api/js/edit.js
@@ -58,7 +58,6 @@ var app = new Vue({
     },
     methods: {
         changeAttr(val) {
-            // console.log('新的值', JSON.stringify(val))
             this.body = val
         },
         changeType(val) {
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 2c417172c9..e1238fc965 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -38,7 +38,6 @@ $(function()
             {
                 setTimeout(function()
                 {
-                    console.log(11);
                     $saveButton.attr('type', 'button').removeAttr('disabled');
                     $saveDraftButton.removeAttr('disabled');
                 }, 10000);
diff --git a/module/zanode/js/common.js b/module/zanode/js/common.js
index 80f22268ea..982fe25595 100644
--- a/module/zanode/js/common.js
+++ b/module/zanode/js/common.js
@@ -26,7 +26,6 @@ $(function()
         $.get(link, function(data)
         {
             data = JSON.parse(data);
-            console.log(data);
             $('#osName').val(data.osName);
             if(data.memory != 0)
             {

From 7e8b3cceb4327bb4d08baba23c802a3efa1cfecc Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 9 Mar 2023 09:42:25 +0800
Subject: [PATCH 312/319] * Fix undefined variable.

---
 module/bug/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/bug/control.php b/module/bug/control.php
index 4e22536a39..00cddd83c6 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2500,6 +2500,7 @@ class bug extends control
     public function ajaxGetProductBugs($productID, $bugID)
     {
         $product     = $this->loadModel('product')->getById($productID);
+        $bug         = $this->loadModel('bug')->getById($bugID);
         $branch      = $product->type == 'branch' ? ($bug->branch > 0 ? $bug->branch . ',0' : '0') : '';
         $productBugs = $this->bug->getProductBugPairs($productID, $branch);
         unset($productBugs[$bugID]);

From a71560aa80d1e700b87be52045e10737095a4a47 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 9 Mar 2023 09:47:01 +0800
Subject: [PATCH 313/319] * Fix undefined variable.

---
 module/bug/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 00cddd83c6..a838c93eb8 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2500,7 +2500,7 @@ class bug extends control
     public function ajaxGetProductBugs($productID, $bugID)
     {
         $product     = $this->loadModel('product')->getById($productID);
-        $bug         = $this->loadModel('bug')->getById($bugID);
+        $bug         = $this->getById($bugID);
         $branch      = $product->type == 'branch' ? ($bug->branch > 0 ? $bug->branch . ',0' : '0') : '';
         $productBugs = $this->bug->getProductBugPairs($productID, $branch);
         unset($productBugs[$bugID]);

From f69af0f62cabc86dcc3f62ff12d92fa090a2a6f5 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 9 Mar 2023 09:50:51 +0800
Subject: [PATCH 314/319] * Fix undefined variable.

---
 module/bug/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index a838c93eb8..9c3cbe038f 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2500,7 +2500,7 @@ class bug extends control
     public function ajaxGetProductBugs($productID, $bugID)
     {
         $product     = $this->loadModel('product')->getById($productID);
-        $bug         = $this->getById($bugID);
+        $bug         = $this->bug->getById($bugID);
         $branch      = $product->type == 'branch' ? ($bug->branch > 0 ? $bug->branch . ',0' : '0') : '';
         $productBugs = $this->bug->getProductBugPairs($productID, $branch);
         unset($productBugs[$bugID]);

From 99f54fc9557c3862cdf66888bd19c38d89b66b4d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 9 Mar 2023 10:54:41 +0800
Subject: [PATCH 315/319]  * fix bug #32738.

---
 module/dev/view/editor.html.php   | 2 +-
 module/editor/control.php         | 2 +-
 module/editor/view/index.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/dev/view/editor.html.php b/module/dev/view/editor.html.php
index d0710305f0..16a0229441 100644
--- a/module/dev/view/editor.html.php
+++ b/module/dev/view/editor.html.php
@@ -15,7 +15,7 @@
   <div class='text-center'>
     <?php
     echo $lang->dev->noteEditor;
-    if(common::hasPriv('editor', 'switch')) echo html::a($this->createLink('editor', 'switch', 'status=1'), $lang->dev->switchList[1], 'hiddenwin', "class='btn btn-primary'");
+    if(common::hasPriv('editor', 'switch')) echo html::a($this->createLink('editor', 'switch', 'status=1'), $lang->dev->switchList[1], '', "class='btn btn-primary'");
     ?>
   </div>
 </div>
diff --git a/module/editor/control.php b/module/editor/control.php
index 5ea09122ec..5e94e2d125 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -200,6 +200,6 @@ class editor extends control
         $this->loadModel('setting')->setItem('system.common.global.editor', $status);
 
         $link = empty($status) ? $this->createLink('dev', 'editor') : $this->createLink('editor', 'index');
-        return print(js::locate($link, 'parent'));
+        return print(js::locate($link));
     }
 }
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
index 52ad67d1a1..35bf66b4ef 100644
--- a/module/editor/view/index.html.php
+++ b/module/editor/view/index.html.php
@@ -16,7 +16,7 @@
   <div class="pull-left">
     <?php
     echo $lang->editor->turnOff;
-    echo html::a($this->createLink('editor', 'switch', 'status=0'), $lang->dev->switchList['0'], 'hiddenwin', "class='btn btn-sm'");
+    echo html::a($this->createLink('editor', 'switch', 'status=0'), $lang->dev->switchList['0'], '', "class='btn btn-sm'");
     ?>
   </div>
 </div>

From 4549e19e5da4e12ef92fcfb52d3c0561aab4e70c Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 9 Mar 2023 11:30:39 +0800
Subject: [PATCH 316/319]  * adjust for editor.

---
 module/editor/control.php    |  2 ++
 module/editor/css/extend.css |  1 +
 module/editor/model.php      | 13 ++++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/module/editor/control.php b/module/editor/control.php
index 5e94e2d125..f3956a5ffd 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -50,6 +50,8 @@ class editor extends control
      */
     public function extend($moduleDir = '')
     {
+        if(!isset($this->lang->{$moduleDir}->common)) $this->app->loadLang($moduleDir);
+
         $moduleFiles = $this->editor->getModuleFiles($moduleDir);
         $this->view->module = $moduleDir;
         $this->view->tree   = $this->editor->printTree($moduleFiles);
diff --git a/module/editor/css/extend.css b/module/editor/css/extend.css
index e019a90efa..a9ad22f8ae 100644
--- a/module/editor/css/extend.css
+++ b/module/editor/css/extend.css
@@ -3,3 +3,4 @@ body{padding-bottom:0px;background-color:#fff;}
 .collapsable > ul {display: block!important}
 .tree li:before {margin-right: 4px;}
 .tree li>a{display:inline;}
+.main-content{padding: 0px; padding-top: 20px;}
diff --git a/module/editor/model.php b/module/editor/model.php
index df5ef584e4..4598e6838f 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -25,6 +25,7 @@ class editorModel extends model
         foreach($this->config->editor->sort as $name)
         {
             $moduleFullFile = $modulePath . $name;
+            if(!file_exists($moduleFullFile)) continue;
             if($name == 'control.php' or $name == 'model.php')
             {
                 $allModules[$modulePath][$moduleFullFile] = $this->analysis($moduleFullFile);
@@ -204,9 +205,15 @@ class editorModel extends model
     {
         $tree     = '';
         $fileName = basename($filePath);
-        $file     = "<span title='$fileName'>$fileName</span>";
-        if(isset($this->lang->editor->modules[$fileName]))   $file = "<span title='$fileName'>" . $this->lang->editor->modules[$fileName]   . '</span>';
-        if(isset($this->lang->editor->translate[$fileName])) $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
+        if(isset($this->lang->editor->translate[$fileName]))
+        {
+            $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
+        }
+        else
+        {
+            $moduleName = zget($this->lang->editor->modules, $fileName, isset($this->lang->{$fileName}->common) ? $this->lang->{$fileName}->common : $fileName);
+            $file = "<span title='{$fileName}'>{$moduleName}</span>";
+        }
 
         if(strpos($filePath, DS . 'ext' . DS) !== false)
         {

From 7ed3f67bb5aaa032fc5b534e55479342227d9110 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 9 Mar 2023 14:01:58 +0800
Subject: [PATCH 317/319]  * fix bug for php 5.6.

---
 module/dev/view/editor.html.php   | 2 +-
 module/editor/control.php         | 2 +-
 module/editor/view/index.html.php | 4 ++--
 module/mail/config.php            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/dev/view/editor.html.php b/module/dev/view/editor.html.php
index 16a0229441..f905338d56 100644
--- a/module/dev/view/editor.html.php
+++ b/module/dev/view/editor.html.php
@@ -15,7 +15,7 @@
   <div class='text-center'>
     <?php
     echo $lang->dev->noteEditor;
-    if(common::hasPriv('editor', 'switch')) echo html::a($this->createLink('editor', 'switch', 'status=1'), $lang->dev->switchList[1], '', "class='btn btn-primary'");
+    if(common::hasPriv('editor', 'turnon')) echo html::a($this->createLink('editor', 'turnon', 'status=1'), $lang->dev->switchList[1], '', "class='btn btn-primary'");
     ?>
   </div>
 </div>
diff --git a/module/editor/control.php b/module/editor/control.php
index f3956a5ffd..4186dee101 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -197,7 +197,7 @@ class editor extends control
      * @access public
      * @return void
      */
-    public function switch($status)
+    public function turnon($status)
     {
         $this->loadModel('setting')->setItem('system.common.global.editor', $status);
 
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
index 35bf66b4ef..17fdfa33b9 100644
--- a/module/editor/view/index.html.php
+++ b/module/editor/view/index.html.php
@@ -11,12 +11,12 @@
  */
 ?>
 <?php include $app->getModuleRoot() . 'dev/view/header.html.php';?>
-<?php if(common::hasPriv('editor', 'switch')):?>
+<?php if(common::hasPriv('editor', 'turnon')):?>
 <div id='mainMenu' class='clearfix menu-secondary'>
   <div class="pull-left">
     <?php
     echo $lang->editor->turnOff;
-    echo html::a($this->createLink('editor', 'switch', 'status=0'), $lang->dev->switchList['0'], '', "class='btn btn-sm'");
+    echo html::a($this->createLink('editor', 'turnon', 'status=0'), $lang->dev->switchList['0'], '', "class='btn btn-sm'");
     ?>
   </div>
 </div>
diff --git a/module/mail/config.php b/module/mail/config.php
index 2fbfa040cb..16d3e0b39b 100644
--- a/module/mail/config.php
+++ b/module/mail/config.php
@@ -10,7 +10,7 @@ $config->mail->fromAddress = '';            // The from address.
 $config->mail->fromName    = '';            // The from name.
 $config->mail->mta         = 'smtp';        // The send mail type.
 $config->mail->smtp->debug    = 0;          // Debug level, 0,1,2.
-$config->mail->smtp->charset  = 'utf-8';    // Charset 
+$config->mail->smtp->charset  = 'utf-8';    // Charset
 $config->mail->smtp->auth     = true;       // Need auth or not. true|false
 $config->mail->smtp->host     = 'localhost';// The smtp server host address.
 $config->mail->smtp->port     = '25';       // The smtp server host port.

From f99fba7c50952ffdfd3d1d7e198fb68ae778699a Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 9 Mar 2023 14:12:13 +0800
Subject: [PATCH 318/319]  * fix bug.

---
 module/editor/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/editor/control.php b/module/editor/control.php
index 4186dee101..13d392ddd0 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -22,7 +22,7 @@ class editor extends control
     public function __construct($module = '', $method = '')
     {
         parent::__construct($module, $method);
-        if($this->app->getMethodName() != 'switch' and empty($this->config->global->editor)) $this->locate($this->createLink('dev', 'editor'));
+        if($this->app->getMethodName() != 'turnon' and empty($this->config->global->editor)) $this->locate($this->createLink('dev', 'editor'));
     }
 
     /**

From cad1498860bc1956a71057b7e6fec83b40995a79 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 9 Mar 2023 14:50:22 +0800
Subject: [PATCH 319/319]  * fix bug for module list.

---
 module/editor/view/index.html.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
index 17fdfa33b9..0fd6e4e40a 100644
--- a/module/editor/view/index.html.php
+++ b/module/editor/view/index.html.php
@@ -39,7 +39,18 @@
         <?php if(!empty($modules[$group])):?>
         <div class='modulegroup'><?php echo $groupName?></div>
         <?php foreach($modules[$group] as $module):?>
-        <?php $moduleName = zget($lang->dev->tableList, $module, $module);?>
+        <?php
+        $moduleName = $module;
+        if(isset($lang->dev->tableList[$module]))
+        {
+            $moduleName = $lang->dev->tableList[$module];
+        }
+        else
+        {
+            if(!isset($lang->{$module}->common)) $app->loadLang($module);
+            $moduleName = isset($lang->{$module}->common) ? $lang->{$module}->common : $module;
+        }
+        ?>
         <?php echo html::a(inlink('extend', "moduleDir=$module"), $moduleName, 'extendWin');?>
         <?php endforeach;?>
         <?php endif;?>